From d51e95f59e69f0d3808c99b36cd10a65a208f0b4 Mon Sep 17 00:00:00 2001
From: noahspannbauer <noahspannbauer@icloud.com>
Date: Mon, 13 Jul 2026 08:04:16 -0500
Subject: [PATCH] adding infisical action to workflows

---
 .DS_Store                                 | Bin 8196 -> 8196 bytes
 .gitea/workflows/build_and_test.yaml      |  26 +++++++++----
 .gitea/workflows/deploy.yaml              |  14 ++++++-
 .gitea/workflows/infrastructure.yaml      |  43 ++++++++++++++++++++++
 README.md                                 |  24 +++++++++++-
 client/src/components/logbook/Logbook.tsx |   2 +-
 docker-compose.yaml                       |  22 +++++++++--
 7 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 .gitea/workflows/infrastructure.yaml

diff --git a/.DS_Store b/.DS_Store
index dc31f0fdc9adfe7fd62c2ebce32c7ac6db786edb..23b43372e10323c1ca81e2f1e1c12f94cafb12c0 100644
GIT binary patch
delta 36
scmZp1XmOa}&nUDpU^hRb&}1Hg)Xnn+elc$@k(t0ev4LkZyTo610OjZml>h($

delta 72
zcmZp1XmOa}&nUbxU^hRb@MIo=RAqJsJ%)6KOokGM42DvMB+s1u<fNSZBnAcs0U&k+
Z;(43X1Xx)%FOo@Op4h;%nO)*9I{=s_5?TNN

diff --git a/.gitea/workflows/build_and_test.yaml b/.gitea/workflows/build_and_test.yaml
index fea054e..95b170d 100644
--- a/.gitea/workflows/build_and_test.yaml
+++ b/.gitea/workflows/build_and_test.yaml
@@ -21,6 +21,16 @@ jobs:
             api
             client
 
+      - name: Get Secrets from Infisical
+        uses: Infisical/secrets-action@v1.0.16
+        with:
+          domain: "https://secrets.noahspan.me" 
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: noahspan-8t6-z
+          env-slug: ${{ inputs.environment_name }}
+          secret-path: /flying
+
       - name: Install Nest CLI
         run: |
           npm install -g @nestjs/cli
@@ -28,7 +38,7 @@ jobs:
       - name: 'Setup Node'
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ vars.NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
 
       - name: Install dependencies
         run: |
@@ -44,11 +54,11 @@ jobs:
 
       - name: Build Client
         env:
-          VITE_API_URL: ${{ vars.VITE_API_URL }}
-          VITE_BASE_URL: ${{ inputs.environment_name == 'test' && vars.VITE_BASE_URL_TEST || vars.VITE_BASE_URL_PROD }}
-          VITE_CLIENT_ID: ${{ inputs.environment_name == 'test' && vars.VITE_CLIENT_ID_TEST || vars.VITE_CLIENT_ID_PROD }}
-          VITE_ISSUER_URI: ${{ vars.VITE_ISSUER_URI }}
-          VITE_TENANT_ID: ${{ vars.VITE_TENANT_ID }}
+          VITE_API_URL: ${{ env.VITE_API_URL }}
+          VITE_BASE_URL: ${{ env.VITE_BASE_URL }}
+          VITE_CLIENT_ID: ${{ env.VITE_CLIENT_ID }}
+          VITE_ISSUER_URI: ${{ env.VITE_ISSUER_URI }}
+          VITE_TENANT_ID: ${{ env.VITE_TENANT_ID }}
         run: |
           printenv
           npm run build -w client
@@ -57,8 +67,8 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ env.DOCKERHUB_TOKEN }}
 
       - name: Setup Docker Buildx
         if: ${{ github.event_name != 'pull_request' }}
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 235edca..335660f 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -21,14 +21,24 @@ jobs:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment_name }}
     steps:
+      - name: Get Secrets from Infisical
+        uses: Infisical/secrets-action@v1.0.16
+        with:
+          domain: "https://secrets.noahspan.me" 
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: noahspan-8t6-z
+          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 ${{ vars.AZURE_CLIENT_ID }} --password ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ vars.AZURE_TENANT_ID }}
+          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 ${{ vars.RESOURCE_GROUP }} --image docker.io/noahspan/${{ inputs.app_name }}:${{ inputs.version_number }}
\ No newline at end of file
+          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 }}
\ No newline at end of file
diff --git a/.gitea/workflows/infrastructure.yaml b/.gitea/workflows/infrastructure.yaml
new file mode 100644
index 0000000..3fc5c49
--- /dev/null
+++ b/.gitea/workflows/infrastructure.yaml
@@ -0,0 +1,43 @@
+name: 'Infrastructure'
+on:
+  workflow_dispatch:
+    inputs:
+      environment_name:
+        type: string
+
+jobs:
+  infrastructure:
+    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: "https://secrets.noahspan.me" 
+          client-id: ${{ secrets.INFISICAL_CLIENT_ID }}
+          client-secret: ${{ secrets.INFISICAL_CLIENT_SECRET }}
+          project-slug: noahspan-8t6-z
+          env-slug: ${{ inputs.environment_name }}
+          secret-path: /flying/terraform
+
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v4
+
+      - name: Terraform init
+        uses: |
+          terraform init -input=false
+
+      - name: Terraform plan
+        uses: |
+          terraform plan -no-color -input=false
+
+      - name: Terraform apply
+        uses: |
+          terraform apply -no-color -
+          
\ No newline at end of file
diff --git a/README.md b/README.md
index f2824a3..cba97c3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,23 @@
-# Flying (React and NestJS)
+# Flying
 
-A pilot logbook app
+A web app for tracking pilot flight hours and sharing flight tracks.
+
+## Built With
+
+## Getting Started
+
+### Prerequisites
+
+### Installation
+
+## Usage
+
+## Roadmap
+
+- [ ] Expense tracking for plane rental, instructor fees, and fuel rates
+- [ ] Export logbook to CSV
+- [ ] 
+
+## License
+
+## Contact
diff --git a/client/src/components/logbook/Logbook.tsx b/client/src/components/logbook/Logbook.tsx
index 2e6606c..3d1e71c 100644
--- a/client/src/components/logbook/Logbook.tsx
+++ b/client/src/components/logbook/Logbook.tsx
@@ -561,7 +561,7 @@ const Logbook: React.FC<unknown> = () => {
           </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'>
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 40362fc..6cc9dfe 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,15 +3,30 @@ version: '3.8'
 services:
   azurite:
     container_name: azurite-flying
-    image: mcr.microsoft.com/azure-storage/azurite
+    image: mcr.microsoft.com/azure-storage/azurite 
     ports:
       - '10000:10000'
       - '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
@@ -51,6 +66,7 @@ services:
         condition: service_started
 
 volumes:
-  # azurite-data:
+  azurite-data:
   backup:
-  data:
\ No newline at end of file
+  data:
+  seed-data:
\ No newline at end of file