From b08d4bf5c951ff986b426dec29f9efa8a1687385 Mon Sep 17 00:00:00 2001
From: Chris Joy <chrisjoy@protonmail.com>
Date: Sat, 23 Dec 2023 02:37:25 +0000
Subject: [PATCH] REFACTOR: ui-app to client

---
 .github/workflows/ci-flagbase-client.yml      |  2 +-
 .github/workflows/release-flagbase-client.yml |  6 ++--
 .github/workflows/release-flagbase-core.yml   | 15 +++------
 .../workflows/release-flagbase-website.yml    |  2 +-
 client/.firebaserc                            | 10 ++----
 client/firebase.json                          | 32 +------------------
 6 files changed, 12 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/ci-flagbase-client.yml b/.github/workflows/ci-flagbase-client.yml
index 80f73328..39cc85cc 100644
--- a/.github/workflows/ci-flagbase-client.yml
+++ b/.github/workflows/ci-flagbase-client.yml
@@ -42,7 +42,7 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_FLAGBASE }}"
           projectId: flagbase
-          target: dev-flagbase-ui-app
+          target: flagbase-client
           entryPoint: ./client
 
   lint:
diff --git a/.github/workflows/release-flagbase-client.yml b/.github/workflows/release-flagbase-client.yml
index 2d579a97..5d796302 100644
--- a/.github/workflows/release-flagbase-client.yml
+++ b/.github/workflows/release-flagbase-client.yml
@@ -9,15 +9,13 @@ on:
 
 jobs:
   release:
-    name: "Deploy: client.flagbase.xyz"
     runs-on: ubuntu-latest
     steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+      - uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.FLAGBASE_COM_ACCESS_TOKEN }}
           repository: ${{ secrets.FLAGBASE_COM_REPO }}
-          event-type: ${{ secrets.FLAGBASE_COM_RELEASE_UI_APP_EVENT_TYPE }}
+          event-type: release-client
     concurrency:
       group: ${{ github.ref }}
       cancel-in-progress: true
diff --git a/.github/workflows/release-flagbase-core.yml b/.github/workflows/release-flagbase-core.yml
index 771704f7..4fdadcd7 100644
--- a/.github/workflows/release-flagbase-core.yml
+++ b/.github/workflows/release-flagbase-core.yml
@@ -9,27 +9,22 @@ on:
 
 jobs:
   release:
-    name: "Deploy: core.flagbase.xyz"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
+      - uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: "DockerHub: Set up docker buildx"
-        uses: docker/setup-buildx-action@v2
-      - name: "DockerHub: Build and push"
-        uses: docker/build-push-action@v4
+      - uses: docker/setup-buildx-action@v2
+      - uses: docker/build-push-action@v4
         with:
           context: ./core
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/core:latest
-      - name: "Deploy: core.flagbase.xyz"
-        uses: peter-evans/repository-dispatch@v1
+      - uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.FLAGBASE_COM_ACCESS_TOKEN }}
           repository: ${{ secrets.FLAGBASE_COM_REPO }}
-          event-type: ${{ secrets.FLAGBASE_COM_RELEASE_CORE_EVENT_TYPE }}
+          event-type: release-core
diff --git a/.github/workflows/release-flagbase-website.yml b/.github/workflows/release-flagbase-website.yml
index bc806f15..5c239896 100644
--- a/.github/workflows/release-flagbase-website.yml
+++ b/.github/workflows/release-flagbase-website.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           token: ${{ secrets.FLAGBASE_COM_ACCESS_TOKEN }}
           repository: ${{ secrets.FLAGBASE_COM_REPO }}
-          event-type: ${{ secrets.FLAGBASE_COM_RELEASE_WEBSITE_EVENT_TYPE }}
+          event-type: release-website
     concurrency:
       group: ${{ github.ref }}
       cancel-in-progress: true
diff --git a/client/.firebaserc b/client/.firebaserc
index 6a41d76f..98c86b8c 100644
--- a/client/.firebaserc
+++ b/client/.firebaserc
@@ -5,14 +5,8 @@
   "targets": {
     "flagbase": {
       "hosting": {
-        "prod-flagbase-ui-app": [
-          "prod-flagbase-ui-app"
-        ],
-        "staging-flagbase-ui-app": [
-          "staging-flagbase-ui-app"
-        ],
-        "dev-flagbase-ui-app": [
-          "dev-flagbase-ui-app"
+        "flagbase-client": [
+          "flagbase-client"
         ]
       }
     }
diff --git a/client/firebase.json b/client/firebase.json
index 9051dea9..3b429ea1 100644
--- a/client/firebase.json
+++ b/client/firebase.json
@@ -1,37 +1,7 @@
 {
   "hosting": [
     {
-      "target": "prod-flagbase-ui-app",
-      "public": "./dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ]
-    },
-    {
-      "target": "staging-flagbase-ui-app",
-      "public": "./dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
-      ],
-      "rewrites": [
-        {
-          "source": "**",
-          "destination": "/index.html"
-        }
-      ]
-    },
-    {
-      "target": "dev-flagbase-ui-app",
+      "target": "flagbase-client",
       "public": "./dist",
       "ignore": [
         "firebase.json",