diff --git a/client/src/components/AvatarList.tsx b/client/src/components/AvatarList.tsx new file mode 100644 index 0000000..97085bd --- /dev/null +++ b/client/src/components/AvatarList.tsx @@ -0,0 +1,15 @@ +import React, { FC } from "react"; + +type AvatarListProps = { + avatars: string[]; +}; + +export const AvatarList: FC = ({ avatars }) => { + return ( +
+ {avatars.map((avatar: string) => ( + + ))} +
+ ); +}; diff --git a/client/src/components/Header.tsx b/client/src/components/Header.tsx new file mode 100644 index 0000000..1d225a3 --- /dev/null +++ b/client/src/components/Header.tsx @@ -0,0 +1,18 @@ +import React, { FC } from "react"; + +type HeaderProps = { + title: string; + description: string; +}; + +export const Header: FC = ({ + title, + description +}) => { + return ( + <> +

{title}

+

{description}

+ + ); +}; diff --git a/client/src/components/ProgressBar.tsx b/client/src/components/ProgressBar.tsx new file mode 100644 index 0000000..20d856b --- /dev/null +++ b/client/src/components/ProgressBar.tsx @@ -0,0 +1,17 @@ +import React, { FC } from "react"; + +type ProgressBarProps = { + value?: number; + max?: number; +}; + +export const ProgressBar: FC = ({ + value = 60, + max = 100 +}) => { + return ( +
+ +
+ ); +}; diff --git a/client/src/components/TicketList.tsx b/client/src/components/TicketList.tsx new file mode 100644 index 0000000..b83d047 --- /dev/null +++ b/client/src/components/TicketList.tsx @@ -0,0 +1,22 @@ +import React, { FC } from "react"; +import { Ticket } from "../types/Ticket"; + +type TicketListProps = { + tickets?: Ticket[]; +}; + +export const TicketList: FC = ({ + tickets = [ + { Id: 1, Title: "Todo today" }, + { Id: 2, Title: "Todo tomorrow" }, + { Id: 5, Title: "Todo NOW!!!" } + ] +}) => { + return ( +
+ {tickets.map((t: Ticket) => ( +
  • {t.Title}
    • + ))} +
    + ); +}; diff --git a/client/src/controllers/HomeController.tsx b/client/src/controllers/HomeController.tsx new file mode 100644 index 0000000..cf821ae --- /dev/null +++ b/client/src/controllers/HomeController.tsx @@ -0,0 +1,6 @@ +import React, { FC } from "react"; +import { HomePage } from "../pages/HomePage"; + +export const HomeController: FC = () => { + return ; +}; diff --git a/client/src/controllers/ProjectController.tsx b/client/src/controllers/ProjectController.tsx new file mode 100644 index 0000000..4706d6c --- /dev/null +++ b/client/src/controllers/ProjectController.tsx @@ -0,0 +1,6 @@ +import React, { FC } from "react"; +import { ProjectPage } from "../pages/ProjectPage"; + +export const ProjectController: FC = () => { + return ; +}; diff --git a/client/src/controllers/TicketController.tsx b/client/src/controllers/TicketController.tsx new file mode 100644 index 0000000..afc218e --- /dev/null +++ b/client/src/controllers/TicketController.tsx @@ -0,0 +1,6 @@ +import React, { FC } from "react"; +import { TicketPage } from "../pages/TicketPage"; + +export const TicketController: FC = () => { + return ; +}; diff --git a/client/src/controllers/UserController.tsx b/client/src/controllers/UserController.tsx new file mode 100644 index 0000000..a023b5e --- /dev/null +++ b/client/src/controllers/UserController.tsx @@ -0,0 +1,6 @@ +import React, { FC } from "react"; +import { UserPage } from "../pages/UserPage"; + +export const UserController: FC = () => { + return ; +}; diff --git a/client/src/images/user_1.jpg b/client/src/images/user_1.jpg new file mode 100644 index 0000000..88052c5 Binary files /dev/null and b/client/src/images/user_1.jpg differ diff --git a/client/src/images/user_2.jpg b/client/src/images/user_2.jpg new file mode 100644 index 0000000..e0e8d51 Binary files /dev/null and b/client/src/images/user_2.jpg differ diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx index bd607f7..a90127a 100644 --- a/client/src/pages/ProjectPage.tsx +++ b/client/src/pages/ProjectPage.tsx @@ -1,14 +1,27 @@ import React, { FC } from "react"; +import { Header } from "../components/Header"; +import { AvatarList } from "../components/AvatarList"; +import { ProgressBar } from "../components/ProgressBar"; +import { TicketList } from "../components/TicketList"; export const ProjectPage: FC = () => { - return( -
    - - - - - - - - ) -} \ No newline at end of file + return ( +
    +
    +
    + { - return( -
    - - - - - - - - - ) -} \ No newline at end of file + return ( + <> +
    + + + {/* // + // + // + // + // + // */} + + ); +}; diff --git a/client/src/pages/UserPage.tsx b/client/src/pages/UserPage.tsx index 1816cb7..da371ac 100644 --- a/client/src/pages/UserPage.tsx +++ b/client/src/pages/UserPage.tsx @@ -1,11 +1,12 @@ import React, { FC } from "react"; +import { Header } from "../components/Header"; export const UserPage: FC = () => { - return( -
    - - - - - ) -} \ No newline at end of file + return ( +
    + // + // + // + // + ); +}; diff --git a/client/src/types/Ticket.ts b/client/src/types/Ticket.ts index 2abfc52..ff67139 100644 --- a/client/src/types/Ticket.ts +++ b/client/src/types/Ticket.ts @@ -1,3 +1,4 @@ export interface Ticket { Id: number; + Title: string; } diff --git a/client/src/utils/router.tsx b/client/src/utils/router.tsx index 42a60d5..a90cafb 100644 --- a/client/src/utils/router.tsx +++ b/client/src/utils/router.tsx @@ -1,10 +1,11 @@ import React from "react"; import { Router, Route, Switch, Link, NavLink } from "react-router-dom"; import * as creacteHistory from "history"; -import { HomePage } from "../pages/HomePage"; -import { UserPage } from "../pages/UserPage"; -import { ProjectPage } from "../pages/ProjectPage"; import { TicketPage } from "../pages/TicketPage"; +import { HomeController } from "../controllers/HomeController"; +import { ProjectController } from "../controllers/ProjectController"; +import { UserController } from "../controllers/UserController"; +import { TicketController } from "../controllers/TicketController"; export const history = creacteHistory.createBrowserHistory(); @@ -13,18 +14,18 @@ export const AppRouter = () => {
    - - + {/* + - - + + */} - - - - + + {/* + + */}
    diff --git a/client/src/viewModels/ProjectVM.ts b/client/src/viewModels/ProjectVM.ts index 4ab39eb..82c8059 100644 --- a/client/src/viewModels/ProjectVM.ts +++ b/client/src/viewModels/ProjectVM.ts @@ -1,5 +1,5 @@ export class ProjectVM { - public Id: number; + public Id?: number; public constructor() {} } diff --git a/client/src/viewModels/TicketVM.ts b/client/src/viewModels/TicketVM.ts index d0f6782..fa5323c 100644 --- a/client/src/viewModels/TicketVM.ts +++ b/client/src/viewModels/TicketVM.ts @@ -1,5 +1,5 @@ export class TicketVM { - public Id: number; + public Id?: number; public constructor() {} } diff --git a/client/src/viewModels/UserVM.ts b/client/src/viewModels/UserVM.ts index 5379357..821ee4f 100644 --- a/client/src/viewModels/UserVM.ts +++ b/client/src/viewModels/UserVM.ts @@ -1,5 +1,5 @@ export class UserVM { - public Id: number; + public Id?: number; public constructor() {} }