From ed237a6342987ebcf9ed6a9ef8b6be3bdcb9d582 Mon Sep 17 00:00:00 2001
From: Ruidy Nemausat <ruidy.nemausat@gmail.com>
Date: Sun, 9 Feb 2020 22:52:29 +0100
Subject: [PATCH] horizontal card

---
 client/src/components/AvatarList.tsx      | 10 ++---
 client/src/components/HorizontalCard.tsx  | 41 +++++++++++++++++
 client/src/components/TabRouter.tsx       | 54 +++++++++++++++++------
 client/src/components/TabRouterHeader.tsx | 10 +++--
 client/src/components/TicketList.tsx      | 41 ++++++++++++++---
 client/src/pages/ProjectPage.tsx          | 20 +++++----
 6 files changed, 140 insertions(+), 36 deletions(-)
 create mode 100644 client/src/components/HorizontalCard.tsx

diff --git a/client/src/components/AvatarList.tsx b/client/src/components/AvatarList.tsx
index 1b83021..7075728 100644
--- a/client/src/components/AvatarList.tsx
+++ b/client/src/components/AvatarList.tsx
@@ -1,18 +1,16 @@
 import React, { FC } from "react";
-import { Button } from "./Button";
 import { FloatingButton } from "./FloatingButton";
 
-type AvatarListProps = {
+interface AvatarListProps {
   avatars: string[];
-};
+}
 
 export const AvatarList: FC<AvatarListProps> = ({ avatars }) => {
   return (
-    <div className="row valign-wrapper">
+    <>
       {avatars.map((avatar: string) => (
         <img className="circle" src={avatar} width="32vh" height="32vh" />
       ))}
-      <FloatingButton icon="add" color="grey" size="small" />
-    </div>
+    </>
   );
 };
diff --git a/client/src/components/HorizontalCard.tsx b/client/src/components/HorizontalCard.tsx
new file mode 100644
index 0000000..b613116
--- /dev/null
+++ b/client/src/components/HorizontalCard.tsx
@@ -0,0 +1,41 @@
+import React, { FC } from "react";
+import { AvatarList } from "./AvatarList";
+
+interface IProps {
+  title: string;
+  tasksTotalCount?: number;
+  tasksDone?: number;
+  remainingDays?: number;
+  avatars: string[];
+}
+
+export const HorizontalCard: FC<IProps> = ({
+  title,
+  tasksDone,
+  tasksTotalCount,
+  remainingDays,
+  avatars
+}) => {
+  return (
+    <div className="col s12">
+      <div className="card horizontal">
+        <div className="card-stacked">
+          <div className="card-content">
+            <h6>{title}</h6>
+            <AvatarList avatars={avatars} />
+            <div className="row">
+              <i className="left material-icons">playlist_add_check</i>
+              <span>
+                {tasksDone}/{tasksTotalCount}
+              </span>
+
+              <div className="right">
+                <span>Due {remainingDays} days</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/client/src/components/TabRouter.tsx b/client/src/components/TabRouter.tsx
index 192f1f1..4f16a81 100644
--- a/client/src/components/TabRouter.tsx
+++ b/client/src/components/TabRouter.tsx
@@ -1,22 +1,50 @@
 import React, { FC } from "react";
 import { TabRouterHeader } from "./TabRouterHeader";
+import { TicketList } from "./TicketList";
+import { Ticket } from "../types/Ticket";
+import { Switch, Route, useRouteMatch } from "react-router-dom";
 
-interface IProps {}
-export const TabRouter: FC<IProps> = ({ children }) => {
+interface IProps {
+  tickets: Ticket[];
+  tasksTotalCount?: number;
+  tasksDone?: number;
+  remainingDays?: number;
+  avatars: string[];
+}
+
+export const TabRouter: FC<IProps> = ({
+  tickets,
+  tasksDone,
+  tasksTotalCount,
+  remainingDays,
+  avatars
+}) => {
+  const { url } = useRouteMatch();
   return (
     <>
-      <div className="row">
-        <TabRouterHeader />
-        <div id="test1" className="col s12">
-          Tickets
+      <Switch>
+        <div className="row">
+          <TabRouterHeader />
+
+          <Route path={`${url}/tickets`}>
+            <TicketList
+              tickets={tickets}
+              tasksDone={tasksDone}
+              tasksTotalCount={tasksTotalCount}
+              remainingDays={remainingDays}
+              avatars={avatars}
+            />
+          </Route>
+
+          <Route path={`${url}/files`}>
+            {/* <TicketList tickets={tickets} /> */}
+          </Route>
+
+          <Route path={`${url}/activity`}>
+            {/* <TicketList tickets={tickets} /> */}
+          </Route>
         </div>
-        <div id="test2" className="col s12">
-          Files
-        </div>
-        <div id="test3" className="col s12">
-          Activity
-        </div>
-      </div>
+      </Switch>
     </>
   );
 };
diff --git a/client/src/components/TabRouterHeader.tsx b/client/src/components/TabRouterHeader.tsx
index 3471bbd..b21eb11 100644
--- a/client/src/components/TabRouterHeader.tsx
+++ b/client/src/components/TabRouterHeader.tsx
@@ -1,4 +1,5 @@
 import React, { FC, useState } from "react";
+import { Link, useRouteMatch } from "react-router-dom";
 
 interface TabUnitProps {
   tabClass: string;
@@ -15,16 +16,17 @@ const TabUnit: FC<TabUnitProps> = ({
   text,
   value
 }) => {
+  const { url } = useRouteMatch();
   return (
     <li className={tabClass} key={value}>
-      <a
+      <Link
+        to={`${url}/${text}`}
         id={value}
         className={isActive === parseInt(value) ? "active" : ""}
-        href={`#${text}`}
         onClick={() => setIsActive(parseInt(value))}
       >
         {text}
-      </a>
+      </Link>
     </li>
   );
 };
@@ -47,7 +49,7 @@ export const TabRouterHeader: FC<IProps> = ({
 
   return (
     <>
-      <div className="col s12">
+      <div className="row col s12">
         <ul className="tabs">
           <TabUnit
             text="Tickets"
diff --git a/client/src/components/TicketList.tsx b/client/src/components/TicketList.tsx
index b665cc3..7a6b655 100644
--- a/client/src/components/TicketList.tsx
+++ b/client/src/components/TicketList.tsx
@@ -1,16 +1,47 @@
 import React, { FC } from "react";
 import { Ticket } from "../types/Ticket";
+import { FloatingButton } from "./FloatingButton";
+import { HorizontalCard } from "./HorizontalCard";
 
 type TicketListProps = {
   tickets: Ticket[];
+  tasksTotalCount?: number;
+  tasksDone?: number;
+  remainingDays?: number;
+  avatars: string[];
 };
 
-export const TicketList: FC<TicketListProps> = ({ tickets }) => {
+export const TicketList: FC<TicketListProps> = ({
+  tickets,
+  tasksDone,
+  tasksTotalCount,
+  remainingDays,
+  avatars
+}) => {
   return (
-    <div className="row">
-      {tickets.map((t: Ticket) => (
-        <li key={t.id}>{t.title}</li>
-      ))}
+    <div className="col s12">
+      <div className="row valign-wrapper">
+        <div className="col s6 m4">
+          <h2>Tickets</h2>
+        </div>
+        <div className="col s6 m8">
+          <FloatingButton color="grey" size="big" />
+        </div>
+      </div>
+
+      <ul>
+        {tickets.map((t: Ticket) => (
+          <li key={t.id}>
+            <HorizontalCard
+              title={t.title}
+              tasksDone={tasksDone}
+              tasksTotalCount={tasksTotalCount}
+              remainingDays={remainingDays}
+              avatars={avatars}
+            />
+          </li>
+        ))}
+      </ul>
     </div>
   );
 };
diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx
index 231f401..5ce7d1e 100644
--- a/client/src/pages/ProjectPage.tsx
+++ b/client/src/pages/ProjectPage.tsx
@@ -2,9 +2,9 @@ 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";
 import ProjectVM from "../viewModels/ProjectVM";
 import { TabRouter } from "../components/TabRouter";
+import { FloatingButton } from "../components/FloatingButton";
 
 interface IProps {
   viewModel: ProjectVM;
@@ -24,19 +24,23 @@ export const ProjectPage: FC<IProps> = ({ viewModel }) => {
     <div className="section">
       <div className="container">
         <Header title={title} description={description} />
-        <AvatarList avatars={avatars} />
+        <div className="row valign-wrapper">
+          <AvatarList avatars={avatars} />
+          <FloatingButton icon="add" color="grey" size="small" />
+        </div>
         <ProgressBar
           value={value}
           tasksDone={ticketsDone}
           tasksTotalCount={ticketsTotalCount}
           remainingDays={remainingDays}
         />
-        <TabRouter>
-          {/* <TabRouterSelector/> */}
-          <TicketList tickets={tickets} />
-          {/* <ChildFile />
-        <ChildActivity /> */}
-        </TabRouter>
+        <TabRouter
+          tickets={tickets}
+          tasksDone={ticketsDone}
+          tasksTotalCount={ticketsTotalCount}
+          remainingDays={remainingDays}
+          avatars={avatars}
+        />
       </div>
     </div>
   );