Merge pull request #33 from pesto-students/dev

File structure restructure
pesto-students · Aug 7, 2023 · 5d5bf07 · 5d5bf07
2 parents 22f5baf + d75171c
commit 5d5bf07
Show file tree

Hide file tree

Showing 79 changed files with 230 additions and 396 deletions.
diff --git a/src/App/assets/404.svg → public/404.svg b/src/App/assets/404.svg → public/404.svg
diff --git a/src/App/assets/hero.png → public/hero.png b/src/App/assets/hero.png → public/hero.png
diff --git a/src/App/assets/MIRA.png → public/mira.png b/src/App/assets/MIRA.png → public/mira.png
diff --git a/src/App/assets/undraw_wandering_mind.svg → public/undraw_wandering_mind.svg b/src/App/assets/undraw_wandering_mind.svg → public/undraw_wandering_mind.svg
diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src/App/App.tsx → src/App.tsx b/src/App/App.tsx → src/App.tsx
@@ -1,12 +1,9 @@
-import { useEffect } from 'react';
 import { styled, CssBaseline } from '@mui/material';
 import { useRoutes } from 'react-router-dom';
 import { LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
-import { useAppDispatch, useAppSelector } from 'App/hooks';
-import { onAuthStateChangedListener } from 'App/firebase/firebaseConfig';
-import { saveFirebaseUser } from 'features/auth/authSlice';
 import { SnackbarProvider, MaterialDesignContent } from 'notistack';
+
 import router from './router';
 import ThemeProvider from './theme/ThemeProvider';
 
@@ -22,8 +19,6 @@ const StyledSnackbarContent = styled(MaterialDesignContent)(({ theme }) => ({
 const App = () => {
   const content = useRoutes(router);
 
-  const dispatch = useAppDispatch();
-
   return (
     <SnackbarProvider
       Components={{

diff --git a/src/App/assets/avatar-1.svg b/src/App/assets/avatar-1.svg
diff --git a/src/App/assets/img.png b/src/App/assets/img.png
diff --git a/src/App/assets/logo.png b/src/App/assets/logo.png
diff --git a/src/App/router.tsx b/src/App/router.tsx
diff --git a/src/api/api.tsx b/src/api/api.tsx
diff --git a/src/components/temp/tempDrawer.tsx b/src/components/temp/tempDrawer.tsx
diff --git a/src/features/Board/Filters/index.tsx b/src/features/Board/Filters/index.tsx
@@ -15,8 +15,8 @@ import { debounce, xor } from 'lodash';
 
 import { ClearAll, Filters } from './Styles';
 
-import TextFieldWrapper from 'shared/components/TextFieldWrapper';
-import { useAppDispatch, useAppSelector } from 'App/hooks';
+import TextFieldWrapper from 'ui/TextFieldWrapper';
+import { useAppDispatch, useAppSelector } from 'hooks';
 import {
   setClearAll,
   setMyOnly,

diff --git a/src/features/Board/Lists/List/Issue/Issue.tsx b/src/features/Board/Lists/List/Issue/Issue.tsx
@@ -17,7 +17,7 @@ import {
   Assignees,
   AssigneeAvatar,
 } from './Styles';
-import { useAppSelector } from 'App/hooks';
+import { useAppSelector } from 'hooks';
 import { CardPriority } from 'shared/constants/card';
 import { useNavigate } from 'react-router-dom';
 

diff --git a/src/features/Board/Lists/Lists.tsx b/src/features/Board/Lists/Lists.tsx
@@ -4,9 +4,9 @@ import { CardStatus } from 'shared/constants/card';
 import List from './List/List';
 import { Lists } from './Styles';
 import React, { useEffect, useState } from 'react';
-import { useAppDispatch, useAppSelector } from 'App/hooks';
+import { useAppDispatch, useAppSelector } from 'hooks';
 
-import { Icard } from 'App/types';
+import { Icard } from 'types';
 import { Ifilters } from 'features/Board/types';
 import type { DropResult } from 'react-beautiful-dnd';
 import { useGetCardsQuery } from 'features/card/cardApiSlice';

diff --git a/src/features/Board/ProjectBoard.tsx b/src/features/Board/ProjectBoard.tsx
@@ -1,17 +1,17 @@
 import React, { useEffect } from 'react';
 
-import Breadcrumbs from 'shared/components/Breadcrumbs';
+import Breadcrumbs from 'ui/Breadcrumbs';
 
-import PageHeader from 'shared/components/PageHeader/PageHeader';
+import PageHeader from 'ui/PageHeader/PageHeader';
 import Filters from './Filters';
-import { useAppSelector } from 'App/hooks';
+import { useAppSelector } from 'hooks';
 
 import type { IProjectBoardProps as Props } from './types';
-import PageError from 'shared/components/PageError';
+import PageError from 'ui/PageError';
 import ProjectBoardLists from './Lists/Lists';
 import { useGetProjectQuery } from 'features/project/projectApiSlice';
 import { useGetCardsQuery } from 'features/card/cardApiSlice';
-import GlobalLoader from 'components/GlobalLoader/GlobalLoader';
+import GlobalLoader from 'ui/GlobalLoader/GlobalLoader';
 
 const ProjectBoard: React.FC<Props> = () => {
   const { currentProject } = useAppSelector((state) => state.project);

diff --git a/src/features/Board/types.tsx b/src/features/Board/types.tsx
@@ -1,4 +1,4 @@
-import { Iproject, Iuser } from 'App/types';
+import { Iproject, Iuser } from 'types';
 
 export interface Iboard {
   title: string;

diff --git a/src/features/auth/Login.tsx b/src/features/auth/Login.tsx
@@ -9,12 +9,12 @@ import {
   FormControlLabel,
 } from '@mui/material';
 import { Visibility, VisibilityOff } from '@mui/icons-material';
-import ButtonWrapper from 'shared/components/ButtonWrapper';
-import TextFieldWrapper from 'shared/components/TextFieldWrapper';
-import LinkWrapper from 'shared/components/LinkWrapper';
-import GenericErrorModal from 'shared/components/Modal/GenericErrorModal';
+import ButtonWrapper from 'ui/ButtonWrapper';
+import TextFieldWrapper from 'ui/TextFieldWrapper';
+import LinkWrapper from 'ui/LinkWrapper';
+import GenericErrorModal from 'ui/Modal/GenericErrorModal';
 import ResetPassword from './ResetPassword';
-import { useAppDispatch, useAppSelector } from 'App/hooks';
+import { useAppDispatch, useAppSelector } from 'hooks';
 import { userLogin } from './authAction';
 import { setError as setAuthError, setCredentials } from './authSlice';
 import { useLoginMutation } from './authApiSlice';