From 02c04badacd3bf9f4b74dc09ec621b483d7d7d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= <lukas@kucharczyk.xyz>
Date: Wed, 25 Jan 2023 17:49:57 +0100
Subject: [PATCH] Start converting to react-router

---
 frontend/package.json                   |   1 +
 frontend/src/App.jsx                    |   6 +-
 frontend/src/components/Nav.jsx         |  14 +-
 frontend/src/components/SessionList.jsx | 162 ++++++++++++++++++++++++
 frontend/src/error-page.jsx             |  16 +++
 frontend/src/main.jsx                   |  26 +++-
 6 files changed, 215 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/components/SessionList.jsx
 create mode 100644 frontend/src/error-page.jsx

diff --git a/frontend/package.json b/frontend/package.json
index 2199022..3f7acce 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,6 +16,7 @@
     "prettier": "^2.8.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-router-dom": "^6.7.0",
     "tailwindcss": "^3.2.4"
   },
   "devDependencies": {
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 6abeeac..115716b 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -1,15 +1,15 @@
-import { useState } from "react";
 import "./App.css";
 import Nav from "./components/Nav";
+import { Outlet, useLoaderData } from "react-router-dom";
 
 function App() {
-  const [count, setCount] = useState(0);
+  
 
   return (
     <>
       <div className="dark:bg-gray-800 min-h-screen">
         <Nav />
-        {/* {% block content %}No content here.{% endblock content %} */}
+        <Outlet />
       </div>
       {/* {% load version %} */}
       {/* <span className="fixed left-2 bottom-2 text-xs text-slate-300 dark:text-slate-600">{% version %} ({% version_date %})</span> */}
diff --git a/frontend/src/components/Nav.jsx b/frontend/src/components/Nav.jsx
index b85921c..b81c171 100644
--- a/frontend/src/components/Nav.jsx
+++ b/frontend/src/components/Nav.jsx
@@ -1,16 +1,18 @@
+import { Link } from 'react-router-dom';
+
 function Nav() {
   return (
     <nav className="mb-4 bg-white dark:bg-gray-900 border-gray-200 rounded">
       <div className="container flex flex-wrap items-center justify-between mx-auto">
-        <a
-          href="{% url 'index' %}"
+        <Link
+          to="/"
           className="flex items-center"
         >
           <span className="text-4xl">⌚</span>
           <span className="self-center text-xl font-semibold whitespace-nowrap text-white">
             Timetracker
           </span>
-        </a>
+        </Link>
         <div className="w-full md:block md:w-auto">
           <ul className="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
             <li>
@@ -51,12 +53,12 @@ function Nav() {
             {/* {% endif %} */}
             {/* {% if session_count > 0 %} */}
             <li>
-              <a
+              <Link
                 className="block py-2 pl-3 pr-4 hover:underline"
-                href="{% url 'list_sessions' %}"
+                to="/sessions"
               >
                 All Sessions
-              </a>
+              </Link>
             </li>
             {/* {% endif %} */}
           </ul>
diff --git a/frontend/src/components/SessionList.jsx b/frontend/src/components/SessionList.jsx
new file mode 100644
index 0000000..4ffc0e0
--- /dev/null
+++ b/frontend/src/components/SessionList.jsx
@@ -0,0 +1,162 @@
+export default function SessionList() {
+  const data = [
+    {
+        "url": "http://localhost:8000/api/sessions/25/",
+        "timestamp_start": "2020-01-01T00:00:00+01:00",
+        "timestamp_end": null,
+        "duration_manual": "12:00:00",
+        "duration_calculated": "00:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/26/",
+        "timestamp_start": "2022-12-31T15:25:00+01:00",
+        "timestamp_end": "2022-12-31T17:25:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/2/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/27/",
+        "timestamp_start": "2023-01-01T23:00:00+01:00",
+        "timestamp_end": "2023-01-02T00:28:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:28:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/28/",
+        "timestamp_start": "2023-01-02T22:08:00+01:00",
+        "timestamp_end": "2023-01-03T01:08:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "03:00:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/29/",
+        "timestamp_start": "2023-01-03T22:36:00+01:00",
+        "timestamp_end": "2023-01-04T00:12:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:36:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/30/",
+        "timestamp_start": "2023-01-04T20:35:00+01:00",
+        "timestamp_end": "2023-01-04T22:36:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:01:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/31/",
+        "timestamp_start": "2023-01-06T18:48:00+01:00",
+        "timestamp_end": "2023-01-06T23:39:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "04:51:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/32/",
+        "timestamp_start": "2023-01-07T23:49:00+01:00",
+        "timestamp_end": "2023-01-08T01:43:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:54:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/33/",
+        "timestamp_start": "2023-01-08T16:21:00+01:00",
+        "timestamp_end": "2023-01-08T18:27:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:06:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/34/",
+        "timestamp_start": "2023-01-08T19:04:00+01:00",
+        "timestamp_end": "2023-01-08T22:03:00+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:59:00",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/35/",
+        "timestamp_start": "2023-01-09T19:35:48+01:00",
+        "timestamp_end": "2023-01-09T22:13:20.519058+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "02:37:32.519058",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/3/"
+    },
+    {
+        "url": "http://localhost:8000/api/sessions/36/",
+        "timestamp_start": "2023-01-10T15:50:12+01:00",
+        "timestamp_end": "2023-01-10T17:03:45.424429+01:00",
+        "duration_manual": "00:00:00",
+        "duration_calculated": "01:13:33.424429",
+        "note": "",
+        "purchase": "http://localhost:8000/api/purchases/4/"
+    }
+  ]
+  const header = ["url", "timestamp_start", "timestamp_end", "duration_manual", "duration_calculated", "note", "purchase"]
+  // const header = ["Name", "Platform", "Start", "End", "Duration", "Manage"]
+  return (
+        <>
+          <div id="session-table" className="gap-4 shadow rounded-xl max-w-screen-lg mx-auto dark:bg-slate-700 p-2 justify-center">
+              {header.map(column => {
+                <div className="dark:border-white dark:text-slate-300 text-lg">{column}</div>
+              })}
+          {data.map(session => {
+              <>
+                <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.url }
+                </a>
+                <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.timestamp_start }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.timestamp_end }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.duration_manual }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.duration_calculated }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.note }
+                </a>
+              </div>
+              <div className="dark:text-white overflow-hidden text-ellipsis whitespace-nowrap">
+                <a className="hover:underline" href="">
+                  { session.purchase }
+                </a>
+              </div>
+              </div>
+              </>
+          })}
+          </div>
+        </>
+  )
+}
\ No newline at end of file
diff --git a/frontend/src/error-page.jsx b/frontend/src/error-page.jsx
new file mode 100644
index 0000000..02b4361
--- /dev/null
+++ b/frontend/src/error-page.jsx
@@ -0,0 +1,16 @@
+import { useRouteError } from "react-router-dom";
+
+export default function ErrorPage() {
+    const error = useRouteError()
+    console.error(error)
+
+    return (
+        <div className="container text-center">
+            <h1 className="text-3xl">Oops!</h1>
+            <p>Sorry, an unexpected error has occurred.</p>
+            <p>
+                <i>{error.statusText || error.message}</i>
+            </p>
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
index 5cc5991..9c281e2 100644
--- a/frontend/src/main.jsx
+++ b/frontend/src/main.jsx
@@ -2,9 +2,33 @@ import React from 'react'
 import ReactDOM from 'react-dom/client'
 import App from './App'
 import './index.css'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+// import { loader as sessionLoader } from './routes/sessions'
+import ErrorPage from "./error-page"
+import SessionList from './components/SessionList'
+// import Session from './routes/sessions'
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <App />,
+    errorElement: <ErrorPage />,
+    // loader: sessionLoader,
+    children:  [
+      {
+        path: "sessions/",
+        element: <SessionList />
+      }
+    ]
+  },
+  // {
+  //   path: "sessions",
+  //   element: <SessionList />
+  // }
+])
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
-    <App />
+    <RouterProvider router={router} />
   </React.StrictMode>,
 )