diff --git a/.eslintrc.json b/.eslintrc.json index c4f29da..cb6d4e4 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,5 @@ { "extends": [ - "next/core-web-vitals", - "plugin:testing-library/react", - "plugin:jest-dom/recommended" + "next/core-web-vitals" ] } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78ca1fd..d06af2b 100644 --- a/.gitlab-ci.yml +++ b/.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 \ No newline at end of file + - 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 \ No newline at end of file diff --git a/mocks/handler.js b/mocks/handler.js index 91215d2..b9ae85f 100644 --- a/mocks/handler.js +++ b/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 = [ ), ); }), + ] \ No newline at end of file diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabDetails.jsx similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabDetails.jsx rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabDetails.jsx diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabLabel.jsx similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabLabel.jsx rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabLabel.jsx diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabTime.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabTime.jsx similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/CallTabTime.jsx rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/CallTabTime.jsx diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/__test__/CallTabDetails.test.js similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabDetails.test.js rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/__test__/CallTabDetails.test.js diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabTime.test.js b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/__test__/CallTabTime.test.js similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/__test__/CallTabTime.test.js rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/__test__/CallTabTime.test.js diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/index.jsx similarity index 100% rename from src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/callTabsList/index.jsx rename to src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/CallTabsList/index.jsx diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/index.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/index.jsx index 4e1d2f1..8a96506 100644 --- a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/CallTabs/index.jsx +++ b/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() diff --git a/src/components/layouts/Dashboard/Header/index.jsx b/src/components/layouts/Dashboard/Header/index.jsx index 8760960..e8af065 100644 --- a/src/components/layouts/Dashboard/Header/index.jsx +++ b/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(); diff --git a/src/core/components/LoadingHardPage.jsx b/src/core/components/LoadingHardPage.jsx index 4bbdbf4..5d00cd0 100644 --- a/src/core/components/LoadingHardPage.jsx +++ b/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": { diff --git a/src/core/components/StyledForm.jsx b/src/core/components/StyledForm.jsx index 41eeabc..253fc12 100644 --- a/src/core/components/StyledForm.jsx +++ b/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)``; diff --git a/src/core/components/svgs/Svg403.jsx b/src/core/components/svgs/Svg403.jsx index 720828c..d706ed0 100644 --- a/src/core/components/svgs/Svg403.jsx +++ b/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() diff --git a/src/core/components/svgs/Svg404.jsx b/src/core/components/svgs/Svg404.jsx index e46ab12..159d7c6 100644 --- a/src/core/components/svgs/Svg404.jsx +++ b/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() diff --git a/src/core/components/svgs/SvgChangePassword.jsx b/src/core/components/svgs/SvgChangePassword.jsx index a7ee82f..1221d28 100644 --- a/src/core/components/svgs/SvgChangePassword.jsx +++ b/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() diff --git a/src/core/components/svgs/SvgDashboard.jsx b/src/core/components/svgs/SvgDashboard.jsx index a5b40e0..a636bf4 100644 --- a/src/core/components/svgs/SvgDashboard.jsx +++ b/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 ( diff --git a/src/core/components/svgs/SvgLoading.jsx b/src/core/components/svgs/SvgLoading.jsx index f9cea4a..9ff61ff 100644 --- a/src/core/components/svgs/SvgLoading.jsx +++ b/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() diff --git a/src/core/components/svgs/SvgLogin.jsx b/src/core/components/svgs/SvgLogin.jsx index 643c195..edf3b51 100644 --- a/src/core/components/svgs/SvgLogin.jsx +++ b/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() diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js index 3fc0300..dd8acee 100644 --- a/src/core/data/apiRoutes.js +++ b/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"