Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat/fix(#1011): rewriting Barcode Configuration Admin page in React #1026

Merged
merged 7 commits into from
Jun 6, 2024
Merged

feat/fix(#1011): rewriting Barcode Configuration Admin page in React #1026

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd58a44
restController created + Page inital setup
adityadeshlahre Apr 30, 2024
8b286ef
JSP page to React + lang update
adityadeshlahre May 1, 2024
69c3d0e
inputFields + fix done
adityadeshlahre May 2, 2024
4cb7473
notificationsAdded + final commit 00
adityadeshlahre May 2, 2024
55e9e34
hot fix 01
adityadeshlahre Jun 6, 2024
d182614
hot fix 02
adityadeshlahre Jun 6, 2024
b71c14c
Merge branch 'develop' into fix-1011-rewrite-barcode-configuration
mozzy11 Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions frontend/src/components/admin/Admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
Settings,
ListDropdown,
CicsSystemGroup,
QrCode,
} from "@carbon/icons-react";
import PathRoute from "../utils/PathRoute";
import CalculatedValue from "./calculatedValue/CalculatedValueForm";
Expand All @@ -36,6 +37,7 @@ import { CommonProperties } from "./menu/CommonProperties";
import ConfigMenuDisplay from "./formEntry/common/ConfigMenuDisplay";

import ProviderMenu from "./ProviderMenu/ProviderMenu";
import BarcodeConfiguration from "./barcodeConfiguration/BarcodeConfiguration";

function Admin() {
const intl = useIntl();
Expand Down Expand Up @@ -63,6 +65,9 @@ function Admin() {
<SideNavLink renderIcon={CicsSystemGroup} href="#providerMenu">
<FormattedMessage id="provider.browse.title" />
</SideNavLink>
<SideNavLink renderIcon={QrCode} href="#barcodeConfiguration">
<FormattedMessage id="sidenav.label.admin.barcodeconfiguration" />
</SideNavLink>
<SideNavMenu
title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
renderIcon={TableOfContents}
Expand Down Expand Up @@ -145,6 +150,9 @@ function Admin() {
<PathRoute path="#providerMenu">
<ProviderMenu />
</PathRoute>
<PathRoute path="#barcodeConfiguration">
<BarcodeConfiguration />
</PathRoute>
<PathRoute path="#globalMenuManagement">
<GlobalMenuManagement />
</PathRoute>
Expand Down
Loading
Loading