updating version number to 1.4.0

* adding logbook page totals

* adding logbook page totals

* adding logbook page totals

* adding logbook page totals

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "",
   "author": "",
   "private": true,
@@ -19,6 +19,7 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
+    "@azure/storage-blob": "^12.27.0",
     "@microsoft/microsoft-graph-client": "^3.0.7",
     "@nestjs/axios": "^3.0.3",
     "@nestjs/common": "^10.0.0",
@@ -29,10 +30,12 @@
     "@noahspan/azure-database": "^3.1.2",
     "@noahspan/noahspan-modules": "^1.1.5",
     "@schematics/angular": "^17.3.7",
+    "@types/multer": "^1.4.12",
     "dotenv": "^16.4.7",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "uuidv4": "^6.2.13"
   },
   "devDependencies": {
     "@microsoft/microsoft-graph-types": "^2.40.0",

api/src/app.module.ts

@@ -44,11 +44,6 @@ import configuration from './config/configuration';
       provide: APP_FILTER,
       useClass: HttpExceptionFilter
     },
-    // {
-    //   provide: APP_GUARD,
-    //   useClass: AuthGuard
-    // },
-    // Reflector
   ]
 })
 export class AppModule {}

api/src/file/file.service.ts

@@ -0,0 +1,68 @@
+import { BlobServiceClient, BlockBlobClient } from '@azure/storage-blob';
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+@Injectable() export class FileService {
+  constructor(private readonly configService: ConfigService) {}
+
+  private containerName: string;
+
+  private streamToBuffer(readableStream: NodeJS.ReadableStream) {
+    return new Promise<Buffer>((resolve, reject) => {
+      const chunks = [];
+
+      readableStream.on('data', (data) => {
+        chunks.push(data instanceof Buffer ? data : Buffer.from(data));
+      });
+      readableStream.on('end', () => {
+        resolve(Buffer.concat(chunks));
+      });
+      readableStream.on('error', reject)
+    })
+  }
+
+  async getBlobServiceInstance() {
+    const connectionString = this.configService.get<string>('azureStorageConnectionString');
+    const blobServiceClient: BlobServiceClient = await BlobServiceClient.fromConnectionString(connectionString)
+
+    return blobServiceClient;
+  }
+
+  async getBlobClient(fileName: string): Promise<BlockBlobClient> {
+    const blobService = await this.getBlobServiceInstance();
+    const containerName = this.containerName;
+    const containerClient = blobService.getContainerClient(containerName);
+    const blockBlobClient = containerClient.getBlockBlobClient(fileName);
+
+    return blockBlobClient;
+  }
+
+  async uploadFile(file: Express.Multer.File, containerName: string, rowKey: string): Promise<string> {
+    this.containerName = containerName;
+
+    const blockBlobClient = await this.getBlobClient(`${rowKey}/${file.originalname}`);
+    const fileUrl = blockBlobClient.url;
+    
+    await blockBlobClient.uploadData(file.buffer);
+
+    return fileUrl;
+  }
+
+  async downloadFile(containerName: string, rowKey: string, fileName: string): Promise<string> {
+    this.containerName = containerName;
+
+    const blockBlobClient = await this.getBlobClient(`${rowKey}/${fileName}`);
+    const downloadBlockBlobResponse = await blockBlobClient.download();
+    const downloaded: string = (await this.streamToBuffer(downloadBlockBlobResponse.readableStreamBody)).toString()
+    
+    return downloaded
+  }
+
+  async deleteFile(containerName: string, rowKey:string, fileName: string): Promise<void> {
+      this.containerName = containerName;
+
+      const blockBlobClient = await this.getBlobClient(`${rowKey}/${fileName}`);
+
+      await blockBlobClient.deleteIfExists();
+  }
+}

api/src/log/interceptors/log.interceptor.ts

@@ -6,6 +6,7 @@ export class LogInterceptor implements NestInterceptor {
     const req = context.switchToHttp().getRequest();
     const authHeader = req.headers.authorization;
     const token = authHeader && authHeader.split(' ')[1];
+    console.log(token)
 
     if (!token) {
       return handler.handle().pipe(
@@ -22,6 +23,7 @@ export class LogInterceptor implements NestInterceptor {
                 routeFrom: log.routeFrom,
                 routeTo: log.routeTo,
                 durationOfFlight: log.durationOfFlight,
+                tracks: log.tracks,
                 notes: log.notes
               };
             });

api/src/log/log.controller.ts

@@ -7,6 +7,9 @@ import {
   Param,
   Post,
   Put,
+  Query,
+  StreamableFile,
+  UploadedFile,
   UseGuards,
   UseInterceptors
 } from '@nestjs/common';
@@ -16,14 +19,19 @@ import { LogService } from './log.service';
 import { CustomError } from '../error/customError';
 import { AuthGuard } from '@noahspan/noahspan-modules';
 import { LogInterceptor } from './interceptors/log.interceptor';
-
+import { FileService } from '../file/file.service';
+import { FileInterceptor } from '@nestjs/platform-express';
 
 @Controller('logs')
-@UseInterceptors(new LogInterceptor())
 export class LogController {
-  constructor(private readonly logService: LogService) {}
+  constructor(
+    private readonly fileService: FileService,
+    private readonly logService: LogService
+  ) {}
+
  
   @Get(':partitionKey/:rowKey')
+  @UseInterceptors(new LogInterceptor())
   async find(
     @Param('partitionKey') partitionKey: string,
     @Param('rowKey') rowKey: string
@@ -38,6 +46,7 @@ export class LogController {
   }
 
   @Get()
+  @UseInterceptors(new LogInterceptor())
   async findAll(): Promise<Log[]> {
     try {
       return await this.logService.findAll();
@@ -98,4 +107,42 @@ export class LogController {
       throw new HttpException(customError.message, customError.statusCode);
     }
   }
+
+  @UseGuards(AuthGuard)
+  @Post(':partitionKey/:rowKey/track')
+  @UseInterceptors(FileInterceptor('file'))
+  async createTrack(@Param('rowKey') rowKey: string, @UploadedFile() file: Express.Multer.File) {
+    try {
+      const containerName = 'tracks';
+      const url = await this.fileService.uploadFile(file, containerName, rowKey);
+  
+      return { url }
+    } catch (error) {
+      const customError = error as CustomError;
+
+      throw new HttpException(customError.message, customError.statusCode);
+    }
+  }
+
+  @Get(':partitionKey/:rowKey/track')
+  async downloadTrack(@Param('rowKey') rowKey: string, @Query('fileName') fileName: string): Promise<string> {
+    const containerName = 'tracks';
+    const downloadedFile: string = await this.fileService.downloadFile(containerName, rowKey, fileName)
+
+    return downloadedFile;
+  }
+
+  @UseGuards(AuthGuard)
+  @Delete(':partitionKey/:rowKey/track')
+  async deleteTrack(@Param('rowKey') rowKey: string, @Query('fileName') fileName: string): Promise<void> {
+    try {
+      const containerName = 'tracks';
+      
+      return await this.fileService.deleteFile(containerName, rowKey, fileName)
+    } catch (error) {
+      const customError = error as CustomError;
+
+      throw new HttpException(customError.message, customError.statusCode);
+    }
+  }
 }

api/src/log/log.dto.ts

@@ -22,5 +22,6 @@ export class LogDto {
   night: number;
   solo: number;
   pilotInCommand: number;
+  tracks: string[];
   notes: string;
 }

api/src/log/log.entity.ts

@@ -24,5 +24,6 @@ export class Log {
   instrumentApproaches?: number | null;
   instrumentHolds?: number | null;
   instrumentNavTrack?: number | null;
+  tracks?: string[];
   notes?: string;
 }

api/src/log/log.module.ts

@@ -4,6 +4,7 @@ import { LogService } from './log.service';
 import { AzureTableStorageModule } from '@noahspan/azure-database';
 import { Log } from './log.entity';
 import { ConfigModule, ConfigService } from '@nestjs/config';
+import { FileService } from '../file/file.service';
 
 @Module({
   imports: [
@@ -22,6 +23,10 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
     }),
   ],
   controllers: [LogController],
-  providers: [LogService]
+  providers: [
+    ConfigService,
+    FileService,
+    LogService
+  ]
 })
 export class LogModule {}

app/.gitignore

@@ -1,5 +1,4 @@
 # Logs
-logs
 *.log
 npm-debug.log*
 yarn-debug.log*

app/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/noahspan-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Flying</title>
   </head>
   <body>
     <div id="root"></div>

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.2.0",
+  "version": "1.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,16 +13,21 @@
   "dependencies": {
     "@azure/msal-browser": "^4.0.1",
     "@azure/msal-react": "^3.0.1",
-    "@noahspan/noahspan-components": "^1.5.1",
+    "@noahspan/noahspan-components": "^1.9.1",
     "axios": "^1.7.2",
     "dotenv": "^16.4.7",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "leaflet": "^1.9.4",
+    "react": "19.0.0-rc.1",
+    "react-dom": "19.0.0-rc.1",
     "react-hook-form": "^7.51.4",
-    "react-router-dom": "^6.23.0"
+    "react-leaflet": "^5.0.0",
+    "react-leaflet-kml": "^2.1.2",
+    "react-router-dom": "^6.23.0",
+    "swiper": "^11.2.6"
   },
   "devDependencies": {
     "@microsoft/microsoft-graph-types": "^2.40.0",
+    "@types/leaflet": "^1.9.16",
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",
     "@vitejs/plugin-react": "^4.2.1",

app/src/App.tsx

@@ -1,6 +1,7 @@
 import { Navigate, Route, Routes } from 'react-router-dom';
-import Pilots from './components/pilots/Pilots';
+import Flights from './components/flights/Flights';
 import Logbook from './components/logbook/Logbook';
+import Pilots from './components/pilots/Pilots';
 import SiteNav from './components/siteNav/SiteNav';
 import { useIsAuthenticated } from '@azure/msal-react';
 
@@ -19,8 +20,10 @@ const App = () => {
     <>
       <SiteNav />
       <Routes>
+        <Route path='/' element={<Flights />} />
+        <Route path="/logbook" element={<Logbook />} />
         <Route path="/pilots" element={<Pilots />} />
-        <Route path="/" element={<Logbook />} />
+        
       </Routes>
     </>
   );

app/src/components/actionMenu/ActionMenu.tsx

@@ -12,7 +12,7 @@ import {
 import { FormMode } from '../../enums/formMode';
 import { useIsAuthenticated } from '@azure/msal-react';
 
-const ActionMenu = ({ id, onDelete, onOpenCloseForm }: IActionMenuProps) => {
+const ActionMenu = ({ id, onDelete, onOpenCloseForm, onOpenCloseTracks }: IActionMenuProps) => {
   const [anchorElAction, setAnchorElAction] = useState<null | HTMLElement>(
     null
   );
@@ -38,12 +38,23 @@ const ActionMenu = ({ id, onDelete, onOpenCloseForm }: IActionMenuProps) => {
         onClose={onCloseActionMenu}
       >
         {isAuthenticated &&
+        <>
           <MenuItem onClick={() => onOpenCloseForm(FormMode.EDIT, id)}>
             <ListItemIcon>
               <Icon iconName={IconName.PEN} size="lg" />
             </ListItemIcon>
             <ListItemText>Edit</ListItemText>
           </MenuItem>
+          {onOpenCloseTracks &&
+            <MenuItem onClick={() => onOpenCloseTracks!(FormMode.EDIT, id)}>
+              <ListItemIcon>
+                <Icon iconName={IconName.MAP_LOCATION_DOT} size="lg" />
+              </ListItemIcon>
+              <ListItemText>Tracks</ListItemText>
+            </MenuItem>
+          }
+        </>
+
         }
         <MenuItem onClick={() => onOpenCloseForm(FormMode.VIEW, id)}>
           <ListItemIcon>

app/src/components/actionMenu/IActionMenuProps.tsx

@@ -4,4 +4,5 @@ export interface IActionMenuProps {
   id: string;
   onDelete: (entryId: string) => void;
   onOpenCloseForm: (formMode: FormMode, id: string) => void;
+  onOpenCloseTracks?: (formMode: FormMode, id: string) => void;
 }

app/src/components/flights/Flights.tsx

@@ -0,0 +1,76 @@
+import { Box, Card, CardContent, Container, Grid, Skeleton, Spinner, Stack, theme, Typography, useMediaQuery } from "@noahspan/noahspan-components";
+import LogbookCard from "../logbookCard/LogbookCard";
+import { useEffect, useState } from "react";
+import { useLogs } from "../../hooks/logs/UseLogs";
+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) => {
+      if (log.tracks && JSON.parse(log.tracks).length > 0) {
+        return log;
+      }
+    })
+
+    if (flights && flights.length > 0) {
+      setFlights(flights)
+    }
+  }, [logs])
+  
+  return (
+    <Container>
+      <Box sx={{ margin: '20px' }}>
+        <Grid container spacing={2}>
+          <Grid size={isMedium ? 11 : 6}>
+            <Typography variant="h4">Flights</Typography>
+          </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>
+  )
+}
+
+export default Flights;

app/src/components/logForm/LogForm.tsx

@@ -174,7 +174,7 @@ const LogForm: React.FC<ILogFormProps> = ({
       }}
     >
       <FormProvider {...methods}>
-        <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <form onSubmit={methods.handleSubmit(onSubmit)} style={{ paddingBottom: '50px' }}>
           <Grid container spacing={2}>
             <Grid size={11}>
               <Typography variant="h4">{`${mode.toString().toLowerCase().charAt(0).toUpperCase() + mode.toString().slice(1).toLowerCase()} Entry`}</Typography>

app/src/components/logTrackMaps/LogTrackMaps.css

@@ -0,0 +1,53 @@
+#app {
+  height: 100%;
+}
+html,
+body {
+  position: relative;
+  height: 100%;
+}
+
+body {
+  background: #eee;
+  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  color: #000;
+  margin: 0;
+  padding: 0;
+}
+
+.swiper {
+  width: 100%;
+  height: 100%;
+}
+
+.swiper-wrapper {
+  margin-bottom: 20px;
+}
+
+.swiper-slide {
+  text-align: center;
+  font-size: 18px;
+  background: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.swiper-slide img {
+  display: block;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.swiper-pagination-bullet {
+  background-color: #000000;
+  height: 13px;
+  width: 13px;
+  border: 2px solid #FFFFFF;
+}
+
+.swiper-pagination-bullet-active {
+  box-shadow: 0 0 0 1px #000000;
+}

app/src/components/logTrackMaps/LogTrackMaps.tsx

@@ -0,0 +1,64 @@
+import { useEffect, useState } from 'react';
+import { LogTrackMapsProps } from './LogTrackMapsProps.interface';
+import { useHttpClient } from '../../hooks/httpClient/UseHttpClient';
+import { AxiosInstance, AxiosResponse } from 'axios';
+import { useAccessToken } from '../../hooks/accessToken/UseAcessToken';
+import { useIsAuthenticated } from '@azure/msal-react';
+import { MapContainer, TileLayer } from 'react-leaflet';
+import ReactLeafletKml from 'react-leaflet-kml';
+import 'swiper/css';
+import 'swiper/css/pagination';
+import 'swiper/css';
+import './LogTrackMaps.css';
+import 'leaflet/dist/leaflet.css';
+
+const LogTrackMaps = ({ rowKey, trackUrls }: LogTrackMapsProps) => {
+  const [tracks, setTracks] = useState<any[]>([])
+  const httpClient: AxiosInstance = useHttpClient();
+  const { getAccessToken } = useAccessToken();
+  const isAuthenticated = useIsAuthenticated();
+  
+  useEffect(() => {
+    const getTracks = async () => {
+      const convertedTracks: any[] = []
+
+      for (const trackUrl of trackUrls) {
+        const trackUrlSplit = trackUrl.split('/')
+        const filename = trackUrlSplit[trackUrlSplit.length - 1];
+        const config = isAuthenticated
+          ? { headers: { Authorization: await getAccessToken() } }
+          : {};
+        const response: AxiosResponse = await httpClient.get(
+          `api/logs/log/${rowKey}/track?fileName=${filename}`,
+          config
+        );
+        const kml = new DOMParser().parseFromString(response.data, 'text/xml')
+         
+        convertedTracks.push(kml);
+      }
+
+      setTracks(convertedTracks)
+    }
+
+    getTracks();
+  }, [trackUrls])
+
+  return (
+    <MapContainer 
+      center={[45.14489, -93.21019]} 
+      scrollWheelZoom={false}
+      style={{ height: '500px', width: '100%' }}
+      zoom={8}
+    >
+      <TileLayer
+        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+        url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+      />
+      {tracks.length > 0 && tracks.map((track) => (
+        <ReactLeafletKml kml={track} />
+      ))}
+    </MapContainer>
+  );
+}
+
+export default LogTrackMaps;

app/src/components/logTrackMaps/LogTrackMapsProps.interface.ts

@@ -0,0 +1,4 @@
+export interface LogTrackMapsProps {
+  rowKey: string;
+  trackUrls: string[];
+}

app/src/components/logTracks/LogTracks.tsx

@@ -0,0 +1,209 @@
+import { useEffect, useReducer } from "react";
+import { Button, Drawer, Grid, Icon, IconButton, IconName, Spinner, TextField, theme, Typography, useMediaQuery } from "@noahspan/noahspan-components";
+import { useHttpClient } from "../../hooks/httpClient/UseHttpClient";
+import { AxiosInstance, AxiosResponse } from "axios";
+import { useAccessToken } from "../../hooks/accessToken/UseAcessToken";
+import { LogTracksProps } from "./LogTracksProps.interface";
+import { FormMode } from "../../enums/formMode";
+import { useIsAuthenticated } from "@azure/msal-react";
+import { ILogbookEntry } from "../logbook/ILogbookEntry";
+import ConfirmationDialog from "../confirmationDialog/ConfirmationDialog";
+import { initialState, reducer } from "./reducer";
+import LogTrackMaps from "../logTrackMaps/LogTrackMaps";
+
+const LogTracks = ({ isDrawerOpen, mode, onOpenClose, selectedRowKey }: LogTracksProps) => {
+  const [state, dispatch] = useReducer(reducer, initialState)
+  const httpClient: AxiosInstance = useHttpClient();
+  const { getAccessToken } = useAccessToken();
+  const isAuthenticated = useIsAuthenticated();
+  
+  const isMedium = useMediaQuery(theme.breakpoints.up('md'));
+
+  const getConfig = async () => {
+    const config = isAuthenticated
+      ? { headers: { Authorization: await getAccessToken() } }
+      : {};
+
+    return config
+  }
+
+  const getLog = async (): Promise<ILogbookEntry> => {
+    const logResponse: AxiosResponse = await httpClient.get(
+      `api/logs/log/${selectedRowKey}`,
+      await getConfig()
+    );
+    const logData: ILogbookEntry = logResponse.data;
+
+    return logData
+  }
+
+  const handleFileUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    try {
+      dispatch({ type: 'SET_IS_LOADING', payload: true})
+
+      const file = event.target.files![0]
+      const formData = new FormData();
+      const config = await getConfig();
+      const formDataConfig = {
+        headers: {
+          ...config.headers,
+          'Content-Type': 'multipart/form-data'
+        }
+      }
+      
+      formData.append('file', file);
+
+      const uploadResponse: AxiosResponse = await httpClient.post(`api/logs/log/${selectedRowKey}/track`, formData, formDataConfig);
+      const uploadUrl = uploadResponse.data.url;
+      const log = await getLog();
+      const tracks: string[] = log.tracks ? JSON.parse(log.tracks!) : [];
+
+      tracks.push(uploadUrl)
+      log.tracks = JSON.stringify(tracks);
+      await httpClient.put(`api/logs/log/${selectedRowKey}`, log, config);
+      
+      const updatedLog = await getLog();
+
+      dispatch({ type: 'SET_TRACKS', payload: JSON.parse(updatedLog.tracks!) })
+    } catch (error) {
+      console.log(error)
+    } finally {
+      dispatch({ type: 'SET_IS_LOADING', payload: false });
+    }
+  }
+
+  const onCancel = () => {
+    onOpenClose(FormMode.CANCEL)
+  }
+
+  const onDeleteTrack = async (fileName: string, index: number) => {
+    dispatch({ type: 'SET_ON_DELETE_TRACK', payload: { isConfirmDialogOpen: true, selectedTrack: { fileName: fileName, index: index }}})
+  }
+
+  const onConfirmDialogConfirm = async () => {
+    try {
+      const config = await getConfig();
+
+      await httpClient.delete(`api/logs/log/${selectedRowKey}/track?fileName=${state.selectedTrack!.fileName}`, config);
+
+      const log = await getLog();
+      const tracks: string[] = JSON.parse(log.tracks!);
+
+      tracks.splice(state.selectedTrack!.index, 1);
+      log.tracks = JSON.stringify(tracks);
+      await httpClient.put(`api/logs/log/${selectedRowKey}`, log, config);
+
+      const updatedLog = await getLog();
+
+      dispatch({ type: 'SET_TRACKS', payload: JSON.parse(updatedLog.tracks!) })
+      dispatch({ type: 'SET_IS_CONFIRM_DIALOG_OPEN', payload: false })
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  const onConfirmDialogCancel = async () => {
+    dispatch({ type: 'SET_IS_CONFIRM_DIALOG_OPEN', payload: false })
+  }
+
+  useEffect(() => {
+    const updateTracks = async () => {
+      const log = await getLog();
+      
+      dispatch({ type: 'SET_TRACKS', payload: JSON.parse(log.tracks!) });
+    }
+
+    updateTracks();
+  }, [])
+
+  return (
+    <Drawer
+      open={isDrawerOpen}
+      anchor='right'
+      PaperProps={{
+        sx: {
+          padding: '30px',
+          width: isMedium ? '33%' : '75%'
+        }
+      }}
+    >
+      <Grid container spacing={2}>
+        <Grid size={11}>
+          <Typography variant="h4">{`${mode.toString().toLowerCase().charAt(0).toUpperCase() + mode.toString().slice(1).toLowerCase()} Tracks`}</Typography>
+        </Grid>
+        <Grid display="flex" justifyContent="right" size={1}>
+          <IconButton disabled={state.isLoading ? true : false} onClick={onCancel}>
+            <Icon iconName={IconName.XMARK} />
+          </IconButton>
+        </Grid>
+        {mode === FormMode.EDIT &&
+          <>
+            {state.isLoading &&
+              <>
+                <Grid display="flex" justifyContent="center" size={12}>
+                  <Spinner />
+                </Grid>
+                <Grid display="flex" justifyContent="center" size={12}>
+                  Loading...
+                </Grid>
+              </>
+            }
+            {!state.isLoading && state.tracks.length > 0 && state.tracks.map((track, index) => {
+              const trackSplit = track.split('/')
+              const filename = trackSplit[trackSplit.length - 1];
+
+              return (
+                <>
+                  <Grid size={11}>
+                    <TextField disabled={true} fullWidth value={filename} />
+                  </Grid>
+                  <Grid size={1}>
+                    <IconButton onClick={() => onDeleteTrack(filename, index)}><Icon iconName={IconName.TRASH} /></IconButton>
+                  </Grid>
+                </>
+              )
+            })}
+            <Grid display='flex' gap={2} justifyContent='right' size={12}>
+              <Button
+                disabled={state.isLoading ? true : false}
+                startIcon={<Icon iconName={IconName.XMARK} />}
+                variant="outlined"
+                onClick={onCancel}
+                size="small"
+              >
+                Close
+              </Button>
+              {mode.toString() !== FormMode.VIEW && (
+                <Button
+                  component='label'
+                  disabled={state.isLoading ? true : false}
+                  startIcon={<Icon iconName={IconName.UPLOAD} />}
+                  variant='contained'
+                >
+                  Upload Track
+                  <input hidden onChange={handleFileUpload} type='file' />
+                </Button>
+              )}
+            </Grid>
+          </>
+        }
+        {mode === FormMode.VIEW && 
+          <LogTrackMaps rowKey={selectedRowKey!} trackUrls={state.tracks} />
+        }
+      </Grid>
+      {state.isConfirmDialogOpen && (
+        <ConfirmationDialog
+          contentText="Are you sure you want to delete this track?"
+          isLoading={state.isConfirmDialogLoading}
+          isOpen={state.isConfirmDialogOpen}
+          onCancel={onConfirmDialogCancel}
+          onConfirm={onConfirmDialogConfirm}
+          title="Confirm Delete"
+        />
+      )}
+      
+    </Drawer>
+  )
+}
+
+export default LogTracks;

app/src/components/logTracks/LogTracksProps.interface.ts

@@ -0,0 +1,8 @@
+import { FormMode } from "../../enums/formMode";
+
+export interface LogTracksProps {
+  isDrawerOpen: boolean;
+  mode: FormMode;
+  onOpenClose: (mode: FormMode) => void;
+  selectedRowKey: string | undefined;
+}

app/src/components/logTracks/LogTracksState.interface.ts

@@ -0,0 +1,10 @@
+export interface LogTracksState {
+  isConfirmDialogOpen: boolean;
+  isConfirmDialogLoading: boolean;
+  isLoading: boolean;
+  selectedTrack: {
+    fileName: string,
+    index: number
+  } | undefined;
+  tracks: string[];
+}

app/src/components/logTracks/reducer.ts

@@ -0,0 +1,55 @@
+import { LogTracksState } from "./LogTracksState.interface";
+
+type Action = 
+  | { type: 'SET_IS_CONFIRM_DIALOG_OPEN'; payload: boolean }
+  | { type: 'SET_IS_CONFORM_DIALOG_LOADING'; payload: boolean }
+  | { type: 'SET_IS_LOADING'; payload: boolean }
+  | { type: 'SET_ON_DELETE_TRACK'; payload: { isConfirmDialogOpen: boolean, selectedTrack: { fileName: string, index: number } }}
+  | { type: 'SET_TRACKS'; payload: string[] };
+
+export const initialState: LogTracksState = {
+  isConfirmDialogOpen: false,
+  isConfirmDialogLoading: false,
+  isLoading: false,
+  selectedTrack: undefined,
+  tracks: []
+}
+
+export const reducer = (state: LogTracksState, action: Action): LogTracksState => {
+  switch (action.type) {
+    case 'SET_IS_CONFIRM_DIALOG_OPEN': {
+      return {
+        ...state,
+        isConfirmDialogOpen: action.payload
+      }
+    }
+    case 'SET_IS_CONFORM_DIALOG_LOADING': {
+      return {
+        ...state,
+        isConfirmDialogLoading: action.payload
+      }
+    }
+    case 'SET_IS_LOADING': {
+      return {
+        ...state,
+        isLoading: action.payload
+      }
+    }
+    case 'SET_ON_DELETE_TRACK': {
+      return {
+        ...state,
+        isConfirmDialogOpen: action.payload.isConfirmDialogOpen,
+        selectedTrack: action.payload.selectedTrack
+      }
+    }
+    case 'SET_TRACKS': {
+      return {
+        ...state,
+        tracks: action.payload
+      }
+    }
+    default: {
+      return state
+    }
+  }
+}

app/src/components/logbook/ILogbookEntry.ts

@@ -1,3 +1,5 @@
+import { ColumnDef } from "@noahspan/noahspan-components";
+
 export interface ILogbookEntry {
   partitionKey: string;
   rowKey: string;
@@ -25,5 +27,6 @@ export interface ILogbookEntry {
   night: number | null;
   solo: number | null;
   pilotInCommand: number | null;
+  tracks: string | undefined;
   notes: string;
 }

app/src/components/logbook/ILogbookState.ts

@@ -1,14 +1,18 @@
+import { ColumnDef } from '@noahspan/noahspan-components';
 import { FormMode } from '../../enums/formMode';
 import { Alert } from '../../interfaces/Alert.interface';
 import { ILogbookEntry } from './ILogbookEntry';
 
 export interface ILogbookState {
   alert: Alert | undefined;
+  columns: ColumnDef<ILogbookEntry>[];
   entries: ILogbookEntry[];
   formMode: FormMode;
   isConfirmDialogLoading: boolean;
   isConfirmDialogOpen: boolean;
   isFormOpen: boolean;
   isLoading: boolean;
+  isTracksOpen: boolean;
   selectedEntryId: string | undefined;
+  tracksMode: FormMode;
 }

app/src/components/logbook/Logbook.tsx

@@ -7,6 +7,7 @@ import {
   ColumnDef,
   Grid,
   Icon,
+  IconButton,
   IconName,
   Spinner,
   Table,
@@ -20,10 +21,12 @@ import { AxiosError, AxiosInstance, AxiosResponse } from 'axios';
 import { useAccessToken } from '../../hooks/accessToken/UseAcessToken';
 import { useIsAuthenticated } from '@azure/msal-react';
 import { FormMode } from '../../enums/formMode';
+import { authColumns, unauthColumns } from './columns';
 import ActionMenu from '../actionMenu/ActionMenu';
 import ConfirmationDialog from '../confirmationDialog/ConfirmationDialog';
 import { ILogbookEntry } from './ILogbookEntry';
 import LogbookCard from '../logbookCard/LogbookCard';
+import LogTracks from '../logTracks/LogTracks';
 
 const Logbook: React.FC<unknown> = () => {
   const [state, dispatch] = useReducer(reducer, initialState);
@@ -31,12 +34,41 @@ const Logbook: React.FC<unknown> = () => {
   const isAuthenticated = useIsAuthenticated();
   const { getAccessToken } = useAccessToken();
   const isMedium = useMediaQuery(theme.breakpoints.up('md'));
+  const actionsColumn: ColumnDef<ILogbookEntry> = {
+    header: 'Actions',
+    meta: {
+      align: 'center',
+      headerAlign: 'center'
+    },
+    cell: (info: any) => (
+      <ActionMenu
+        id={info.row.original.rowKey}
+        onDelete={onDeleteEntry}
+        onOpenCloseForm={onOpenCloseEntryForm}
+        onOpenCloseTracks={onOpenCloseTracks}
+      />
+    )
+  }
+  const tracksColumn: ColumnDef<ILogbookEntry> = {
+    accessorKey: 'tracks',
+    header: 'Tracks',
+    cell: (info: any) => {
+      if (info.row.original.tracks && JSON.parse(info.row.original.tracks).length > 0) {
+        return (
+          <IconButton onClick={() => onOpenCloseTracks(FormMode.VIEW, info.row.original.rowKey)}><Icon iconName={IconName.MAP_LOCATION_DOT} /></IconButton>
+        )
+      }
+    }
+  }
 
   const getLogbookEntries = async () => {
     try {
       dispatch({ type: 'SET_IS_LOADING', payload: true });
 
-      const response: AxiosResponse = await httpClient.get(`api/logs`);
+      const config = isAuthenticated
+        ? { headers: { Authorization: await getAccessToken() } }
+        : {};
+      const response: AxiosResponse = await httpClient.get(`api/logs`, config);
       const entries: ILogbookEntry[] = response.data;
       
       entries.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
@@ -91,6 +123,34 @@ const Logbook: React.FC<unknown> = () => {
     }
   };
 
+  const onOpenCloseTracks = (mode: FormMode, rowKey?: string) => {
+    switch(mode) {
+      case FormMode.EDIT:
+      case FormMode.VIEW:
+        dispatch({
+          type: 'SET_OPEN_CLOSE_TRACKS',
+          payload: {
+            tracksMode: mode,
+            isTracksOpen: true,
+            selectedRowKey: rowKey
+          }
+        })
+
+        break;
+      case FormMode.CANCEL:
+        dispatch({
+          type: 'SET_OPEN_CLOSE_TRACKS',
+          payload: {
+            tracksMode: mode,
+            isTracksOpen: false,
+            selectedRowKey: undefined
+          }
+        })
+
+        break;
+    }
+  }
+
   const onDeleteEntry = (entryId: string) => {
     dispatch({
       type: 'SET_DELETE',
@@ -133,292 +193,36 @@ const Logbook: React.FC<unknown> = () => {
     });
   };
 
-  const unauthColumns: ColumnDef<ILogbookEntry>[] = [
-    {
-      accessorKey: 'pilotName',
-      header: 'Pilot',
-    },
-    {
-      accessorKey: 'date',
-      header: 'Date'
-    },
-    {
-      accessorKey: 'aircraftMakeModel',
-      header: 'Aircraft Make & Model'
-    },
-    {
-      id: 'route',
-      header: 'Route of Flight',
-      meta: {
-        headerAlign: 'center'
-      },
-      columns: [
-        {
-          accessorKey: 'routeFrom',
-          header: 'From'
-        },
-        {
-          accessorKey: 'routeTo',
-          header: 'To'
-        }
-      ]
-    },
-    {
-      accessorKey: 'durationOfFlight',
-      header: 'Duration Of Flight',
-      meta: {
-        align: 'right',
-        headerAlign: 'right'
-      },
-      cell: (info: any) =>
-        info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-    },
-    {
-      accessorKey: 'notes',
-      header: 'Notes'
-    },
-    {
-      header: 'Actions',
-      meta: {
-        align: 'center',
-        headerAlign: 'center'
-      },
-      cell: (info: any) => (
-        <ActionMenu
-          id={info.row.original.rowKey}
-          onDelete={onDeleteEntry}
-          onOpenCloseForm={onOpenCloseEntryForm}
-        />
-      )
-    }
-  ]
+  useEffect(() => {
+    let newColumns: ColumnDef<ILogbookEntry>[];
 
-  const authColumns: ColumnDef<ILogbookEntry>[] = [
-    {
-      accessorKey: 'pilotName',
-      header: 'Pilot',
-    },
-    {
-      accessorKey: 'date',
-      header: 'Date'
-    },
-    {
-      accessorKey: 'aircraftMakeModel',
-      header: 'Aircraft Make & Model'
-    },
-    {
-      accessorKey: 'aircraftIdentity',
-      header: 'Aircraft Identity',
-    },
-    {
-      id: 'route',
-      header: 'Route of Flight',
-      meta: {
-        headerAlign: 'center'
-      },
-      columns: [
-        {
-          accessorKey: 'routeFrom',
-          header: 'From'
-        },
-        {
-          accessorKey: 'routeTo',
-          header: 'To'
-        }
-      ]
-    },
-    {
-      accessorKey: 'durationOfFlight',
-      header: 'Duration Of Flight',
-      meta: {
-        align: 'right',
-        headerAlign: 'right'
-      },
-      cell: (info: any) =>
-        info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-    },
-    {
-      accessorKey: 'singleEngineLand',
-      header: 'Single Engine Land',
-      meta: {
-        align: 'right',
-        headerAlign: 'right'
-      },
-      cell: (info: any) =>
-        info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-    },
-    {
-      id: 'landings',
-      header: 'Landings',
-      meta: {
-        headerAlign: 'center'
-      },
-      columns: [
-        {
-          accessorKey: 'landingsDay',
-          header: 'Day',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          }
-        },
-        {
-          accessorKey: 'landingsNight',
-          header: 'Night',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          }
-        }
-      ]
-    },
-    {
-      id: 'instrument',
-      header: 'Instrument',
-      meta: {
-        headerAlign: 'center'
-      },
-      columns: [
-        {
-          accessorKey: 'instrumentActual',
-          header: 'Actual',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'instrumentSimulated',
-          header: 'Simulated',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'instrumentApproaches',
-          header: 'Approaches',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          }
-        },
-        {
-          accessorKey: 'instrumentHolds',
-          header: 'Holds',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          }
-        },
-        {
-          accessorKey: 'instrumentNavTrack',
-          header: 'Nav/Track',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          }
-        }
-      ]
-    },
-    {
-      id: 'experienceTraining',
-      header: 'Type of pilot experience or training',
-      meta: {
-        headerAlign: 'center'
-      },
-      columns: [
-        {
-          accessorKey: 'groundTrainingReceived',
-          header: 'Ground Training Received',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'flightTrainingReceived',
-          header: 'Flight Training Received',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'crossCountry',
-          header: 'Cross Country',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'night',
-          header: 'Night',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'solo',
-          header: 'Solo',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        },
-        {
-          accessorKey: 'pilotInCommand',
-          header: 'Pilot In Command',
-          meta: {
-            align: 'right',
-            headerAlign: 'right'
-          },
-          cell: (info: any) =>
-            info.getValue() ? parseFloat(info.getValue()).toFixed(1) : ''
-        }
-      ]
-    },
-    {
-      accessorKey: 'notes',
-      header: 'Notes'
-    },
-    {
-      header: 'Actions',
-      meta: {
-        align: 'center',
-        headerAlign: 'center'
-      },
-      cell: (info: any) => (
-        <ActionMenu
-          id={info.row.original.rowKey}
-          onDelete={onDeleteEntry}
-          onOpenCloseForm={onOpenCloseEntryForm}
-        />
-      )
+    if (isAuthenticated) {
+      newColumns = [...authColumns];
+    } else {
+      newColumns = [...unauthColumns];
     }
-  ];
+
+    const actionsColumnExists = newColumns.find((column) => column.id === 'actions');
+    const tracksColumnExists = newColumns.find((column) => column.id === 'actions');
+    
+    if (!actionsColumnExists) {
+      newColumns.push(actionsColumn);
+    }
+
+    if (!tracksColumnExists) {
+      const notesColumnIndex = newColumns.findIndex((column) => column.id === 'notes')
+
+      newColumns.splice(notesColumnIndex, 0, tracksColumn)
+    }
+
+    dispatch({ type: 'SET_COLUMNS', payload: newColumns })
+  }, [isAuthenticated])
 
   useEffect(() => {
     if (!state.isFormOpen) {
       getLogbookEntries();
     }
-  }, [state.isFormOpen]);
+  }, [state.isFormOpen, state.isTracksOpen]);
 
   return (
     <Box sx={{ margin: '20px' }}>
@@ -453,11 +257,11 @@ const Logbook: React.FC<unknown> = () => {
         )}
         {!state.isLoading && (
           <Grid size={12}>
-            {isMedium && state.entries.length > 0 && (
-              <Table columns={isAuthenticated ? authColumns : unauthColumns} data={state.entries} />
+            {isMedium && state.columns && state.columns.length > 0 && state.entries.length > 0 && (
+              <Table columns={state.columns} data={state.entries} />
             )}
             {!isMedium && state.entries.length > 0 &&
-              <LogbookCard logs={state.entries} onDelete={onDeleteEntry} onOpenCloseForm={onOpenCloseEntryForm} />
+              <LogbookCard logs={state.entries} onDelete={onDeleteEntry} mode='logbook' onOpenCloseForm={onOpenCloseEntryForm} />
             }
           </Grid>
         )}
@@ -490,6 +294,14 @@ const Logbook: React.FC<unknown> = () => {
           title="Confirm Delete"
         />
       )}
+      {state.isTracksOpen && 
+        <LogTracks
+          isDrawerOpen={state.isTracksOpen}
+          mode={state.tracksMode}
+          onOpenClose={(mode) => onOpenCloseTracks(mode)}
+          selectedRowKey={state.selectedEntryId}
+        />
+      }
     </Box>
   );
 };

app/src/components/logbook/columns.tsx

@@ -0,0 +1,278 @@
+import {
+  CellContext,
+  ColumnDef,
+  HeaderContext,
+} from '@noahspan/noahspan-components';
+import { ILogbookEntry } from './ILogbookEntry';
+
+const columnTotal = (info: HeaderContext<ILogbookEntry, unknown>): number => {
+  const values: number[] = info.table.getFilteredRowModel().rows.map((row: any) => Number(row.getValue(info.column.id))).filter((value: any) => !Number.isNaN(value));
+  let total: number = 0;
+  
+  if (values.length > 0) {
+    total = values.reduce((accumulator, currentValue) => accumulator + currentValue, total)
+  }
+
+  return total;
+} 
+
+const pilotName: ColumnDef<ILogbookEntry> = {
+  id: 'pilotName',
+  accessorKey: 'pilotName',
+  header: 'Pilot',
+  footer: 'PAGE TOTALS'
+}
+const date: ColumnDef<ILogbookEntry> = {
+  id: 'date',
+  accessorKey: 'date',
+  header: 'Date'
+}
+const aircraftMakeModel: ColumnDef<ILogbookEntry> = {
+  id: 'aircraftMakeModel',
+  accessorKey: 'aircraftMakeModel',
+  header: 'Aircraft Make & Model'
+}
+const route: ColumnDef<ILogbookEntry> = {
+  id: 'route',
+  header: 'Route of Flight',
+  meta: {
+    headerAlign: 'center'
+  },
+  columns: [
+    {
+      id: 'routeFrom',
+      accessorKey: 'routeFrom',
+      header: 'From'
+    },
+    {
+      id: 'routeTo',
+      accessorKey: 'routeTo',
+      header: 'To'
+    }
+  ]
+}
+const durationOfFlight: ColumnDef<ILogbookEntry> = {
+  id: 'durationOfFlight',
+  accessorKey: 'durationOfFlight',
+  header: 'Duration Of Flight',
+  meta: {
+    align: 'right',
+    headerAlign: 'right'
+  },
+  cell: (info: CellContext<ILogbookEntry, unknown>) =>
+    info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
+  footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : ''
+}
+const notes: ColumnDef<ILogbookEntry> = {
+  id: 'notes',
+  accessorKey: 'notes',
+  header: 'Notes'
+}
+
+export const unauthColumns: ColumnDef<ILogbookEntry>[] = [
+  pilotName,
+  date,
+  aircraftMakeModel,
+  route,
+  durationOfFlight,
+  notes
+]
+
+export const authColumns: ColumnDef<ILogbookEntry>[] = [
+  pilotName,
+  date,
+  aircraftMakeModel,
+  {
+    id: 'aircraftIdentity',
+    accessorKey: 'aircraftIdentity',
+    header: 'Aircraft Identity',
+  },
+  route,
+  durationOfFlight,
+  {
+    id: 'singleEngineLand',
+    accessorKey: 'singleEngineLand',
+    header: 'Single Engine Land',
+    meta: {
+      align: 'right',
+      headerAlign: 'right'
+    },
+    cell: (info: CellContext<ILogbookEntry, unknown>) =>
+      info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
+    footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : ''
+  },
+  {
+    id: 'landings',
+    header: 'Landings',
+    meta: {
+      headerAlign: 'center'
+    },
+    columns: [
+      {
+        id: 'landingsDay',
+        accessorKey: 'landingsDay',
+        header: 'Day',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        }
+      },
+      {
+        id: 'landingsNight',
+        accessorKey: 'landingsNight',
+        header: 'Night',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        }
+      }
+    ]
+  },
+  {
+    id: 'instrument',
+    header: 'Instrument',
+    meta: {
+      headerAlign: 'center'
+    },
+    columns: [
+      {
+        id: 'instrumentActual',
+        accessorKey: 'instrumentActual',
+        header: 'Actual',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : '',
+      },
+      {
+        id: 'instrumentSimulated',
+        accessorKey: 'instrumentSimulated',
+        header: 'Simulated',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'instrumentApproaches',
+        accessorKey: 'instrumentApproaches',
+        header: 'Approaches',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        }
+      },
+      {
+        id: 'instrumentHolds',
+        accessorKey: 'instrumentHolds',
+        header: 'Holds',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        }
+      },
+      {
+        id: 'instrumentNavTrack',
+        accessorKey: 'instrumentNavTrack',
+        header: 'Nav/Track',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        }
+      }
+    ]
+  },
+  {
+    id: 'experienceTraining',
+    header: 'Type of pilot experience or training',
+    meta: {
+      headerAlign: 'center'
+    },
+    columns: [
+      {
+        id: 'groundTrainingReceived',
+        accessorKey: 'groundTrainingReceived',
+        header: 'Ground Training Received',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'flightTrainingReceived',
+        accessorKey: 'flightTrainingReceived',
+        header: 'Flight Training Received',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'crossCountry',
+        accessorKey: 'crossCountry',
+        header: 'Cross Country',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'night',
+        accessorKey: 'night',
+        header: 'Night',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'solo',
+        accessorKey: 'solo',
+        header: 'Solo',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      },
+      {
+        id: 'pilotInCommand',
+        accessorKey: 'pilotInCommand',
+        header: 'Pilot In Command',
+        footer: (info: HeaderContext<ILogbookEntry, unknown>) => columnTotal(info) > 0 ? columnTotal(info).toFixed(1) : '',
+        meta: {
+          align: 'right',
+          headerAlign: 'right'
+        },
+        cell: (info: CellContext<ILogbookEntry, unknown>) =>
+          info.getValue() ? parseFloat(info.getValue() as string).toFixed(1) : ''
+      }
+    ]
+  },
+  notes
+]

app/src/components/logbook/reducer.ts

@@ -1,9 +1,11 @@
+import { ColumnDef } from '@noahspan/noahspan-components';
 import { FormMode } from '../../enums/formMode';
 import { Alert } from '../../interfaces/Alert.interface';
 import { ILogbookEntry } from './ILogbookEntry';
 import { ILogbookState } from './ILogbookState';
 
 type Action =
+  | { type: 'SET_COLUMNS'; payload: ColumnDef<ILogbookEntry>[] }
   | {
       type: 'SET_DELETE';
       payload: {
@@ -23,17 +25,21 @@ type Action =
         selectedEntryId: string | undefined;
         isFormOpen: boolean;
       };
-    };
+    }
+  | { type: 'SET_OPEN_CLOSE_TRACKS'; payload: { tracksMode: FormMode, selectedRowKey: string | undefined, isTracksOpen: boolean; }};
 
 export const initialState: ILogbookState = {
   alert: undefined,
+  columns: [],
   entries: [],
   formMode: FormMode.CANCEL,
   isConfirmDialogLoading: false,
   isConfirmDialogOpen: false,
   isFormOpen: false,
   isLoading: false,
-  selectedEntryId: undefined
+  isTracksOpen: false,
+  selectedEntryId: undefined,
+  tracksMode: FormMode.CANCEL
 };
 
 export const reducer = (
@@ -41,6 +47,12 @@ export const reducer = (
   action: Action
 ): ILogbookState => {
   switch (action.type) {
+    case 'SET_COLUMNS': {
+      return {
+        ...state,
+        columns: action.payload
+      }
+    }
     case 'SET_DELETE': {
       return {
         ...state,
@@ -86,6 +98,14 @@ export const reducer = (
         selectedEntryId: action.payload.selectedEntryId
       };
     }
+    case 'SET_OPEN_CLOSE_TRACKS': {
+      return {
+        ...state,
+        tracksMode: action.payload.tracksMode,
+        isTracksOpen: action.payload.isTracksOpen,
+        selectedEntryId: action.payload.selectedRowKey
+      }
+    }
     default: {
       return state;
     }

app/src/components/logbookCard/LogbookCard.tsx

@@ -1,18 +1,19 @@
 import { Card, CardContent, CardHeader, Grid, Typography } from "@noahspan/noahspan-components";
 import { LogbookCardProps } from "./LogbookCardProps.interface";
-import { useEffect } from "react";
 import ActionMenu from "../actionMenu/ActionMenu";
+import LogTrackMaps from "../logTrackMaps/LogTrackMaps";
 
 
-const LogbookCard = ({ logs, onDelete, onOpenCloseForm }: LogbookCardProps) => {  
+const LogbookCard = ({ logs, mode, onDelete, onOpenCloseForm }: LogbookCardProps) => {  
   return (
     <Grid container spacing={2}>
       {logs.map((log) => {
+        console.log(log)
         return (
           <Grid size={12}>
             <Card key={log.rowKey}>
               <CardHeader
-                action={<ActionMenu id={log.rowKey} onDelete={onDelete} onOpenCloseForm={onOpenCloseForm} />}
+                action={mode === 'logbook' ? <ActionMenu id={log.rowKey} onDelete={onDelete!} onOpenCloseForm={onOpenCloseForm!} /> : null}
                 subheader={log.pilotName}
                 title={log.date}
                 slotProps={{
@@ -26,6 +27,14 @@ const LogbookCard = ({ logs, onDelete, onOpenCloseForm }: LogbookCardProps) => {
               />
               <CardContent>
                 <Grid container spacing={1}>
+                  {mode === 'flights' && log.tracks && JSON.parse(log.tracks).length > 0 &&
+                    <Grid size={12}>
+                      <LogTrackMaps 
+                        rowKey={log.rowKey}
+                        trackUrls={JSON.parse(log.tracks)}
+                      />
+                    </Grid>
+                  }
                   <Grid size={12}>
                     <Typography variant="subtitle2">Aircraft Make and Model</Typography>
                   </Grid>
@@ -50,6 +59,24 @@ const LogbookCard = ({ logs, onDelete, onOpenCloseForm }: LogbookCardProps) => {
                   <Grid size={12}>
                     <Typography variant="body1">{log.durationOfFlight}</Typography>
                   </Grid>
+                  {mode === 'logbook' && log.tracks && JSON.parse(log.tracks).length > 0 && 
+                    <>
+                      <Grid size={12}>
+                        <Typography variant="subtitle2">Tracks</Typography>
+                      </Grid>
+                      {JSON.parse(log.tracks).map((track: string) => {
+                        const trackSplit = track.split('/')
+                        const filename = trackSplit[trackSplit.length - 1];
+
+                        return (
+                          <Grid size={12}>
+                            <Typography variant="body1">{filename}</Typography>
+                          </Grid>
+                        )
+                        
+                      })}
+                    </>
+                  }
                   {log.notes &&
                     <>
                       <Grid size={12}>

app/src/components/logbookCard/LogbookCardProps.interface.ts

@@ -3,6 +3,7 @@ import { ILogbookEntry } from "../logbook/ILogbookEntry";
 
 export interface LogbookCardProps {
   logs: ILogbookEntry[];
-  onDelete: (entryId: string) => void;
-  onOpenCloseForm: (formMode: FormMode, id: string) => void;
+  mode: 'flights' | 'logbook';
+  onDelete?: (entryId: string) => void;
+  onOpenCloseForm?: (formMode: FormMode, id: string) => void;
 }

app/src/components/pilotForm/PilotForm.tsx

@@ -197,7 +197,7 @@ const PilotForm: React.FC<IPilotFormProps> = ({
       }}
     >
       <FormProvider {...methods}>
-        <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <form onSubmit={methods.handleSubmit(onSubmit)} style={{ paddingBottom: '50px' }}>
           <Grid container spacing={2}>
             <Grid size={11}>
               <Typography variant="h4">{`${mode.toString().toLowerCase().charAt(0).toUpperCase() + mode.toString().slice(1).toLowerCase()} Pilot`}</Typography>

app/src/components/siteNav/SiteNav.tsx

@@ -32,9 +32,13 @@ const SiteNav = () => {
   const getPages = () => {
     const pages = [
       {
-        name: 'Logbook',
+        name: 'Flights',
         url: '/'
       },
+      {
+        name: 'Logbook',
+        url: '/logbook'
+      },
       {
         name: 'Pilots',
         url: '/pilots'
@@ -79,7 +83,6 @@ const SiteNav = () => {
 
       return imageUrl;
     } catch (error) {
-      console.log(error);
       throw new Error();
     }
   };

app/src/hooks/logs/UseLogs.tsx

@@ -0,0 +1,46 @@
+import { useEffect, useState } from "react";
+import { useHttpClient } from "../httpClient/UseHttpClient";
+import { useAccessToken } from "../accessToken/UseAcessToken";
+import { useIsAuthenticated } from "@azure/msal-react";
+import { AxiosInstance, AxiosResponse } from "axios";
+import { ILogbookEntry } from "../../components/logbook/ILogbookEntry";
+
+export const useLogs = () => {
+  const [logs, setLogs] = useState<ILogbookEntry[]>();
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const httpClient: AxiosInstance = useHttpClient();
+  const { getAccessToken } = useAccessToken();
+  const isAuthenticated = useIsAuthenticated();
+
+  useEffect(() => {
+    const getLogs = async () => {
+      try {
+        setIsLoading(true);
+
+        const config = isAuthenticated
+          ? { headers: { Authorization: await getAccessToken() } }
+          : {};
+        const response: AxiosResponse = await httpClient.get(
+          `api/logs`,
+          config
+        );
+        const logs: ILogbookEntry[] = response.data;
+
+        logs.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
+
+        setLogs(logs)
+      } catch (error) {
+        return error;
+      } finally {
+        setIsLoading(false);
+      }
+    }
+
+    getLogs();
+  }, [])
+
+  return {
+    logs,
+    isLoading
+  }
+}

app/src/index.css

@@ -1,3 +1,4 @@
 body {
   background-color: #f2f2f2;
+  margin: 8px;
 }

docker-compose.yaml

@@ -8,7 +8,7 @@ services:
       - '10000:10000'
       - '10001:10001'
       - '10002:10002'
-    command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose'
+    command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose --skipApiVersionCheck'
     volumes: 
       - ./azurite-flying:/data
 

infrastructure/config/main.tf

@@ -59,6 +59,11 @@ locals {
     prod = "noahspanflyingprod"
   }
 
+  storage_containers = {
+    test = ["tracks"]
+    prod = ["tracks"]
+  }
+
   storage_tables = {
     test = ["logs", "pilots"]
     prod = ["logs", "pilots"]

infrastructure/config/outputs.tf

@@ -46,6 +46,10 @@ output "storage_account_name" {
   value = local.storage_account_name[var.environment]
 }
 
+output "storage_containers" {
+  value = local.storage_containers[var.environment]
+}
+
 output "storage_tables" {
   value = local.storage_tables[var.environment]
 }

infrastructure/main.tf

@@ -2,6 +2,7 @@ module "storage" {
   source = "github.com/noahspannbauer/noahspan-terraform/modules/storage"
   resource_group_name = var.RESOURCE_GROUP_NAME
   storage_account_name = module.environment.storage_account_name
+  storage_containers = module.environment.storage_containers
   storage_tables = module.environment.storage_tables
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/flying",
-  "version": "1.2.0",
+  "version": "1.4.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\"",