- + {title ?? "Nothing to do"}
diff --git a/client/src/components/InputField.tsx b/client/src/components/InputField.tsx new file mode 100644 index 0000000..6dc5468 --- /dev/null +++ b/client/src/components/InputField.tsx @@ -0,0 +1,10 @@ +import React, { FC } from "react"; + +export const InputField: FC = () => { + return ( +
+
+
+
+ );
+};
diff --git a/client/src/components/LogInForm.tsx b/client/src/components/LogInForm.tsx
new file mode 100644
index 0000000..9ef2fb0
--- /dev/null
+++ b/client/src/components/LogInForm.tsx
@@ -0,0 +1,23 @@
+import React, { FC } from "react";
+import { InputField } from "./InputField";
+import { PasswordField } from "./PasswordField";
+import { Button } from "./Button";
+
+export const LogInForm: FC = () => {
+ return (
+
+
+ );
+};
diff --git a/client/src/components/NewTicketModal.tsx b/client/src/components/NewTicketModal.tsx
index 03c7ccd..055974f 100644
--- a/client/src/components/NewTicketModal.tsx
+++ b/client/src/components/NewTicketModal.tsx
@@ -1,12 +1,12 @@
import React, { FC, useState, FormEvent } from "react";
-import { useParams, useRouteMatch } from "react-router-dom";
+import { useRouteMatch } from "react-router-dom";
import { Modal } from "./Modal";
import { NewTicketForm } from "./NewTicketForm";
import { Ticket } from "../types/Ticket";
import { Project } from "../types/Project";
import { post } from "../utils/http";
import { Constants } from "../utils/Constants";
-import { HttpResponse } from "../types/HttpResponse";
+// import { HttpResponse } from "../types/HttpResponse";
interface IProps {
show: boolean;
@@ -38,12 +38,9 @@ export const NewTicketModal: FC
+
+
+
+ Login
+ +
+
+
+
+ );
+};
diff --git a/client/src/components/ProfileSelector.tsx b/client/src/components/ProfileSelector.tsx
new file mode 100644
index 0000000..f689262
--- /dev/null
+++ b/client/src/components/ProfileSelector.tsx
@@ -0,0 +1,20 @@
+import React, { FC } from "react";
+import { HorizontalCard } from "./HorizontalCard";
+import { Avatar } from "./Avatar";
+import { Link } from "react-router-dom";
+
+export const ProfileSelector: FC = () => {
+ return (
+
+
+ );
+};
diff --git a/client/src/components/ProjectList.tsx b/client/src/components/ProjectList.tsx
index 85d1460..a574d41 100644
--- a/client/src/components/ProjectList.tsx
+++ b/client/src/components/ProjectList.tsx
@@ -1,6 +1,5 @@
import React, { FC, useState, ChangeEvent, MouseEvent } from "react";
import { Ticket } from "../types/Ticket";
-import { FloatingButton } from "./FloatingButton";
import { HorizontalCard } from "./HorizontalCard";
import { FilterBar } from "./FilterBar";
import { put } from "../utils/http";
@@ -17,19 +16,13 @@ export const ProjectList: FC
+
+
+
+ Select a profile
+ +Demo User
+Projects
-
+
diff --git a/client/src/controllers/ProjectController.tsx b/client/src/controllers/ProjectController.tsx
index 3d30d04..427bd8f 100644
--- a/client/src/controllers/ProjectController.tsx
+++ b/client/src/controllers/ProjectController.tsx
@@ -77,6 +77,7 @@ export const ProjectController: FC = () => {
if (hasError) {
return ({} as Ticket);
+ const [hasError, setHasError] = useState(false);
+ const [error, setError] = useState("");
+ const { id } = useParams();
+
+ async function httpGetTicket(id: string): Promise {
+ try {
+ const response: HttpResponse = await get(
+ `${Constants.ticketsURI}/${id}`
+ );
+ if (response.parsedBody !== undefined) {
+ setTicket(response.parsedBody);
+ setIsLoading(false);
+ }
+ } catch (ex) {
+ console.error(ex);
+ setHasError(true);
+ setError(ex);
+ }
+ }
+
+ useEffect(() => {
+ if (id !== undefined) {
+ httpGetTicket(id);
+ } else {
+ setHasError(true);
+ setError("Bad Request");
+ }
+ }, [id]);
+
+ if (hasError) {
+ return ({} as User);
+ const [hasError, setHasError] = useState(false);
+ const [error, setError] = useState("");
+ const { id } = useParams();
- const user: User = {
- id: "resldsm,dgd",
- firstName: "David",
- lastName: "Whittaker",
- fullName: "David Whittaker",
- presentation: "Interface designer and front-end developer",
- creationDate: new Date().toDateString(),
- email: "dw@mail.au",
- phone: "0998765432",
- picture: require("../images/user_1.jpg"),
- projects: [
- {
- id: 1,
- title: "Project Title",
- description: "What is it about",
- progression: 25,
- creationDate: new Date().toDateString(),
- endingDate: "2020-02-17 15:51:02.787373",
- status: "Todo",
- manager: {} as User,
- users: [] as User[],
- tickets: [] as Ticket[],
- files: [] as AppFile[],
- activities: [] as Activity[]
+ async function httpGetUser(id: string): Promise {
+ try {
+ const response: HttpResponse = await get(
+ `${Constants.usersURI}/${id}`
+ );
+ if (response.parsedBody !== undefined) {
+ setUser(response.parsedBody);
+ setIsLoading(false);
}
- ],
- tickets: [
- {
- id: 1,
- title: "Client objective meeting",
- description: "Client objective meeting",
- endingDate: "2020-02-17 15:51:02.787373",
- status: "Done",
- project: {
- id: 1,
- title: "Project Title",
- description: "What is it about",
- progression: 25,
- creationDate: new Date().toDateString(),
- endingDate: "2020-02-17 15:51:02.787373",
- status: "Todo",
- manager: {} as User,
- users: [] as User[],
- tickets: [] as Ticket[],
- files: [] as AppFile[],
- activities: [] as Activity[]
- }
- },
- {
- id: 2,
- title: "Assemble Outcomes Report for client",
- description: "Assemble Outcomes Report for client",
- endingDate: "2020-02-27 15:51:02.787373",
- status: "To Do",
- project: {
- id: 1,
- title: "Project Title",
- description: "What is it about",
- progression: 25,
- creationDate: new Date().toDateString(),
- endingDate: "2020-02-17 15:51:02.787373",
- status: "Todo",
- manager: {} as User,
- users: [] as User[],
- tickets: [] as Ticket[],
- files: [] as AppFile[],
- activities: [] as Activity[]
- }
- }
- ],
- activities: []
- };
+ } catch (ex) {
+ console.error(ex);
+ setHasError(true);
+ setError(ex);
+ }
+ }
+
useEffect(() => {
- setTimeout(() => setIsLoading(false), 1000);
- });
+ if (id !== undefined) {
+ httpGetUser(id);
+ } else {
+ setHasError(true);
+ setError("Bad Request");
+ }
+ }, [id]);
+
+ if (hasError) {
+ return
-
{filteredTickets.length === 0 ? (
Tickets
-
- = ({ viewModel }) => {
+ const {
+ title,
+ description,
+ users,
+ endingDate,
+ project,
+ status,
+ category,
+ impact,
+ difficulty
+ } = viewModel;
+ const daysToEnd: number = getRemainingdays(endingDate);
+ // let notes: string = "";
-export const TicketPage: FC = () => {
return (
- <>
-
- //
- //
-
+ {/*
*/}
+
+
+
- {/*
- */}
+
- {/*
- */}
-
+
+
+
+
HomePage
+
+
);
};
diff --git a/client/src/pages/TicketPage.tsx b/client/src/pages/TicketPage.tsx
index 4036985..df4f640 100644
--- a/client/src/pages/TicketPage.tsx
+++ b/client/src/pages/TicketPage.tsx
@@ -1,23 +1,79 @@
import React, { FC } from "react";
import { Header } from "../components/Header";
import { AvatarList } from "../components/AvatarList";
-import { ProgressBar } from "../components/ProgressBar";
+import { TicketVM } from "../VM/TicketVM";
+import { getRemainingdays } from "../utils/methods";
+import { Link } from "react-router-dom";
+
+interface IProps {
+ viewModel: TicketVM;
+}
+
+export const TicketPage: FC
+
Ticket Manager
+
+
+
+
+
+
+
+
);
};
diff --git a/client/src/types/Ticket.ts b/client/src/types/Ticket.ts
index be6cac3..6d32d88 100644
--- a/client/src/types/Ticket.ts
+++ b/client/src/types/Ticket.ts
@@ -1,10 +1,17 @@
import { Project } from "./Project";
+import { User } from "./User";
export interface Ticket {
id: number;
title: string;
description: string;
- status: string;
+ creationDate: string;
endingDate: string;
+ status: string;
+ impact: string;
+ difficulty: string;
+ category: string;
+ creatorId: string;
project: Project;
+ users: User[];
}
diff --git a/client/src/utils/http.ts b/client/src/utils/http.ts
index a050343..07b99b1 100644
--- a/client/src/utils/http.ts
+++ b/client/src/utils/http.ts
@@ -58,5 +58,5 @@ const headers: Headers = new Headers({
Accept: "application/json",
"Content-Type": "application/json",
Authorization:
- "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1UWkNSRFEzUkRnd1FUQXlNRFExTmtOQ09UQXlSamhGTURaRU1Ea3pNRGxHUkRrelFqZENSZyJ9.eyJpc3MiOiJodHRwczovL2Rldi1meWpydm9oeC5hdXRoMC5jb20vIiwic3ViIjoiR3dlZTlGUnN3ejNWNE5vZFVRTjJIcjJyQjJTMDI1UmZAY2xpZW50cyIsImF1ZCI6Imh0dHBzOi8vbG9jYWxob3N0OjUwMDEvYXBpL1YxLyIsImlhdCI6MTU4Mzc0MzE1OSwiZXhwIjoxNTgzODI5NTU5LCJhenAiOiJHd2VlOUZSc3d6M1Y0Tm9kVVFOMkhyMnJCMlMwMjVSZiIsImd0eSI6ImNsaWVudC1jcmVkZW50aWFscyJ9.G1PTca14OLP1Ty3YFJaW0n_LRiG8ib1Nw_OcDH4HgWKgK6sZlIQ6RuAxiJjE0X6c7sxiTmtVhsRF-dqnfXuQcMWouj-8nd5C1LdVco3D08t0megehCeSZ4ffjjDQXQjWwvahTfuxJhXFVwK1M7F-dtLnk6lUJC9EjRg5qwtT5pa_js47RawHZWSfm-h6A1tVVs_cjy4I4xQLThKYQ3bTR5fYGNjnfa2AybE9Dv2Q0JehSDqSt1zCyIAnZTxJmgUWPW7Rp2xnmHf6Usmpy_9P5HbnnuRXZ1IT3dllS6OMIki3xyTeJDlCxhI37Ib1Dtx6PaPbFAP88QiRy2hwSi_S6w"
+ "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1UWkNSRFEzUkRnd1FUQXlNRFExTmtOQ09UQXlSamhGTURaRU1Ea3pNRGxHUkRrelFqZENSZyJ9.eyJpc3MiOiJodHRwczovL2Rldi1meWpydm9oeC5hdXRoMC5jb20vIiwic3ViIjoiR3dlZTlGUnN3ejNWNE5vZFVRTjJIcjJyQjJTMDI1UmZAY2xpZW50cyIsImF1ZCI6Imh0dHBzOi8vbG9jYWxob3N0OjUwMDEvYXBpL1YxLyIsImlhdCI6MTU4NDE5ODQ4MCwiZXhwIjoxNTg0Mjg0ODgwLCJhenAiOiJHd2VlOUZSc3d6M1Y0Tm9kVVFOMkhyMnJCMlMwMjVSZiIsImd0eSI6ImNsaWVudC1jcmVkZW50aWFscyJ9.I1D49ILGBLhnq9biIA0y6Ra93zTKRDJI_rfGvU05MtT1zkI1ZliX9P-7LyKeWBv8tPonB6gT12lJiai_GHBET8kKbXNqwfVvDJ3eqYK-TtTqfL65RfWL9tQfQybHbfuF9M0oiXMqWMqmsc5Umpp4a3bLTQgwkUEKxcdMm84L7zoaqMycns4mFojWpQJKfPa64oZFDIXYy6hPDXcX50Djuk1m-aqMhtpmqkZvPfwEjvtEtGGCTOJHV7uugn3r8Wk4HX02ShrV676GICE1Yw7eHufAbY7yvHz3ImZ1cfEVrRbbijPA2vogXd5RmqNyindDDlT1Y_C80U0DyvhS7P7apQ"
});
diff --git a/client/src/utils/router.tsx b/client/src/utils/router.tsx
index 8d99a96..88a01d4 100644
--- a/client/src/utils/router.tsx
+++ b/client/src/utils/router.tsx
@@ -1,19 +1,12 @@
import React from "react";
-import {
- Router,
- Route,
- Switch
- // Redirect
- //Link, NavLink
-} from "react-router-dom";
+import { Router, Route, Switch } from "react-router-dom";
import * as creacteHistory from "history";
-// import { TicketPage } from "../pages/TicketPage";
-// import { HomeController } from "../controllers/HomeController";
+import { HomeController } from "../controllers/HomeController";
import { ProjectController } from "../controllers/ProjectController";
-import { NotFoundPage } from "../pages/NotFoundPage";
-import { TestPage } from "../pages/TestPage";
import { UserController } from "../controllers/UserController";
-// import { TicketController } from "../controllers/TicketController";
+import { TicketController } from "../controllers/TicketController";
+import { NotFoundPage } from "../pages/NotFoundPage";
+// import { TestPage } from "../pages/TestPage";
export const history = creacteHistory.createBrowserHistory();
@@ -22,24 +15,27 @@ export const AppRouter = () => {
+
+
+
+
+
+
+ + In project: {" "} + {project.title} +
+
+ timer
+ Due in {daysToEnd} days
+
+
+
+
+ Status: {status}
+ {/* close */}
+
+
+
+ Category: {category}
+ {/* close */}
+
+
+
+ Impact: {impact}
+ {/* close */}
+
+
+
+ Difficulty: {difficulty}
+ {/* close */}
+
+
+ {/* */}
+