From 01a38570e4ef4102c646712b81cbb9106540cf0f Mon Sep 17 00:00:00 2001
From: corpulent <artemgolub@gmail.com>
Date: Sun, 21 Aug 2022 18:40:37 +0300
Subject: [PATCH] feat: call project on select on new project

---
 .../src/components/Projects/index.tsx         | 40 +++++++++++--------
 .../src/components/global/SideBar.tsx         | 29 ++++++++++----
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/services/frontend/src/components/Projects/index.tsx b/services/frontend/src/components/Projects/index.tsx
index 6f8d7ab..f941ac1 100644
--- a/services/frontend/src/components/Projects/index.tsx
+++ b/services/frontend/src/components/Projects/index.tsx
@@ -1,7 +1,8 @@
 import { useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { PROJECTS_FETCH_LIMIT } from "../../constants";
 import ModalImport from "../modals/import";
+import ModalNewProject from "../modals/new-project";
 import { IProject } from "../../types";
 import { toaster } from "../../utils";
 import Spinner from "../../components/global/Spinner";
@@ -17,13 +18,10 @@ const Projects = () => {
   const [offset, setOffset] = useState(0);
   const [importing, setImporting] = useState(false);
   const [showImportModal, setShowImportModal] = useState(false);
+  const [showNewProjectModal, setShowNewProjectModal] = useState(false);
   const { isLoading, isError, error, data, isFetching, isPreviousData } =
     useProjects(limit, offset);
 
-  const onImportClick = () => {
-    setShowImportModal(true);
-  };
-
   const handleImport = (values: IImportFinalValues) => {
     setImporting(true);
     importProject(values)
@@ -49,10 +47,14 @@ const Projects = () => {
         />
       ) : null}
 
+      {showNewProjectModal ? (
+        <ModalNewProject onHide={() => setShowNewProjectModal(false)} />
+      ) : null}
+
       <div className="md:pl-16 flex flex-col flex-1 h-screen">
         <main>
-          <div className="py-6">
-            <div className="flex flex-col sm:flex-row justify-between px-4 sm:px-6 md:px-8">
+          <div className="py-4 md:py-6">
+            <div className="flex flex-col sm:flex-row justify-between px-4 md:px-6">
               <h1 className="text-2xl font-semibold dark:text-white text-gray-900">
                 Projects
               </h1>
@@ -60,26 +62,26 @@ const Projects = () => {
               {data && data.results.length > 0 && (
                 <div className="flex justify-end space-x-1">
                   <button
-                    onClick={onImportClick}
+                    onClick={() => setShowImportModal(true)}
                     className="btn-util text-white bg-blue-600 hover:bg-blue-700 sm:w-auto"
                   >
                     <span>Import</span>
                   </button>
 
-                  <Link
+                  <button
+                    onClick={() => setShowNewProjectModal(true)}
                     className="btn-util text-white bg-blue-600 hover:bg-blue-700 sm:w-auto"
-                    to="/projects/new"
                   >
                     <span>Create new project</span>
-                  </Link>
+                  </button>
                 </div>
               )}
             </div>
 
-            <div className="px-4 sm:px-6 md:px-8">
+            <div className="px-4 md:px-6">
               {!isFetching && !isLoading && (
                 <>
-                  <div className="py-4">
+                  <div className="py-4 md:py-6">
                     {error && (
                       <div className="text-center">
                         <h3 className="mt-12 text-sm font-medium text-gray-900 dark:text-white">
@@ -117,11 +119,17 @@ const Projects = () => {
                           Get started by creating a new project
                         </p>
                         <div className="flex flex-col md:flex-row mt-6 items-center space-y-2 md:space-y-0 space-x-2">
-                          <button onClick={onImportClick} className="btn-util">
+                          <button
+                            onClick={() => setShowImportModal(true)}
+                            className="btn-util"
+                          >
                             <span>Import</span>
                           </button>
 
-                          <Link to="/projects/new" className="btn-util">
+                          <button
+                            onClick={() => setShowNewProjectModal(true)}
+                            className="btn-util"
+                          >
                             <span className="flex space-x-1 items-center">
                               <PlusIcon
                                 className="h-3 w-3"
@@ -129,7 +137,7 @@ const Projects = () => {
                               />
                               <span>New project</span>
                             </span>
-                          </Link>
+                          </button>
                         </div>
                       </div>
                     )}
diff --git a/services/frontend/src/components/global/SideBar.tsx b/services/frontend/src/components/global/SideBar.tsx
index cb25374..1148c03 100644
--- a/services/frontend/src/components/global/SideBar.tsx
+++ b/services/frontend/src/components/global/SideBar.tsx
@@ -1,9 +1,11 @@
 import { useLocation } from "react-router-dom";
 import { BookOpenIcon, PlusIcon } from "@heroicons/react/outline";
 import { Link } from "react-router-dom";
+import ModalNewProject from "../modals/new-project";
 import UserMenu from "./UserMenu";
 import Logo from "./logo";
 import { classNames } from "../../utils/styles";
+import { useState } from "react";
 
 interface ISideBarProps {
   state: any;
@@ -21,20 +23,17 @@ export default function SideBar(props: ISideBarProps) {
       icon: BookOpenIcon,
       current: pathname.match(projRegex) || pathname == "/" ? true : false,
       visible: isAuthenticated
-    },
-    {
-      name: "New project",
-      href: "/projects/new",
-      icon: PlusIcon,
-      current: false,
-      visible: true
     }
   ];
-
+  const [showNewProjectModal, setShowNewProjectModal] = useState(false);
   const userName = state.user ? state.user.username : "";
 
   return (
     <>
+      {showNewProjectModal ? (
+        <ModalNewProject onHide={() => setShowNewProjectModal(false)} />
+      ) : null}
+
       <div className="md:flex md:w-16 md:flex-col md:fixed md:inset-y-0">
         <div className="flex justify-between flex-col sm:flex-row md:flex-col md:flex-grow md:pt-5 bg-blue-700 overflow-y-auto">
           <div className="flex items-center flex-shrink-0 mx-auto p-2 ">
@@ -67,6 +66,20 @@ export default function SideBar(props: ISideBarProps) {
                   );
                 }
               })}
+
+              <button
+                onClick={() => setShowNewProjectModal(true)}
+                className={classNames(
+                  "text-blue-100 hover:bg-blue-600",
+                  "group flex items-center justify-center p-2 text-sm font-medium rounded-md"
+                )}
+              >
+                <PlusIcon
+                  className="mr-3 sm:mr-0 flex-shrink-0 h-5 w-5"
+                  aria-hidden="true"
+                />
+                <span className="sm:hidden">New project</span>
+              </button>
             </nav>
 
             <UserMenu