From b446ac93eb393a857f11947daeeea6626f82a6a2 Mon Sep 17 00:00:00 2001
From: april <aprl.petersen@gmail.com>
Date: Mon, 8 Jan 2024 14:59:07 -0600
Subject: [PATCH] Remove takeoffs field, add dashboard route

---
 web/app/routes/logbook.dashboard/route.tsx   |  3 ++
 web/app/routes/logbook.flights.$id/route.tsx | 42 ++++++--------------
 web/app/routes/logbook/route.tsx             |  2 +
 web/app/ui/form/flight-form.tsx              | 38 +++---------------
 web/app/ui/nav/navbar.tsx                    |  4 +-
 web/app/util/types.ts                        |  2 -
 6 files changed, 25 insertions(+), 66 deletions(-)
 create mode 100644 web/app/routes/logbook.dashboard/route.tsx

diff --git a/web/app/routes/logbook.dashboard/route.tsx b/web/app/routes/logbook.dashboard/route.tsx
new file mode 100644
index 0000000..461ec75
--- /dev/null
+++ b/web/app/routes/logbook.dashboard/route.tsx
@@ -0,0 +1,3 @@
+export default function Dashboard() {
+  return;
+}
diff --git a/web/app/routes/logbook.flights.$id/route.tsx b/web/app/routes/logbook.flights.$id/route.tsx
index 78df7f2..d18961c 100644
--- a/web/app/routes/logbook.flights.$id/route.tsx
+++ b/web/app/routes/logbook.flights.$id/route.tsx
@@ -307,36 +307,18 @@ export default function Flight() {
                         </Group>
                       </CollapsibleFieldset>
                     ) : null}
-                    <Grid w="100%" mt="sm">
-                      <Grid.Col span={6}>
-                        <CollapsibleFieldset legend="Takeoffs" w="100%">
-                          <Group grow>
-                            <VerticalLogItem
-                              label="Day"
-                              content={log.takeoffs_day}
-                            />
-                            <VerticalLogItem
-                              label="Night"
-                              content={log.takeoffs_night}
-                            />
-                          </Group>
-                        </CollapsibleFieldset>
-                      </Grid.Col>
-                      <Grid.Col span={6}>
-                        <CollapsibleFieldset legend="Landings" w="100%">
-                          <Group grow>
-                            <VerticalLogItem
-                              label="Day"
-                              content={log.landings_day}
-                            />
-                            <VerticalLogItem
-                              label="Night"
-                              content={log.landings_night}
-                            />
-                          </Group>
-                        </CollapsibleFieldset>
-                      </Grid.Col>
-                    </Grid>
+                    <CollapsibleFieldset legend="Landings" w="100%">
+                      <Group grow>
+                        <VerticalLogItem
+                          label="Day"
+                          content={log.landings_day}
+                        />
+                        <VerticalLogItem
+                          label="Night"
+                          content={log.landings_night}
+                        />
+                      </Group>
+                    </CollapsibleFieldset>
                     {log.time_instrument ||
                     log.time_sim_instrument ||
                     log.holds_instrument ? (
diff --git a/web/app/routes/logbook/route.tsx b/web/app/routes/logbook/route.tsx
index effad56..1b35c26 100644
--- a/web/app/routes/logbook/route.tsx
+++ b/web/app/routes/logbook/route.tsx
@@ -25,6 +25,8 @@ export default function Index() {
   useEffect(() => {
     if (!loading && !user) {
       navigate("/login");
+    } else {
+      navigate("/logbook/dashboard");
     }
   }, [user, loading, navigate]);
 
diff --git a/web/app/ui/form/flight-form.tsx b/web/app/ui/form/flight-form.tsx
index 725b90a..fee87a7 100644
--- a/web/app/ui/form/flight-form.tsx
+++ b/web/app/ui/form/flight-form.tsx
@@ -67,9 +67,7 @@ export default function FlightForm({
       time_xc: 0.0,
       dist_xc: 0.0,
 
-      takeoffs_day: 0,
       landings_day: 0,
-      takeoffs_night: 0,
       landings_night: 0,
 
       time_instrument: 0.0,
@@ -171,13 +169,9 @@ export default function FlightForm({
 
           <Fieldset legend="Cross-Country" mt="md">
             <Group justify="center" grow>
-              <ZeroHourInput
-                form={form}
-                field="time_xc"
-                label="Time Cross-Country"
-              />
+              <ZeroHourInput form={form} field="time_xc" label="Hours" />
               <NumberInput
-                label="Distance Cross-Country"
+                label="Distance"
                 decimalScale={1}
                 min={0}
                 fixedDecimalScale
@@ -198,32 +192,12 @@ export default function FlightForm({
             </Group>
           </Fieldset>
 
-          {/* Takeoffs and Landings */}
+          {/* Landings */}
 
-          <Fieldset legend="Takeoffs and Landings" mt="md">
+          <Fieldset legend="Landings" mt="md">
             <Group justify="center" grow>
-              <ZeroIntInput
-                form={form}
-                field="takeoffs_day"
-                label="Day Takeoffs"
-              />
-              <ZeroIntInput
-                form={form}
-                field="landings_day"
-                label="Day Landings"
-              />
-            </Group>
-            <Group justify="center" grow mt="md">
-              <ZeroIntInput
-                form={form}
-                field="takeoffs_night"
-                label="Night Takeoffs"
-              />
-              <ZeroIntInput
-                form={form}
-                field="landings_night"
-                label="Night Landings"
-              />
+              <ZeroIntInput form={form} field="landings_day" label="Day" />
+              <ZeroIntInput form={form} field="landings_night" label="Night" />
             </Group>
           </Fieldset>
 
diff --git a/web/app/ui/nav/navbar.tsx b/web/app/ui/nav/navbar.tsx
index 6b8e1ef..4766a9f 100644
--- a/web/app/ui/nav/navbar.tsx
+++ b/web/app/ui/nav/navbar.tsx
@@ -26,10 +26,10 @@ export default function Navbar({
         <NavLink
           p="md"
           component={Link}
-          to="/logbook"
+          to="/logbook/dashboard"
           label="Dashboard"
           leftSection={<IconPlaneDeparture />}
-          active={page == null}
+          active={page == "dashboard"}
           onClick={() => (opened ? toggle() : null)}
         />
         <NavLink
diff --git a/web/app/util/types.ts b/web/app/util/types.ts
index b1ad463..67aa8c9 100644
--- a/web/app/util/types.ts
+++ b/web/app/util/types.ts
@@ -23,9 +23,7 @@ type FlightBaseSchema = {
   time_xc: number;
   dist_xc: number;
 
-  takeoffs_day: number;
   landings_day: number;
-  takeoffs_night: number;
   landings_night: number;
 
   time_instrument: number;