[chore]: Components folder organisation

client/src/components/Avatars/AvatarList.tsx

@@ -2,7 +2,7 @@ import React, { FC } from "react";
 import { Link } from "react-router-dom";
 import Avatar from "@material-ui/core/Avatar";
 import AvatarGroup from "@material-ui/lab/AvatarGroup";
-import { User } from "../types/User";
+import { User } from "../../types/User";
 import { makeStyles, Theme, createStyles } from "@material-ui/core";
 
 interface AvatarListProps {

client/src/components/Cards/HorizontalCard.tsx

@@ -1,11 +1,11 @@
-import React, { FC, MouseEvent, ReactNode } from "react";
+import React, { FC, ReactNode } from "react";
 import { Link } from "react-router-dom";
 import { makeStyles } from "@material-ui/core/styles";
 import Card from "@material-ui/core/Card";
 import CardActions from "@material-ui/core/CardActions";
 import CardContent from "@material-ui/core/CardContent";
 import Typography from "@material-ui/core/Typography";
-import { ProgressBar } from "./ProgressBar";
+import { ProgressBar } from "../Progress/ProgressBar";
 
 interface IProps {
   title?: string;

client/src/components/Cards/ProjectCard.tsx

@@ -1,11 +1,10 @@
 import React, { FC } from "react";
 import { HorizontalCard } from "./HorizontalCard";
-import { Typography, makeStyles, Theme, createStyles } from "@material-ui/core";
+import { makeStyles, Theme, createStyles } from "@material-ui/core";
-import { getRemainingdays } from "../utils/methods";
+import { AvatarList } from "../Avatars/AvatarList";
-import { User } from "../types/User";
+import { ProgressInfo } from "../Progress/ProgressInfo";
-import { AvatarList } from "./AvatarList";
+import { User } from "../../types/User";
-import { ProgressBar } from "./ProgressBar";
+import { getRemainingdays } from "../../utils/methods";
-import { ProgressInfo } from "./ProgressInfo";
 
 interface IProps {
   title?: string;

client/src/components/Cards/TicketCard.tsx

@@ -1,7 +1,7 @@
 import React, { FC, MouseEvent } from "react";
 import { HorizontalCard } from "./HorizontalCard";
 import { Button, Typography } from "@material-ui/core";
-import { getRemainingdays } from "../utils/methods";
+import { getRemainingdays } from "../../utils/methods";
 
 interface IProps {
   title?: string;

client/src/components/Lists/ActivityList.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState, ChangeEvent, MouseEvent } from "react";
-import { ActivityCollection } from "./ActivityCollection";
+import { ActivityCollection } from "../ActivityCollection";
-import { Activity } from "../types/Activity";
+import { Activity } from "../../types/Activity";
-import { FilterBar } from "./FilterBar";
+import { FilterBar } from "../FilterBar";
 
 type IProps = {
   activities: Activity[];

client/src/components/Lists/AppFileList.tsx

@@ -1,8 +1,8 @@
 import React, { FC, useState, ChangeEvent, MouseEvent } from "react";
-import { AppFile } from "../types/AppFile";
+import { AppFile } from "../../types/AppFile";
-import { FileCollection } from "./FileCollection";
+import { FileCollection } from "../FileCollection";
-import { InputFile } from "./InputFile";
+import { InputFile } from "../InputFile";
-import { FilterBar } from "./FilterBar";
+import { FilterBar } from "../FilterBar";
 import { Grid, Typography } from "@material-ui/core";
 
 type IProps = {

client/src/components/Lists/MemberList.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState, ChangeEvent, MouseEvent } from "react";
-import { UsersModalEntry } from "./UsersModalEntry";
+import { UsersModalEntry } from "../Modals/UsersModalEntry";
-import { FilterBar } from "./FilterBar";
+import { FilterBar } from "../FilterBar";
-import { User } from "../types/User";
+import { User } from "../../types/User";
 
 interface IProps {
   users: User[];

client/src/components/Lists/ProjectList.tsx

@@ -6,9 +6,9 @@ import {
   createStyles,
   Theme,
 } from "@material-ui/core";
-import { FilterBar } from "./FilterBar";
+import { FilterBar } from "../FilterBar";
-import ProjectCard from "./ProjectCard";
+import ProjectCard from "../Cards/ProjectCard";
-import { Project } from "../types/Project";
+import { Project } from "../../types/Project";
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({

client/src/components/Lists/TicketList.tsx

@@ -6,16 +6,15 @@ import {
   Theme,
   createStyles,
 } from "@material-ui/core";
-import { FloatingButton } from "./FloatingButton";
+import { FloatingButton } from "../Buttons/FloatingButton";
-import { HorizontalCard } from "./HorizontalCard";
+import { FilterBar } from "../FilterBar";
-import { FilterBar } from "./FilterBar";
+import { HttpResponse } from "../../types/HttpResponse";
-import { HttpResponse } from "../types/HttpResponse";
+import { Ticket } from "../../types/Ticket";
-import { Ticket } from "../types/Ticket";
+import { NewTicketModal } from "../Modals/NewTicketModal";
-import { NewTicketModal } from "./NewTicketModal";
+import { Project } from "../../types/Project";
-import { Project } from "../types/Project";
+import { put } from "../../utils/http";
-import { put } from "../utils/http";
+import { Constants } from "../../utils/Constants";
-import { Constants } from "../utils/Constants";
+import TicketCard from "../Cards/TicketCard";
-import TicketCard from "./TicketCard";
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({

client/src/components/LogInForm.tsx

@@ -1,7 +1,7 @@
 import React, { FC } from "react";
 import { InputField } from "./InputField";
 import { PasswordField } from "./PasswordField";
-import { Button } from "./Button";
+import { Button } from "./Buttons/Button";
 
 export const LogInForm: FC = () => {
   return (

client/src/components/Modals/NewTicketModal.tsx

@@ -1,11 +1,11 @@
 import React, { FC, useState, FormEvent } from "react";
 import { useRouteMatch } from "react-router-dom";
 import { Modal } from "./Modal";
-import { NewTicketForm } from "./NewTicketForm";
+import { NewTicketForm } from "../NewTicketForm";
-import { Ticket } from "../types/Ticket";
+import { Ticket } from "../../types/Ticket";
-import { Project } from "../types/Project";
+import { Project } from "../../types/Project";
-import { post } from "../utils/http";
+import { post } from "../../utils/http";
-import { Constants } from "../utils/Constants";
+import { Constants } from "../../utils/Constants";
 
 interface IProps {
   show: boolean;
@@ -16,7 +16,7 @@ interface IProps {
 export const NewTicketModal: FC<IProps> = ({
   show,
   handleClose,
-  allProjects
+  allProjects,
 }) => {
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
@@ -35,7 +35,7 @@ export const NewTicketModal: FC<IProps> = ({
       description: description,
       endingDate: new Date(endingDate).toISOString(),
       creatorId: "20bf4b2a-7209-4826-96cd-29c2bc937a94",
-      projectId: parseInt(projectId)
+      projectId: parseInt(projectId),
     };
 
     // const response: HttpResponse<Ticket> =

client/src/components/Modals/UsersModal.tsx

@@ -1,10 +1,10 @@
 import React, { FC, useState, ChangeEvent, FormEvent } from "react";
 import { Modal } from "./Modal";
-import { AvatarList } from "./AvatarList";
+import { AvatarList } from "../Avatars/AvatarList";
-import { User } from "../types/User";
+import { User } from "../../types/User";
-import { FilterBar } from "./FilterBar";
+import { FilterBar } from "../FilterBar";
-import { patch } from "../utils/http";
+import { patch } from "../../utils/http";
-import { Constants } from "../utils/Constants";
+import { Constants } from "../../utils/Constants";
 import { UsersModalEntry } from "./UsersModalEntry";
 import { useParams } from "react-router-dom";
 
@@ -19,7 +19,7 @@ export const UsersModal: FC<IProps> = ({
   show,
   handleClose,
   users,
-  allUsers
+  allUsers,
 }) => {
   const [filterText, setFilterText] = useState<string>("");
   const [members, setMembers] = useState<User[]>(users);
@@ -35,7 +35,7 @@ export const UsersModal: FC<IProps> = ({
     e.preventDefault();
     await patch<User[]>(
       `${Constants.projectsURI}/${id}/members`,
-      members.map(m => m.id)
+      members.map((m) => m.id)
     );
     handleClose();
   };

client/src/components/Modals/UsersModalEntry.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react";
-import { User } from "../types/User";
+import { User } from "../../types/User";
 
 interface IProps {
   setMembers: React.Dispatch<React.SetStateAction<User[]>>;
@@ -9,7 +9,7 @@ interface IProps {
 
 export const UsersModalEntry: FC<IProps> = ({ user, setMembers, members }) => {
   const match: (id: string) => boolean = (id: string) => {
-    return Boolean(members.find(m => m.id === id));
+    return Boolean(members.find((m) => m.id === id));
   };
   return (
     <div className="valign-wrapper">
@@ -22,7 +22,7 @@ export const UsersModalEntry: FC<IProps> = ({ user, setMembers, members }) => {
           onChange={() => {
             !match(user.id)
               ? setMembers([...members, user])
-              : setMembers(members.filter(p => p.id !== user.id));
+              : setMembers(members.filter((p) => p.id !== user.id));
           }}
         />
         <span>

client/src/components/Panels/ProjectTabPanel.tsx

@@ -1,16 +1,16 @@
 import React, { FC, useState, ReactNode } from "react";
-import SwipeableViews from "react-swipeable-views";
 import { makeStyles, Theme, useTheme } from "@material-ui/core/styles";
 import AppBar from "@material-ui/core/AppBar";
 import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
 import Typography from "@material-ui/core/Typography";
 import Box from "@material-ui/core/Box";
-import { Ticket } from "../types/Ticket";
+import SwipeableViews from "react-swipeable-views";
-import { Project } from "../types/Project";
+import { Ticket } from "../../types/Ticket";
-import { FileList } from "./AppFileList";
+import { Project } from "../../types/Project";
-import { TicketList } from "./TicketList";
+import { TicketList } from "../Lists/TicketList";
-import { AppFile } from "../types/AppFile";
+// import { FileList } from "./AppFileList";
+import { AppFile } from "../../types/AppFile";
 
 interface TabProps {
   children?: ReactNode;

client/src/components/Panels/TabRouter.tsx

@@ -1,12 +1,12 @@
 import React, { FC } from "react";
 import { Route, useRouteMatch, Redirect } from "react-router-dom";
 import { TabRouterHeader } from "./TabRouterHeader";
-import { TicketList } from "./TicketList";
+import { TicketList } from "../Lists/TicketList";
-import { FileList } from "./AppFileList";
+import { FileList } from "../Lists/AppFileList";
-import { Ticket } from "../types/Ticket";
+import { Ticket } from "../../types/Ticket";
-import { AppFile } from "../types/AppFile";
+import { AppFile } from "../../types/AppFile";
-import { Activity } from "../types/Activity";
+import { Activity } from "../../types/Activity";
-import { Project } from "../types/Project";
+import { Project } from "../../types/Project";
 
 interface IProps {
   tickets: Ticket[];
@@ -22,7 +22,7 @@ export const TabRouter: FC<IProps> = ({
   tabNames,
   files,
   activities,
-  allProjects
+  allProjects,
 }) => {
   const { url } = useRouteMatch();
 

client/src/components/Panels/UserTabPanel.tsx

@@ -6,10 +6,10 @@ import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
 import Typography from "@material-ui/core/Typography";
 import Box from "@material-ui/core/Box";
-import { Ticket } from "../types/Ticket";
+import { Ticket } from "../../types/Ticket";
-import { Project } from "../types/Project";
+import { Project } from "../../types/Project";
-import { ProjectList } from "./ProjectList";
+import { ProjectList } from "../Lists/ProjectList";
-import { TicketList } from "./TicketList";
+import { TicketList } from "../Lists/TicketList";
 
 interface TabProps {
   children?: ReactNode;

client/src/components/Panels/UserTabRouter.tsx

@@ -1,10 +1,10 @@
 import React, { FC } from "react";
 import { Route, useRouteMatch, Redirect } from "react-router-dom";
 import { TabRouterHeader } from "./TabRouterHeader";
-import { ProjectList } from "./ProjectList";
+import { ProjectList } from "../Lists/ProjectList";
-import { Ticket } from "../types/Ticket";
+import { Ticket } from "../../types/Ticket";
-import { Project } from "../types/Project";
+import { Project } from "../../types/Project";
-import { TicketList } from "./TicketList";
+import { TicketList } from "../Lists/TicketList";
 
 interface IProps {
   tabNames: string[];

client/src/components/ProfileSelector.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react";
-import { UserAvatar } from "./UserAvatar";
+import { UserAvatar } from "./Avatars/UserAvatar";
 import { Link } from "react-router-dom";
 
 export const ProfileSelector: FC = () => {

client/src/components/Progress/ProgressBar.tsx

@@ -2,7 +2,6 @@ import React, { FC } from "react";
 import { makeStyles, Theme, createStyles } from "@material-ui/core/styles";
 import LinearProgress from "@material-ui/core/LinearProgress";
 import { Box } from "@material-ui/core";
-import { PlaylistAddCheck } from "@material-ui/icons";
 
 type IProps = {
   value: number;
@@ -44,9 +43,3 @@ export const ProgressBar: FC<IProps> = ({ value }) => {
     </Box>
   );
 };
-
-{
-  /* <div className="progress">
-  <div className={`determinate ${barColor}`} style={styleString}></div>
-</div> */
-}

client/src/components/Progress/ProgressInfo.tsx

@@ -1,6 +1,5 @@
 import React, { FC } from "react";
-import { makeStyles, Theme, createStyles } from "@material-ui/core/styles";
+// import { makeStyles, Theme, createStyles } from "@material-ui/core/styles";
-import LinearProgress from "@material-ui/core/LinearProgress";
 import { Box } from "@material-ui/core";
 import { PlaylistAddCheck } from "@material-ui/icons";
 
@@ -10,23 +9,23 @@ type IProps = {
   remainingDays?: number;
 };
 
-const useStyles = makeStyles((theme: Theme) =>
+// const useStyles = makeStyles((theme: Theme) =>
-  createStyles({
+//   createStyles({
-    root: {
+//     root: {
-      width: "100%",
+//       width: "100%",
-      "& > * + *": {
+//       "& > * + *": {
-        marginTop: theme.spacing(2),
+//         marginTop: theme.spacing(2),
-      },
+//       },
-    },
+//     },
-  })
+//   })
-);
+// );
 
 export const ProgressInfo: FC<IProps> = ({
   tasksDone,
   tasksTotalCount,
   remainingDays,
 }) => {
-  const classes = useStyles();
+  // const classes = useStyles();
 
   return (
     <Box>

client/src/components/UserHeader.tsx

@@ -1,6 +1,6 @@
 import React, { FC } from "react";
 import { Header } from "../components/Header";
-import { UserAvatar } from "./UserAvatar";
+import { UserAvatar } from "./Avatars/UserAvatar";
 import {
   Grid,
   //  makeStyles, Theme

client/src/pages/ProjectPage.tsx

@@ -1,14 +1,14 @@
 import React, { FC, useState } from "react";
 import { Grid, makeStyles, Theme } from "@material-ui/core";
 import { Header } from "../components/Header";
-import { AvatarList } from "../components/AvatarList";
+import { AvatarList } from "../components/Avatars/AvatarList";
-import { ProgressBar } from "../components/ProgressBar";
+import { ProgressBar } from "../components/Progress/ProgressBar";
-import { FloatingButton } from "../components/FloatingButton";
+import { FloatingButton } from "../components/Buttons/FloatingButton";
-import { UsersModal } from "../components/UsersModal";
+import { UsersModal } from "../components/Modals/UsersModal";
-import { ProjectTabPanel } from "../components/ProjectTabPanel";
+import { ProjectTabPanel } from "../components/Panels/ProjectTabPanel";
 import ProjectVM from "../VM/ProjectVM";
 import PageLayout from "../layouts/PageLayout";
-import { ProgressInfo } from "../components/ProgressInfo";
+import { ProgressInfo } from "../components/Progress/ProgressInfo";
 
 interface IProps {
   viewModel: ProjectVM;
@@ -62,8 +62,6 @@ export const ProjectPage: FC<IProps> = ({ viewModel }) => {
             alignItems="center"
           >
             <AvatarList users={users} />
-            {/* </Grid>
-          <Grid item xs={9}> */}
             <FloatingButton
               icon="add"
               color="default"

client/src/pages/TicketPage.tsx

@@ -8,7 +8,7 @@ import TableHead from "@material-ui/core/TableHead";
 import TableRow from "@material-ui/core/TableRow";
 import Paper from "@material-ui/core/Paper";
 import { Header } from "../components/Header";
-import { AvatarList } from "../components/AvatarList";
+import { AvatarList } from "../components/Avatars/AvatarList";
 import { TicketVM } from "../VM/TicketVM";
 import { getRemainingdays } from "../utils/methods";
 

client/src/pages/UserPage.tsx

@@ -1,7 +1,7 @@
 import React, { FC } from "react";
 import { UserVM } from "../VM/UserVM";
 import { UserHeader } from "../components/UserHeader";
-import { UserTabPanel } from "../components/UserTabPanel";
+import { UserTabPanel } from "../components/Panels/UserTabPanel";
 import PageLayout from "../layouts/PageLayout";
 
 interface IProps {