feat: move ui to ui folder (#340)

* feat: move ui to ui folder * fix: typo in readme * fix: Add proper .dockerignore * feat: Properly build project
2026-07-16 16:47:05 +02:00 · 2024-02-06 23:06:03 +01:00
parent 43e7368ca4
commit 6c550a8344
258 changed files with 60 additions and 101 deletions
@@ -1,2 +1,3 @@
-node_modules
+ui/node_modules
 docs
+!ui/build
@@ -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
@@ -1,4 +1,4 @@
-name: ci
+name: Build & Test & Push Image

 on:
  push:
@@ -12,13 +12,32 @@ 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 ui tests
+        run: yarn test
+        working-directory: ui
+
+      - name: Build ui
+        run: yarn build
+        working-directory: ui
+
+      - uses: docker/login-action@v3
        if: github.event_name != 'pull_request'
        with:
          registry: ghcr.io
@@ -42,6 +61,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 +72,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 +88,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:
@@ -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

@@ -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
@@ -29,7 +29,7 @@ HASURA_GRAPHQL_JWT_SECRET='{"type":"RS256","key":"-----BEGIN CERTIFICATE-----\n
 ...
 }\n-----END CERTIFICATE-----\n","header":{"type":"Authorization"},"claims_map":{"x-hasura-user-id":{"path":"$.sub"},"x-hasura-email":{"path":"$.email"},"x-hasura-allowed-roles":["user","editor"],"x-hasura-default-role":"user"}}'
 POSTGRES_PASSWORD=postgrespassword
-HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
+HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey
 ```

 3. Run docker compose environment:
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Sitrep.iml" filepath="$PROJECT_DIR$/Sitrep.iml" />
-    </modules>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
@@ -1,6 +0,0 @@
-{
-  "name": "Sitrep",
-  "version": "1.0.0",
-  "dependencies": {
-  }
-}
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/Show More
+++ b/Show More