diff --git a/client/public/index.html b/client/public/index.html index eb30249..2b59b87 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -11,12 +11,6 @@ /> - - t.status === "Done").length; + : this.tickets.filter((t) => t.status === "Done").length; this.remainingDays = getRemainingdays(project.endingDate); this.allProjects = allProjects; } diff --git a/client/src/VM/TicketVM.ts b/client/src/VM/TicketVM.ts index 6b6d641..5518275 100644 --- a/client/src/VM/TicketVM.ts +++ b/client/src/VM/TicketVM.ts @@ -1,8 +1,8 @@ -import { Ticket } from "../types/Ticket"; -import { Project } from "../types/Project"; -import { User } from "../types/User"; +import Project from "../types/Project"; +import Ticket from "../types/Ticket"; +import User from "../types/User"; -export class TicketVM { +export default class TicketVM { public id: number; public title: string; public description: string; diff --git a/client/src/VM/UserVM.ts b/client/src/VM/UserVM.ts index 0ddbfcf..a0e878e 100644 --- a/client/src/VM/UserVM.ts +++ b/client/src/VM/UserVM.ts @@ -1,7 +1,7 @@ -import { Project } from "../types/Project"; -import { Ticket } from "../types/Ticket"; -import { User } from "../types/User"; -import { Activity } from "../types/Activity"; +import Activity from "../types/Activity"; +import Project from "../types/Project"; +import Ticket from "../types/Ticket"; +import User from "../types/User"; export class UserVM { public id: string; diff --git a/client/src/authentication/auth0.jsx b/client/src/authentication/auth0.jsx index aa5194a..33521f5 100644 --- a/client/src/authentication/auth0.jsx +++ b/client/src/authentication/auth0.jsx @@ -1,4 +1,3 @@ -// src/react-auth0-spa.js import React, { useState, useEffect, useContext } from "react"; import createAuth0Client from "@auth0/auth0-spa-js"; @@ -68,6 +67,7 @@ export const Auth0Provider = ({ setIsAuthenticated(true); setUser(user); }; + return ( auth0Client.loginWithRedirect(...p), getTokenSilently: (...p) => auth0Client.getTokenSilently(...p), getTokenWithPopup: (...p) => auth0Client.getTokenWithPopup(...p), - logout: (...p) => auth0Client.logout(...p) + logout: (...p) => auth0Client.logout(...p), }} > {children} diff --git a/client/src/components/ActivityCollection.tsx b/client/src/components/ActivityCollection.tsx index c347cc2..3f9476b 100644 --- a/client/src/components/ActivityCollection.tsx +++ b/client/src/components/ActivityCollection.tsx @@ -1,12 +1,12 @@ import React, { FC } from "react"; -import { Activity } from "../types/Activity"; +import Activity from "../types/Activity"; type IProps = { activities: Activity[]; filterText: string; }; -export const ActivityCollection: FC = ({ activities, filterText }) => { +const ActivityCollection: FC = ({ activities, filterText }) => { return activities === undefined ? ( <> ) : ( @@ -17,7 +17,7 @@ export const ActivityCollection: FC = ({ activities, filterText }) => { ) : ( activities .filter( - a => + (a) => a.description .toLowerCase() .includes(filterText.toLowerCase()) || @@ -67,3 +67,4 @@ export const ActivityEntry: FC = ({ activity }) => { ); }; +export default ActivityCollection; diff --git a/client/src/components/Avatars/AvatarList.tsx b/client/src/components/Avatars/AvatarList.tsx index 5c1cf8a..0507aee 100644 --- a/client/src/components/Avatars/AvatarList.tsx +++ b/client/src/components/Avatars/AvatarList.tsx @@ -1,9 +1,8 @@ import React, { FC } from "react"; import { Link } from "react-router-dom"; -import Avatar from "@material-ui/core/Avatar"; +import { makeStyles, Theme, createStyles, Avatar } from "@material-ui/core"; import AvatarGroup from "@material-ui/lab/AvatarGroup"; -import { User } from "../../types/User"; -import { makeStyles, Theme, createStyles } from "@material-ui/core"; +import User from "../../types/User"; interface AvatarListProps { users: User[]; @@ -34,3 +33,5 @@ export const AvatarList: FC = ({ users }) => { ); }; + +export default AvatarList; diff --git a/client/src/components/Avatars/UserAvatar.tsx b/client/src/components/Avatars/UserAvatar.tsx index 6bbd826..c887cdf 100644 --- a/client/src/components/Avatars/UserAvatar.tsx +++ b/client/src/components/Avatars/UserAvatar.tsx @@ -12,17 +12,17 @@ const useStyles = makeStyles((theme: Theme) => root: { display: "flex", "& > *": { - margin: theme.spacing(1) - } + margin: theme.spacing(1), + }, }, small: { width: theme.spacing(3), - height: theme.spacing(3) + height: theme.spacing(3), }, large: { width: theme.spacing(10), - height: theme.spacing(10) - } + height: theme.spacing(10), + }, }) ); @@ -35,3 +35,5 @@ export const UserAvatar: FC = ({ picture, alt }) => { ); }; + +export default UserAvatar; diff --git a/client/src/components/ButtonAppBar.tsx b/client/src/components/ButtonAppBar.tsx index d652d15..5eb934e 100644 --- a/client/src/components/ButtonAppBar.tsx +++ b/client/src/components/ButtonAppBar.tsx @@ -1,24 +1,26 @@ import React from "react"; +import { + AppBar, + Button, + IconButton, + Toolbar, + Typography, +} from "@material-ui/core"; import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; -import AppBar from "@material-ui/core/AppBar"; -import Toolbar from "@material-ui/core/Toolbar"; -import Typography from "@material-ui/core/Typography"; -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; import MenuIcon from "@material-ui/icons/Menu"; import { useAuth0 } from "../authentication/auth0"; const useStyles = makeStyles((theme: Theme) => createStyles({ root: { - flexGrow: 1 + flexGrow: 1, }, menuButton: { - marginRight: theme.spacing(2) + marginRight: theme.spacing(2), }, title: { - flexGrow: 1 - } + flexGrow: 1, + }, }) ); diff --git a/client/src/components/Buttons/Button.tsx b/client/src/components/Buttons/Button.tsx index bb3c49b..ca40ec2 100644 --- a/client/src/components/Buttons/Button.tsx +++ b/client/src/components/Buttons/Button.tsx @@ -9,12 +9,12 @@ interface IProps { onClick?: (e: MouseEvent) => void; } -export const Button: FC = ({ +const Button: FC = ({ size = "small", shape = "", color, onClick, - children + children, }) => { return ( ); }; + +export default Button; diff --git a/client/src/components/Buttons/FloatingButton.tsx b/client/src/components/Buttons/FloatingButton.tsx index ea28e6d..29e9ead 100644 --- a/client/src/components/Buttons/FloatingButton.tsx +++ b/client/src/components/Buttons/FloatingButton.tsx @@ -10,13 +10,7 @@ interface IProps { text?: string; } -export const FloatingButton: FC = ({ - color, - icon, - size, - text, - onClick -}) => { +const FloatingButton: FC = ({ color, icon, size, text, onClick }) => { return ( @@ -24,3 +18,5 @@ export const FloatingButton: FC = ({ ); }; + +export default FloatingButton; diff --git a/client/src/components/Cards/HorizontalCard.tsx b/client/src/components/Cards/HorizontalCard.tsx index d915df5..5450912 100644 --- a/client/src/components/Cards/HorizontalCard.tsx +++ b/client/src/components/Cards/HorizontalCard.tsx @@ -1,10 +1,7 @@ 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 { Card, CardActions, CardContent, Typography } from "@material-ui/core"; import { ProgressBar } from "../Progress/ProgressBar"; interface IProps { @@ -22,7 +19,7 @@ const useStyles = makeStyles({ }, }); -export const HorizontalCard: FC = ({ +const HorizontalCard: FC = ({ title, link = "#", content, @@ -46,3 +43,5 @@ export const HorizontalCard: FC = ({ ); }; + +export default HorizontalCard; diff --git a/client/src/components/Cards/ProjectCard.tsx b/client/src/components/Cards/ProjectCard.tsx index 3f3fe9a..19231e6 100644 --- a/client/src/components/Cards/ProjectCard.tsx +++ b/client/src/components/Cards/ProjectCard.tsx @@ -1,10 +1,10 @@ import React, { FC } from "react"; -import { HorizontalCard } from "./HorizontalCard"; import { makeStyles, Theme, createStyles } from "@material-ui/core"; -import { AvatarList } from "../Avatars/AvatarList"; -import { ProgressInfo } from "../Progress/ProgressInfo"; -import { User } from "../../types/User"; -import { getRemainingdays } from "../../utils/methods"; +import HorizontalCard from "./HorizontalCard"; +import AvatarList from "../Avatars/AvatarList"; +import ProgressInfo from "../Progress/ProgressInfo"; +import User from "../../types/User"; +import getRemainingdays from "../../utils/methods"; interface IProps { title?: string; diff --git a/client/src/components/Cards/TicketCard.tsx b/client/src/components/Cards/TicketCard.tsx index 9018c84..8cbb129 100644 --- a/client/src/components/Cards/TicketCard.tsx +++ b/client/src/components/Cards/TicketCard.tsx @@ -1,9 +1,9 @@ import React, { FC, MouseEvent } from "react"; import { Button, Typography, Grid } from "@material-ui/core"; -import { HorizontalCard } from "./HorizontalCard"; +import HorizontalCard from "./HorizontalCard"; import TicketChipsArray from "./TicketChipsArray"; -import { Ticket } from "../../types/Ticket"; -import { getRemainingdays } from "../../utils/methods"; +import Ticket from "../../types/Ticket"; +import getRemainingdays from "../../utils/methods"; interface IProps { ticket?: Ticket; diff --git a/client/src/components/FileCollection.tsx b/client/src/components/FileCollection.tsx index 4f25ec3..1a1f416 100644 --- a/client/src/components/FileCollection.tsx +++ b/client/src/components/FileCollection.tsx @@ -1,12 +1,14 @@ import React, { FC } from "react"; +import { + Avatar, + ListItemAvatar, + List, + ListItemText, + ListItem, +} from "@material-ui/core"; import { createStyles, Theme, makeStyles } from "@material-ui/core/styles"; -import List from "@material-ui/core/List"; -import ListItem from "@material-ui/core/ListItem"; -import ListItemText from "@material-ui/core/ListItemText"; -import ListItemAvatar from "@material-ui/core/ListItemAvatar"; -import Avatar from "@material-ui/core/Avatar"; import WorkIcon from "@material-ui/icons/Work"; -import { AppFile } from "../types/AppFile"; +import AppFile from "../types/AppFile"; type IProps = { files: AppFile[]; @@ -18,12 +20,12 @@ const useStyles = makeStyles((theme: Theme) => root: { width: "100%", maxWidth: 360, - backgroundColor: theme.palette.background.paper - } + backgroundColor: theme.palette.background.paper, + }, }) ); -export const FileCollection: FC = ({ files, filterText }) => { +const FileCollection: FC = ({ files, filterText }) => { const classes = useStyles(); return ( @@ -32,7 +34,7 @@ export const FileCollection: FC = ({ files, filterText }) => { ) : ( files .filter( - f => + (f) => f.name.toLowerCase().includes(filterText.toLowerCase()) || f.format.toLowerCase().includes(filterText.toLowerCase()) ) @@ -61,3 +63,4 @@ export const FileEntry: FC = ({ file }) => { ); }; +export default FileCollection; diff --git a/client/src/components/FilterBar.tsx b/client/src/components/FilterBar.tsx index bae32cb..328e484 100644 --- a/client/src/components/FilterBar.tsx +++ b/client/src/components/FilterBar.tsx @@ -1,9 +1,7 @@ import React, { FC, ChangeEvent, MouseEvent } from "react"; import { useRouteMatch } from "react-router-dom"; +import { Grid, TextField } from "@material-ui/core"; import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; -import TextField from "@material-ui/core/TextField"; -import { Grid } from "@material-ui/core"; -// import { AccountCircle, FilterList, FilterListSharp } from "@material-ui/icons"; type IProps = { filterText: string; @@ -28,7 +26,7 @@ const useStyles = makeStyles((theme: Theme) => }) ); -export const FilterBar: FC = ({ +const FilterBar: FC = ({ filterText, handleChange, // clearFilterText @@ -55,3 +53,4 @@ export const FilterBar: FC = ({ ); }; +export default FilterBar; diff --git a/client/src/components/Footer.tsx b/client/src/components/Footer.tsx index 09a94eb..ce709cc 100644 --- a/client/src/components/Footer.tsx +++ b/client/src/components/Footer.tsx @@ -1,8 +1,6 @@ import React, { FC } from "react"; -import Typography from "@material-ui/core/Typography"; +import { Container, Typography, Link } from "@material-ui/core"; import { makeStyles } from "@material-ui/core/styles"; -import Container from "@material-ui/core/Container"; -import Link from "@material-ui/core/Link"; interface IProps { brand: string; @@ -11,7 +9,7 @@ interface IProps { const copyParams: IProps = { brand: "BugBuster", - text: "Made with 🔥" + text: "Made with 🔥", }; const Copyright: FC = ({ brand, text }) => { @@ -27,15 +25,15 @@ const Copyright: FC = ({ brand, text }) => { ); }; -const useStyles = makeStyles(theme => ({ +const useStyles = makeStyles((theme) => ({ footer: { padding: theme.spacing(3, 2), marginTop: "auto", backgroundColor: theme.palette.type === "light" ? theme.palette.grey[200] - : theme.palette.grey[800] - } + : theme.palette.grey[800], + }, })); export default function Footer() { diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx index a93d504..1d0d7a4 100644 --- a/client/src/components/Header.tsx +++ b/client/src/components/Header.tsx @@ -6,7 +6,7 @@ type HeaderProps = { description: string; }; -export const Header: FC = ({ title, description }) => { +const Header: FC = ({ title, description }) => { return ( @@ -18,3 +18,5 @@ export const Header: FC = ({ title, description }) => { ); }; + +export default Header; diff --git a/client/src/components/InputField.tsx b/client/src/components/InputField.tsx index 6dc5468..888b142 100644 --- a/client/src/components/InputField.tsx +++ b/client/src/components/InputField.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; -export const InputField: FC = () => { +const InputField: FC = () => { return (
@@ -8,3 +8,5 @@ export const InputField: FC = () => {
); }; + +export default InputField; diff --git a/client/src/components/InputFile.tsx b/client/src/components/InputFile.tsx index c4257e7..3c36e5c 100644 --- a/client/src/components/InputFile.tsx +++ b/client/src/components/InputFile.tsx @@ -3,22 +3,20 @@ import { CloudUpload } from "@material-ui/icons"; import { makeStyles, createStyles, Theme } from "@material-ui/core/styles"; import Button from "@material-ui/core/Button"; -export const InputFile: FC = () => { +const InputFile: FC = () => { return ( - <> -
-
- - - - -
-
- +
+
+ + + + +
+
); }; @@ -26,12 +24,12 @@ const useStyles = makeStyles((theme: Theme) => createStyles({ root: { "& > *": { - margin: theme.spacing(1) - } + margin: theme.spacing(1), + }, }, input: { - display: "none" - } + display: "none", + }, }) ); @@ -60,3 +58,5 @@ const UploadButton: FC = () => { ); }; + +export default InputFile; diff --git a/client/src/components/Lists/ActivityList.tsx b/client/src/components/Lists/ActivityList.tsx index c70082c..69513d9 100644 --- a/client/src/components/Lists/ActivityList.tsx +++ b/client/src/components/Lists/ActivityList.tsx @@ -1,13 +1,13 @@ import React, { FC, useState, ChangeEvent, MouseEvent } from "react"; -import { ActivityCollection } from "../ActivityCollection"; -import { Activity } from "../../types/Activity"; -import { FilterBar } from "../FilterBar"; +import ActivityCollection from "../ActivityCollection"; +import FilterBar from "../FilterBar"; +import Activity from "../../types/Activity"; type IProps = { activities: Activity[]; }; -export const ActivityList: FC = ({ activities }) => { +const ActivityList: FC = ({ activities }) => { const [filterText, setFilterText] = useState(""); const clearFilterText: (e: MouseEvent) => void = (e: MouseEvent) => { setFilterText(""); @@ -30,3 +30,5 @@ export const ActivityList: FC = ({ activities }) => { ); }; + +export default ActivityList; diff --git a/client/src/components/Lists/AppFileList.tsx b/client/src/components/Lists/AppFileList.tsx index 028d18b..4dfc589 100644 --- a/client/src/components/Lists/AppFileList.tsx +++ b/client/src/components/Lists/AppFileList.tsx @@ -1,15 +1,15 @@ import React, { FC, useState, ChangeEvent, MouseEvent } from "react"; -import { AppFile } from "../../types/AppFile"; -import { FileCollection } from "../FileCollection"; -import { InputFile } from "../InputFile"; -import { FilterBar } from "../FilterBar"; import { Grid, Typography } from "@material-ui/core"; +import FileCollection from "../FileCollection"; +import FilterBar from "../FilterBar"; +import InputFile from "../InputFile"; +import AppFile from "../../types/AppFile"; type IProps = { files: AppFile[]; }; -export const FileList: FC = ({ files }) => { +const FileList: FC = ({ files }) => { const [filterText, setFilterText] = useState(""); const clearFilterText = (e: MouseEvent): void => { setFilterText(""); @@ -38,3 +38,5 @@ export const FileList: FC = ({ files }) => { ); }; + +export default FileList; diff --git a/client/src/components/Lists/MemberList.tsx b/client/src/components/Lists/MemberList.tsx index 631fe80..909cefb 100644 --- a/client/src/components/Lists/MemberList.tsx +++ b/client/src/components/Lists/MemberList.tsx @@ -1,13 +1,13 @@ import React, { FC, useState, ChangeEvent, MouseEvent } from "react"; -import { UsersModalEntry } from "../Modals/UsersModalEntry"; -import { FilterBar } from "../FilterBar"; -import { User } from "../../types/User"; +import FilterBar from "../FilterBar"; +import UsersModalEntry from "../Modals/UsersModalEntry"; +import User from "../../types/User"; interface IProps { users: User[]; } -export const MemberList: FC = ({ users }) => { +const MemberList: FC = ({ users }) => { const [members, setMembers] = useState([]); const [filterText, setFilterText] = useState(""); const clearFilterText = (e: MouseEvent): void => { @@ -37,3 +37,5 @@ export const MemberList: FC = ({ users }) => { ); }; + +export default MemberList; diff --git a/client/src/components/Lists/ProjectList.tsx b/client/src/components/Lists/ProjectList.tsx index 873e83a..e20cba5 100644 --- a/client/src/components/Lists/ProjectList.tsx +++ b/client/src/components/Lists/ProjectList.tsx @@ -6,12 +6,12 @@ import { createStyles, Theme, } from "@material-ui/core"; -import { FilterBar } from "../FilterBar"; +import FilterBar from "../FilterBar"; import ProjectCard from "../Cards/ProjectCard"; -import { FloatingButton } from "../Buttons/FloatingButton"; -import { NewProjectModal } from "../Modals/NewProjectModal"; -import { Project } from "../../types/Project"; -import { User } from "../../types/User"; +import FloatingButton from "../Buttons/FloatingButton"; +import NewProjectModal from "../Modals/NewProjectModal"; +import Project from "../../types/Project"; +import User from "../../types/User"; const useStyles = makeStyles((theme: Theme) => createStyles({ @@ -30,7 +30,7 @@ type IProps = { allUsers: User[]; }; -export const ProjectList: FC = ({ projects, allUsers }) => { +const ProjectList: FC = ({ projects, allUsers }) => { const [filterText, setFilterText] = useState(""); const clearFilterText: (e: MouseEvent) => void = (e: MouseEvent) => { setFilterText(""); @@ -109,3 +109,5 @@ export const ProjectList: FC = ({ projects, allUsers }) => { ); }; + +export default ProjectList; diff --git a/client/src/components/Lists/TicketList.tsx b/client/src/components/Lists/TicketList.tsx index e6910c5..fe64a43 100644 --- a/client/src/components/Lists/TicketList.tsx +++ b/client/src/components/Lists/TicketList.tsx @@ -6,15 +6,15 @@ import { Theme, createStyles, } from "@material-ui/core"; -import { FloatingButton } from "../Buttons/FloatingButton"; -import { FilterBar } from "../FilterBar"; -import { HttpResponse } from "../../types/HttpResponse"; -import { Ticket } from "../../types/Ticket"; -import { NewTicketModal } from "../Modals/NewTicketModal"; -import { Project } from "../../types/Project"; -import { put } from "../../utils/http"; -import { Constants } from "../../utils/Constants"; +import FloatingButton from "../Buttons/FloatingButton"; +import FilterBar from "../FilterBar"; import TicketCard from "../Cards/TicketCard"; +import NewTicketModal from "../Modals/NewTicketModal"; +import HttpResponse from "../../types/HttpResponse"; +import Ticket from "../../types/Ticket"; +import Project from "../../types/Project"; +import { put } from "../../utils/http"; +import Constants from "../../utils/Constants"; const useStyles = makeStyles((theme: Theme) => createStyles({ @@ -34,7 +34,7 @@ type TicketListProps = { addButton?: Boolean; }; -export const TicketList: FC = ({ +const TicketList: FC = ({ tickets, allProjects, addButton = true, @@ -124,3 +124,5 @@ export const TicketList: FC = ({ ); }; + +export default TicketList; diff --git a/client/src/components/LogInForm.tsx b/client/src/components/LogInForm.tsx index 4a85da7..b215d6b 100644 --- a/client/src/components/LogInForm.tsx +++ b/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 "./Buttons/Button"; +import InputField from "./InputField"; +import PasswordField from "./PasswordField"; +import Button from "./Buttons/Button"; export const LogInForm: FC = () => { return ( diff --git a/client/src/components/Modals/Modal.tsx b/client/src/components/Modals/Modal.tsx index 705f172..d4745ca 100644 --- a/client/src/components/Modals/Modal.tsx +++ b/client/src/components/Modals/Modal.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; -import Dialog from "@material-ui/core/Dialog"; import { + Dialog, DialogTitle, Typography, IconButton, @@ -36,7 +36,7 @@ const useStyles = makeStyles((theme: Theme) => }) ); -export const Modal: FC = ({ +const Modal: FC = ({ handleClose, show, action, @@ -77,3 +77,5 @@ export const Modal: FC = ({ ); }; + +export default Modal; diff --git a/client/src/components/Modals/NewProjectModal.tsx b/client/src/components/Modals/NewProjectModal.tsx index 3d63126..3ade31b 100644 --- a/client/src/components/Modals/NewProjectModal.tsx +++ b/client/src/components/Modals/NewProjectModal.tsx @@ -1,10 +1,10 @@ import React, { FC, useState, FormEvent } from "react"; -import { TextField } from "@material-ui/core"; -import { Modal } from "./Modal"; -import { Project } from "../../types/Project"; -import { User } from "../../types/User"; -import { post } from "../../utils/http"; -import { Constants } from "../../utils/Constants"; +import TextField from "@material-ui/core"; +import Modal from "./Modal"; +import Project from "../../types/Project"; +import User from "../../types/User"; +import post from "../../utils/http"; +import Constants from "../../utils/Constants"; interface IProps { show: boolean; @@ -12,7 +12,7 @@ interface IProps { allUsers: User[]; } -export const NewProjectModal: FC = ({ show, handleClose }) => { +const NewProjectModal: FC = ({ show, handleClose }) => { const [title, setTitle] = useState(""); const [description, setDescription] = useState(""); const [endingDate, setEndingDate] = useState(""); @@ -88,3 +88,5 @@ export const NewProjectModal: FC = ({ show, handleClose }) => { ); }; + +export default NewProjectModal; diff --git a/client/src/components/Modals/NewTicketModal.tsx b/client/src/components/Modals/NewTicketModal.tsx index 9493b17..bff3858 100644 --- a/client/src/components/Modals/NewTicketModal.tsx +++ b/client/src/components/Modals/NewTicketModal.tsx @@ -7,14 +7,14 @@ import { makeStyles, Theme, } from "@material-ui/core"; -import { Modal } from "./Modal"; -import { Ticket } from "../../types/Ticket"; -import { Project } from "../../types/Project"; -import { post } from "../../utils/http"; -import { Constants } from "../../utils/Constants"; +import Modal from "./Modal"; +import Ticket from "../../types/Ticket"; +import Project from "../../types/Project"; import Category from "../../types/enums/category"; import Impact from "../../types/enums/impact"; import Difficulty from "../../types/enums/difficulty"; +import { post } from "../../utils/http"; +import Constants from "../../utils/Constants"; interface IProps { show: boolean; @@ -28,11 +28,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, })); -export const NewTicketModal: FC = ({ - show, - handleClose, - allProjects, -}) => { +const NewTicketModal: FC = ({ show, handleClose, allProjects }) => { const [title, setTitle] = useState(""); const [description, setDescription] = useState(""); const [endingDate, setEndingDate] = useState(""); @@ -211,3 +207,5 @@ export const NewTicketModal: FC = ({ ); }; + +export default NewTicketModal; diff --git a/client/src/components/Modals/UsersModal.tsx b/client/src/components/Modals/UsersModal.tsx index 4b915f9..e5df651 100644 --- a/client/src/components/Modals/UsersModal.tsx +++ b/client/src/components/Modals/UsersModal.tsx @@ -1,20 +1,22 @@ import React, { FC, useState, ChangeEvent, FormEvent } from "react"; import { useParams } from "react-router-dom"; -import { Grid } from "@material-ui/core"; +import { + Avatar, + Checkbox, + Grid, + List, + ListItem, + ListItemSecondaryAction, + ListItemText, + ListItemAvatar, +} from "@material-ui/core"; import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; -import List from "@material-ui/core/List"; -import ListItem from "@material-ui/core/ListItem"; -import ListItemSecondaryAction from "@material-ui/core/ListItemSecondaryAction"; -import ListItemText from "@material-ui/core/ListItemText"; -import ListItemAvatar from "@material-ui/core/ListItemAvatar"; -import Checkbox from "@material-ui/core/Checkbox"; -import Avatar from "@material-ui/core/Avatar"; -import { Modal } from "./Modal"; -import { AvatarList } from "../Avatars/AvatarList"; -import { FilterBar } from "../FilterBar"; -import { User } from "../../types/User"; +import AvatarList from "../Avatars/AvatarList"; +import FilterBar from "../FilterBar"; +import Modal from "./Modal"; +import User from "../../types/User"; import { patch } from "../../utils/http"; -import { Constants } from "../../utils/Constants"; +import Constants from "../../utils/Constants"; interface IProps { show: boolean; @@ -33,12 +35,7 @@ const useStyles = makeStyles((theme: Theme) => }) ); -export const UsersModal: FC = ({ - show, - handleClose, - users, - allUsers, -}) => { +const UsersModal: FC = ({ show, handleClose, users, allUsers }) => { const { id } = useParams(); const [filterText, setFilterText] = useState(""); @@ -112,3 +109,5 @@ export const UsersModal: FC = ({ ); }; + +export default UsersModal; diff --git a/client/src/components/Modals/UsersModalEntry.tsx b/client/src/components/Modals/UsersModalEntry.tsx index 7e7f04c..d3a5943 100644 --- a/client/src/components/Modals/UsersModalEntry.tsx +++ b/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>; @@ -7,7 +7,7 @@ interface IProps { user: User; } -export const UsersModalEntry: FC = ({ user, setMembers, members }) => { +const UsersModalEntry: FC = ({ user, setMembers, members }) => { const match: (id: string) => boolean = (id: string) => { return Boolean(members.find((m) => m.id === id)); }; @@ -40,3 +40,5 @@ export const UsersModalEntry: FC = ({ user, setMembers, members }) => { ); }; + +export default UsersModalEntry; diff --git a/client/src/components/Navbar.tsx b/client/src/components/Navbar.tsx index 3432b0a..ec0fa54 100644 --- a/client/src/components/Navbar.tsx +++ b/client/src/components/Navbar.tsx @@ -1,7 +1,7 @@ import React from "react"; import { useAuth0 } from "../authentication/auth0"; -export const NavBar = () => { +const NavBar = () => { const { isAuthenticated, loginWithRedirect, logout } = useAuth0(); return ( @@ -14,3 +14,5 @@ export const NavBar = () => { ); }; + +export default NavBar; diff --git a/client/src/components/NewTicketForm.tsx b/client/src/components/NewTicketForm.tsx deleted file mode 100644 index aac5205..0000000 --- a/client/src/components/NewTicketForm.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import React, { FC } from "react"; -import { TextField, MenuItem } from "@material-ui/core"; -import { Project } from "../types/Project"; - -interface IProps { - title: string; - setTitle: React.Dispatch>; - description: string; - setDescription: React.Dispatch>; - endingDate: string; - setEndingDate: React.Dispatch>; - allProjects: Project[]; - projectId: string; - setProjectId: React.Dispatch>; -} - -export const NewTicketForm: FC = ({ - title, - setTitle, - description, - setDescription, - endingDate, - setEndingDate, - allProjects, - projectId, - setProjectId, -}) => { - return ( - <> - {/*
-
- date_range - ) => - setEndingDate(e.target.value) - } - /> - -
- -
- -
-
*/} - - ); -}; diff --git a/client/src/components/Panels/ProjectTabPanel.tsx b/client/src/components/Panels/ProjectTabPanel.tsx index b3fb77f..17d6677 100644 --- a/client/src/components/Panels/ProjectTabPanel.tsx +++ b/client/src/components/Panels/ProjectTabPanel.tsx @@ -1,16 +1,11 @@ import React, { FC, useState, ReactNode } from "react"; -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 SwipeableViews from "react-swipeable-views"; -import { Ticket } from "../../types/Ticket"; -import { Project } from "../../types/Project"; -import { TicketList } from "../Lists/TicketList"; -// import { FileList } from "./AppFileList"; -import { AppFile } from "../../types/AppFile"; +import { makeStyles, Theme, useTheme } from "@material-ui/core/styles"; +import { AppBar, Box, Tab, Tabs, Typography } from "@material-ui/core"; +import Ticket from "../../types/Ticket"; +import Project from "../../types/Project"; +import TicketList from "../Lists/TicketList"; +import AppFile from "../../types/AppFile"; interface TabProps { children?: ReactNode; @@ -59,7 +54,7 @@ interface IProps { allProjects: Project[]; } -export const ProjectTabPanel: FC = ({ +const ProjectTabPanel: FC = ({ tickets, tabNames, files, @@ -116,3 +111,5 @@ export const ProjectTabPanel: FC = ({ ); }; + +export default ProjectTabPanel; diff --git a/client/src/components/Panels/TabRouter.tsx b/client/src/components/Panels/TabRouter.tsx index 24f9286..bc2da24 100644 --- a/client/src/components/Panels/TabRouter.tsx +++ b/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 "../Lists/TicketList"; -import { FileList } from "../Lists/AppFileList"; -import { Ticket } from "../../types/Ticket"; -import { AppFile } from "../../types/AppFile"; -import { Activity } from "../../types/Activity"; -import { Project } from "../../types/Project"; +import TabRouterHeader from "./TabRouterHeader"; +import TicketList from "../Lists/TicketList"; +import FileList from "../Lists/AppFileList"; +import Ticket from "../../types/Ticket"; +import AppFile from "../../types/AppFile"; +import Activity from "../../types/Activity"; +import Project from "../../types/Project"; interface IProps { tickets: Ticket[]; @@ -17,7 +17,7 @@ interface IProps { allProjects: Project[]; } -export const TabRouter: FC = ({ +const TabRouter: FC = ({ tickets, tabNames, files, @@ -48,3 +48,5 @@ export const TabRouter: FC = ({ ); }; + +export default TabRouter; diff --git a/client/src/components/Panels/TabRouterHeader.tsx b/client/src/components/Panels/TabRouterHeader.tsx index 2bd15ef..baaaae0 100644 --- a/client/src/components/Panels/TabRouterHeader.tsx +++ b/client/src/components/Panels/TabRouterHeader.tsx @@ -6,9 +6,9 @@ interface IProps { tabNames: string[]; } -export const TabRouterHeader: FC = ({ +const TabRouterHeader: FC = ({ tabNames, - tabClass = `tab col s${12 / tabNames.length}` + tabClass = `tab col s${12 / tabNames.length}`, }) => { const [isActive, setIsActive] = useState(0); const nTabs = tabNames.length; @@ -31,7 +31,7 @@ export const TabRouterHeader: FC = ({ className="indicator indigo lighten-2" style={{ left: `${(isActive / nTabs) * 100}%`, - right: `${(1 - (isActive + 1) / nTabs) * 100}%` + right: `${(1 - (isActive + 1) / nTabs) * 100}%`, }} > @@ -54,7 +54,7 @@ const TabUnit: FC = ({ setIsActive, text, value, - nTabs + nTabs, }) => { const { url } = useRouteMatch(); return ( @@ -63,7 +63,7 @@ const TabUnit: FC = ({ key={value} style={{ left: `${(isActive / nTabs) * 100}%`, - right: `${(1 - (isActive + 1) / nTabs) * 100}%` + right: `${(1 - (isActive + 1) / nTabs) * 100}%`, }} > = ({ ); }; + +export default TabRouterHeader; diff --git a/client/src/components/Panels/UserTabPanel.tsx b/client/src/components/Panels/UserTabPanel.tsx index ad0c2ba..8205af7 100644 --- a/client/src/components/Panels/UserTabPanel.tsx +++ b/client/src/components/Panels/UserTabPanel.tsx @@ -1,16 +1,12 @@ 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 { Project } from "../../types/Project"; -import { ProjectList } from "../Lists/ProjectList"; -import { TicketList } from "../Lists/TicketList"; -import { User } from "../../types/User"; +import { AppBar, Box, Tab, Tabs, Typography } from "@material-ui/core"; +import ProjectList from "../Lists/ProjectList"; +import TicketList from "../Lists/TicketList"; +import Ticket from "../../types/Ticket"; +import Project from "../../types/Project"; +import User from "../../types/User"; interface TabProps { children?: ReactNode; @@ -58,7 +54,7 @@ interface IProps { allUsers: User[]; } -export const UserTabPanel: FC = ({ +const UserTabPanel: FC = ({ tickets, tabNames, projects, @@ -107,3 +103,4 @@ export const UserTabPanel: FC = ({ ); }; +export default UserTabPanel; diff --git a/client/src/components/Panels/UserTabRouter.tsx b/client/src/components/Panels/UserTabRouter.tsx index 6a45d4d..218990a 100644 --- a/client/src/components/Panels/UserTabRouter.tsx +++ b/client/src/components/Panels/UserTabRouter.tsx @@ -1,10 +1,9 @@ import React, { FC } from "react"; import { Route, useRouteMatch, Redirect } from "react-router-dom"; -import { TabRouterHeader } from "./TabRouterHeader"; -import { ProjectList } from "../Lists/ProjectList"; -import { Ticket } from "../../types/Ticket"; -import { Project } from "../../types/Project"; -import { TicketList } from "../Lists/TicketList"; +import TabRouterHeader from "./TabRouterHeader"; +import TicketList from "../Lists/TicketList"; +import Ticket from "../../types/Ticket"; +import Project from "../../types/Project"; interface IProps { tabNames: string[]; @@ -33,3 +32,5 @@ export const UserTabRouter: FC = ({ tickets, tabNames, projects }) => { ); }; + +export default UserTabRouter; diff --git a/client/src/components/PasswordField.tsx b/client/src/components/PasswordField.tsx index d30d302..ea5ac53 100644 --- a/client/src/components/PasswordField.tsx +++ b/client/src/components/PasswordField.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; -export const PasswordField: FC = () => { +const PasswordField: FC = () => { return (
@@ -8,3 +8,5 @@ export const PasswordField: FC = () => {
); }; + +export default PasswordField; diff --git a/client/src/components/Preloader.tsx b/client/src/components/Preloader.tsx index 5c77cca..3a1a5c2 100644 --- a/client/src/components/Preloader.tsx +++ b/client/src/components/Preloader.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; -export const Preloader: FC = () => { +const Preloader: FC = () => { return (
@@ -53,3 +53,5 @@ export const Preloader: FC = () => {
); }; + +export default Preloader; diff --git a/client/src/components/ProfileSelector.tsx b/client/src/components/ProfileSelector.tsx index 3c6fdb9..4b2aeae 100644 --- a/client/src/components/ProfileSelector.tsx +++ b/client/src/components/ProfileSelector.tsx @@ -1,8 +1,8 @@ import React, { FC } from "react"; -import { UserAvatar } from "./Avatars/UserAvatar"; import { Link } from "react-router-dom"; +import { UserAvatar } from "./Avatars/UserAvatar"; -export const ProfileSelector: FC = () => { +const ProfileSelector: FC = () => { return (
@@ -20,3 +20,4 @@ export const ProfileSelector: FC = () => {
); }; +export default ProfileSelector; diff --git a/client/src/components/Progress/ProgressBar.tsx b/client/src/components/Progress/ProgressBar.tsx index e3f837c..670764e 100644 --- a/client/src/components/Progress/ProgressBar.tsx +++ b/client/src/components/Progress/ProgressBar.tsx @@ -1,7 +1,6 @@ import React, { FC } from "react"; +import { Box, LinearProgress } from "@material-ui/core"; import { makeStyles, Theme, createStyles } from "@material-ui/core/styles"; -import LinearProgress from "@material-ui/core/LinearProgress"; -import { Box } from "@material-ui/core"; type IProps = { value: number; @@ -18,7 +17,7 @@ const useStyles = makeStyles((theme: Theme) => }) ); -export const ProgressBar: FC = ({ value }) => { +const ProgressBar: FC = ({ value }) => { // const styleString: CSSProperties = { width: `${value}%` }; // let barColor: string = "green"; @@ -43,3 +42,5 @@ export const ProgressBar: FC = ({ value }) => { ); }; + +export default ProgressBar; diff --git a/client/src/components/Progress/ProgressInfo.tsx b/client/src/components/Progress/ProgressInfo.tsx index eaaf028..cf9ec37 100644 --- a/client/src/components/Progress/ProgressInfo.tsx +++ b/client/src/components/Progress/ProgressInfo.tsx @@ -20,7 +20,7 @@ type IProps = { // }) // ); -export const ProgressInfo: FC = ({ +const ProgressInfo: FC = ({ tasksDone, tasksTotalCount, remainingDays, @@ -39,3 +39,5 @@ export const ProgressInfo: FC = ({ ); }; + +export default ProgressInfo; diff --git a/client/src/components/UserHeader.tsx b/client/src/components/UserHeader.tsx index 98f6ff9..9b7f8d9 100644 --- a/client/src/components/UserHeader.tsx +++ b/client/src/components/UserHeader.tsx @@ -1,6 +1,6 @@ import React, { FC } from "react"; -import { Header } from "../components/Header"; -import { UserAvatar } from "./Avatars/UserAvatar"; +import Header from "../components/Header"; +import UserAvatar from "./Avatars/UserAvatar"; import { Grid, // makeStyles, Theme @@ -19,7 +19,7 @@ interface IProps { // }, // })); -export const UserHeader: FC = ({ fullName, presentation, picture }) => { +const UserHeader: FC = ({ fullName, presentation, picture }) => { // const classes = useStyles(); return ( //
@@ -34,3 +34,5 @@ export const UserHeader: FC = ({ fullName, presentation, picture }) => { //
); }; + +export default UserHeader; diff --git a/client/src/controllers/ErrorController.tsx b/client/src/controllers/ErrorController.tsx index 0f00683..9b7edb8 100644 --- a/client/src/controllers/ErrorController.tsx +++ b/client/src/controllers/ErrorController.tsx @@ -5,7 +5,7 @@ interface IProps { error: string; } -export const ErrorController: FC = ({ error }) => { +const ErrorController: FC = ({ error }) => { switch (error) { case "Bad Request": return ; @@ -20,3 +20,5 @@ export const ErrorController: FC = ({ error }) => { return ; } }; + +export default ErrorController; diff --git a/client/src/controllers/HomeController.tsx b/client/src/controllers/HomeController.tsx index cf821ae..fbabe73 100644 --- a/client/src/controllers/HomeController.tsx +++ b/client/src/controllers/HomeController.tsx @@ -1,6 +1,8 @@ import React, { FC } from "react"; -import { HomePage } from "../pages/HomePage"; +import HomePage from "../pages/HomePage"; -export const HomeController: FC = () => { +const HomeController: FC = () => { return ; }; + +export default HomeController; diff --git a/client/src/controllers/ProjectController.tsx b/client/src/controllers/ProjectController.tsx index 427bd8f..02fed22 100644 --- a/client/src/controllers/ProjectController.tsx +++ b/client/src/controllers/ProjectController.tsx @@ -1,16 +1,16 @@ import React, { FC, useState, useEffect } from "react"; import { useParams } from "react-router-dom"; -import { ErrorController } from "./ErrorController"; -import { ProjectPage } from "../pages/ProjectPage"; +import ErrorController from "./ErrorController"; +import ProjectPage from "../pages/ProjectPage"; import ProjectVM from "../VM/ProjectVM"; -import { Project } from "../types/Project"; -import { HttpResponse } from "../types/HttpResponse"; +import HttpResponse from "../types/HttpResponse"; +import Project from "../types/Project"; +import User from "../types/User"; import { Preloader } from "../components/Preloader"; -import { Constants } from "../utils/Constants"; +import Constants from "../utils/Constants"; import { get } from "../utils/http"; -import { User } from "../types/User"; -export const ProjectController: FC = () => { +const ProjectController: FC = () => { const [project, setProject] = useState({} as Project); const [allUsers, setAllUsers] = useState([]); const [allProjects, setAllProjects] = useState([]); @@ -81,3 +81,5 @@ export const ProjectController: FC = () => { const viewModel = new ProjectVM(project, allUsers, allProjects); return isLoading ? : ; }; + +export default ProjectController; diff --git a/client/src/controllers/TicketController.tsx b/client/src/controllers/TicketController.tsx index 0cccd54..38db429 100644 --- a/client/src/controllers/TicketController.tsx +++ b/client/src/controllers/TicketController.tsx @@ -1,15 +1,15 @@ import React, { FC, useState, useEffect } from "react"; import { useParams } from "react-router-dom"; -import { TicketPage } from "../pages/TicketPage"; -import { ErrorController } from "./ErrorController"; -import { HttpResponse } from "../types/HttpResponse"; +import ErrorController from "./ErrorController"; +import TicketPage from "../pages/TicketPage"; +import TicketVM from "../VM/TicketVM"; +import HttpResponse from "../types/HttpResponse"; +import Ticket from "../types/Ticket"; import { Preloader } from "../components/Preloader"; import { get } from "../utils/http"; -import { Constants } from "../utils/Constants"; -import { Ticket } from "../types/Ticket"; -import { TicketVM } from "../VM/TicketVM"; +import Constants from "../utils/Constants"; -export const TicketController: FC = () => { +const TicketController: FC = () => { const [isLoading, setIsLoading] = useState(true); const [ticket, setTicket] = useState({} as Ticket); const [hasError, setHasError] = useState(false); @@ -48,3 +48,5 @@ export const TicketController: FC = () => { const viewModel = new TicketVM(ticket); return isLoading ? : ; }; + +export default TicketController; diff --git a/client/src/controllers/UserController.tsx b/client/src/controllers/UserController.tsx index fc31881..04855df 100644 --- a/client/src/controllers/UserController.tsx +++ b/client/src/controllers/UserController.tsx @@ -1,15 +1,15 @@ import React, { FC, useState, useEffect } from "react"; import { useParams } from "react-router-dom"; -import { UserPage } from "../pages/UserPage"; +import ErrorController from "./ErrorController"; +import UserPage from "../pages/UserPage"; import { UserVM } from "../VM/UserVM"; -import { User } from "../types/User"; -import { HttpResponse } from "../types/HttpResponse"; +import HttpResponse from "../types/HttpResponse"; +import User from "../types/User"; import { Preloader } from "../components/Preloader"; +import Constants from "../utils/Constants"; import { get } from "../utils/http"; -import { Constants } from "../utils/Constants"; -import { ErrorController } from "./ErrorController"; -export const UserController: FC = () => { +const UserController: FC = () => { const [isLoading, setIsLoading] = useState(true); const [user, setUser] = useState({} as User); const [hasError, setHasError] = useState(false); @@ -64,3 +64,5 @@ export const UserController: FC = () => { const viewModel = new UserVM(user, allUsers); return isLoading ? : ; }; + +export default UserController; diff --git a/client/src/pages/HomePage.tsx b/client/src/pages/HomePage.tsx index e6fe164..a7981e8 100644 --- a/client/src/pages/HomePage.tsx +++ b/client/src/pages/HomePage.tsx @@ -1,9 +1,9 @@ -import React from "react"; +import React, { FC } from "react"; // import { LogInForm } from "../components/LogInForm"; // import { ProfileSelector } from "../components/ProfileSelector"; import SignInSide from "../components/SignInSide"; -export const HomePage: React.FC = () => { +const HomePage: FC = () => { return ( //
//
@@ -21,3 +21,5 @@ export const HomePage: React.FC = () => { ); }; + +export default HomePage; diff --git a/client/src/pages/NotFoundPage.tsx b/client/src/pages/NotFoundPage.tsx index 5b60c5e..1283edf 100644 --- a/client/src/pages/NotFoundPage.tsx +++ b/client/src/pages/NotFoundPage.tsx @@ -1,9 +1,8 @@ import React, { FC } from "react"; import PageLayout from "../layouts/PageLayout"; -import { Header } from "../components/Header"; +import Header from "../components/Header"; -interface IProps {} -export const NotFoundPage: FC = () => { +const NotFoundPage: FC = () => { return ( } @@ -11,3 +10,5 @@ export const NotFoundPage: FC = () => { /> ); }; + +export default NotFoundPage; diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx index 43e12cd..02746f0 100644 --- a/client/src/pages/ProjectPage.tsx +++ b/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/Avatars/AvatarList"; -import { ProgressBar } from "../components/Progress/ProgressBar"; -import { FloatingButton } from "../components/Buttons/FloatingButton"; -import { UsersModal } from "../components/Modals/UsersModal"; -import { ProjectTabPanel } from "../components/Panels/ProjectTabPanel"; +import Header from "../components/Header"; +import AvatarList from "../components/Avatars/AvatarList"; +import ProgressBar from "../components/Progress/ProgressBar"; +import FloatingButton from "../components/Buttons/FloatingButton"; +import UsersModal from "../components/Modals/UsersModal"; +import ProjectTabPanel from "../components/Panels/ProjectTabPanel"; +import ProgressInfo from "../components/Progress/ProgressInfo"; import ProjectVM from "../VM/ProjectVM"; import PageLayout from "../layouts/PageLayout"; -import { ProgressInfo } from "../components/Progress/ProgressInfo"; interface IProps { viewModel: ProjectVM; @@ -22,7 +22,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, })); -export const ProjectPage: FC = ({ viewModel }) => { +const ProjectPage: FC = ({ viewModel }) => { const { // id, title, @@ -97,3 +97,5 @@ export const ProjectPage: FC = ({ viewModel }) => { /> ); }; + +export default ProjectPage; diff --git a/client/src/pages/TicketPage.tsx b/client/src/pages/TicketPage.tsx index 7ed4937..37782e0 100644 --- a/client/src/pages/TicketPage.tsx +++ b/client/src/pages/TicketPage.tsx @@ -2,12 +2,12 @@ import React, { FC } from "react"; import { Link } from "react-router-dom"; import { makeStyles, Theme, Grid, Typography } from "@material-ui/core"; import { Timer } from "@material-ui/icons"; +import TicketVM from "../VM/TicketVM"; import PageLayout from "../layouts/PageLayout"; -import { TicketVM } from "../VM/TicketVM"; -import { Header } from "../components/Header"; -import { AvatarList } from "../components/Avatars/AvatarList"; +import Header from "../components/Header"; +import AvatarList from "../components/Avatars/AvatarList"; import TicketChipsArray from "../components/Cards/TicketChipsArray"; -import { getRemainingdays } from "../utils/methods"; +import getRemainingdays from "../utils/methods"; interface IProps { viewModel: TicketVM; @@ -16,7 +16,6 @@ interface IProps { const useStyles = makeStyles((theme: Theme) => ({ root: { margin: theme.spacing(1), - // flexGrow: 1, }, table: { margin: "auto", @@ -28,7 +27,7 @@ const useStyles = makeStyles((theme: Theme) => ({ }, })); -export const TicketPage: FC = ({ viewModel }) => { +const TicketPage: FC = ({ viewModel }) => { const { title, description, @@ -133,3 +132,5 @@ export const TicketPage: FC = ({ viewModel }) => { // // ); // }; + +export default TicketPage; diff --git a/client/src/pages/UserPage.tsx b/client/src/pages/UserPage.tsx index b3d8e2c..35960e7 100644 --- a/client/src/pages/UserPage.tsx +++ b/client/src/pages/UserPage.tsx @@ -1,14 +1,14 @@ import React, { FC } from "react"; import { UserVM } from "../VM/UserVM"; -import { UserHeader } from "../components/UserHeader"; -import { UserTabPanel } from "../components/Panels/UserTabPanel"; +import UserHeader from "../components/UserHeader"; +import UserTabPanel from "../components/Panels/UserTabPanel"; import PageLayout from "../layouts/PageLayout"; interface IProps { viewModel: UserVM; } -export const UserPage: FC = ({ viewModel }) => { +const UserPage: FC = ({ viewModel }) => { const { fullName, presentation, @@ -39,3 +39,5 @@ export const UserPage: FC = ({ viewModel }) => { /> ); }; + +export default UserPage; diff --git a/client/src/routes/AppRouter.tsx b/client/src/routes/AppRouter.tsx index 631525b..f45491a 100644 --- a/client/src/routes/AppRouter.tsx +++ b/client/src/routes/AppRouter.tsx @@ -1,14 +1,14 @@ import React from "react"; import { Route, Switch } from "react-router-dom"; -import { HomeController } from "../controllers/HomeController"; -import { ProjectController } from "../controllers/ProjectController"; -import { UserController } from "../controllers/UserController"; -import { TicketController } from "../controllers/TicketController"; -import { NotFoundPage } from "../pages/NotFoundPage"; -import { TestPage } from "../pages/TestPage"; -import { PrivateRoute } from "./PrivateRoute"; +import HomeController from "../controllers/HomeController"; +import ProjectController from "../controllers/ProjectController"; +import UserController from "../controllers/UserController"; +import TicketController from "../controllers/TicketController"; +import NotFoundPage from "../pages/NotFoundPage"; +import TestPage from "../pages/TestPage"; +import PrivateRoute from "./PrivateRoute"; -export const AppRouter = () => { +const AppRouter = () => { return ( @@ -35,3 +35,5 @@ export const AppRouter = () => { ); }; + +export default AppRouter; diff --git a/client/src/routes/PrivateRoute.jsx b/client/src/routes/PrivateRoute.jsx index 7573cbf..03ea69b 100644 --- a/client/src/routes/PrivateRoute.jsx +++ b/client/src/routes/PrivateRoute.jsx @@ -2,7 +2,7 @@ import React, { useEffect } from "react"; import { Route } from "react-router-dom"; import { useAuth0 } from "../authentication/auth0"; -export const PrivateRoute = ({ component: Component, path, ...rest }) => { +const PrivateRoute = ({ component: Component, path, ...rest }) => { const { loading, isAuthenticated, loginWithRedirect } = useAuth0(); useEffect(() => { @@ -22,3 +22,5 @@ export const PrivateRoute = ({ component: Component, path, ...rest }) => { return ; }; + +export default PrivateRoute; diff --git a/client/src/types/Activity.ts b/client/src/types/Activity.ts index 4fb8157..6fe0128 100644 --- a/client/src/types/Activity.ts +++ b/client/src/types/Activity.ts @@ -1,7 +1,7 @@ import { User } from "./User"; import { Ticket } from "./Ticket"; -export interface Activity { +export default interface Activity { id: number; description: string; date: Date; diff --git a/client/src/types/AppFile.ts b/client/src/types/AppFile.ts index 6fc9cec..b402297 100644 --- a/client/src/types/AppFile.ts +++ b/client/src/types/AppFile.ts @@ -1,6 +1,6 @@ import { User } from "./User"; -export interface AppFile { +export default interface AppFile { id: number; name: string; description: string; diff --git a/client/src/types/HttpResponse.ts b/client/src/types/HttpResponse.ts index a5825c0..e6865f9 100644 --- a/client/src/types/HttpResponse.ts +++ b/client/src/types/HttpResponse.ts @@ -1,3 +1,3 @@ -export interface HttpResponse extends Response { +export default interface HttpResponse extends Response { parsedBody?: T; } diff --git a/client/src/types/Note.ts b/client/src/types/Note.ts index 0cf71ff..dcb7784 100644 --- a/client/src/types/Note.ts +++ b/client/src/types/Note.ts @@ -1,3 +1,3 @@ -export interface Note { +export default interface Note { Id: number; } diff --git a/client/src/types/Project.ts b/client/src/types/Project.ts index b42af19..7abb871 100644 --- a/client/src/types/Project.ts +++ b/client/src/types/Project.ts @@ -1,9 +1,9 @@ -import { Ticket } from "./Ticket"; -import { User } from "./User"; -import { AppFile } from "./AppFile"; -import { Activity } from "./Activity"; +import AppFile from "./AppFile"; +import Activity from "./Activity"; +import Ticket from "./Ticket"; +import User from "./User"; -export interface Project { +export default interface Project { id: number; title: string; description: string; diff --git a/client/src/types/Ticket.ts b/client/src/types/Ticket.ts index 6d32d88..ea46005 100644 --- a/client/src/types/Ticket.ts +++ b/client/src/types/Ticket.ts @@ -1,7 +1,7 @@ -import { Project } from "./Project"; -import { User } from "./User"; +import Project from "./Project"; +import User from "./User"; -export interface Ticket { +export default interface Ticket { id: number; title: string; description: string; diff --git a/client/src/types/User.ts b/client/src/types/User.ts index 7cdfb58..5cb1d43 100644 --- a/client/src/types/User.ts +++ b/client/src/types/User.ts @@ -1,8 +1,8 @@ -import { Activity } from "./Activity"; -import { Project } from "./Project"; -import { Ticket } from "./Ticket"; +import Activity from "./Activity"; +import Project from "./Project"; +import Ticket from "./Ticket"; -export interface User { +export default interface User { id: string; firstName: string; lastName: string; diff --git a/client/src/utils/Constants.ts b/client/src/utils/Constants.ts index cdfb2b9..5025e15 100644 --- a/client/src/utils/Constants.ts +++ b/client/src/utils/Constants.ts @@ -1,4 +1,4 @@ -export class Constants { +export default class Constants { static projectsURI: string = "/api/v1/projects"; static ticketsURI: string = "/api/v1/tickets"; static usersURI: string = "/api/v1/users"; diff --git a/client/src/utils/history.ts b/client/src/utils/history.ts index cecd79d..89c46e3 100644 --- a/client/src/utils/history.ts +++ b/client/src/utils/history.ts @@ -1,2 +1,4 @@ import * as createHistory from "history"; -export const history = createHistory.createBrowserHistory(); +const history = createHistory.createBrowserHistory(); + +export default history; diff --git a/client/src/utils/http.ts b/client/src/utils/http.ts index 07b99b1..28acd29 100644 --- a/client/src/utils/http.ts +++ b/client/src/utils/http.ts @@ -1,4 +1,4 @@ -import { HttpResponse } from "../types/HttpResponse"; +import HttpResponse from "../types/HttpResponse"; export async function http(request: RequestInfo): Promise> { const response: HttpResponse = await fetch(request); @@ -24,7 +24,7 @@ export async function post( args: RequestInit = { method: "post", headers: headers, - body: JSON.stringify(body) + body: JSON.stringify(body), } ): Promise> { return await http(new Request(path, args)); @@ -36,7 +36,7 @@ export async function put( args: RequestInit = { method: "put", headers: headers, - body: JSON.stringify(body) + body: JSON.stringify(body), } ): Promise> { return await http(new Request(path, args)); @@ -48,7 +48,7 @@ export async function patch( args: RequestInit = { method: "patch", headers: headers, - body: JSON.stringify(body) + body: JSON.stringify(body), } ): Promise> { return await http(new Request(path, args)); @@ -58,5 +58,5 @@ const headers: Headers = new Headers({ Accept: "application/json", "Content-Type": "application/json", Authorization: - "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1UWkNSRFEzUkRnd1FUQXlNRFExTmtOQ09UQXlSamhGTURaRU1Ea3pNRGxHUkRrelFqZENSZyJ9.eyJpc3MiOiJodHRwczovL2Rldi1meWpydm9oeC5hdXRoMC5jb20vIiwic3ViIjoiR3dlZTlGUnN3ejNWNE5vZFVRTjJIcjJyQjJTMDI1UmZAY2xpZW50cyIsImF1ZCI6Imh0dHBzOi8vbG9jYWxob3N0OjUwMDEvYXBpL1YxLyIsImlhdCI6MTU4NDE5ODQ4MCwiZXhwIjoxNTg0Mjg0ODgwLCJhenAiOiJHd2VlOUZSc3d6M1Y0Tm9kVVFOMkhyMnJCMlMwMjVSZiIsImd0eSI6ImNsaWVudC1jcmVkZW50aWFscyJ9.I1D49ILGBLhnq9biIA0y6Ra93zTKRDJI_rfGvU05MtT1zkI1ZliX9P-7LyKeWBv8tPonB6gT12lJiai_GHBET8kKbXNqwfVvDJ3eqYK-TtTqfL65RfWL9tQfQybHbfuF9M0oiXMqWMqmsc5Umpp4a3bLTQgwkUEKxcdMm84L7zoaqMycns4mFojWpQJKfPa64oZFDIXYy6hPDXcX50Djuk1m-aqMhtpmqkZvPfwEjvtEtGGCTOJHV7uugn3r8Wk4HX02ShrV676GICE1Yw7eHufAbY7yvHz3ImZ1cfEVrRbbijPA2vogXd5RmqNyindDDlT1Y_C80U0DyvhS7P7apQ" + "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1UWkNSRFEzUkRnd1FUQXlNRFExTmtOQ09UQXlSamhGTURaRU1Ea3pNRGxHUkRrelFqZENSZyJ9.eyJpc3MiOiJodHRwczovL2Rldi1meWpydm9oeC5hdXRoMC5jb20vIiwic3ViIjoiR3dlZTlGUnN3ejNWNE5vZFVRTjJIcjJyQjJTMDI1UmZAY2xpZW50cyIsImF1ZCI6Imh0dHBzOi8vbG9jYWxob3N0OjUwMDEvYXBpL1YxLyIsImlhdCI6MTU4NDE5ODQ4MCwiZXhwIjoxNTg0Mjg0ODgwLCJhenAiOiJHd2VlOUZSc3d6M1Y0Tm9kVVFOMkhyMnJCMlMwMjVSZiIsImd0eSI6ImNsaWVudC1jcmVkZW50aWFscyJ9.I1D49ILGBLhnq9biIA0y6Ra93zTKRDJI_rfGvU05MtT1zkI1ZliX9P-7LyKeWBv8tPonB6gT12lJiai_GHBET8kKbXNqwfVvDJ3eqYK-TtTqfL65RfWL9tQfQybHbfuF9M0oiXMqWMqmsc5Umpp4a3bLTQgwkUEKxcdMm84L7zoaqMycns4mFojWpQJKfPa64oZFDIXYy6hPDXcX50Djuk1m-aqMhtpmqkZvPfwEjvtEtGGCTOJHV7uugn3r8Wk4HX02ShrV676GICE1Yw7eHufAbY7yvHz3ImZ1cfEVrRbbijPA2vogXd5RmqNyindDDlT1Y_C80U0DyvhS7P7apQ", }); diff --git a/client/src/utils/methods.ts b/client/src/utils/methods.ts index 8051548..2ae2007 100644 --- a/client/src/utils/methods.ts +++ b/client/src/utils/methods.ts @@ -1,7 +1,7 @@ -export const getRemainingdays: (endDate: string) => number = ( - endDate: string -) => { +const getRemainingdays: (endDate: string) => number = (endDate: string) => { let endingDate: Date = new Date(endDate); let today: Date = new Date(); return Math.abs(endingDate.getDate() - today.getDate()); }; + +export default getRemainingdays;