CFE-26 merging

.eslintrc.json

@@ -1,7 +1,5 @@
 {
   "extends": [
-    "next/core-web-vitals",
-    "plugin:testing-library/react",
-    "plugin:jest-dom/recommended"
+    "next/core-web-vitals"
   ]
 }

.gitlab-ci.yml

@@ -3,22 +3,116 @@ image: node:latest
 stages:
   - build
   - test
+  - test:build
+  - deploy
 
-before_script:
-  - npm install
+merge:build:
+  stage: build
+  script:
+    - npm install
+    - cp example.env.local .env.local
+    - cp example.env.local .env.test
+  only:
+    - merge_requests
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+merge:test:jest:
+  stage: test
+  script:
+    - npm run test
+  only:
+    - merge_requests
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+merge:test:lint:
+  stage: test
+  script:
+    - npm run lint
+  only:
+    - merge_requests
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+merge:test:build:
+  stage: test:build
+  script:
+    - npm run build
+  only:
+    - merge_requests
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
 
 build:
   stage: build
   script:
-    - echo "Run build project"
-    - npm run build
+    - npm install
+    - cp example.env.local .env.local
+    - cp example.env.local .env.test
   only:
-    - merge_requests
+    - develop
+    - main
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
 
-test:
+test:jest:
   stage: test
   script:
-    - echo "Run test project"
     - npm run test
   only:
-    - merge_requests
+    - develop
+    - main
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+test:lint:
+  stage: test
+  script:
+    - npm run lint
+  only:
+    - develop
+    - main
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+test:build:
+  stage: test:build
+  script:
+    - npm run build
+  only:
+    - develop
+    - main
+  artifacts:
+    paths:
+      - node_modules
+      - .env.local
+      - .env.test
+
+deploy:
+  stage: deploy
+  script:
+    - echo "Run deploy project"
+  only:
+    - main

mocks/handler.js

@@ -1,7 +1,7 @@
 import {
     GET_PERMISSIONS_LIST,
     GET_ROLE_MANAGEMENT,
-    GET_TAB_DETAILS,
+    GET_SIDEBAR_NOTIFICATION,
     GET_USER_ROUTE,
     SET_USER_PASSWORD
 } from "@/core/data/apiRoutes";
@@ -18,6 +18,11 @@ export const handler = [
             }
         }))
     }),
+    rest.get(GET_SIDEBAR_NOTIFICATION, (req, res, ctx) => {
+        return res(ctx.json({
+            data: []
+        }))
+    }),
     rest.post(SET_USER_PASSWORD, (req, res, ctx) => {
         return res(
             ctx.status(200),
@@ -90,4 +95,5 @@ export const handler = [
             ),
         );
     }),
+
 ]

src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/index.jsx

@@ -1,6 +1,6 @@
-import CallTabsList from "src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList";
 import CallTabPanel from "@/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabPanel";
 import useAnswers from "@/lib/callWidget/hooks/useAnswers";
+import CallTabsList from "src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList";
 
 const CallTabs = () => {
     const {answersList} = useAnswers()

src/components/layouts/Dashboard/Header/index.jsx

@@ -1,6 +1,8 @@
 import MenuIcon from "@mui/icons-material/Menu";
-import {AppBar, Box, Container, CssBaseline, IconButton, Stack, Toolbar, useTheme} from "@mui/material";
 import ProfileMenu from "./ProfileMenu";
+import {useTheme} from "@mui/material/styles";
+import CssBaseline from "@mui/material/CssBaseline";
+import {AppBar, Box, Container, IconButton, Stack, Toolbar} from "@mui/material";
 
 function Header({drawerWidth, handleDrawerToggle}) {
     const theme = useTheme();

src/core/components/LoadingHardPage.jsx

@@ -1,5 +1,6 @@
-import {Backdrop, Box, styled} from "@mui/material";
 import SvgLoading from "@/core/components/svgs/SvgLoading";
+import {Backdrop, Box} from "@mui/material";
+import {styled} from "@mui/material/styles";
 
 const LoadingImage = styled(Box)({
     "@keyframes load": {

src/core/components/StyledForm.jsx

@@ -1,5 +1,5 @@
-import {styled} from "@mui/material";
 import {Form} from "formik";
+import {styled} from "@mui/material/styles";
 
 const StyledForm = styled(Form)``;
 

src/core/components/svgs/Svg403.jsx

@@ -1,4 +1,4 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const Svg403 = ({width, height}) => {
     const theme = useTheme()

src/core/components/svgs/Svg404.jsx

@@ -1,4 +1,4 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const Svg404 = ({width, height}) => {
     const theme = useTheme()

src/core/components/svgs/SvgChangePassword.jsx

@@ -1,4 +1,4 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const SvgChangePassword = ({width, height}) => {
     const theme = useTheme()

src/core/components/svgs/SvgDashboard.jsx

@@ -1,9 +1,9 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const SvgDashboard = ({width, height}) => {
     const theme = useTheme()
     const fillColor = theme.palette.primary.main
-    
+
     return (
         <svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" width={width} height={height}
              viewBox="0 0 1029.56255 548.69495">

src/core/components/svgs/SvgLoading.jsx

@@ -1,4 +1,4 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const SvgLoading = ({width, height}) => {
     const theme = useTheme()

src/core/components/svgs/SvgLogin.jsx

@@ -1,4 +1,4 @@
-import {useTheme} from "@mui/material";
+import {useTheme} from "@mui/material/styles";
 
 const SvgLogin = ({width, height}) => {
     const theme = useTheme()

src/core/data/apiRoutes.js

@@ -4,6 +4,10 @@ const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL;
 export const GET_USER_TOKEN = BASE_URL + "/api/auth/login";
 //end login
 
+//edit profile
+export const UPDATE_AVATAR = BASE_URL + "";
+//end edit profile
+
 //change password
 export const SET_USER_PASSWORD = BASE_URL + "/api/profile/change_password";
 //end change password
@@ -12,6 +16,11 @@ export const SET_USER_PASSWORD = BASE_URL + "/api/profile/change_password";
 export const GET_USER_ROUTE = BASE_URL + "/api/profile/info";
 //user data
 
+//sidebar notification
+export const GET_SIDEBAR_NOTIFICATION = BASE_URL + "/dashboard/notification"
+//sidebar notification
+
+
 // role management
 export const GET_ROLE_MANAGEMENT =
     BASE_URL + "/api/roles"