Merge branch 'main' into feature/81-add-totals-to-logbook-table

adding logbook page totals
2025-05-16 10:23:06 -05:00 · 2025-05-16 10:20:14 -05:00 · 2025-05-16 10:13:01 -05:00 · 2025-05-16 10:07:15 -05:00 · 2025-05-16 10:02:20 -05:00
5 changed files with 16 additions and 44 deletions
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "api",
-  "version": "1.4.0",
+  "version": "1.3.1",
  "description": "",
  "author": "",
  "private": true,
--- a/app/index.html
+++ b/app/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/png" href="/noahspan-logo.png" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Flying</title>
+    <title>Vite + React + TS</title>
  </head>
  <body>
    <div id="root"></div>
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "app",
  "private": true,
-  "version": "1.4.0",
+  "version": "1.3.1",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/app/src/components/flights/Flights.tsx
+++ b/app/src/components/flights/Flights.tsx
@@ -1,4 +1,4 @@
-import { Box, Card, CardContent, Container, Grid, Skeleton, Spinner, Stack, theme, Typography, useMediaQuery } from "@noahspan/noahspan-components";
+import { Box, Container, Grid, Spinner } from "@noahspan/noahspan-components";
 import LogbookCard from "../logbookCard/LogbookCard";
 import { useEffect, useState } from "react";
 import { useLogs } from "../../hooks/logs/UseLogs";
@@ -7,7 +7,6 @@ import { ILogbookEntry } from "../logbook/ILogbookEntry";
 const Flights = () => {
  const [flights, setFlights] = useState<ILogbookEntry[]>([]);
  const { logs, isLoading } = useLogs();
-  const isMedium = useMediaQuery(theme.breakpoints.up('md'));

  useEffect(() => {
    const flights: ILogbookEntry[] | undefined = logs?.filter((log: ILogbookEntry) => {
@@ -25,48 +24,21 @@ const Flights = () => {
    <Container>
      <Box sx={{ margin: '20px' }}>
        <Grid container spacing={2}>
-          <Grid size={isMedium ? 11 : 6}>
-            <Typography variant="h4">Flights</Typography>
-          </Grid>
+          {isLoading &&
+            <>
+              <Grid display="flex" justifyContent="center" size={12}>
+                <Spinner />
+              </Grid>
+              <Grid display="flex" justifyContent="center" size={12}>
+                Loading...
+              </Grid>
+            </>
+          }
          {!isLoading &&
            <Grid size={12}>
              <LogbookCard logs={flights} mode='flights' />
            </Grid>
          }
-          {isLoading && [...Array(6)].map((_element, index) => {
-            return (
-              <Grid display='flex' justifyContent='center' size={12}>
-                <Card
-                  key={index}
-                  sx={{
-                    width: '100%'
-                  }}
-                >
-                  <CardContent>
-                    <Grid container>
-                      <Grid size={12}>
-                        <Skeleton height={60} width={200} />
-                        <Skeleton height={30} width={200} />
-                      </Grid>
-                      <Grid size={12}>
-                        <Skeleton height={300} />
-                      </Grid>
-                      <Grid size={12}>
-                        {[...Array(4)].map((_element, index) => {
-                          return (
-                            <>
-                              <Skeleton height={20} width={300} />
-                              <Skeleton height={40} width={300} />
-                            </>
-                          )
-                        })}
-                      </Grid>
-                    </Grid>
-                  </CardContent>
-                </Card>
-              </Grid>
-            )
-          })}
        </Grid>
      </Box>
    </Container>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@noahspan/flying",
-  "version": "1.4.0",
+  "version": "1.3.0",
  "scripts": {
    "start": "concurrently 'npm run start:azure -w api' 'wait-on tcp:0.0.0.0:7071 && npm run dev -w app'",
    "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",
Author	SHA1	Message	Date
noahspannbauer	c12b4a02e1	Merge branch 'main' into feature/81-add-totals-to-logbook-table	2025-05-16 10:23:06 -05:00
Noah Spannbauer	f92a858281	adding logbook page totals	2025-05-16 10:20:14 -05:00
Noah Spannbauer	cc8e2f55fe	adding logbook page totals	2025-05-16 10:13:01 -05:00
Noah Spannbauer	b6be7a9d2c	adding logbook page totals	2025-05-16 10:07:15 -05:00
Noah Spannbauer	729ab636be	adding logbook page totals	2025-05-16 10:02:20 -05:00