Tag branch

.devcontainer/Dockerfile

@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:18
+FROM mcr.microsoft.com/devcontainers/javascript-node:22
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
-RUN curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok
+# RUN curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | sudo tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" | sudo tee /etc/apt/sources.list.d/ngrok.list && sudo apt update && sudo apt install ngrok
 
 # [Optional] Uncomment if you want to install an additional version of node using nvm
 # ARG EXTRA_NODE_VERSION=10

.devcontainer/devcontainer.json

@@ -45,19 +45,16 @@
 
   "containerEnv": {
     "HOME": "/home/node",
-    "DB_HOST": "localhost",
-    "DB_PORT": "5432",
-    "DB_NAME": "danceblue",
-    "DB_UNAME": "danceblue",
-    "DB_PWD": "danceblue",
     "DATABASE_URL": "postgres://danceblue:danceblue@localhost:5432/danceblue?schema=danceblue",
     "NODE_ENV": "development",
     "APPLICATION_HOST": "localhost",
     "APPLICATION_PORT": "8000",
     "MS_OIDC_URL": "https://login.microsoftonline.com/2b30530b-69b6-4457-b818-481cb53d42ae/v2.0/.well-known/openid-configuration",
+    "SERVE_ORIGIN": "http://localhost:8000",
     "SERVE_PATH": "/workspaces/monorepo/local-uploads",
     "UPLOAD_PATH": "/workspaces/monorepo/local-uploads",
-    "MAX_FILE_SIZE": "200"
+    "MAX_FILE_SIZE": "200",
+    "LOG_DIR": "/workspaces/monorepo/packages/server/logs"
   },
 
   "customizations": {

.github/workflows/docker-build.yml

@@ -19,134 +19,62 @@ env:
   SERVER_IMAGE_NAME: ukdanceblue/app-server
 
 jobs:
-  build-and-push-portal-image:
+  build-and-push-images:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Enable Corepack before setting up Node
-        run: corepack enable
-      - name: Set up node 18.x
-        uses: actions/[email protected]
-        with:
-          node-version: 18
-          cache: yarn
-      - name: Install dependencies
-        working-directory: ./packages/portal
-        run:
-          yarn workspaces focus @ukdanceblue/common @ukdanceblue/portal
-          @ukdanceblue/monorepo
-      - name: Build GraphQL
-        run: yarn run gql:build
-        working-directory: .
-      - name: Build common
-        run: yarn run build
-        working-directory: ./packages/common
-      - name: Build portal
-        run: yarn run build
-        working-directory: ./packages/portal
       # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+        id: portalMeta
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.PORTAL_IMAGE_NAME }}
-      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
-      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
-      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
-        with:
-          context: ./packages/portal
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-server-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Enable Corepack before setting up Node
-        run: corepack enable
-      - name: Set up node 18.x
-        uses: actions/[email protected]
-        with:
-          node-version: 18
-          cache: yarn
-      - name: Install dependencies
-        working-directory: ./packages/server
-        run:
-          yarn workspaces focus @ukdanceblue/common @ukdanceblue/server
-          @ukdanceblue/monorepo
-      - name: Build common
-        run: yarn run build
-        working-directory: ./packages/common
-      - name: Generate prisma client
-        run: yarn dlx prisma generate
-        working-directory: ./packages/server
-      - name: Build server
-        run: yarn run build
-        working-directory: ./packages/server
-      - name: Focus on server
-        run:
-          yarn workspaces focus --production @ukdanceblue/server
-          @ukdanceblue/common
-      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
-      - name: Log in to the Container registry
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+        id: serverMeta
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.SERVER_IMAGE_NAME }}
       # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0
+      - name: Build and push Portal image
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./packages/server/Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  trigger-recreate-release:
-    runs-on: ubuntu-latest
-    needs: [build-and-push-portal-image, build-and-push-server-image]
-    if: github.ref == 'refs/heads/release'
-    steps:
-      - name: Trigger container recreate
-        shell: bash
-        run: |
-          ((curl --insecure -X POST ${{ secrets.DANCEBLUE_APP_PORTAL_RECREATE_WEBHOOK }} -H "CF-Access-Client-Id: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID }}" -H "CF-Access-Client-Secret: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET }}") || exit 1)
-          ((curl --insecure -X POST ${{ secrets.DANCEBLUE_APP_SERVER_RECREATE_WEBHOOK }} -H "CF-Access-Client-Id: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID }}" -H "CF-Access-Client-Secret: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET }}") || exit 1)
-  trigger-recreate-main:
-    runs-on: ubuntu-latest
-    needs: [build-and-push-portal-image, build-and-push-server-image]
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - name: Trigger container recreate
-        shell: bash
-        run: |
-          ((curl --insecure -X POST ${{ secrets.DANCEBLUE_APP_DEV_PORTAL_RECREATE_WEBHOOK }} -H "CF-Access-Client-Id: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID }}" -H "CF-Access-Client-Secret: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET }}") || exit 1)
-          ((curl --insecure -X POST ${{ secrets.DANCEBLUE_APP_DEV_SERVER_RECREATE_WEBHOOK }} -H "CF-Access-Client-Id: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_ID }}" -H "CF-Access-Client-Secret: ${{ secrets.CLOUDFLARE_ACCESS_SERVICE_TOKEN_CLIENT_SECRET }}") || exit 1)
+          tags: ${{ steps.portalMeta.outputs.tags }}
+          labels: ${{ steps.portalMeta.outputs.labels }}
+          target: portal
+      - name: Build and push Server image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.serverMeta.outputs.tags }}
+          labels: ${{ steps.serverMeta.outputs.labels }}
+          target: server
+      - name: Remove old Portal images
+        uses: actions/delete-package-versions@v5
+        with:
+          package-name: ${{ env.PORTAL_IMAGE_NAME }}
+          package-type: "container"
+          min-versions-to-keep: 2
+          delete-only-untagged-versions: "true"
+      - name: Remove old Server images
+        uses: actions/delete-package-versions@v5
+        with:
+          package-name: ${{ env.SERVER_IMAGE_NAME }}
+          package-type: "container"
+          min-versions-to-keep: 2
+          delete-only-untagged-versions: "true"

.vscode/extensions.json

@@ -0,0 +1,25 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "msjsdiag.vscode-react-native",
+    "Prisma.prisma",
+    "esbenp.prettier-vscode",
+    "christian-kohler.npm-intellisense",
+    "VisualStudioExptTeam.vscodeintellicode",
+    "VisualStudioExptTeam.intellicode-api-usage-examples",
+    "cmstead.js-codeformer",
+    "cmstead.jsrefactor",
+    "ecmel.vscode-html-css",
+    "GraphQL.vscode-graphql-syntax",
+    "GraphQL.vscode-graphql",
+    "eamodio.gitlens",
+    "github.vscode-github-actions",
+    "expo.vscode-expo-tools",
+    "ms-azuretools.vscode-docker",
+    "naumovs.color-highlight",
+    "streetsidesoftware.code-spell-checker",
+    "vitest.explorer",
+    "GitHub.copilot",
+    "GitHub.vscode-pull-request-github"
+  ]
+}

.vscode/settings.json

@@ -1,14 +1,14 @@
 {
   "eslint.workingDirectories": ["."],
-  "eslint.experimental.useFlatConfig": true,
+  "eslint.useFlatConfig": true,
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "typescript.tsserver.experimental.enableProjectDiagnostics": true,
   "npm.packageManager": "yarn",
   "editor.formatOnSave": true,
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": "explicit",
+    "source.organizeImports": "never",
     "source.fixAll": "explicit"
   },
   "search.exclude": {
@@ -17,8 +17,14 @@
   },
   "remote.localPortHost": "allInterfaces",
   "typescript.inlayHints.parameterNames.enabled": "all",
-  "typescript.preferences.preferTypeOnlyAutoImports": true,
   "javascript.inlayHints.parameterNames.enabled": "all",
-  "cSpell.words": ["cooldown", "Spinnable", "Whatwg"],
+  "cSpell.words": [
+    "Catchable",
+    "cooldown",
+    "Errorable",
+    "Leaderboards",
+    "Spinnable",
+    "Whatwg"
+  ],
   "eslint.codeActionsOnSave.mode": "problems"
 }

.vscode/tasks.json

@@ -104,7 +104,7 @@
       "problemMatcher": [],
       "label": "Server: Build",
       "detail": "yarn workspace @ukdanceblue/server run build",
-      "dependsOn": ["Server: Prisma Generate", "Common: Build"]
+      "dependsOn": ["Common: Build"]
     }
   ]
 }

Dockerfile

@@ -0,0 +1,66 @@
+# syntax=docker/dockerfile:1.7-labs
+FROM node:22.4.1 as build
+
+ADD --link --exclude=packages/mobile . /builddir
+
+WORKDIR /builddir
+
+RUN corepack yarn install
+
+RUN corepack yarn run gql:build
+
+WORKDIR /builddir/packages/common
+
+RUN corepack yarn build
+
+# Server build
+FROM build as server-build
+
+WORKDIR /builddir/packages/server
+
+RUN corepack yarn prisma generate
+
+RUN corepack yarn build
+
+RUN corepack yarn workspaces focus --production -A
+
+# Portal build
+FROM build as portal-build
+
+WORKDIR /builddir/packages/portal
+
+ENV VITE_API_BASE_URL=""
+
+RUN corepack yarn build
+
+# Server
+FROM node:22.4.1 as server
+
+ENV MS_OIDC_URL="https://login.microsoftonline.com/2b30530b-69b6-4457-b818-481cb53d42ae/v2.0/.well-known/openid-configuration"
+ENV NODE_ENV="production"
+ENV APPLICATION_PORT="8000"
+ENV APPLICATION_HOST="0.0.0.0"
+
+RUN mkdir -p /app/packages/server
+RUN mkdir -p /app/packages/common
+RUN mkdir -p /app/.yarn
+RUN mkdir -p /app/node_modules
+
+COPY --from=server-build /builddir/packages/server/dist /app/packages/server/dist
+COPY --from=server-build /builddir/packages/server/node_modules /app/packages/server/node_modules
+COPY --from=server-build /builddir/packages/server/prisma /app/packages/server/prisma
+COPY --from=server-build /builddir/packages/server/package.json /app/packages/server/package.json
+COPY --from=server-build /builddir/packages/common/dist /app/packages/common/dist
+COPY --from=server-build /builddir/packages/common/package.json /app/packages/common/package.json
+COPY --from=server-build /builddir/node_modules /app/node_modules
+COPY --from=server-build /builddir/package.json /app/package.json
+COPY --from=server-build /builddir/yarn.lock /app/yarn.lock
+
+WORKDIR /app/packages/server
+
+CMD corepack yarn dlx prisma migrate deploy && node .
+
+# Portal
+FROM nginx:stable-alpine as portal
+
+COPY --from=portal-build /builddir/packages/portal/dist /usr/share/nginx/html

README.md

@@ -172,6 +172,9 @@ Project Link:
   DB22, DB23, DB24
 - [Jackson Huse](https://github.com/jphuse) - App Design Coordinator - DB23,
   DB24
+- [Skyler Trowel](https://github.com/smtrowel) - App Development Coordinator -
+  DB25
+- [Camille Dyer](https://github.com/cdyer8) - App Design Coordinator - DB25
 - [Everyone on the DanceBlue committee](http://www.danceblue.org/meet-the-team)
 
 <p align="right">(<a href="#top">back to top</a>)</p>