add onboarding screen (#56)

* add onboarding screen * System Check Design Fixed * height scroll issue fix * add static memory dependency check * remove back button --------- Co-authored-by: hardik <hardik.radicalloop@gmail.com>
bit-gpt · Jun 2, 2023 · 166c7c7 · 166c7c7
1 parent 7d685eb
commit 166c7c7
Show file tree

Hide file tree

Showing 12 changed files with 322 additions and 187 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,80 +1,18 @@
-import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-
-import NotFound from "shared/components/NotFound";
-import useDocker from "shared/hooks/useDocker";
-import DownloadDockerWall from "shared/components/DownloadDockerWall";
-import { DISPLAY_WELCOME_SCREEN_KEY, isBrowserEnv } from "shared/helpers/utils";
-
-import PremChat from "modules/prem-chat/components/PremChat";
-import Service from "modules/service/components/Service";
-import ServiceDetail from "modules/service-detail/components/ServiceDetail";
-import Settings from "modules/settings/components/Settings";
-import { ToastContainer } from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
 import Modal from "react-modal";
-import WelcomeScreen from "shared/components/WelcomeScreen";
-import { useState } from "react";
+import Onboarding from "modules/onboarding/components/Onboarding";
+import { isBrowserEnv } from "shared/helpers/utils";
+import AppRouter from "AppRouter";
 
 Modal.setAppElement("#root");
 
-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      refetchOnWindowFocus: false,
-      staleTime: 1000 * 60,
-      retry: 1,
-    },
-  },
-});
-
 function App() {
-  const {
-    isDockerRunning,
-    isContainerRunning,
-    isServerRunning,
-    handleCheckIsDockerRunning,
-  } = useDocker();
   const isBrowser = isBrowserEnv();
-  const [displayWelcomeScreen, setDisplayWelcomeScreen] = useState(
-    sessionStorage.getItem(DISPLAY_WELCOME_SCREEN_KEY) === null
-  );
 
-  const closeWelcomeScreen = () => {
-    setDisplayWelcomeScreen(false);
-    sessionStorage.setItem(DISPLAY_WELCOME_SCREEN_KEY, "false");
-  };
-
-  if (!isBrowser && displayWelcomeScreen) {
-    return <WelcomeScreen close={closeWelcomeScreen} />;
+  if (!isBrowser) {
+    return <Onboarding redirectTo={<AppRouter />} />;
   }
 
-  if (!isBrowser)
-    if (!isDockerRunning || !isContainerRunning || !isServerRunning)
-      return (
-        <DownloadDockerWall
-          handleCheckIsDockerRunning={handleCheckIsDockerRunning}
-          isDockerRunning={isDockerRunning}
-        />
-      );
-
-  return (
-    <QueryClientProvider client={queryClient}>
-      <Router>
-        <Routes>
-          <Route path="/" element={<Service />} />
-          <Route path="/prem-chat/:serviceId/:chatId?" element={<PremChat />} />
-          <Route
-            path="/services/:serviceId/detail"
-            element={<ServiceDetail />}
-          />
-          <Route path="/settings" element={<Settings />} />
-          <Route path="*" element={<NotFound />} />
-        </Routes>
-      </Router>
-      <ToastContainer position="bottom-right"/>
-    </QueryClientProvider>
-  );
+  return <AppRouter />;
 }
 
 export default App;
diff --git a/src/AppRouter.tsx b/src/AppRouter.tsx
@@ -0,0 +1,41 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import PremChat from "modules/prem-chat/components/PremChat";
+import ServiceDetail from "modules/service-detail/components/ServiceDetail";
+import Service from "modules/service/components/Service";
+import Settings from "modules/settings/components/Settings";
+import { Route, BrowserRouter as Router, Routes } from "react-router-dom";
+import NotFound from "shared/components/NotFound";
+import { ToastContainer } from "react-toastify";
+import "react-toastify/dist/ReactToastify.css";
+
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: false,
+      staleTime: 1000 * 60,
+      retry: 1,
+    },
+  },
+});
+
+const AppRouter = () => {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <Router>
+        <Routes>
+          <Route path="/" element={<Service />} />
+          <Route path="/prem-chat/:serviceId/:chatId?" element={<PremChat />} />
+          <Route
+            path="/services/:serviceId/detail"
+            element={<ServiceDetail />}
+          />
+          <Route path="/settings" element={<Settings />} />
+          <Route path="*" element={<NotFound />} />
+        </Routes>
+      </Router>
+      <ToastContainer position="bottom-right" />
+    </QueryClientProvider>
+  );
+};
+
+export default AppRouter;
diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
@@ -18,9 +18,21 @@ header img {
   @apply w-[140px];
 }
 
-.docker-not-detected {
+.system-check {
   @apply dark:bg-darkjunglegreen min-h-screen;
 }
+.system-check__requirements p,
+.system-check__requirements button {
+  @apply text-sm;
+}
+.system-check__requirements p:last-child,
+.system-check__requirements button {
+  @apply w-[150px];
+}
+.system-check__container {
+  min-height: calc(100vh - 182px);
+  @apply flex mb-[70px] items-center;
+}
 
 .scrollbar-none {
   scrollbar-width: none;
@@ -37,11 +49,6 @@ header img {
   @apply absolute top-0 right-0 left-0 w-full h-full bg-contain bottom-0;
 }
 
-.docker-not-detected__modal {
-  @apply text-white relative;
-  background: #26262a;
-  margin: 1.5px;
-}
 .docker-modal-wrap {
   background: linear-gradient(
     131.93deg,
@@ -52,9 +59,6 @@ header img {
   );
 }
 
-.docker-not-detected__modal hr {
-  border-color: rgba(237, 237, 237, 0.34);
-}
 
 .modal-height {
   margin-bottom: 70px;

diff --git a/src/assets/images/computer.svg b/src/assets/images/computer.svg
diff --git a/src/modules/onboarding/components/Dependency.tsx b/src/modules/onboarding/components/Dependency.tsx
@@ -0,0 +1,50 @@
+import { Tooltip } from "react-tooltip";
+import { DependencyProps } from "../types";
+
+const Dependency = ({ isRunning, name, status, tooltip }: DependencyProps) => {
+  return (
+    <div className="flex justify-between mt-4">
+      <p className="text-[#CFCFCF] text-base">{name}</p>
+      {isRunning && (
+        <p className="text-[#2ED291] text-base">&#10003;&nbsp;{status}</p>
+      )}
+      {!isRunning && (
+        <>
+          <button className="text-[#F9B96D] flex gap-3 not_found">
+            <svg
+              width="16"
+              height="16"
+              viewBox="0 0 16 16"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <g clipPath="url(#clip0_1084_304)">
+                <path
+                  d="M9 4.33334C9 4.53112 8.94136 4.72446 8.83147 4.88891C8.72159 5.05336 8.56541 5.18153 8.38269 5.25722C8.19996 5.3329 7.9989 5.35271 7.80491 5.31412C7.61093 5.27554 7.43275 5.1803 7.2929 5.04044C7.15305 4.90059 7.0578 4.72241 7.01922 4.52843C6.98063 4.33445 7.00044 4.13338 7.07613 3.95065C7.15181 3.76793 7.27999 3.61175 7.44443 3.50187C7.60888 3.39199 7.80222 3.33334 8 3.33334C8.26522 3.33334 8.51958 3.43869 8.70711 3.62623C8.89465 3.81377 9 4.06812 9 4.33334ZM16 8C16 6.41775 15.5308 4.87104 14.6518 3.55544C13.7727 2.23985 12.5233 1.21447 11.0615 0.608967C9.59966 0.00346629 7.99113 -0.15496 6.43928 0.153721C4.88743 0.462403 3.46197 1.22433 2.34315 2.34315C1.22433 3.46197 0.462403 4.88743 0.153721 6.43928C-0.15496 7.99113 0.00346629 9.59966 0.608967 11.0615C1.21447 12.5233 2.23985 13.7727 3.55544 14.6518C4.87104 15.5308 6.41775 16 8 16H16V8ZM14.6667 8V14.6667H8C6.68146 14.6667 5.39253 14.2757 4.2962 13.5431C3.19987 12.8106 2.34539 11.7694 1.84081 10.5512C1.33622 9.33305 1.2042 7.99261 1.46144 6.6994C1.71867 5.4062 2.35361 4.21831 3.28596 3.28596C4.21831 2.35361 5.4062 1.71867 6.6994 1.46144C7.99261 1.2042 9.33305 1.33622 10.5512 1.84081C11.7694 2.34539 12.8106 3.19987 13.5431 4.2962C14.2757 5.39253 14.6667 6.68146 14.6667 8ZM9.33334 8C9.33334 7.64638 9.19286 7.30724 8.94281 7.0572C8.69277 6.80715 8.35363 6.66667 8 6.66667H6.66667V8H8V12.6667H9.33334V8Z"
+                  fill="#F9B96D"
+                />
+              </g>
+              <defs>
+                <clipPath id="clip0_1084_304">
+                  <rect width="16" height="16" fill="white" />
+                </clipPath>
+              </defs>
+            </svg>
+            {status}
+          </button>
+          {tooltip && (
+            <Tooltip
+              anchorSelect=".not_found"
+              place="bottom"
+              className="topltip"
+            >
+              {tooltip}
+            </Tooltip>
+          )}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default Dependency;
diff --git a/src/modules/onboarding/components/Onboarding.tsx b/src/modules/onboarding/components/Onboarding.tsx
@@ -0,0 +1,45 @@
+import useDocker from "shared/hooks/useDocker";
+import useWelcomeScreen from "shared/hooks/useWelcomeScreen";
+import WelcomeScreen from "./WelcomeScreen";
+import SystemCheck from "./SystemCheck";
+import { useState } from "react";
+import { OnboardingProps } from "../types";
+
+const Onboarding = ({ redirectTo }: OnboardingProps) => {
+  const { displayWelcomeScreen, setDisplayWelcomeScreen, closeWelcomeScreen } =
+    useWelcomeScreen();
+  const {
+    isDockerRunning,
+    isContainerRunning,
+    isServerRunning,
+    handleCheckIsDockerRunning,
+  } = useDocker();
+
+  const [isSystemChecked, setIsSystemChecked] = useState(false);
+
+  const isSystemCheckRequired =
+    !isDockerRunning ||
+    !isContainerRunning ||
+    !isServerRunning ||
+    !isSystemChecked;
+
+  if (displayWelcomeScreen) {
+    return <WelcomeScreen close={closeWelcomeScreen} />;
+  }
+
+  if (isSystemCheckRequired) {
+    return (
+      <SystemCheck
+        handleCheckIsDockerRunning={handleCheckIsDockerRunning}
+        isDockerRunning={isDockerRunning}
+        isServerRunning={isServerRunning && isContainerRunning}
+        back={() => setDisplayWelcomeScreen(true)}
+        next={() => setIsSystemChecked(true)}
+      />
+    );
+  }
+
+  return redirectTo;
+};
+
+export default Onboarding;