From 369de39dc406ab468c79057e53540c98805d779b Mon Sep 17 00:00:00 2001
From: Ruidy Nemausat <ruidy.nemausat@gmail.com>
Date: Sun, 1 Mar 2020 18:08:04 +0100
Subject: [PATCH] Finished NewTicketForm layout

---
 client/src/components/MemberList.tsx         | 11 +----
 client/src/components/NewTicketModal.tsx     | 47 ++++++--------------
 client/src/components/NewTicketTabRouter.tsx | 14 +++---
 client/src/components/ProjectList.tsx        |  7 ---
 client/src/components/TabRouter.tsx          |  5 +--
 client/src/components/UserTabRouter.tsx      |  1 -
 6 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/client/src/components/MemberList.tsx b/client/src/components/MemberList.tsx
index 3c4c04a..4f49466 100644
--- a/client/src/components/MemberList.tsx
+++ b/client/src/components/MemberList.tsx
@@ -1,16 +1,7 @@
 import React, { FC, useState, ChangeEvent, MouseEvent } from "react";
-import { TabRouterHeader } from "./TabRouterHeader";
-import { TicketList } from "./TicketList";
-import { FileList } from "./AppFileList";
-import { Ticket } from "../types/Ticket";
-import { AppFile } from "../types/AppFile";
-import { Route, useRouteMatch, Redirect } from "react-router-dom";
-import { ActivityList } from "./ActivityList";
-import { Activity } from "../types/Activity";
-import { NewTicketModal } from "./NewTicketModal";
-import { User } from "../types/User";
 import { UsersModalEntry } from "./UsersModalEntry";
 import { FilterBar } from "./FilterBar";
+import { User } from "../types/User";
 
 interface IProps {
   users: User[];
diff --git a/client/src/components/NewTicketModal.tsx b/client/src/components/NewTicketModal.tsx
index dd876bf..615385a 100644
--- a/client/src/components/NewTicketModal.tsx
+++ b/client/src/components/NewTicketModal.tsx
@@ -1,31 +1,19 @@
 import React, { FC, useState, ChangeEvent, useEffect, FormEvent } from "react";
-import { Modal } from "./Modal";
-import { AvatarList } from "./AvatarList";
-import { User } from "../types/User";
-import { FilterBar } from "./FilterBar";
-import { HttpResponse } from "../types/HttpResponse";
-import { get, put, patch } from "../utils/http";
-import { Constants } from "../utils/Constants";
-import { UsersModalEntry } from "./UsersModalEntry";
 import { useParams } from "react-router-dom";
-import _ from "underscore";
+import { Modal } from "./Modal";
 import { NewTicketTabRouter } from "./NewTicketTabRouter";
+import { User } from "../types/User";
+import { patch } from "../utils/http";
+import { Constants } from "../utils/Constants";
 
 interface IProps {
   show: boolean;
   handleClose(): void;
-  // users: User[];
   allUsers: User[];
 }
 
-export const NewTicketModal: FC<IProps> = ({
-  show,
-  handleClose,
-  // users,
-  allUsers
-}) => {
+export const NewTicketModal: FC<IProps> = ({ show, handleClose, allUsers }) => {
   const [filterText, setFilterText] = useState<string>("");
-  // const [members, setMembers] = useState<User[]>(users);
   const { id } = useParams();
 
   const handleChange: (e: ChangeEvent<HTMLInputElement>) => void = (
@@ -53,6 +41,7 @@ export const NewTicketModal: FC<IProps> = ({
         <div className="col s10">
           <h4 className="white-text">New Ticket</h4>
         </div>
+
         <div className="col s2">
           <i
             className="right material-icons indigo lighten-3 circle"
@@ -62,25 +51,15 @@ export const NewTicketModal: FC<IProps> = ({
           </i>
         </div>
       </div>
-      <div className="row">
-        <NewTicketTabRouter
-          tabNames={["Details", "Members"]}
-          users={allUsers}
-        />
-      </div>
 
       <form onSubmit={handleSubmit}>
-        {/* <ul>
-          {allUsers.map((u: User) => (
-            <li key={u.id}>
-              <UsersModalEntry
-                user={u}
-                members={members}
-                setMembers={setMembers}
-              />
-            </li>
-          ))}
-        </ul> */}
+        <div className="row">
+          <NewTicketTabRouter
+            tabNames={["Details", "Members"]}
+            users={allUsers}
+          />
+        </div>
+
         <div className="modal-footer grey lighten-3">
           <input
             type="submit"
diff --git a/client/src/components/NewTicketTabRouter.tsx b/client/src/components/NewTicketTabRouter.tsx
index 2e8660d..a6f7eda 100644
--- a/client/src/components/NewTicketTabRouter.tsx
+++ b/client/src/components/NewTicketTabRouter.tsx
@@ -19,15 +19,13 @@ export const NewTicketTabRouter: FC<IProps> = ({ tabNames, users }) => {
 
         <Redirect from={url} to={`${url}/details`} />
 
-        <form onSubmit={() => {}}>
-          <Route path={`${url}/details`}>
-            <NewTicketForm />
-          </Route>
+        <Route path={`${url}/details`}>
+          <NewTicketForm />
+        </Route>
 
-          <Route path={`${url}/members`}>
-            <MemberList users={users} />
-          </Route>
-        </form>
+        <Route path={`${url}/members`}>
+          <MemberList users={users} />
+        </Route>
       </div>
     </>
   );
diff --git a/client/src/components/ProjectList.tsx b/client/src/components/ProjectList.tsx
index da701a4..067a52f 100644
--- a/client/src/components/ProjectList.tsx
+++ b/client/src/components/ProjectList.tsx
@@ -38,13 +38,6 @@ export const ProjectList: FC<IProps> = ({ projects }) => {
   return (
     <>
       <div className="row valign-wrapper">
-        {/* <NewTicketModal
-          handleClose={() => {
-            setShowNew(false);
-          }}
-          show={showNew}
-          allUsers={users}
-        /> */}
         <h3>Projects</h3>
         <FloatingButton
           color="indigo lighten-1"
diff --git a/client/src/components/TabRouter.tsx b/client/src/components/TabRouter.tsx
index 8182f22..0938467 100644
--- a/client/src/components/TabRouter.tsx
+++ b/client/src/components/TabRouter.tsx
@@ -1,13 +1,12 @@
 import React, { FC } from "react";
+import { Route, useRouteMatch, Redirect } from "react-router-dom";
 import { TabRouterHeader } from "./TabRouterHeader";
 import { TicketList } from "./TicketList";
 import { FileList } from "./AppFileList";
+import { ActivityList } from "./ActivityList";
 import { Ticket } from "../types/Ticket";
 import { AppFile } from "../types/AppFile";
-import { Route, useRouteMatch, Redirect } from "react-router-dom";
-import { ActivityList } from "./ActivityList";
 import { Activity } from "../types/Activity";
-import { NewTicketModal } from "./NewTicketModal";
 import { User } from "../types/User";
 
 interface IProps {
diff --git a/client/src/components/UserTabRouter.tsx b/client/src/components/UserTabRouter.tsx
index 4ff4131..7ee89ae 100644
--- a/client/src/components/UserTabRouter.tsx
+++ b/client/src/components/UserTabRouter.tsx
@@ -1,7 +1,6 @@
 import React, { FC } from "react";
 import { Route, useRouteMatch, Redirect } from "react-router-dom";
 import { TabRouterHeader } from "./TabRouterHeader";
-import { TicketList } from "./TicketList";
 import { ProjectList } from "./ProjectList";
 import { Ticket } from "../types/Ticket";
 import { Project } from "../types/Project";