From 00ab43aaf54a6ca9228cd0388c78895f18e8e1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= Date: Wed, 14 Dec 2022 12:03:12 -0300 Subject: [PATCH] Move home and classroom screen to student folder --- src/app/StudentRoutes.js | 5 +++-- .../{ => student}/Classroom/AnnouncementsTab/index.js | 6 +++--- .../{ => student}/Classroom/AnnouncementsTab/styles.js | 0 src/screens/{ => student}/Classroom/AssignmentsTab/index.js | 2 +- .../{ => student}/Classroom/AssignmentsTab/styles.js | 0 src/screens/{ => student}/Classroom/Header/index.js | 0 src/screens/{ => student}/Classroom/Header/styles.js | 0 src/screens/{ => student}/Classroom/PeopleTab/index.js | 2 +- src/screens/{ => student}/Classroom/PeopleTab/styles.js | 0 src/screens/{ => student}/Classroom/View.js | 0 src/screens/{ => student}/Classroom/index.js | 4 ++-- src/screens/{ => student}/Classroom/styles.js | 0 src/screens/{ => student}/Classroom/tabOptions.js | 0 src/screens/{ => student}/Home/View.js | 6 +++--- src/screens/{ => student}/Home/index.js | 6 +++--- src/screens/{ => student}/Home/styles.js | 0 16 files changed, 16 insertions(+), 15 deletions(-) rename src/screens/{ => student}/Classroom/AnnouncementsTab/index.js (98%) rename src/screens/{ => student}/Classroom/AnnouncementsTab/styles.js (100%) rename src/screens/{ => student}/Classroom/AssignmentsTab/index.js (99%) rename src/screens/{ => student}/Classroom/AssignmentsTab/styles.js (100%) rename src/screens/{ => student}/Classroom/Header/index.js (100%) rename src/screens/{ => student}/Classroom/Header/styles.js (100%) rename src/screens/{ => student}/Classroom/PeopleTab/index.js (99%) rename src/screens/{ => student}/Classroom/PeopleTab/styles.js (100%) rename src/screens/{ => student}/Classroom/View.js (100%) rename src/screens/{ => student}/Classroom/index.js (97%) rename src/screens/{ => student}/Classroom/styles.js (100%) rename src/screens/{ => student}/Classroom/tabOptions.js (100%) rename src/screens/{ => student}/Home/View.js (96%) rename src/screens/{ => student}/Home/index.js (87%) rename src/screens/{ => student}/Home/styles.js (100%) diff --git a/src/app/StudentRoutes.js b/src/app/StudentRoutes.js index b3d2961..1dc6b4a 100644 --- a/src/app/StudentRoutes.js +++ b/src/app/StudentRoutes.js @@ -1,9 +1,10 @@ import { Navigate, Route, Routes } from 'react-router-dom'; -import Home from '../screens/Home'; +import Home from '../screens/student/Home'; +import Classroom from '../screens/student/Classroom'; + import Information from '../screens/Information'; import Calendar from '../screens/Calendar'; -import Classroom from '../screens/Classroom'; import Assignment from '../screens/Assignment'; import Profile from '../screens/Profile'; diff --git a/src/screens/Classroom/AnnouncementsTab/index.js b/src/screens/student/Classroom/AnnouncementsTab/index.js similarity index 98% rename from src/screens/Classroom/AnnouncementsTab/index.js rename to src/screens/student/Classroom/AnnouncementsTab/index.js index 5540a94..90d169d 100644 --- a/src/screens/Classroom/AnnouncementsTab/index.js +++ b/src/screens/student/Classroom/AnnouncementsTab/index.js @@ -8,11 +8,11 @@ import { Stack, Typography, } from '@mui/material'; -import AnnouncementCard from '../../../components/AnnouncementCard'; -import { createArrayFrom1ToN } from '../../../utils/createArrayFrom1ToN'; +import AnnouncementCard from '../../../../components/AnnouncementCard'; +import { createArrayFrom1ToN } from '../../../../utils/createArrayFrom1ToN'; import styles from './styles'; -import jitsiLogo from '../../../assets/jitsi.svg'; +import jitsiLogo from '../../../../assets/jitsi.svg'; function AnnouncementsTab({ layoutType, announcementsTabData, classroom }) { const { container, emptyStateContainer } = styles[layoutType]; diff --git a/src/screens/Classroom/AnnouncementsTab/styles.js b/src/screens/student/Classroom/AnnouncementsTab/styles.js similarity index 100% rename from src/screens/Classroom/AnnouncementsTab/styles.js rename to src/screens/student/Classroom/AnnouncementsTab/styles.js diff --git a/src/screens/Classroom/AssignmentsTab/index.js b/src/screens/student/Classroom/AssignmentsTab/index.js similarity index 99% rename from src/screens/Classroom/AssignmentsTab/index.js rename to src/screens/student/Classroom/AssignmentsTab/index.js index bc089fe..19757b4 100644 --- a/src/screens/Classroom/AssignmentsTab/index.js +++ b/src/screens/student/Classroom/AssignmentsTab/index.js @@ -1,6 +1,6 @@ import { Container, Link, Skeleton, Stack, Typography } from '@mui/material'; import dayjs from 'dayjs'; -import { capitalizeFirstLetter } from '../../../utils/capitalizeFirstLetter'; +import { capitalizeFirstLetter } from '../../../../utils/capitalizeFirstLetter'; import styles from './styles'; function AssignmentsTab({ assignmentsTabData, layoutType }) { diff --git a/src/screens/Classroom/AssignmentsTab/styles.js b/src/screens/student/Classroom/AssignmentsTab/styles.js similarity index 100% rename from src/screens/Classroom/AssignmentsTab/styles.js rename to src/screens/student/Classroom/AssignmentsTab/styles.js diff --git a/src/screens/Classroom/Header/index.js b/src/screens/student/Classroom/Header/index.js similarity index 100% rename from src/screens/Classroom/Header/index.js rename to src/screens/student/Classroom/Header/index.js diff --git a/src/screens/Classroom/Header/styles.js b/src/screens/student/Classroom/Header/styles.js similarity index 100% rename from src/screens/Classroom/Header/styles.js rename to src/screens/student/Classroom/Header/styles.js diff --git a/src/screens/Classroom/PeopleTab/index.js b/src/screens/student/Classroom/PeopleTab/index.js similarity index 99% rename from src/screens/Classroom/PeopleTab/index.js rename to src/screens/student/Classroom/PeopleTab/index.js index 3080ee3..9dfde7b 100644 --- a/src/screens/Classroom/PeopleTab/index.js +++ b/src/screens/student/Classroom/PeopleTab/index.js @@ -1,5 +1,5 @@ import { Avatar, Container, Skeleton, Stack, Typography } from '@mui/material'; -import { createArrayFrom1ToN } from '../../../utils/createArrayFrom1ToN'; +import { createArrayFrom1ToN } from '../../../../utils/createArrayFrom1ToN'; import styles from './styles'; function PeopleTab({ layoutType, peopleTabData }) { diff --git a/src/screens/Classroom/PeopleTab/styles.js b/src/screens/student/Classroom/PeopleTab/styles.js similarity index 100% rename from src/screens/Classroom/PeopleTab/styles.js rename to src/screens/student/Classroom/PeopleTab/styles.js diff --git a/src/screens/Classroom/View.js b/src/screens/student/Classroom/View.js similarity index 100% rename from src/screens/Classroom/View.js rename to src/screens/student/Classroom/View.js diff --git a/src/screens/Classroom/index.js b/src/screens/student/Classroom/index.js similarity index 97% rename from src/screens/Classroom/index.js rename to src/screens/student/Classroom/index.js index 01eb4f3..5201b49 100644 --- a/src/screens/Classroom/index.js +++ b/src/screens/student/Classroom/index.js @@ -1,7 +1,7 @@ import { useCallback, useEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; -import { useUser } from '../../context/user'; -import useLayoutType from '../../hooks/useLayoutType'; +import { useUser } from '../../../context/user'; +import useLayoutType from '../../../hooks/useLayoutType'; import { TAB_OPTIONS } from './tabOptions'; import View from './View'; diff --git a/src/screens/Classroom/styles.js b/src/screens/student/Classroom/styles.js similarity index 100% rename from src/screens/Classroom/styles.js rename to src/screens/student/Classroom/styles.js diff --git a/src/screens/Classroom/tabOptions.js b/src/screens/student/Classroom/tabOptions.js similarity index 100% rename from src/screens/Classroom/tabOptions.js rename to src/screens/student/Classroom/tabOptions.js diff --git a/src/screens/Home/View.js b/src/screens/student/Home/View.js similarity index 96% rename from src/screens/Home/View.js rename to src/screens/student/Home/View.js index 749049d..27b0f78 100644 --- a/src/screens/Home/View.js +++ b/src/screens/student/Home/View.js @@ -1,10 +1,10 @@ import { Container, Grid, Skeleton, Stack } from '@mui/material'; -import ClassCard from '../../components/ClassCard'; -import AssignmentCard from '../../components/AssignmentCard'; +import ClassCard from '../../../components/ClassCard'; +import AssignmentCard from '../../../components/AssignmentCard'; import styles from './styles'; -import { createArrayFrom1ToN } from '../../utils/createArrayFrom1ToN'; +import { createArrayFrom1ToN } from '../../../utils/createArrayFrom1ToN'; function View({ layoutType, diff --git a/src/screens/Home/index.js b/src/screens/student/Home/index.js similarity index 87% rename from src/screens/Home/index.js rename to src/screens/student/Home/index.js index 6e535c5..75d734e 100644 --- a/src/screens/Home/index.js +++ b/src/screens/student/Home/index.js @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react'; import { useNavigate } from 'react-router-dom'; -import { useUser } from '../../context/user'; -import { useDocumentTitle } from '../../hooks/useDocumentTitle'; -import useLayoutType from '../../hooks/useLayoutType'; +import { useUser } from '../../../context/user'; +import { useDocumentTitle } from '../../../hooks/useDocumentTitle'; +import useLayoutType from '../../../hooks/useLayoutType'; import View from './View'; function Home() { diff --git a/src/screens/Home/styles.js b/src/screens/student/Home/styles.js similarity index 100% rename from src/screens/Home/styles.js rename to src/screens/student/Home/styles.js