chore: push stage to main

.dockerignore

@@ -0,0 +1,9 @@
+Dockerfile
+.dockerignore
+.git/
+.env
+node_modules/
+.nuxt/
+.output/
+server/utils/generated/
+README.md

.github/workflows/main.yml

@@ -10,31 +10,29 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     runs-on: ubuntu-24.04-arm
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
       # - name: Set up Docker Buildx
       #  uses: docker/setup-buildx-action@v1
-
       - name: configure aws credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.ACTIONS_ROLE_ARN }}
           role-session-name: GitHub_to_AWS_via_FederatedOIDC
           aws-region: us-east-2
-
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-
       - name: Build and Push Docker image
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           REPOSITORY: ${{ vars.REPOSITORY }}
           IMAGE_TAG: ${{ github.sha }}
-          DATABASE_URL: 'file:./dev.db'
+          DATABASE_URL: "file:./dev.db"
+          CLUSTER_NAME: ${{ secrets.CLUSTER_NAME }}
+          SERVICE_NAME: ${{ vars.REPOSITORY }}-prod-service
         run: |
-          docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:$IMAGE_TAG .
           docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:prod .
+          aws ecs update-service --cluster $CLUSTER_NAME --service $SERVICE_NAME --force-new-deployment --output text --query "service.serviceName" >/dev/null
+          echo "The ECS service will update now"

.github/workflows/stage.yml

@@ -5,39 +5,34 @@ on:
     branches:
       - stage
 
-env:
-  DATABASE_URL:"file:./prisma/dev.db"
-
 jobs:
   build:
     permissions:
       id-token: write # This is required for requesting the JWT
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
+      # - name: Set up Docker Buildx
+      #  uses: docker/setup-buildx-action@v1
       - name: configure aws credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: arn:aws:iam::654654236858:role/GithubActions
+          role-to-assume: ${{ secrets.ACTIONS_ROLE_ARN }}
           role-session-name: GitHub_to_AWS_via_FederatedOIDC
           aws-region: us-east-2
-
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
-
       - name: Build and Push Docker image
         env:
-          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry}}
-          REPOSITORY: abide-connect
-          IMAGE_TAG: ${{ github.sha}}-stage
-          DATABASE_URL: "file:./prisma/dev.db"
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          REPOSITORY: ${{ vars.REPOSITORY }}
+          IMAGE_TAG: ${{ github.sha }}
+          DATABASE_URL: "file:./dev.db"
+          CLUSTER_NAME: ${{ secrets.CLUSTER_NAME }}
+          SERVICE_NAME: ${{ vars.REPOSITORY }}-stage-service
         run: |
-          docker buildx build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:$IMAGE_TAG .
-          docker buildx build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:stage .
+          docker build --output type=image,push=true --platform linux/arm64 -t $ECR_REGISTRY/$REPOSITORY:stage .
+          aws ecs update-service --cluster $CLUSTER_NAME --service $SERVICE_NAME --force-new-deployment --output text --query "service.serviceName" >/dev/null
+          echo "The ECS service will update now"

.gitignore

@@ -25,7 +25,6 @@ logs
 
 # Prisma related files
 prisma/dev.db
-prisma/migrations
-.vscode/*
 
+.vscode/*
 server/utils/generated/

Dockerfile

@@ -0,0 +1,44 @@
+# Build container
+FROM node:lts-alpine AS builder
+
+# Use Workdir because things like tailwind will scan the entire current dir and can cause issues if it scans root
+WORKDIR /app
+
+COPY package.json ./
+COPY pnpm-lock.yaml ./
+COPY pnpm-workspace.yaml ./
+
+ENV PNPM_HOME="~/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN npm i -g pnpm
+
+RUN pnpm i --frozen-lockfile
+
+COPY . ./
+RUN pnpm prisma generate
+RUN pnpm run build
+
+# Deployment container
+FROM node:lts-alpine AS deployment
+WORKDIR /app
+# Copy stuff from build container to ensure we have prisma and everything it needs
+COPY --from=builder /app/.output ./
+COPY --from=builder /app/package.json ./
+COPY --from=builder /app/pnpm-lock.yaml ./
+COPY --from=builder /app/pnpm-workspace.yaml ./
+COPY --from=builder /app/prisma ./prisma
+COPY --from=builder /app/prisma.config.ts ./
+RUN npm i -g pnpm
+
+# Install Prisma without running any scripts to avoid running nuxt scripts
+RUN pnpm i --dev --ignore-scripts --frozen-lockfile
+# Run the build scripts needed for prisma to work (for migrations and seeding)
+RUN pnpm rebuild esbuild better-sqlite3 @prisma/engines prisma
+RUN pnpm prisma generate
+COPY --from=builder /app/entrypoint.sh /entrypoint
+
+# Ensure we can actually run the entrypoint script
+RUN chmod +x /entrypoint
+EXPOSE 3000
+ENTRYPOINT ["/entrypoint"]
+CMD ["node", "./server/index.mjs"]

README.md

@@ -37,9 +37,9 @@ Post-Signup Volunteer Dashboard
 
 Admin Dashboard (Admin only)
 - Overview Panel
-  - Event management
   - Training Certificate approval
   - Volunteer hour log approval
+  - Donation fund creation
 
 Event Management
 - Add Event (options: volunteer-only, public, internal)
@@ -86,16 +86,16 @@ Next, make sure to create a `.env` file based on the `.env.example` file and fil
 Then, initialize prisma client.
 
 ```bash
-pnpx prisma generate
+pnpm prisma generate
 ```
 
 The generated client will be placed in `/server/utils/generated/prisma`.
 
 Next, migrate and seed the database.
 
 ```bash
-pnpx prisma migrate dev
-pnpx prisma db seed
+pnpm prisma migrate dev
+pnpm prisma db seed
 ```
 
 You are now ready to use/deploy the app!
@@ -121,8 +121,8 @@ After performing database operations, it may be good to reset the database to en
 In order to achieve this, run the following commands:
 
 ```bash
-pnpx prisma migrate reset
-pnpx prisma db seed
+pnpm prisma migrate reset
+pnpm prisma db seed
 ```
 
 ### Production
@@ -140,4 +140,4 @@ pnpm run build
 ## Deploying to Production
 
 There is currently a Github Actions flow setup such that for each commit to main, a new build is created and dockerized.
-We can then manually deploy to the NPTS EC2 instances for prod and staging that are currently set up.
+This then gets automatically deployed to the NPTS ECS cluster.

app/app.config.ts

@@ -1 +1 @@
-export default defineAppConfig({});
+export default defineAppConfig({})

app/app.vue

@@ -1,7 +1,17 @@
 <template>
   <UApp>
+    <Head>
+      <Link
+        rel="manifest"
+        href="/manifest.json"
+      />
+      <Meta
+        name="theme-color"
+        content="#00786F"
+      />
+    </Head>
     <NuxtLayout>
       <NuxtPage />
     </NuxtLayout>
   </UApp>
-</template>
+</template>