fixing logbook skip take order by

.gitea/workflows/deploy.yaml

@@ -1,44 +0,0 @@
-name: Deploy
-on:
-  workflow_call:
-    inputs:
-      app_name:
-        required: true
-        type: string
-      environment_name:
-        required: true
-        type: string
-      version_number:
-        required: true
-        type: string
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    environment: ${{ inputs.environment_name }}
-    steps:
-      - name: Get Secrets from Infisical
-        uses: Infisical/secrets-action@v1.0.16
-        with:
-          domain: ${{ secrets.INFISICAL_DOMAIN }}
-          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
-          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
-          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
-          env-slug: ${{ inputs.environment_name }}
-          secret-path: /flying
-
-      - name: Install Azure CLI
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-
-      - name: Log in to Azure
-        run: |
-          az login --service-principal --username ${{ env.AZURE_CLIENT_ID }} --password ${{ env.AZURE_CLIENT_SECRET }} --tenant ${{ env.AZURE_TENANT_ID }}
-
-      - name: Update Container App
-        run: |
-          az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group ${{ env.RESOURCE_GROUP }} --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}

.gitea/workflows/pull_request.yaml

@@ -1,29 +0,0 @@
-name: Pull Request
-
-on:
-  pull_request:
-
-jobs:
-  changes:
-    uses: ./.gitea/workflows/changes.yaml
-
-  build:
-    if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true'}}
-    name: build-and-test
-    needs:
-      - changes
-    uses: ./.gitea/workflows/build_and_test.yaml
-    with:
-      environment_name: test
-      version_number: ${{ github.run_id }}
-    secrets: inherit
-
-  terraform:
-    if: ${{ needs.changes.outputs.infrastructure == 'true' }}
-    name: terraform-plan
-    needs: 
-      - changes
-    uses: ./.gitea/workflows/infrastructure.yaml
-    with:
-      environment_name: test
-    secrets: inherit

.gitea/workflows/terraform.yaml

@@ -1,45 +0,0 @@
-name: 'Terraform'
-on:
-  workflow_dispatch:
-    inputs:
-      environment_name:
-        type: string
-
-jobs:
-  terraform:
-    runs-on: ubuntu-latest
-    environment:
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            infrastructure
-
-      - name: Get Secrets from Infisical
-        uses: Infisical/secrets-action@v1.0.16
-        with:
-          domain: ${{ secrets.INFISICAL_DOMAIN }}
-          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
-          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
-          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
-          env-slug: ${{ inputs.environment_name }}
-          secret-path: /flying/terraform
-
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v4
-
-      - name: Terraform init
-        run: |
-          terraform -chdir=./infrastructure init -input=false
-
-      - name: Terraform plan
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          terraform -chdir=./infrastructure plan -no-color -input=false
-
-      - name: Terraform apply
-        if: ${{ github.event_name != 'pull_request' }}
-        run: |
-          terraform -chdir=./infrastructure apply -no-color -input=false
-          

.github/workflows/build_and_test.yaml

@@ -15,22 +15,12 @@ jobs:
     environment: ${{ inputs.environment_name }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           sparse-checkout: |
             api
             client
 
-      - name: Get Secrets from Infisical
-        uses: Infisical/secrets-action@v1.0.16
-        with:
-          domain: ${{ secrets.INFISICAL_DOMAIN }}
-          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
-          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
-          project-slug: ${{ secrets.INFISICAL_PROJECT_SLUG }}
-          env-slug: ${{ inputs.environment_name }}
-          secret-path: /flying
-
       - name: Install Nest CLI
         run: |
           npm install -g @nestjs/cli
@@ -38,7 +28,7 @@ jobs:
       - name: 'Setup Node'
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: ${{ vars.NODE_VERSION }}
 
       - name: Install dependencies
         run: |
@@ -54,20 +44,21 @@ jobs:
 
       - name: Build Client
         env:
-          VITE_API_URL: ${{ env.VITE_API_URL }}
+          VITE_API_URL: ${{ vars.VITE_API_URL }}
-          VITE_BASE_URL: ${{ env.VITE_BASE_URL }}
+          VITE_BASE_URL: ${{ vars.VITE_BASE_URL }}
-          VITE_CLIENT_ID: ${{ env.VITE_CLIENT_ID }}
+          VITE_CLIENT_ID: ${{ vars.VITE_CLIENT_ID }}
-          VITE_ISSUER_URI: ${{ env.VITE_ISSUER_URI }}
+          VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
-          VITE_TENANT_ID: ${{ env.VITE_TENANT_ID }}
+          VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
         run: |
+          printenv
           npm run build -w client
 
       - name: Log into Docker Hub
         if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
         with:
-          username: ${{ env.DOCKERHUB_USERNAME }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ env.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Setup Docker Buildx
         if: ${{ github.event_name != 'pull_request' }}

.github/workflows/changes.yaml

@@ -7,9 +7,6 @@ on:
       client:
         value: ${{ jobs.changes.outputs.client }}
 
-permissions:
-  contents: read
-
 jobs:
   changes:
     name: filter
@@ -18,13 +15,7 @@ jobs:
       api: ${{ steps.filter.outputs.api }}
       client: ${{ steps.filter.outputs.client }}
     steps:
-      - name: 'Setup Node'
+      - uses: actions/checkout@v3
-        uses: actions/setup-node@v6
-        with:
-          node-version: '22.x'
-
-      - name: Checkout
-        uses: actions/checkout@v4
       
       - uses: dorny/paths-filter@v3
         id: filter
@@ -34,5 +25,3 @@ jobs:
               - 'api/**'
             client:
               - 'client/**'
-            infrastructure:
-              - 'infrastructure/**'

.github/workflows/deploy.yaml

@@ -0,0 +1,35 @@
+name: Deploy
+on:
+  workflow_call:
+    inputs:
+      app_name:
+        required: true
+        type: string
+      environment_name:
+        required: true
+        type: string
+      version_number:
+        required: true
+        type: string
+
+permissions:
+  id-token: write
+  contents: read
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.environment_name }}
+    steps:
+      - name: Log in to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ vars.AZURE_CLIENT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          tenant-id: ${{ vars.AZURE_TENANT_ID }}
+
+      - name: Azure CLI script
+        uses: azure/cli@v2
+        with:
+          azcliversion: latest
+          inlineScript: |
+            az containerapp update --name ${{ inputs.app_name }}-${{ inputs.environment_name }} --container-name ${{ inputs.app_name }} --resource-group noahspan --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}

.github/workflows/main.yaml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   changes:
-    uses: ./.gitea/workflows/changes.yaml
+    uses: ./.github/workflows/changes.yaml
 
-  build-and-test:
+  build:
     if: ${{ needs.changes.outputs.api == 'true' || needs.changes.outputs.client == 'true' }}
-    name: build-and-test
+    name: build
     needs:
       - changes
-    uses: ./.gitea/workflows/build_and_test.yaml
+    uses: ./.github/workflows/build_and_test.yaml
     with:
       environment_name: test
       version_number: ${{ github.run_id }}
@@ -23,8 +23,8 @@ jobs:
     name: deploy
     needs: 
       - changes
-      - build-and-test
+      - build
-    uses: ./.gitea/workflows/deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: test

.github/workflows/pull_request.yaml

@@ -0,0 +1,19 @@
+name: Pull Request
+
+on:
+  pull_request:
+
+jobs:
+  changes:
+    uses: ./.github/workflows/changes.yaml
+
+  build:
+    if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}}
+    name: build
+    needs:
+      - changes
+    uses: ./.github/workflows/build_and_test.yaml
+    with:
+      environment_name: pull_request
+      version_number: ${{ github.run_id }}
+    secrets: inherit

.github/workflows/tag.yaml

@@ -5,9 +5,9 @@ on:
       - '**'
 
 jobs:
-  build-and-test:
+  build:
-    name: build-and-test
+    name: build
-    uses: ./.gitea/workflows/build_and_test.yaml
+    uses: ./.github/workflows/build_and_test.yaml
     with:
       environment_name: prod
       version_number: ${{ github.ref_name }}
@@ -16,8 +16,8 @@ jobs:
   deploy:
     name: deploy
     needs: 
-      - build-and-test
+      - build
-    uses: ./.gitea/workflows/deploy.yaml
+    uses: ./.github/workflows/deploy.yaml
     with:
       app_name: flying
       environment_name: prod

README.md

@@ -1,23 +1,3 @@
-# Flying
+# Flying (React and NestJS)
 
-A web app for tracking pilot flight hours and sharing flight tracks.
+A pilot logbook app
-
-## Built With
-
-## Getting Started
-
-### Prerequisites
-
-### Installation
-
-## Usage
-
-## Roadmap
-
-- [ ] Expense tracking for plane rental, instructor fees, and fuel rates
-- [ ] Export logbook to CSV
-- [ ] 
-
-## License
-
-## Contact

api/README.md

@@ -1,4 +1,3 @@
 # Flying API
 
 An API for the Flying app.
-...

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "2.1.5",
+  "version": "2.1.2",
   "description": "",
   "author": "",
   "private": true,

api/src/log/log.interceptor.ts

@@ -40,7 +40,7 @@ export class LogInterceptor implements NestInterceptor {
 
           if (jwtPayload[rolesKeyName].includes('Flying.Read')) {
             if (data.entities) {
-              const logs = data.entities.map((entity) => limitData(entity));
+              const logs = data.entities.map((entity) => limitData(data.entities));
 
               return {
                 entities: logs,
@@ -62,8 +62,8 @@ export class LogInterceptor implements NestInterceptor {
             const logs = publicData.slice(0, 5)
 
             return {
-              entities: logs,
+              entities: publicData,
-              total: logs.length,
+              total: data.total,
               hasNextPage: false
             };
           } else {
@@ -71,6 +71,7 @@ export class LogInterceptor implements NestInterceptor {
 
             return publicData
           }
+          
         }
       })
     );

client/README.md

@@ -1 +0,0 @@
-...

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "2.1.5",
+  "version": "2.1.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

client/src/components/logbook/Logbook.tsx

@@ -413,7 +413,7 @@ const Logbook: React.FC<unknown> = () => {
         setColumnVisibility(columnVisibility)
         dispatch({ type: 'SET_ENTRIES', payload: { entries: entries, totalEntries: response.data.total }});
 
-        if (!isUserLoggedIn && response.data.entities.length >= 5) {
+        if (!isUserLoggedIn && response.data.length >= 5) {
           dispatch({ type: 'SET_ALERT', payload: { severity: 'info', message: 'A limited number of log entries displayed. Sign in to view all log entries.'}})
         } else {
           dispatch({ type: 'SET_ALERT', payload: undefined})
@@ -528,8 +528,8 @@ const Logbook: React.FC<unknown> = () => {
   }, [state.totalEntries, state.pagination?.pageSize])
 
   useEffect(() => {
-    console.log(state.alert)
+    console.log(state.pagination)
-  }, [state.alert])
+  }, [state.pagination])
 
   return (
     <>
@@ -554,14 +554,14 @@ const Logbook: React.FC<unknown> = () => {
               onClose={() =>
                 dispatch({ type: 'SET_ALERT', payload: undefined })
               }
-              severity={state.alert.severity}
+              severity={'info'}
             >
               {state.alert.message}
             </Alert>
           </div>
         )}
         {!state.isLoading && state.entries.length > 0 && screenSize !== ScreenSize.SM && screenSize !== ScreenSize.MD && (
-          <div className='col-span-12 pr-5 pb-5 pl-5 bg-base-100 border border-base-100 rounded-lg'>
+          <div className='col-span-12 pr-5 pb-5 pl-5 bg-base-100 border border-base-100 rounded-lg '>
             <div className='overflow-x-auto mb-5'>
               <div className='col-span-12 justify-self-end self-center mt-1 mr-1 mb-2'>
                 <label className='select select-sm select-ghost'>

client/vite.config.ts

@@ -13,7 +13,6 @@ export default defineConfig({
     strictPort: true
   },
   server: {
-    host: true,
     port: 8080,
     proxy: {
       '/api': {

docker-compose.yaml

@@ -9,24 +9,9 @@ services:
       - '10001:10001'
       - '10002:10002'
     command: 'azurite --blobHost 0.0.0.0 --queueHost 0.0.0.0 --tableHost 0.0.0.0 --loose --skipApiVersionCheck'
-    healthcheck:
-      test: ["CMD", "nc", "-z", "127.0.0.1", "10000"]
     volumes: 
       - ./azurite-data:/data
 
-  seed:
-    image: mcr.microsoft.com/azure-cli
-    depends_on:
-      azurite:
-        condition: service_healthy
-    volumes:
-      - ./seed-data:/data
-    entrypoint: >
-      sh -c "
-      az storage container create --name mycontainer --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;' &&
-      az storage blob upload-batch --destination mycontainer --source /data --connection-string 'DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;'
-      "
-
   restore:
     container_name: restore
     image: litestream/litestream:0.3.13
@@ -66,7 +51,6 @@ services:
         condition: service_started
 
 volumes:
-  azurite-data:
+  # azurite-data:
   backup:
   data:
-  seed-data:

infrastructure/.gitignore

@@ -2,4 +2,3 @@
 .terraform/*
 *.tfstate
 *.tfstate.*
-.DS_Store

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahspan/flying",
-  "version": "2.1.5",
+  "version": "2.1.2",
   "scripts": {
     "start": "node api/dist/main",
     "format": "prettier --write \"**/src/**/*.ts\" \"**/test/**/*.ts\"",