feat: move ui to ui folder

.dockerignore

@@ -1,2 +1,2 @@
-node_modules
+ui/node_modules
 docs

.github/workflows/build.yaml

@@ -1,20 +1,28 @@
 name: Automated Tests and Linting
 
-on: [push]
-
+on:
+  push:
+    branches-ignore:
+      - "main"
+      - "develop"
 jobs:
-  Test:
+  build:
     runs-on: ubuntu-latest
+    name: "Test and Build"
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-          cache-dependency-path: yarn.lock
+          cache-dependency-path: "ui/yarn.lock"
 
       - name: Install packages
         run: yarn install --immutable
+        working-directory: ui
 
       - name: Run tests
         run: yarn test
+        working-directory: ui

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: ci
+name: Build & Test & Push Image
 
 on:
   push:
@@ -12,13 +12,28 @@ on:
       - "main"
       - "develop"
 jobs:
-  docker:
+  build:
     runs-on: ubuntu-latest
+    name: "Test and Build"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+          cache-dependency-path: "ui/yarn.lock"
+
+      - name: Install packages
+        run: yarn install --immutable
+        working-directory: ui
+
+      - name: Run tests
+        run: yarn test
+        working-directory: ui
+
+      - uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
@@ -42,6 +57,7 @@ jobs:
             # priority 600
             type=ref,event=branch
             type=ref,event=pr,prefix=pr-,enable=true
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
@@ -52,6 +68,7 @@ jobs:
           build-args: |
             VERSION=${{ steps.meta.outputs.version }}
             GIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+
       - name: Docker meta for hasura
         id: meta-hasura
         uses: docker/metadata-action@v5
@@ -67,6 +84,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}},prefix=v,priority=410
             type=semver,pattern={{major}},prefix=v,priority=400
             type=sha
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:

.gitignore

@@ -1,20 +1,20 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+ui/node_modules
+ui/.pnp.*
+ui/.yarn/*
+!ui/.yarn/patches
+!ui/.yarn/plugins
+!ui/.yarn/releases
+!ui/.yarn/sdks
+!ui/.yarn/versions
 
 # testing
-/coverage
+ui/coverage
 
 # production
-/build
+ui/build
 
 # misc
 .DS_Store
@@ -62,24 +62,24 @@ bower_components
 build/Release
 
 # Dependency directories
-node_modules/
-jspm_packages/
+ui/node_modules/
+ui/jspm_packages/
 
 # Typescript v1 declaration files
-typings/
+ui/typings/
 
 # Optional npm cache directory
-.npm
+ui/.npm
 
 # Optional eslint cache
-.eslintcache
+ui/.eslintcache
 
 # Optional REPL history
-.node_repl_history
+ui/.node_repl_history
 
 # Output of 'npm pack'
-*.tgz
+ui/*.tgz
 
 # Yarn Integrity file
-.yarn-integrity
+ui/.yarn-integrity
 

Dockerfile

@@ -1,16 +1,3 @@
-FROM docker.io/library/node:20 as build-deps
-WORKDIR /usr/src/app
-COPY yarn.lock package.json .yarnrc.yml ./
-COPY .yarn ./.yarn
-RUN find ./
-RUN yarn install --immutable
-COPY . ./
-ARG GIT_SHA
-ENV GIT_SHA=${GIT_SHA}
-ARG VERSION
-ENV VERSION=${VERSION:-develop}
-RUN yarn build
-
 FROM quay.io/oauth2-proxy/oauth2-proxy:v7.5.1
 ENV OAUTH2_PROXY_PROXY_WEBSOCKETS=true \
     OAUTH2_PROXY_PASS_AUTHORIZATION_HEADER=true \
@@ -19,5 +6,4 @@ ENV OAUTH2_PROXY_PROXY_WEBSOCKETS=true \
     OAUTH2_PROXY_PROXY_WEBSOCKETS=true \
     OAUTH2_PROXY_PASS_ACCESS_TOKEN=true \
     OAUTH2_PROXY_HTTP_ADDRESS=:4180
-COPY --from=build-deps /usr/src/app/build /static
-
+COPY ui/build /static