feat: 메뉴 반영

3 years ago · 8f43d84268
parent 486e87febc
commit 8f43d84268
9 changed files with 93 additions and 50 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,3 @@
-REACT_APP_VERSION = v3.1.0
+REACT_APP_VERSION = v0.0.1
 REACT_APP_API_URL=http://localhost:8090
 REACT_APP_SERVER_TIMEOUT=60000
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
-  "name": "berry-material-react",
-  "version": "3.1.0",
+  "name": "xit-opst-fo",
+  "version": "0.0.1",
  "private": true,
  "dependencies": {
    "@auth0/auth0-spa-js": "^1.19.4",
--- a/public/index.html
+++ b/public/index.html
@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-    <title>Berry - React Material Admin Dashboard Template</title>
+    <title>주정차 위반 의견진술 심사</title>
    <link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
    <!-- Meta Tags-->
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#2296f3" />
-    <meta name="title" content="Berry - React Material Admin Dashboard Template by CodedThemes" />
+    <meta name="title" content="Parking violation opinion statement review" />
    <meta
      name="description"
      content="Start your next React project with Berry admin template. It build with Reactjs, Material-UI, Redux, and Hook for faster web development."
--- a/src/contexts/JWTContext.js
+++ b/src/contexts/JWTContext.js
@ -30,6 +30,7 @@ const verifyToken = (accessToken) => {
  }
  const decoded = jwtDecode(accessToken);
  console.log(decoded);
+  console.log(decoded.exp > Date.now() / 1000);

  /**
   * Property 'exp' does not exist on type '<T = unknown>(token, options?: JwtDecodeOptions | undefined) => T'.
--- a/src/layout/MainLayout/Sidebar/index.js
+++ b/src/layout/MainLayout/Sidebar/index.js
@ -3,7 +3,7 @@ import { memo, useMemo } from 'react';

 // material-ui
 import { useTheme } from '@mui/material/styles';
-import { Box, Drawer, Stack, useMediaQuery } from '@mui/material';
+import { Box, Drawer, useMediaQuery } from '@mui/material';

 // third-party
 import PerfectScrollbar from 'react-perfect-scrollbar';
@ -11,11 +11,9 @@ import PerfectScrollbar from 'react-perfect-scrollbar';
 // project imports
 import MenuList from './MenuList';
 import LogoSection from '../LogoSection';
-import MenuCard from './MenuCard';
 import { openDrawer } from 'store/slices/menu';
 import { useDispatch, useSelector } from 'store';
 import { drawerWidth } from 'store/constant';
-import Chip from 'ui-component/extended/Chip';

 // ==============================|| SIDEBAR DRAWER ||============================== //

@ -48,10 +46,6 @@ const Sidebar = ({ window }) => {
        }}
      >
        <MenuList />
-        <MenuCard />
-        <Stack direction="row" justifyContent="center" sx={{ mb: 2 }}>
-          <Chip label={process.env.REACT_APP_VERSION} disabled chipcolor="secondary" size="small" sx={{ cursor: 'pointer' }} />
-        </Stack>
      </PerfectScrollbar>
    ),
    // eslint-disable-next-line react-hooks/exhaustive-deps
--- a/src/menu-items/opst.js
+++ b/src/menu-items/opst.js
@ -16,7 +16,11 @@ import {
  IconClipboardCheck,
  IconDisabled,
  IconUser,
-  IconParking
+  IconParking,
+  IconDatabase,
+  IconDatabaseImport,
+  IconList,
+  IconFileCertificate
 } from '@tabler/icons';

 // constant
@ -34,7 +38,11 @@ const icons = {
  IconClipboardCheck,
  IconUser,
  IconDisabled,
-  IconParking
+  IconParking,
+  IconDatabase,
+  IconDatabaseImport,
+  IconList,
+  IconFileCertificate
 };

 // ==============================|| OPST MENU ITEMS ||============================== //
@ -65,16 +73,16 @@ const opst = {
          id: 'opst-2-1',
          title: <FormattedMessage id="opst-2-1" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/parking/review',
+          icon: icons.IconList
        },
        {
          /* 심의 등록 */
          id: 'opst-2-2',
          title: <FormattedMessage id="opst-2-2" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/parking/register',
+          icon: icons.IconDatabaseImport
        }
      ]
    },
@ -90,24 +98,24 @@ const opst = {
          id: 'opst-3-1',
          title: <FormattedMessage id="opst-3-1" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/resident/data',
+          icon: icons.IconDatabase
        },
        {
          /* 심의 목록 */
          id: 'opst-3-2',
          title: <FormattedMessage id="opst-2-1" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/resident/review',
+          icon: icons.IconList
        },
        {
          /* 심의 등록 */
          id: 'opst-3-3',
-          title: <FormattedMessage id="opst-2-1" />,
+          title: <FormattedMessage id="opst-2-2" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/resident/register',
+          icon: icons.IconDatabaseImport
        }
      ]
    },
@ -123,24 +131,24 @@ const opst = {
          id: 'opst-4-1',
          title: <FormattedMessage id="opst-3-1" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/disabled/dataMgt',
+          icon: icons.IconDatabase
        },
        {
          /* 심의 목록 */
          id: 'opst-4-2',
          title: <FormattedMessage id="opst-2-1" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/disabled/review',
+          icon: icons.IconList
        },
        {
          /* 심의 등록 */
          id: 'opst-4-3',
          title: <FormattedMessage id="opst-2-2" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey
+          url: '/disabled/register',
+          icon: icons.IconDatabaseImport
        }
      ]
    },
@ -157,18 +165,16 @@ const opst = {
          id: 'opst-5-1',
          title: <FormattedMessage id="opst-5" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey,
-          target: true
+          url: '/user/management',
+          icon: icons.IconDatabase
        },
        {
          /* 심사위원 평가 */
          id: 'opst-5-2',
          title: <FormattedMessage id="opst-5-2" />,
          type: 'item',
-          url: '/board',
-          icon: icons.IconKey,
-          target: true
+          url: '/user/juror',
+          icon: icons.IconFileCertificate
        }
      ]
    },
@ -177,9 +183,8 @@ const opst = {
      id: 'opst-6',
      title: <FormattedMessage id="opst-6" />,
      type: 'item',
-      url: '/board',
-      icon: icons.IconMessage,
-      target: true
+      url: '/sms/management',
+      icon: icons.IconMessage
    },
    {
      /* 게시판 관리 */
--- a/src/menu-items/other.js
+++ b/src/menu-items/other.js
@ -33,15 +33,6 @@ const other = {
      icon: icons.IconHelp,
      external: true,
      target: true
-    },
-    {
-      id: 'roadmap',
-      title: <FormattedMessage id="roadmap" />,
-      type: 'item',
-      url: 'https://codedthemes.gitbook.io/berry/roadmap',
-      icon: icons.IconSitemap,
-      external: true,
-      target: true
    }
  ]
 };
--- a/src/routes/MainRoutes.js
+++ b/src/routes/MainRoutes.js
@ -24,6 +24,7 @@ const MainRoutes = {
    </AuthGuard>
  ),
  children: [
+    /* Dashboard */
    {
      path: '/dashboard/default',
      element: <DashboardDefault />
@ -32,14 +33,65 @@ const MainRoutes = {
      path: '/dashboard/analytics',
      element: <DashboardAnalytics />
    },
+    /* 공지사항 */
    {
      path: '/publicBoard',
      element: <PublicBoard />
    },
+    /* 주정차 */
+    {
+      path: '/parking/review',
+      element: <Board />
+    },
+    {
+      path: '/parking/register',
+      element: <Board />
+    },
+    /* 거주자 */
+    {
+      path: '/resident/data',
+      element: <Board />
+    },
+    {
+      path: '/resident/review',
+      element: <Board />
+    },
+    {
+      path: '/resident/register',
+      element: <Board />
+    },
+    /* 장애인 */
+    {
+      path: '/disabled/data',
+      element: <Board />
+    },
+    {
+      path: '/disabled/review',
+      element: <Board />
+    },
+    {
+      path: '/disabled/register',
+      element: <Board />
+    },
+    /* 사용자 */
+    {
+      path: '/user/management',
+      element: <Board />
+    },
+    /* SMS */
+    {
+      path: '/sms/management',
+      element: <Board />
+    },
+    /* 게시판 */
    {
      path: '/board',
      element: <Board />
    },
+    {
+      path: '/user/juror',
+      element: <Board />
+    },
    {
      path: '/sample-page',
      element: <SamplePage />
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@ -28,7 +28,7 @@ const axiosService = axios.create({
 const alertError = (config, request, response, error) => {
  if (response && response.data) {
    const errCode = response.data.code || response.data.status;
-    const errMsg = response.data.code != '' && response.data.code != null ? response.data.message : response.data.error;
+    const errMsg = response.data.code !== '' && response.data.code !== null ? response.data.message : response.data.error;
    console.error(`${errCode}: ${errMsg}`);
    console.error('=================================');