Merge pull request #141 from siesgstarena/dev

Restructured the codebase

src/Components/admin/resetSubmissionStatus/ResetSubmissionTableEntry.jsx

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import Switch from '@material/react-switch';
 import '../../user/settings/settings.scss';
 import { RESET_SUBMISSION, CHANGE_PLAGIARISM_STATUS } from '../../../graphql/mutations';
-import { getSubmissionColor } from '../../../commonFunctions';
+import { getSubmissionColor } from '../../../utils/commonFunctions';
 import useSessionExpired from '../../../customHooks/useSessionExpired';
 import useSentry from '../../../customHooks/useSentry';
 

src/PrivateRoute.js → src/Components/common/PrivateRoute.jsx

@@ -6,7 +6,7 @@
 import React, { useContext } from 'react';
 import { Redirect, Route, useLocation } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import AuthContext from './Contexts/AuthContext';
+import AuthContext from '../../Contexts/AuthContext';
 
 const PrivateRoute = ({ component: Component, data, ...rest }) => {
   const { authState } = useContext(AuthContext);

src/Components/common/ScrollToTop.jsx

@@ -0,0 +1,29 @@
+import PropTypes from 'prop-types';
+import { useEffect, useRef } from 'react';
+import { useLocation } from 'react-router-dom';
+
+const usePrevLocation = () => {
+  const location = useLocation();
+  const prevLocRef = useRef(location);
+
+  useEffect(() => {
+    prevLocRef.current = location;
+  }, [location]);
+
+  return prevLocRef.current;
+};
+
+const ScrollToTop = ({ children }) => {
+  const { pathname: prevPath, search: prevSearch } = usePrevLocation();
+  const { pathname: currentPath, search: currentSearch } = useLocation();
+  if (currentPath !== prevPath || currentSearch !== prevSearch) {
+    window.scrollTo(0, 0);
+  }
+  return children;
+};
+
+ScrollToTop.propTypes = {
+  children: PropTypes.any.isRequired,
+};
+
+export default ScrollToTop;

src/Components/drawer/blogs/BlogCard/BlogCard.jsx

@@ -12,12 +12,12 @@ import { DELETE_BLOG, CHANGE_BLOG_PIN_STATUS } from '../../../../graphql/mutatio
 // import { GET_ALL_BLOGS } from '../../../../graphql/queries';
 import AlertBox from '../../../common/AlertBox/index';
 import Pill from '../../../common/Pill/index';
-import { userColor } from '../../../../commonFunctions';
+import { userColor } from '../../../../utils/commonFunctions';
 import AuthContext from '../../../../Contexts/AuthContext';
 import './BlogCard.scss';
 import useSessionExpired from '../../../../customHooks/useSessionExpired';
 import useSentry from '../../../../customHooks/useSentry';
-import { myBlogsLimit, allBlogsLimit } from '../../../../constants';
+import { myBlogsLimit, allBlogsLimit } from '../../../../utils/constants';
 import { GET_BLOGS_BY_USER, GET_ALL_BLOGS } from '../../../../graphql/queries';
 
 const BlogCard = ({

src/Components/drawer/blogs/blogPage/BlogFooter/CommentSection/Comment.jsx

@@ -17,7 +17,7 @@ import {
   // getYear,
   // convertTime,
   // adding330Minutes,
-} from '../../../../../../commonFunctions';
+} from '../../../../../../utils/commonFunctions';
 import AuthContext from '../../../../../../Contexts/AuthContext';
 import {
   UPVOTE_COMMENT,

src/Components/drawer/blogs/blogPage/BlogHeader.jsx

@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import { Headline4, Headline6 } from '@material/react-typography';
 import PropTypes from 'prop-types';
 import Pill from '../../../common/Pill/index';
-import { userColor } from '../../../../commonFunctions';
+import { userColor } from '../../../../utils/commonFunctions';
 
 const tagsArray = (tags) =>
   tags.map((tag) => (

src/Components/drawer/blogs/blogsList/index.jsx

@@ -8,7 +8,7 @@ import useSessionExpired from '../../../../customHooks/useSessionExpired';
 import useActivePageState from '../../../../customHooks/useAcitvePageState';
 import LoadingCardArray from '../../../common/LoadingCardArray';
 import BlogsArray from '../../../user/myBlogs/BlogsArray';
-import { allBlogsLimit } from '../../../../constants';
+import { allBlogsLimit } from '../../../../utils/constants';
 
 const AllBlogsPageContainer = ({ isSuperuserRoute = false }) => {
   const { redirectOnSessionExpiredBeforeRender, isSessionExpired } = useSessionExpired();

src/Components/drawer/blogs/create/index.jsx

@@ -7,7 +7,7 @@ import MessageCard from '../../../common/MessageCard';
 import BlogDetails from './BlogDetails';
 import { CREATE_BLOG } from '../../../../graphql/mutations';
 import { GET_ALL_BLOGS, GET_BLOGS_BY_USER } from '../../../../graphql/queries';
-import { allBlogsLimit, profileMyPostsLimit, myBlogsLimit } from '../../../../constants';
+import { allBlogsLimit, profileMyPostsLimit, myBlogsLimit } from '../../../../utils/constants';
 import AuthContext from '../../../../Contexts/AuthContext';
 
 const CreateBlog = () => {

src/Components/drawer/contests/common/CountDownTimer.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable no-param-reassign */
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { countDownTimerValues } from '../../../../commonFunctions';
+import { countDownTimerValues } from '../../../../utils/commonFunctions';
 
 const CountDownTimer = ({ countDownTill }) => {
   const [timer, setTimer] = useState('');

src/Components/drawer/contests/dashboard/ProblemsTable.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link, useRouteMatch } from 'react-router-dom';
 import Table from '../../../common/Table/index';
-import { problemBackgroundColor } from '../../../../commonFunctions';
+import { problemBackgroundColor } from '../../../../utils/commonFunctions';
 
 const ProblemsTable = ({ problems }) => {
   const tableHeadings = ['#', 'Points', 'Problem Name'];

src/Components/drawer/contests/ratingChanges/RatingChangesTable.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import Table from '../../../common/Table/index';
-import { userColor } from '../../../../commonFunctions';
+import { userColor } from '../../../../utils/commonFunctions';
 
 const RatingChangesTable = ({ ratingChanges }) => {
   const tableHeadings = ['#', 'Who', 'Δ', 'Rating'];

src/Components/drawer/contests/schedule/ContestsTable.jsx

@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { format, formatDistanceStrict, formatDistanceToNowStrict, isPast } from 'date-fns/esm';
-import { userColor } from '../../../../commonFunctions';
+import { userColor } from '../../../../utils/commonFunctions';
 
 const ContestsTable = ({ contests }) => {
   // hidden variable is used to hide the licontestAdmin when the width

src/Components/drawer/contests/scoreboard/DataTable.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { userColor } from '../../../../commonFunctions';
+import { userColor } from '../../../../utils/commonFunctions';
 import Table from '../../../common/Table/index';
 
 const DataTable = ({ problems, scoreboardDetails }) => {

src/Components/drawer/contests/status/ProblemStatusTable.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { format } from 'date-fns';
 import Table from '../../../common/Table/index';
-import { getSubmissionColor, userColor } from '../../../../commonFunctions';
+import { getSubmissionColor, userColor } from '../../../../utils/commonFunctions';
 import AuthContext from '../../../../Contexts/AuthContext';
 
 const ProblemsubmissionTable = ({

src/Components/drawer/contests/submissionPage/index.jsx

@@ -8,7 +8,7 @@ import { GET_SUBMISSION_PAGE_DETAILS } from '../../../../graphql/queries';
 import SomethingWentWrong from '../../../common/SomethingWentWrong/index';
 import useSessionExpired from '../../../../customHooks/useSessionExpired';
 import Spinner from '../../../common/Spinner/index';
-import { languageCodeAppender } from '../../../../commonFunctions';
+import { languageCodeAppender } from '../../../../utils/commonFunctions';
 import WrongAnswerContent from './WrongAnwerContent';
 
 const SubmitContainer = () => {

src/Components/drawer/lab/Style.css

@@ -1,10 +1,10 @@
-.datasets-container{
-    padding: 0.2rem 1rem;
+.datasets-container {
+  padding: 0.2rem 1rem;
 }
-.datasets-discription{
-    margin-bottom: 2rem;
+.datasets-discription {
+  margin-bottom: 2rem;
 }
 
-.und-clr{
-    text-decoration-color: gray !important;
-}
+.und-clr {
+  text-decoration-color: gray !important;
+}

src/Components/drawer/problemSet/ProblemSetTable.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import Button from '@material/react-button';
 import Table from '../../common/Table/index';
-import { problemBackgroundColor } from '../../../commonFunctions';
+import { problemBackgroundColor } from '../../../utils/commonFunctions';
 
 const ProblemsSetTable = ({ problemsList }) => {
   // Trimming tags because of database inconsistency

src/Components/drawer/ratings/RatingsTable.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import Table from '../../common/Table/index';
-import { userColor } from '../../../commonFunctions';
+import { userColor } from '../../../utils/commonFunctions';
 
 const RatingsTable = ({ users, activePageNumber, limit }) => {
   const tableHeadings = ['#', 'Name', 'Ratings'];

src/Components/editor/Style.css

@@ -68,7 +68,7 @@
   .global-border {
     border-right: none;
   }
-  .run-btn{
+  .run-btn {
     margin-top: 0.4rem !important;
   }
-}
+}

src/Components/search/resultFiles/PostResults.jsx

@@ -4,7 +4,7 @@ import { Headline6 } from '@material/react-typography';
 import PropTypes from 'prop-types';
 import { format } from 'date-fns';
 import Pill from '../../common/Pill';
-import { userColor } from '../../../commonFunctions';
+import { userColor } from '../../../utils/commonFunctions';
 
 const tagsArray = (tags) =>
   tags.map((tag) => (

src/Components/search/resultFiles/UserResults.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { format } from 'date-fns';
 import { Headline6 } from '@material/react-typography';
-import { userColor } from '../../../commonFunctions';
+import { userColor } from '../../../utils/commonFunctions';
 
 const UserResults = ({ userArray }) => (
   <div className="">

src/Components/superuser/announcements/Style.css

@@ -11,7 +11,7 @@
   border-radius: 10px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
 }
-.title{
+.title {
   font-size: 1.75rem;
 }
 .p0 {
@@ -25,13 +25,12 @@
   width: 100%;
 }
 
-
 @media (max-width: 390px) {
   .card-grid {
     flex-direction: column;
     align-items: flex-start;
   }
-  .card-delete{
+  .card-delete {
     margin-top: 1rem;
   }
 }

src/Components/superuser/contests/AllContestsContainer.jsx

@@ -7,7 +7,7 @@ import AllContestPage from './AllContests';
 import PageCountDisplayer from '../../common/PageCountDisplayer';
 import useActivePageState from '../../../customHooks/useAcitvePageState';
 import CustomSnackbar from '../../common/Snackbar/index';
-import { superuserContestsLimit } from '../../../constants';
+import { superuserContestsLimit } from '../../../utils/constants';
 
 const AllContestsContainer = () => {
   const limit = superuserContestsLimit;

src/Components/superuser/contests/ContestCard.jsx

@@ -10,7 +10,7 @@ import AlertBox from '../../common/AlertBox/index';
 import '@material/react-dialog/dist/dialog.css';
 import { DELETE_CONTEST } from '../../../graphql/mutations';
 import { GET_ALL_CONTEST_DETAILS, GET_CONTEST_HOMEPAGE_DETAILS } from '../../../graphql/queries';
-import { superuserContestsLimit } from '../../../constants';
+import { superuserContestsLimit } from '../../../utils/constants';
 
 const ContestCard = ({ name, startTime, duration, endTime, code, setSnackbarMessage }) => {
   // isAlertOpen is the state, used to indicate whether the alertbox is open or not

src/Components/superuser/createContest/CreateContest.jsx

@@ -7,7 +7,7 @@ import ContestDetails from './ContestDetails';
 import MessageCard from '../../common/MessageCard/index';
 import { CREATE_CONTEST } from '../../../graphql/mutations';
 import { GET_CONTEST_HOMEPAGE_DETAILS, GET_ALL_CONTEST_DETAILS } from '../../../graphql/queries';
-import { superuserContestsLimit } from '../../../constants';
+import { superuserContestsLimit } from '../../../utils/constants';
 
 const CreateContest = () => {
   const intialFormDetails = {

src/Components/superuser/editContest/EditContest.jsx

@@ -6,7 +6,7 @@ import { useApolloClient } from '@apollo/client';
 import { Headline4, Body2 } from '@material/react-typography';
 import ContestDetails from '../createContest/ContestDetails';
 import MessageCard from '../../common/MessageCard/index';
-// import { subtracting330Minutes } from '../../../commonFunctions';
+// import { subtracting330Minutes } from '../../../utils/commonFunctions';
 import { EDIT_CONTEST } from '../../../graphql/mutations';
 
 const EditContest = ({ contestData }) => {

src/Components/superuser/manageSuperusers/Style.css

@@ -10,10 +10,10 @@
   margin: 1.5rem 0;
 }
 
-.mr-2{
-    margin-right: 0.5rem !important;
+.mr-2 {
+  margin-right: 0.5rem !important;
 }
 
-.mb-2{
-    margin-bottom: 0.5rem !important;
-}
+.mb-2 {
+  margin-bottom: 0.5rem !important;
+}

src/Components/superuser/updateRatings/UpdateRatingsTableData.jsx

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import TextField, { Input } from '@material/react-text-field';
-import { userColor } from '../../../commonFunctions';
+import { userColor } from '../../../utils/commonFunctions';
 
 const UpdateRatingsTableData = ({ ratingData, setUpdatedRatings }) => {
   const [rating, setRating] = useState(ratingData.newRating);

src/Components/user/myBlogs/index.jsx

@@ -8,7 +8,7 @@ import useActivePageState from '../../../customHooks/useAcitvePageState';
 import AuthContext from '../../../Contexts/AuthContext';
 import BlogsArray from './BlogsArray';
 import LoadingCardArray from '../../common/LoadingCardArray';
-import { myBlogsLimit } from '../../../constants';
+import { myBlogsLimit } from '../../../utils/constants';
 
 const MyBlogsContainer = () => {
   const limit = myBlogsLimit;

src/Components/user/profile/Info.jsx

@@ -6,7 +6,7 @@ import { Cell, Grid, Row } from '@material/react-layout-grid';
 import { Button } from '@material/react-button';
 import { Headline4, Body1, Headline6 } from '@material/react-typography';
 import { format } from 'date-fns';
-import { userColor, userStatus } from '../../../commonFunctions';
+import { userColor, userStatus } from '../../../utils/commonFunctions';
 import AuthContext from '../../../Contexts/AuthContext';
 import EditAbout from './EditAbout';
 import MessageCard from '../../common/MessageCard/index';

src/Components/user/profile/Posts.jsx

@@ -9,7 +9,7 @@ import AuthContext from '../../../Contexts/AuthContext';
 import useSentry from '../../../customHooks/useSentry';
 import BlogsArray from '../myBlogs/BlogsArray';
 import LoadingCardArray from '../../common/LoadingCardArray';
-import { profileMyPostsLimit } from '../../../constants';
+import { profileMyPostsLimit } from '../../../utils/constants';
 
 const PostsContainer = ({ user }) => {
   const limit = profileMyPostsLimit;

src/Components/user/profile/Submissions.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-import { getSubmissionColor } from '../../../commonFunctions';
+import { getSubmissionColor } from '../../../utils/commonFunctions';
 import Table from '../../common/Table';
 
 // SubmissionTab Content

src/Routes.jsx

@@ -2,7 +2,7 @@ import React, { lazy, Suspense } from 'react';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { useQuery } from '@apollo/client';
 import AppBar from './Components/common/AppBar/index';
-import ScrollToTop from './ScrollToTop';
+import ScrollToTop from './Components/common/ScrollToTop';
 import Footer from './Components/common/Footer/index';
 import Spinner from './Components/common/Spinner/index';
 import AuthContext from './Contexts/AuthContext';
@@ -11,7 +11,7 @@ import ErrorBoundary from './Components/common/ErrorBoundary/index';
 import SomethingWentWrong from './Components/common/SomethingWentWrong/index';
 import './App.scss';
 
-const PrivateRoute = lazy(() => import('./PrivateRoute'));
+const PrivateRoute = lazy(() => import('./Components/common/PrivateRoute'));
 const SignIn = lazy(() => import('./Components/auth/signin/index'));
 const SignUp = lazy(() => import('./Components/auth/signup/index'));
 const Forgot = lazy(() => import('./Components/auth/forgot/index'));