From d24b47490bfd78d90208f2c769ba14730d05d654 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 8 Aug 2023 16:09:01 -0400
Subject: [PATCH 01/42] add migrations

---
 .../20230808200805_first_migration/migration.sql      | 11 +++++++++++
 prisma/migrations/migration_lock.toml                 |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 prisma/migrations/20230808200805_first_migration/migration.sql
 create mode 100644 prisma/migrations/migration_lock.toml

diff --git a/prisma/migrations/20230808200805_first_migration/migration.sql b/prisma/migrations/20230808200805_first_migration/migration.sql
new file mode 100644
index 0000000..31ea15f
--- /dev/null
+++ b/prisma/migrations/20230808200805_first_migration/migration.sql
@@ -0,0 +1,11 @@
+-- CreateTable
+CREATE TABLE "Yeet" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deletedAt" TIMESTAMP(6),
+    "ownerId" TEXT NOT NULL,
+    "message" VARCHAR(280) NOT NULL,
+
+    CONSTRAINT "Yeet_pkey" PRIMARY KEY ("id")
+);
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
new file mode 100644
index 0000000..fbffa92
--- /dev/null
+++ b/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "postgresql"
\ No newline at end of file

From 20eee9caab2155373eeea1c2063593c27745f565 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 8 Aug 2023 18:30:18 -0400
Subject: [PATCH 02/42] Update twitter clone to include db migration, fix a
 couple bugs preventing remote deployments from working

---
 app/(home)/home-yeet-form.tsx | 4 ++--
 app/_components/button.tsx    | 3 ++-
 architect.yml                 | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/(home)/home-yeet-form.tsx b/app/(home)/home-yeet-form.tsx
index 5dfd44f..4303d24 100644
--- a/app/(home)/home-yeet-form.tsx
+++ b/app/(home)/home-yeet-form.tsx
@@ -21,9 +21,9 @@ export const HomeYeetForm = () => {
       body: JSON.stringify({
         message,
       }),
+    }).then(() => {
+      location.reload();
     });
-
-    location.reload();
   };
 
   return session ? (
diff --git a/app/_components/button.tsx b/app/_components/button.tsx
index ea0efb2..3804871 100644
--- a/app/_components/button.tsx
+++ b/app/_components/button.tsx
@@ -42,5 +42,6 @@ export const Button = (props: ButtonProps) => {
   }
 
   const btn = <button {...props} className={classes.join(' ')} />;
-  return props.href ? <Link href={props.href}>{btn}</Link> : btn;
+  // Using a Link will not work if the href is external, e.g. during login flow.
+  return props.href ? <a href={props.href}>{btn}</a> : btn;
 };
diff --git a/architect.yml b/architect.yml
index e754f2f..8544b9a 100644
--- a/architect.yml
+++ b/architect.yml
@@ -22,8 +22,8 @@ deployments:
     image: ${{ builds.frontend.id }}
     environment:
       DB_URL: ${{ databases.main.url }}
-      KRATOS_ADDR: ${{ dependencies.kratos.services.kratos-public.url }}
-      KRATOS_ADMIN_ADDR: ${{ dependencies.kratos.services.kratos-admin.url }}
+      KRATOS_ADDR: ${{ dependencies.kratos.ingresses.kratos-public.url }}
+      KRATOS_ADMIN_ADDR: ${{ dependencies.kratos.ingresses.kratos-admin.url }}
       NEXT_PUBLIC_SELF_ADDR: ${{ ingresses.app.url }}
       NEXT_PUBLIC_KRATOS_ADDR: ${{ dependencies.kratos.ingresses.kratos-public.url }}
       NEXT_PUBLIC_USER_SERVICE_ADDR: ${{ dependencies.kratos.ingresses.auth.url }}

From 401d1856a1058de247741a764a15c9dbc833e0ff Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 14:04:52 -0400
Subject: [PATCH 03/42] Use tyleraldrich/kratos image currently

---
 architect.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/architect.yml b/architect.yml
index 8544b9a..07e9ec6 100644
--- a/architect.yml
+++ b/architect.yml
@@ -6,7 +6,7 @@ databases:
 
 dependencies:
   kratos:
-    component: architectio/kratos
+    component: tyleraldrich/kratos
     variables:
       allowed_return_urls:
         - ${{ ingresses.app.url }}

From d2f889b08d1891762e262972ad672a1de1d905a4 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 14:22:52 -0400
Subject: [PATCH 04/42] Add start of deploy action

---
 .github/workflows/deploy.yml | 53 ++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..7c1168d
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,53 @@
+name: Component Deploy
+
+# TODO: Update this, currently just for testing
+on:
+  push:
+    branches:
+      - migrations
+
+env:
+  ARC_DATACENTER: gh-datacenter
+  ARC_ENVIRONMENT: gh-environment
+  GCP_ACCOUNT_NAME: gcp-test
+  GCP_PROJECT: permanent-environment-testing
+  COMPONENT_NAME: tyleraldrich/twitter-clone:latest
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v1'
+        with:
+          credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
+          create_credentials_file: true
+      - name: Download arcctl
+        run: curl -SL https://arcctl-dcs.nyc3.digitaloceanspaces.com/arcctl --output arcctl
+      - name: Make arcctl executable
+        run: chmod +x ./arcctl
+      - name: Setup arcctl backend
+        run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
+      # TODO: Probably remove this - should always be set by the datacenter already and stored in the state backend
+      # - name: Setup arcctl gcp provider
+      #   run: ./arcctl add account ${{ env.GCP_ACCOUNT_NAME }} -p gcp --creds project=${{ env.GCP_PROJECT }} --creds serviceAccountCredentialsFile=${{ env.GOOGLE_APPLICATION_CREDENTIALS }} || true
+  build_component:
+    runs-on: ubuntu-latest
+    needs: setup
+    steps:
+      - name: Build component
+        run: arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
+      # TODO: Need repo creds
+      - name: Push component
+        run: arcctl push ${{ env.COMPONENT_NAME }}
+  deploy_component:
+    runs-on: ubuntu-latest
+    needs: build_component
+    steps:
+      # TODO: Only do this if an environment file changes?
+      - name: Apply environment
+        run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
+      - name: Deploy component
+        run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app

From 2b90a1fdcfd949bea218137f0f2b11bcb839fedb Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 14:49:56 -0400
Subject: [PATCH 05/42] Store and cache values between runs

---
 .github/workflows/deploy.yml | 50 +++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7c1168d..e19f365 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,6 +7,7 @@ on:
       - migrations
 
 env:
+  ARCCTL_CACHE_KEY: arcctl-0.1.0 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test
@@ -18,18 +19,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - id: 'auth'
-        name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+      - name: arcctl binary
+        id: arcctl-cache
+        uses: actions/cache@v3
         with:
-          credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
-          create_credentials_file: true
-      - name: Download arcctl
+          path: ./arcctl
+          key: ${{ env.ARCCTL_CACHE_KEY }}
+      - if: ${{ steps.arcctl-cache.outputs.cache-hit != 'true' }}
+        name: Download arcctl
         run: curl -SL https://arcctl-dcs.nyc3.digitaloceanspaces.com/arcctl --output arcctl
       - name: Make arcctl executable
         run: chmod +x ./arcctl
+      - name: arcctl config
+        uses: actions/cache@v3
+        with:
+          path: ~/.config/arcctl/
+          key: ${{ github.run_id }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
+
       # TODO: Probably remove this - should always be set by the datacenter already and stored in the state backend
       # - name: Setup arcctl gcp provider
       #   run: ./arcctl add account ${{ env.GCP_ACCOUNT_NAME }} -p gcp --creds project=${{ env.GCP_PROJECT }} --creds serviceAccountCredentialsFile=${{ env.GOOGLE_APPLICATION_CREDENTIALS }} || true
@@ -37,6 +45,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: setup
     steps:
+      - uses: actions/checkout@v3
+      - name: Load arcctl binary
+        id: arcctl-cache
+        uses: actions/cache@v3
+        with:
+          path: ./arcctl
+          key: ${{ env.ARCCTL_CACHE_KEY }}
+      - name: arcctl config
+        uses: actions/cache@v3
+        with:
+          path: ~/.config/arcctl/
+          key: ${{ github.run_id }}
       - name: Build component
         run: arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
       # TODO: Need repo creds
@@ -46,6 +66,24 @@ jobs:
     runs-on: ubuntu-latest
     needs: build_component
     steps:
+      - uses: actions/checkout@v3
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v1'
+        with:
+          credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
+          create_credentials_file: true
+      - name: Load arcctl binary
+        id: arcctl-cache
+        uses: actions/cache@v3
+        with:
+          path: ./arcctl
+          key: ${{ env.ARCCTL_CACHE_KEY }}
+      - name: arcctl config
+        uses: actions/cache@v3
+        with:
+          path: ~/.config/arcctl/
+          key: ${{ github.run_id }}
       # TODO: Only do this if an environment file changes?
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From 61759ed0a8728032d1e742e7b10a321c491a1025 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 14:51:22 -0400
Subject: [PATCH 06/42] run ./arcctl and not arcctl

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e19f365..54e7888 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -58,10 +58,10 @@ jobs:
           path: ~/.config/arcctl/
           key: ${{ github.run_id }}
       - name: Build component
-        run: arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
+        run: ./arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
       # TODO: Need repo creds
       - name: Push component
-        run: arcctl push ${{ env.COMPONENT_NAME }}
+        run: ./arcctl push ${{ env.COMPONENT_NAME }}
   deploy_component:
     runs-on: ubuntu-latest
     needs: build_component

From dbab2d307582d7c06339e1429014a4a16a2f56bd Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 15:48:32 -0400
Subject: [PATCH 07/42] Add docker login to build/push components

---
 .github/workflows/deploy.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 54e7888..4b49a7e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -57,6 +57,11 @@ jobs:
         with:
           path: ~/.config/arcctl/
           key: ${{ github.run_id }}
+      - name: Docker Login
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build component
         run: ./arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
       # TODO: Need repo creds

From 96ef88d66ae65943a06a843864e1a226d9bca381 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 16:20:13 -0400
Subject: [PATCH 08/42] List datacenter for debugging

---
 .github/workflows/deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b49a7e..0d83a88 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -89,6 +89,8 @@ jobs:
         with:
           path: ~/.config/arcctl/
           key: ${{ github.run_id }}
+      - name: List datacenters
+        run: ./arcctl list dc
       # TODO: Only do this if an environment file changes?
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From 893448e53855d19a44af8b88032121af72ae7bab Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 16:26:53 -0400
Subject: [PATCH 09/42] Set XDG_CONFIG_HOME so arcctl config is loaded/stored
 properly maybe

---
 .github/workflows/deploy.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0d83a88..a661107 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,6 +13,7 @@ env:
   GCP_ACCOUNT_NAME: gcp-test
   GCP_PROJECT: permanent-environment-testing
   COMPONENT_NAME: tyleraldrich/twitter-clone:latest
+  XDG_CONFIG_HOME: ./arcctl-config/
 
 jobs:
   setup:
@@ -33,7 +34,7 @@ jobs:
       - name: arcctl config
         uses: actions/cache@v3
         with:
-          path: ~/.config/arcctl/
+          path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
@@ -55,7 +56,7 @@ jobs:
       - name: arcctl config
         uses: actions/cache@v3
         with:
-          path: ~/.config/arcctl/
+          path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
       - name: Docker Login
         uses: docker/login-action@v2.2.0
@@ -87,7 +88,7 @@ jobs:
       - name: arcctl config
         uses: actions/cache@v3
         with:
-          path: ~/.config/arcctl/
+          path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
       - name: List datacenters
         run: ./arcctl list dc

From 8ebd9bd258c12f4df54b4b5f5f59f3581f48f7c6 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 16:34:03 -0400
Subject: [PATCH 10/42] Echo google_credentials to make sure its set

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a661107..e37ad5f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -90,8 +90,8 @@ jobs:
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
-      - name: List datacenters
-        run: ./arcctl list dc
+      - name: Echo google cred location
+        run: echo $GOOGLE_CREDENTIALS
       # TODO: Only do this if an environment file changes?
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From e5736d9142885f2e284364eecd3839fae4e5d169 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 6 Sep 2023 16:39:10 -0400
Subject: [PATCH 11/42] Wrong google creds name

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e37ad5f..668298f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -91,9 +91,9 @@ jobs:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
       - name: Echo google cred location
-        run: echo $GOOGLE_CREDENTIALS
+        run: echo $GOOGLE_APPLICATION_CREDENTIALS
       # TODO: Only do this if an environment file changes?
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
       - name: Deploy component
-        run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app
+        run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app --auto-approve

From e13a75096558f5aa5135015e2a75799e8ba349ff Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 11:05:03 -0400
Subject: [PATCH 12/42] Bump arcctl version for debug info

---
 .github/workflows/deploy.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 668298f..5da341b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.0 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.1 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test
@@ -73,11 +73,11 @@ jobs:
     needs: build_component
     steps:
       - uses: actions/checkout@v3
-      - id: 'auth'
-        name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+      - id: auth
+        name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v1
         with:
-          credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
+          credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
           create_credentials_file: true
       - name: Load arcctl binary
         id: arcctl-cache

From a0400308c2917f94d06af267d0ae7e0626392c2c Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 11:36:29 -0400
Subject: [PATCH 13/42] Install gke plugin so auth works

---
 .github/workflows/deploy.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5da341b..671c4b8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -79,6 +79,11 @@ jobs:
         with:
           credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
           create_credentials_file: true
+      # Install gcloud, `setup-gcloud` automatically picks up authentication from `auth`.
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v1
+      - name: Setup GKE gcloud auth plugin
+        run: gcloud components install gke-gcloud-auth-plugin
       - name: Load arcctl binary
         id: arcctl-cache
         uses: actions/cache@v3

From cae97e744a6ca2882687e788e65b2e804be96500 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 11:54:49 -0400
Subject: [PATCH 14/42] Bump arcctl version for more debug info

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 671c4b8..c2e7ece 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.1 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.2 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test

From fe2b461c718cb6899ba5fcec85d88b6a7fe90da7 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 12:14:14 -0400
Subject: [PATCH 15/42] More debug

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c2e7ece..dcfe1ff 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -95,8 +95,8 @@ jobs:
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
-      - name: Echo google cred location
-        run: echo $GOOGLE_APPLICATION_CREDENTIALS
+      - name: ls config dir
+        run: ls ./arcctl-config
       # TODO: Only do this if an environment file changes?
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From 1a2efa226da42dae1bcd24c4a75a65ed1f82df7c Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 12:24:41 -0400
Subject: [PATCH 16/42] Test keeping config dir key the same to avoid potential
 race cond

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dcfe1ff..05361dc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: test # ${{ github.run_id }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
 
@@ -57,7 +57,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: test # ${{ github.run_id }}
       - name: Docker Login
         uses: docker/login-action@v2.2.0
         with:
@@ -94,7 +94,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: test # ${{ github.run_id }}
       - name: ls config dir
         run: ls ./arcctl-config
       # TODO: Only do this if an environment file changes?

From 41b20b37272027f48414997b0801842be71a2157 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 12:38:55 -0400
Subject: [PATCH 17/42] Update arcctl version

---
 .github/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 05361dc..caf3d9e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.2 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.3 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: test # ${{ github.run_id }}
+          key: ${{ github.run_id }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
 
@@ -57,7 +57,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: test # ${{ github.run_id }}
+          key: ${{ github.run_id }}
       - name: Docker Login
         uses: docker/login-action@v2.2.0
         with:
@@ -94,7 +94,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: test # ${{ github.run_id }}
+          key: ${{ github.run_id }}
       - name: ls config dir
         run: ls ./arcctl-config
       # TODO: Only do this if an environment file changes?

From c2ce2c8459013a9a9c149609a2ef59b3afa3bb9d Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 13:28:29 -0400
Subject: [PATCH 18/42] Update arcctl version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index caf3d9e..41908bc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.3 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.4 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test

From 02de3b4d2f4d7542f25f5824e7e97af7f8586e5a Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 13:48:25 -0400
Subject: [PATCH 19/42] Update arcctl version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 41908bc..2b48318 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.4 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.5 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test

From 15713ef74a1a890ad5b29d045749dd8f9ed84eaf Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Thu, 7 Sep 2023 14:00:15 -0400
Subject: [PATCH 20/42] Update arcctl version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2b48318..e9d939e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.5 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.6 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test

From 70278a3cac7f6cf16d4279842e09293e3891c02d Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Fri, 8 Sep 2023 13:04:55 -0400
Subject: [PATCH 21/42] Update arcctl version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e9d939e..9336164 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
       - migrations
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.6 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.7 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test

From 2614a53d744ea85a5fda5e87eaa42a329a0556c3 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Fri, 8 Sep 2023 13:45:47 -0400
Subject: [PATCH 22/42] Test deploying a change

---
 app/(home)/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(home)/page.tsx b/app/(home)/page.tsx
index 51e0dd6..d6c7dd4 100644
--- a/app/(home)/page.tsx
+++ b/app/(home)/page.tsx
@@ -6,7 +6,7 @@ import { HomeYeetForm } from './home-yeet-form';
 
 export const metadata: Metadata = {
   title: 'The Y Feed',
-  description: 'A list of messages yeeted into the ether',
+  description: 'A list of messages yeeted into the ether!',
 };
 
 const HomePage = () => {

From 15232b5955a53fd0351580124f6599ec979c95c1 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Mon, 11 Sep 2023 13:44:39 -0400
Subject: [PATCH 23/42] Update branch name and test with serverless datacenter
 running

---
 .github/workflows/deploy.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9336164..c58cf75 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,14 +1,13 @@
 name: Component Deploy
 
-# TODO: Update this, currently just for testing
 on:
   push:
     branches:
-      - migrations
+      - action-deployment # TODO: Update this, currently just for testing
 
 env:
   ARCCTL_CACHE_KEY: arcctl-0.1.7 # Hardcoding a version number here so we don't keep downloading this
-  ARC_DATACENTER: gh-datacenter
+  ARC_DATACENTER: gh-serverless-dc # gh-datacenter
   ARC_ENVIRONMENT: gh-environment
   GCP_ACCOUNT_NAME: gcp-test
   GCP_PROJECT: permanent-environment-testing
@@ -38,10 +37,6 @@ jobs:
           key: ${{ github.run_id }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
-
-      # TODO: Probably remove this - should always be set by the datacenter already and stored in the state backend
-      # - name: Setup arcctl gcp provider
-      #   run: ./arcctl add account ${{ env.GCP_ACCOUNT_NAME }} -p gcp --creds project=${{ env.GCP_PROJECT }} --creds serviceAccountCredentialsFile=${{ env.GOOGLE_APPLICATION_CREDENTIALS }} || true
   build_component:
     runs-on: ubuntu-latest
     needs: setup
@@ -65,7 +60,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build component
         run: ./arcctl build architect.yml -t ${{ env.COMPONENT_NAME }}
-      # TODO: Need repo creds
       - name: Push component
         run: ./arcctl push ${{ env.COMPONENT_NAME }}
   deploy_component:
@@ -97,7 +91,7 @@ jobs:
           key: ${{ github.run_id }}
       - name: ls config dir
         run: ls ./arcctl-config
-      # TODO: Only do this if an environment file changes?
+      # TODO: Only do this if an environment file changes? When should this happen? It nukes the existing deployment
       - name: Apply environment
         run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
       - name: Deploy component

From c5b3f45684853b1aa91705e08ec8ffa8040f3771 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 12 Sep 2023 10:42:48 -0400
Subject: [PATCH 24/42] Add environment file, test deployment via applying
 environment instead of manual deploy

---
 .github/workflows/deploy.yml | 13 +++++--------
 environments/qa.yml          | 24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 environments/qa.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c58cf75..62b5f1d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,8 +7,8 @@ on:
 
 env:
   ARCCTL_CACHE_KEY: arcctl-0.1.7 # Hardcoding a version number here so we don't keep downloading this
-  ARC_DATACENTER: gh-serverless-dc # gh-datacenter
-  ARC_ENVIRONMENT: gh-environment
+  ARC_DATACENTER: gh-datacenter # gh-serverless-dc
+  ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test
   GCP_PROJECT: permanent-environment-testing
   COMPONENT_NAME: tyleraldrich/twitter-clone:latest
@@ -89,10 +89,7 @@ jobs:
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.run_id }}
-      - name: ls config dir
-        run: ls ./arcctl-config
-      # TODO: Only do this if an environment file changes? When should this happen? It nukes the existing deployment
       - name: Apply environment
-        run: ./arcctl apply env ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
-      - name: Deploy component
-        run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app --auto-approve
+        run: ./arcctl apply env qa-${{github.run_id}} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
+      # - name: Deploy component
+      #   run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app --auto-approve
diff --git a/environments/qa.yml b/environments/qa.yml
new file mode 100644
index 0000000..3077c8e
--- /dev/null
+++ b/environments/qa.yml
@@ -0,0 +1,24 @@
+version: v1
+
+components:
+  smtp:
+    source: tyleraldrich/smtp4dev:latest
+    ingresses:
+      smtp-http:
+        subdomain: smtp
+
+  kratos:
+    source: tyleraldrich/kratos:latest
+    ingresses:
+      kratos-admin:
+        subdomain: kratos-admin
+      kratos-public:
+        subdomain: kratos-public
+      auth:
+        subdomain: auth
+
+  twitter-clone:
+    source: tyleraldrich/twitter-clone:latest
+    ingresses:
+      app:
+        subdomain: app

From d43d36476509abcda3280462e0b68df2e89b8cf7 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 12 Sep 2023 12:32:08 -0400
Subject: [PATCH 25/42] Update arcctl version to fix environment fail not
 exiting with nonzero exit code

---
 .github/workflows/deploy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 62b5f1d..966d38c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
       - action-deployment # TODO: Update this, currently just for testing
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.7 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.8 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test
@@ -91,5 +91,3 @@ jobs:
           key: ${{ github.run_id }}
       - name: Apply environment
         run: ./arcctl apply env qa-${{github.run_id}} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
-      # - name: Deploy component
-      #   run: ./arcctl deploy ${{ env.COMPONENT_NAME }} -e ${{ env.ARC_ENVIRONMENT }} -i app:app --auto-approve

From 6705ea1c1e8bc01d16a25390721ec2e1797f9516 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 12 Sep 2023 12:51:14 -0400
Subject: [PATCH 26/42] Update environment to use correct component names

---
 environments/qa.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/environments/qa.yml b/environments/qa.yml
index 3077c8e..814eaa3 100644
--- a/environments/qa.yml
+++ b/environments/qa.yml
@@ -1,13 +1,13 @@
 version: v1
 
 components:
-  smtp:
+  tyleraldrich/smtp4dev:
     source: tyleraldrich/smtp4dev:latest
     ingresses:
       smtp-http:
         subdomain: smtp
 
-  kratos:
+  tyleraldrich/kratos:
     source: tyleraldrich/kratos:latest
     ingresses:
       kratos-admin:
@@ -17,7 +17,7 @@ components:
       auth:
         subdomain: auth
 
-  twitter-clone:
+  tyleraldrich/twitter-clone:
     source: tyleraldrich/twitter-clone:latest
     ingresses:
       app:

From f4ffdb50808d96efe0c9c1d6c34342d9d4859408 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 12 Sep 2023 14:35:21 -0400
Subject: [PATCH 27/42] Add local datacenter and upgrade nextjs version

---
 .gitignore            |   1 +
 datacenters/local.yml |  91 +++++++++++++++++++++
 package-lock.json     | 180 +++++++++++++++++++++---------------------
 package.json          |   2 +-
 4 files changed, 181 insertions(+), 93 deletions(-)
 create mode 100644 datacenters/local.yml

diff --git a/.gitignore b/.gitignore
index 8f322f0..4fa3d54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+secret/
diff --git a/datacenters/local.yml b/datacenters/local.yml
new file mode 100644
index 0000000..5a1c723
--- /dev/null
+++ b/datacenters/local.yml
@@ -0,0 +1,91 @@
+variables:
+  account:
+    type: arcctlAccount
+    description: The docker account to use for this datacenter
+    provider: docker
+  secretAccount:
+    type: arcctlAccount
+    description: The account used to store secrets
+
+resources:
+  service-registry:
+    type: volume
+    account: ${{ variables.account }}
+    name: traefik-volume
+
+  gateway:
+    type: deployment
+    name: my-gateway
+    account: ${{ variables.account }}
+    exposed_ports:
+      - port: 80
+        target_port: 80
+      - port: 8080
+        target_port: 8080
+    image: traefik:v2.10
+    command:
+      - --providers.file.directory=/etc/traefik
+      - --providers.file.watch=true
+      - --api.insecure=true
+      - --api.dashboard=true
+    volume_mounts:
+      - mount_path: /etc/traefik
+        readonly: true
+        volume: ${{ resources.service-registry.id }}
+
+accounts:
+  gateway:
+    name: local-gateway
+    provider: traefik
+    credentials:
+      type: volume
+      volume: ${{ resources.service-registry.id }}
+      account: ${{ variables.account }}
+
+environment:
+  resources:
+    pg:
+      type: databaseCluster
+      account: ${{ variables.account }}
+      name: ${{ environment.name }}-pg
+      databaseType: postgres
+      databaseVersion: '13'
+      databaseSize: n/a
+      vpc: n/a
+      region: n/a
+
+  accounts:
+    pg:
+      name: ${{ environment.name }}-postgres-db
+      provider: postgres
+      credentials:
+        host: ${{ environment.resources.pg.host }}
+        port: ${{ environment.resources.pg.port }}
+        username: ${{ environment.resources.pg.username }}
+        password: ${{ environment.resources.pg.password }}
+        databaseCluster: architect
+
+  hooks:
+    - when:
+        type: service
+      account: ${{ accounts.gateway.id }}
+      dnsZone: ${{ environment.name }}.172.17.0.1.nip.io
+      namespace: ${{ environment.name }}
+    - when:
+        type: ingressRule
+      account: ${{ accounts.gateway.id }}
+      registry: ${{ resources.service-registry.id }}
+      dnsZone: ${{ environment.name }}.127.0.0.1.nip.io
+      namespace: ${{ environment.name }}
+    - when:
+        type: database
+      account: ${{ environment.accounts.pg.id }}
+    - when:
+        type: deployment
+        image: oryd/kratos-selfservice-ui-node:v0.13.0
+      platform: linux/amd64
+    - when:
+        type: secret
+      account: ${{ variables.secretAccount }}
+    - account: ${{ variables.account }}
+      namespace: ${{ environment.name }}
diff --git a/package-lock.json b/package-lock.json
index d747f53..cd41858 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "eslint-config-next": "13.4.7",
         "flowbite": "^1.6.6",
         "flowbite-react": "^0.4.10",
-        "next": "13.4.12",
+        "next": "^13.4.19",
         "next-redux-wrapper": "^8.1.0",
         "postcss": "8.4.24",
         "react": "18.2.0",
@@ -263,9 +263,9 @@
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "node_modules/@next/env": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
-      "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.19.tgz",
+      "integrity": "sha512-FsAT5x0jF2kkhNkKkukhsyYOrRqtSxrEhfliniIq0bwWbuXLgyt3Gv0Ml+b91XwjwArmuP7NxCiGd++GGKdNMQ=="
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "13.4.7",
@@ -276,9 +276,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
-      "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.19.tgz",
+      "integrity": "sha512-vv1qrjXeGbuF2mOkhkdxMDtv9np7W4mcBtaDnHU+yJG+bBwa6rYsYSCI/9Xm5+TuF5SbZbrWO6G1NfTh1TMjvQ==",
       "cpu": [
         "arm64"
       ],
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
-      "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.19.tgz",
+      "integrity": "sha512-jyzO6wwYhx6F+7gD8ddZfuqO4TtpJdw3wyOduR4fxTUCm3aLw7YmHGYNjS0xRSYGAkLpBkH1E0RcelyId6lNsw==",
       "cpu": [
         "x64"
       ],
@@ -306,9 +306,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
-      "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.19.tgz",
+      "integrity": "sha512-vdlnIlaAEh6H+G6HrKZB9c2zJKnpPVKnA6LBwjwT2BTjxI7e0Hx30+FoWCgi50e+YO49p6oPOtesP9mXDRiiUg==",
       "cpu": [
         "arm64"
       ],
@@ -321,9 +321,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
-      "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.19.tgz",
+      "integrity": "sha512-aU0HkH2XPgxqrbNRBFb3si9Ahu/CpaR5RPmN2s9GiM9qJCiBBlZtRTiEca+DC+xRPyCThTtWYgxjWHgU7ZkyvA==",
       "cpu": [
         "arm64"
       ],
@@ -336,9 +336,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
-      "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.19.tgz",
+      "integrity": "sha512-htwOEagMa/CXNykFFeAHHvMJeqZfNQEoQvHfsA4wgg5QqGNqD5soeCer4oGlCol6NGUxknrQO6VEustcv+Md+g==",
       "cpu": [
         "x64"
       ],
@@ -351,9 +351,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
-      "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.19.tgz",
+      "integrity": "sha512-4Gj4vvtbK1JH8ApWTT214b3GwUh9EKKQjY41hH/t+u55Knxi/0wesMzwQRhppK6Ddalhu0TEttbiJ+wRcoEj5Q==",
       "cpu": [
         "x64"
       ],
@@ -366,9 +366,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
-      "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.19.tgz",
+      "integrity": "sha512-bUfDevQK4NsIAHXs3/JNgnvEY+LRyneDN788W2NYiRIIzmILjba7LaQTfihuFawZDhRtkYCv3JDC3B4TwnmRJw==",
       "cpu": [
         "arm64"
       ],
@@ -381,9 +381,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
-      "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.19.tgz",
+      "integrity": "sha512-Y5kikILFAr81LYIFaw6j/NrOtmiM4Sf3GtOc0pn50ez2GCkr+oejYuKGcwAwq3jiTKuzF6OF4iT2INPoxRycEA==",
       "cpu": [
         "ia32"
       ],
@@ -396,9 +396,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
-      "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.19.tgz",
+      "integrity": "sha512-YzA78jBDXMYiINdPdJJwGgPNT3YqBNNGhsthsDoWHL9p24tEJn9ViQf/ZqTbwSpX/RrkPupLfuuTH2sf73JBAw==",
       "cpu": [
         "x64"
       ],
@@ -3093,11 +3093,11 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/next": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
-      "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.4.19.tgz",
+      "integrity": "sha512-HuPSzzAbJ1T4BD8e0bs6B9C1kWQ6gv8ykZoRWs5AQoiIuqbGHHdQO7Ljuvg05Q0Z24E2ABozHe6FxDvI6HfyAw==",
       "dependencies": {
-        "@next/env": "13.4.12",
+        "@next/env": "13.4.19",
         "@swc/helpers": "0.5.1",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001406",
@@ -3113,19 +3113,18 @@
         "node": ">=16.8.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "13.4.12",
-        "@next/swc-darwin-x64": "13.4.12",
-        "@next/swc-linux-arm64-gnu": "13.4.12",
-        "@next/swc-linux-arm64-musl": "13.4.12",
-        "@next/swc-linux-x64-gnu": "13.4.12",
-        "@next/swc-linux-x64-musl": "13.4.12",
-        "@next/swc-win32-arm64-msvc": "13.4.12",
-        "@next/swc-win32-ia32-msvc": "13.4.12",
-        "@next/swc-win32-x64-msvc": "13.4.12"
+        "@next/swc-darwin-arm64": "13.4.19",
+        "@next/swc-darwin-x64": "13.4.19",
+        "@next/swc-linux-arm64-gnu": "13.4.19",
+        "@next/swc-linux-arm64-musl": "13.4.19",
+        "@next/swc-linux-x64-gnu": "13.4.19",
+        "@next/swc-linux-x64-musl": "13.4.19",
+        "@next/swc-win32-arm64-msvc": "13.4.19",
+        "@next/swc-win32-ia32-msvc": "13.4.19",
+        "@next/swc-win32-x64-msvc": "13.4.19"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
-        "fibers": ">= 3.1.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "sass": "^1.3.0"
@@ -3134,9 +3133,6 @@
         "@opentelemetry/api": {
           "optional": true
         },
-        "fibers": {
-          "optional": true
-        },
         "sass": {
           "optional": true
         }
@@ -4857,9 +4853,9 @@
       }
     },
     "@next/env": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
-      "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.19.tgz",
+      "integrity": "sha512-FsAT5x0jF2kkhNkKkukhsyYOrRqtSxrEhfliniIq0bwWbuXLgyt3Gv0Ml+b91XwjwArmuP7NxCiGd++GGKdNMQ=="
     },
     "@next/eslint-plugin-next": {
       "version": "13.4.7",
@@ -4870,57 +4866,57 @@
       }
     },
     "@next/swc-darwin-arm64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
-      "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.19.tgz",
+      "integrity": "sha512-vv1qrjXeGbuF2mOkhkdxMDtv9np7W4mcBtaDnHU+yJG+bBwa6rYsYSCI/9Xm5+TuF5SbZbrWO6G1NfTh1TMjvQ==",
       "optional": true
     },
     "@next/swc-darwin-x64": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
-      "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.19.tgz",
+      "integrity": "sha512-jyzO6wwYhx6F+7gD8ddZfuqO4TtpJdw3wyOduR4fxTUCm3aLw7YmHGYNjS0xRSYGAkLpBkH1E0RcelyId6lNsw==",
       "optional": true
     },
     "@next/swc-linux-arm64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
-      "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.19.tgz",
+      "integrity": "sha512-vdlnIlaAEh6H+G6HrKZB9c2zJKnpPVKnA6LBwjwT2BTjxI7e0Hx30+FoWCgi50e+YO49p6oPOtesP9mXDRiiUg==",
       "optional": true
     },
     "@next/swc-linux-arm64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
-      "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.19.tgz",
+      "integrity": "sha512-aU0HkH2XPgxqrbNRBFb3si9Ahu/CpaR5RPmN2s9GiM9qJCiBBlZtRTiEca+DC+xRPyCThTtWYgxjWHgU7ZkyvA==",
       "optional": true
     },
     "@next/swc-linux-x64-gnu": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
-      "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.19.tgz",
+      "integrity": "sha512-htwOEagMa/CXNykFFeAHHvMJeqZfNQEoQvHfsA4wgg5QqGNqD5soeCer4oGlCol6NGUxknrQO6VEustcv+Md+g==",
       "optional": true
     },
     "@next/swc-linux-x64-musl": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
-      "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.19.tgz",
+      "integrity": "sha512-4Gj4vvtbK1JH8ApWTT214b3GwUh9EKKQjY41hH/t+u55Knxi/0wesMzwQRhppK6Ddalhu0TEttbiJ+wRcoEj5Q==",
       "optional": true
     },
     "@next/swc-win32-arm64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
-      "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.19.tgz",
+      "integrity": "sha512-bUfDevQK4NsIAHXs3/JNgnvEY+LRyneDN788W2NYiRIIzmILjba7LaQTfihuFawZDhRtkYCv3JDC3B4TwnmRJw==",
       "optional": true
     },
     "@next/swc-win32-ia32-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
-      "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.19.tgz",
+      "integrity": "sha512-Y5kikILFAr81LYIFaw6j/NrOtmiM4Sf3GtOc0pn50ez2GCkr+oejYuKGcwAwq3jiTKuzF6OF4iT2INPoxRycEA==",
       "optional": true
     },
     "@next/swc-win32-x64-msvc": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
-      "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.19.tgz",
+      "integrity": "sha512-YzA78jBDXMYiINdPdJJwGgPNT3YqBNNGhsthsDoWHL9p24tEJn9ViQf/ZqTbwSpX/RrkPupLfuuTH2sf73JBAw==",
       "optional": true
     },
     "@nodelib/fs.scandir": {
@@ -6768,20 +6764,20 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "next": {
-      "version": "13.4.12",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
-      "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
-      "requires": {
-        "@next/env": "13.4.12",
-        "@next/swc-darwin-arm64": "13.4.12",
-        "@next/swc-darwin-x64": "13.4.12",
-        "@next/swc-linux-arm64-gnu": "13.4.12",
-        "@next/swc-linux-arm64-musl": "13.4.12",
-        "@next/swc-linux-x64-gnu": "13.4.12",
-        "@next/swc-linux-x64-musl": "13.4.12",
-        "@next/swc-win32-arm64-msvc": "13.4.12",
-        "@next/swc-win32-ia32-msvc": "13.4.12",
-        "@next/swc-win32-x64-msvc": "13.4.12",
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.4.19.tgz",
+      "integrity": "sha512-HuPSzzAbJ1T4BD8e0bs6B9C1kWQ6gv8ykZoRWs5AQoiIuqbGHHdQO7Ljuvg05Q0Z24E2ABozHe6FxDvI6HfyAw==",
+      "requires": {
+        "@next/env": "13.4.19",
+        "@next/swc-darwin-arm64": "13.4.19",
+        "@next/swc-darwin-x64": "13.4.19",
+        "@next/swc-linux-arm64-gnu": "13.4.19",
+        "@next/swc-linux-arm64-musl": "13.4.19",
+        "@next/swc-linux-x64-gnu": "13.4.19",
+        "@next/swc-linux-x64-musl": "13.4.19",
+        "@next/swc-win32-arm64-msvc": "13.4.19",
+        "@next/swc-win32-ia32-msvc": "13.4.19",
+        "@next/swc-win32-x64-msvc": "13.4.19",
         "@swc/helpers": "0.5.1",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001406",
diff --git a/package.json b/package.json
index 1969d97..815bb9c 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "eslint-config-next": "13.4.7",
     "flowbite": "^1.6.6",
     "flowbite-react": "^0.4.10",
-    "next": "13.4.12",
+    "next": "^13.4.19",
     "next-redux-wrapper": "^8.1.0",
     "postcss": "8.4.24",
     "react": "18.2.0",

From 197b62a89a07418a2764a43779e6040ab2e9b631 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Fri, 15 Sep 2023 15:15:04 -0400
Subject: [PATCH 28/42] Add local config, fix issues with login panel breaking
 between sessions

---
 app/_components/app-layout.tsx |  13 +-
 app/ory.ts                     |   4 +
 datacenters/local.yml          |  91 -----------
 docker-compose.yml             | 270 +++++++++++++++++++++++++++++++++
 4 files changed, 277 insertions(+), 101 deletions(-)
 delete mode 100644 datacenters/local.yml
 create mode 100644 docker-compose.yml

diff --git a/app/_components/app-layout.tsx b/app/_components/app-layout.tsx
index 9e32bf0..4df0826 100644
--- a/app/_components/app-layout.tsx
+++ b/app/_components/app-layout.tsx
@@ -18,6 +18,7 @@ import {
 import { Button } from './button';
 import { classNames, getGravatarImageUrl } from './utils';
 import { Avatar } from './avatar';
+import { oryUserAddr } from '../ory';
 
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
 
@@ -81,10 +82,7 @@ export const AppLayout = ({ children }: React.PropsWithChildren) => {
     navigation.push(
       {
         name: 'Sign in',
-        href:
-          process.env.NEXT_PUBLIC_USER_SERVICE_ADDR?.replace(/\/$/, '') +
-          '/login?return_to=' +
-          returnTo,
+        href: `${oryUserAddr}/login?return_to=${returnTo}`,
         icon: UserIcon,
         current: false,
         inverted: false,
@@ -92,12 +90,7 @@ export const AppLayout = ({ children }: React.PropsWithChildren) => {
       },
       {
         name: 'Sign up',
-        href:
-          process.env.NEXT_PUBLIC_USER_SERVICE_ADDR?.replace(/\/$/, '') +
-          '/registration?return_to=' +
-          returnTo +
-          '&after_verification_return_to=' +
-          returnTo,
+        href: `${oryUserAddr}/registration?return_to=${returnTo}&after_verification_return_to=${returnTo}`,
         icon: UserIcon,
         current: false,
         inverted: true,
diff --git a/app/ory.ts b/app/ory.ts
index 1ad33a5..1fee1b4 100644
--- a/app/ory.ts
+++ b/app/ory.ts
@@ -1,5 +1,9 @@
 import * as sdk from '@ory/client';
 
+export const oryUserAddr = process.env.NEXT_PUBLIC_USER_SERVICE_ADDR?.replace(
+  /\/$/,
+  ''
+);
 export const oryPublicAddr = process.env.NEXT_PUBLIC_KRATOS_ADDR?.replace(
   /\/$/,
   ''
diff --git a/datacenters/local.yml b/datacenters/local.yml
deleted file mode 100644
index 5a1c723..0000000
--- a/datacenters/local.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-variables:
-  account:
-    type: arcctlAccount
-    description: The docker account to use for this datacenter
-    provider: docker
-  secretAccount:
-    type: arcctlAccount
-    description: The account used to store secrets
-
-resources:
-  service-registry:
-    type: volume
-    account: ${{ variables.account }}
-    name: traefik-volume
-
-  gateway:
-    type: deployment
-    name: my-gateway
-    account: ${{ variables.account }}
-    exposed_ports:
-      - port: 80
-        target_port: 80
-      - port: 8080
-        target_port: 8080
-    image: traefik:v2.10
-    command:
-      - --providers.file.directory=/etc/traefik
-      - --providers.file.watch=true
-      - --api.insecure=true
-      - --api.dashboard=true
-    volume_mounts:
-      - mount_path: /etc/traefik
-        readonly: true
-        volume: ${{ resources.service-registry.id }}
-
-accounts:
-  gateway:
-    name: local-gateway
-    provider: traefik
-    credentials:
-      type: volume
-      volume: ${{ resources.service-registry.id }}
-      account: ${{ variables.account }}
-
-environment:
-  resources:
-    pg:
-      type: databaseCluster
-      account: ${{ variables.account }}
-      name: ${{ environment.name }}-pg
-      databaseType: postgres
-      databaseVersion: '13'
-      databaseSize: n/a
-      vpc: n/a
-      region: n/a
-
-  accounts:
-    pg:
-      name: ${{ environment.name }}-postgres-db
-      provider: postgres
-      credentials:
-        host: ${{ environment.resources.pg.host }}
-        port: ${{ environment.resources.pg.port }}
-        username: ${{ environment.resources.pg.username }}
-        password: ${{ environment.resources.pg.password }}
-        databaseCluster: architect
-
-  hooks:
-    - when:
-        type: service
-      account: ${{ accounts.gateway.id }}
-      dnsZone: ${{ environment.name }}.172.17.0.1.nip.io
-      namespace: ${{ environment.name }}
-    - when:
-        type: ingressRule
-      account: ${{ accounts.gateway.id }}
-      registry: ${{ resources.service-registry.id }}
-      dnsZone: ${{ environment.name }}.127.0.0.1.nip.io
-      namespace: ${{ environment.name }}
-    - when:
-        type: database
-      account: ${{ environment.accounts.pg.id }}
-    - when:
-        type: deployment
-        image: oryd/kratos-selfservice-ui-node:v0.13.0
-      platform: linux/amd64
-    - when:
-        type: secret
-      account: ${{ variables.secretAccount }}
-    - account: ${{ variables.account }}
-      namespace: ${{ environment.name }}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..7c5c59a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,270 @@
+services:
+  traefik:
+    image: "traefik:v2.10"
+    container_name: "traefik"
+    command:
+      #- "--log.level=DEBUG"
+      - "--api.insecure=true"
+      - "--providers.docker=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.app.address=:80"
+    ports:
+      - "80:80"
+      - "8080:8080"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+
+  # TODO: Add volume to persist data
+  app-db:
+    image: postgres:15
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: architect
+      POSTGRES_PASSWORD: architect
+      POSTGRES_DB: main
+
+  # TODO: Add volume to persist data
+  kratos-db:
+    image: postgres:15
+    ports:
+      - 5433:5432
+    environment:
+      POSTGRES_USER: architect
+      POSTGRES_PASSWORD: architect
+      POSTGRES_DB: kratos
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
+    environment:
+      DB_URL: postgresql://architect:architect@app-db:5432/main
+      KRATOS_ADDR: http://kratos.127.0.0.1.nip.io:4433/
+      KRATOS_ADMIN_ADDR: http://kratos.127.0.0.1.nip.io:4434/
+      NEXT_PUBLIC_SELF_ADDR: http://app.127.0.0.1.nip.io/
+      NEXT_PUBLIC_KRATOS_ADDR: http://kratos.127.0.0.1.nip.io:4433/
+      NEXT_PUBLIC_USER_SERVICE_ADDR: http://kratos-ui.127.0.0.1.nip.io:3001/
+    command: sh -c "npx prisma db push; npm run dev"
+    volumes:
+      - ./node_modules:/app/node_modules
+      - ./app:/app/app
+      - ./store:/app/store
+      - ./public:/app/public
+      - ./prisma:/app/prisma
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.app.rule=Host(`app.127.0.0.1.nip.io`)"
+      - "traefik.http.routers.app.entrypoints=app"
+    ports:
+      - 3000:3000
+    depends_on:
+      - app-db
+
+  kratos:
+    image: oryd/kratos:v1.0
+    ports:
+      - 4433:4433
+      - 4434:4434
+    entrypoint: ""
+    command:
+      - sh
+      - -c
+      - |
+        mkdir ./kratos
+        echo "$$IDENTITY_SCHEMA" > ./kratos/identity.schema.json
+        echo "$$CONFIG" > ./kratos/.kratos.yml
+        kratos -c ./kratos/.kratos.yml migrate sql -e --yes
+        kratos serve -c ./kratos/.kratos.yml --watch-courier --dev
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.kratos.rule=Host(`kratos.127.0.0.1.nip.io`)"
+      - "traefik.http.routers.kratos.service=kratos"
+    networks:
+      default:
+          aliases:
+            - kratos.127.0.0.1.nip.io
+    environment:
+      CONFIG: |
+        version: v0.13.0
+        dsn: postgresql://architect:architect@kratos-db:5432/kratos?max_conns=20&max_idle_conns=4
+        serve:
+          public:
+            base_url: http://kratos.127.0.0.1.nip.io:4433/
+            cors:
+              enabled: false
+          admin:
+            base_url: http://kratos.127.0.0.1.nip.io:4434/
+        selfservice:
+          default_browser_return_url: http://app.127.0.0.1.nip.io/
+          allowed_return_urls:
+            - http://app.127.0.0.1.nip.io/
+          methods:
+            password:
+              enabled: true
+            totp:
+              config:
+                issuer: Kratos
+              enabled: true
+            code:
+              enabled: true
+            link:
+              enabled: true
+            lookup_secret:
+              enabled: true
+          flows:
+            error:
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/error
+            settings:
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/settings
+              privileged_session_max_age: 15m
+              required_aal: highest_available
+            logout:
+              after:
+                default_browser_return_url: http://app.127.0.0.1.nip.io
+            login:
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/login
+              lifespan: 10m
+            registration:
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/registration
+              lifespan: 10m
+              after:
+                password:
+                  hooks:
+                    - hook: session
+                    - hook: show_verification_ui
+            verification:
+              enabled: true
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/verification
+              use: code
+              after:
+                default_browser_return_url: http://app.127.0.0.1.nip.io
+            recovery:
+              enabled: true
+              ui_url: http://kratos-ui.127.0.0.1.nip.io:3001/recovery
+              use: code
+        courier:
+          smtp:
+            connection_uri: smtps://architect:architect@smtp:25/?skip_ssl_verify=true
+        log:
+          level: info
+          format: text
+          leak_sensitive_values: true
+        secrets:
+          cookie:
+            - PLEASE-CHANGE-ME-I-AM-VERY-INSECURE
+          cipher:
+            - 32-LONG-SECRET-NOT-SECURE-AT-ALL
+        ciphers:
+          algorithm: xchacha20-poly1305
+        hashers:
+          algorithm: bcrypt
+          bcrypt:
+            cost: 8
+        identity:
+          default_schema_id: default
+          schemas:
+            - id: default
+              url: file://./kratos/identity.schema.json
+        cookies:
+          domain: 127.0.0.1.nip.io
+          path: /
+          same_site: Lax
+      IDENTITY_SCHEMA: |
+        {
+          "$$id": "https://schemas.ory.sh/presets/kratos/quickstart/email-password/identity.schema.json",
+          "$$schema": "http://json-schema.org/draft-07/schema#",
+          "title": "Person",
+          "type": "object",
+          "properties": {
+            "traits": {
+              "type": "object",
+              "properties": {
+                "email": {
+                  "type": "string",
+                  "format": "email",
+                  "title": "E-Mail",
+                  "minLength": 3,
+                  "ory.sh/kratos": {
+                    "credentials": {
+                      "password": {
+                        "identifier": true
+                      }
+                    },
+                    "verification": {
+                      "via": "email"
+                    },
+                    "recovery": {
+                      "via": "email"
+                    }
+                  }
+                },
+                "username": {
+                  "type": "string",
+                  "minLength": 1,
+                  "title": "Username",
+                  "ory.sh/kratos": {
+                    "credentials": {
+                      "password": {
+                        "identifier": true
+                      }
+                    }
+                  }
+                },
+                "name": {
+                  "type": "object",
+                  "properties": {
+                    "first": {
+                      "title": "First Name",
+                      "type": "string"
+                    },
+                    "last": {
+                      "title": "Last Name",
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "required": [
+                "email",
+                "username"
+              ],
+              "additionalProperties": false
+            }
+          }
+        }
+
+  kratos-ui:
+    image: tyleraldrich/kratos:latest-deployments-kratos-ui
+    environment:
+      KRATOS_PUBLIC_URL: http://kratos.127.0.0.1.nip.io:4433
+      KRATOS_BROWSER_URL: http://kratos.127.0.0.1.nip.io:4433
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.kratos-ui.rule=Host(`kratos-ui.127.0.0.1.nip.io`)"
+      - "traefik.http.routers.kratos-ui.service=kratos-ui"
+      - "traefik.http.middlewares.cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT,POST,DELETE"
+      - "traefik.http.middlewares.cors.headers.accesscontrolallowheaders=*"
+      - "traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*"
+      - "traefik.http.middlewares.cors.headers.accesscontrolallowcredentials=true"
+      - "traefik.http.routers.kratos-ui.middlewares=cors@docker"
+    ports:
+      - 3001:3000
+
+  smtp:
+    image: rnwood/smtp4dev:v3
+    environment:
+      RelayOptions__Login: architect
+      RelayOptions__Password: architect
+      ServerOptions__TlsMode: ImplicitTls
+      ServerOptions__HostName: smtp
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.smtp.rule=Host(`smtp.127.0.0.1.nip.io`)"
+      - "traefik.http.routers.smtp.service=smtp"
+    networks:
+      default:
+          aliases:
+            - smtp.127.0.0.1.nip.io
+    ports:
+      - 2500:80

From eb2dfef6f93db398ab04d59d2c76bb5d97fa8558 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Mon, 18 Sep 2023 10:55:02 -0400
Subject: [PATCH 29/42] Update action to run on pull request, uses pull request
 number in environment

---
 .github/workflows/deploy.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 966d38c..28299ac 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,9 +1,9 @@
 name: Component Deploy
 
 on:
-  push:
+  pull_request:
     branches:
-      - action-deployment # TODO: Update this, currently just for testing
+      - master
 
 env:
   ARCCTL_CACHE_KEY: arcctl-0.1.8 # Hardcoding a version number here so we don't keep downloading this
@@ -34,7 +34,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: ${{ github.event.pull_request.number }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
   build_component:
@@ -52,7 +52,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: ${{ github.event.pull_request.number }}
       - name: Docker Login
         uses: docker/login-action@v2.2.0
         with:
@@ -88,6 +88,6 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.run_id }}
+          key: ${{ github.event.pull_request.number }}
       - name: Apply environment
-        run: ./arcctl apply env qa-${{github.run_id}} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
+        run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From e62f9d557d4f9e1459121d8310bb0c048baa9941 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Mon, 18 Sep 2023 11:09:00 -0400
Subject: [PATCH 30/42] Dont specify master branch for PR

---
 .github/workflows/deploy.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 28299ac..f70bda0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,8 +2,6 @@ name: Component Deploy
 
 on:
   pull_request:
-    branches:
-      - master
 
 env:
   ARCCTL_CACHE_KEY: arcctl-0.1.8 # Hardcoding a version number here so we don't keep downloading this

From bc220aecb900ad1c27d968179c79ac1b1ca8f2dc Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Mon, 18 Sep 2023 13:14:24 -0400
Subject: [PATCH 31/42] Add refresh environment flag and update arcctl version

---
 .github/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f70bda0..abebf2b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.8 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.1.9 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test
@@ -88,4 +88,4 @@ jobs:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.event.pull_request.number }}
       - name: Apply environment
-        run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve
+        run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve --refresh

From ed363697fdb41d2069f2a6dc5fd55e081177e19c Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 11:27:24 -0400
Subject: [PATCH 32/42] Bump arcctl version for new build features

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index abebf2b..d1a0085 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.1.9 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.2.0 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test

From 327459b3b4632f7598a5921ad50bb5773a9e84c9 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 11:47:26 -0400
Subject: [PATCH 33/42] More arcctl updates

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d1a0085..d460458 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.2.0 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.2.1 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test

From a57009067a77629fe4fd779ee3c688411e4a5ce7 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 11:56:21 -0400
Subject: [PATCH 34/42] Remove unused refresh flag

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d460458..9fd7d85 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -88,4 +88,4 @@ jobs:
           path: ${{ env.XDG_CONFIG_HOME }}
           key: ${{ github.event.pull_request.number }}
       - name: Apply environment
-        run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve --refresh
+        run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From b49bd89c25e7aadb7b84bf254457786a4d12df19 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 12:52:13 -0400
Subject: [PATCH 35/42] Change cache key of arcctl config to fix issue with bad
 component build

---
 .github/workflows/deploy.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9fd7d85..aa6407e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}
+          key: ${{ github.event.pull_request.number }}-force
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
   build_component:
@@ -50,7 +50,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}
+          key: ${{ github.event.pull_request.number }}-force
       - name: Docker Login
         uses: docker/login-action@v2.2.0
         with:
@@ -86,6 +86,6 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}
+          key: ${{ github.event.pull_request.number }}-force
       - name: Apply environment
         run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From c4565c63276a70de5052a848a8d9e3a61b7314fc Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 14:21:38 -0400
Subject: [PATCH 36/42] Bump arcctl version to resolve dependency loop bug

---
 .github/workflows/deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index aa6407e..58eb662 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.2.1 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.2.2 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test
@@ -32,7 +32,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}-force
+          key: ${{ github.event.pull_request.number }}
       - name: Setup arcctl backend
         run: ./arcctl set state.backend --provider s3 --creds accessKeyId=${{ secrets.BUCKET_ACCESS_KEY_ID }} --creds secretAccessKey=${{ secrets.BUCKET_ACCESS_KEY }} --creds endpoint=https://nyc3.digitaloceanspaces.com --creds region=nyc3 --namespace arcctl-dcs
   build_component:
@@ -50,7 +50,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}-force
+          key: ${{ github.event.pull_request.number }}
       - name: Docker Login
         uses: docker/login-action@v2.2.0
         with:
@@ -86,6 +86,6 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.XDG_CONFIG_HOME }}
-          key: ${{ github.event.pull_request.number }}-force
+          key: ${{ github.event.pull_request.number }}
       - name: Apply environment
         run: ./arcctl apply env qa-${{ github.event.pull_request.number }} ${{ env.ARC_ENVIRONMENT }} -d ${{ env.ARC_DATACENTER}} --auto-approve

From a43a889cd835a40601384e475b75c6831ff5d6db Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Tue, 19 Sep 2023 14:52:01 -0400
Subject: [PATCH 37/42] FIx issue with env update failing not failing action

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 58eb662..7249302 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.2.2 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.2.3 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test

From f7a9b4ef2acc2fe7676b2a3d668c89745aef5d3d Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 20 Sep 2023 13:12:40 -0400
Subject: [PATCH 38/42] bump arcctl, added component tagging via sha so
 redeploys work

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7249302..b01c769 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.2.3 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.2.4 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test

From a0981af70897e53689c4639fcf8befec4d3c4a03 Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 20 Sep 2023 13:56:45 -0400
Subject: [PATCH 39/42] Slightly modify the process.env to see if that makes a
 difference

---
 app/ory.ts       | 12 +++---------
 app/provider.tsx |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/ory.ts b/app/ory.ts
index 1fee1b4..0bd7444 100644
--- a/app/ory.ts
+++ b/app/ory.ts
@@ -1,13 +1,7 @@
 import * as sdk from '@ory/client';
 
-export const oryUserAddr = process.env.NEXT_PUBLIC_USER_SERVICE_ADDR?.replace(
-  /\/$/,
-  ''
-);
-export const oryPublicAddr = process.env.NEXT_PUBLIC_KRATOS_ADDR?.replace(
-  /\/$/,
-  ''
-);
+export const oryUserAddr = process.env.NEXT_PUBLIC_USER_SERVICE_ADDR;
+export const oryPublicAddr = process.env.NEXT_PUBLIC_KRATOS_ADDR;
 
 export const oryClient = new sdk.FrontendApi(
   new sdk.Configuration({
@@ -20,7 +14,7 @@ export const oryClient = new sdk.FrontendApi(
 
 export const oryServer = new sdk.FrontendApi(
   new sdk.Configuration({
-    basePath: process.env.KRATOS_ADDR?.replace(/\/$/, ''),
+    basePath: process.env.KRATOS_ADDR,
     baseOptions: {
       withCredentials: true,
     },
diff --git a/app/provider.tsx b/app/provider.tsx
index f4a1fa7..b66c2da 100644
--- a/app/provider.tsx
+++ b/app/provider.tsx
@@ -3,7 +3,7 @@
 import { Provider as ReduxProvider } from 'react-redux';
 import { store } from '@/store';
 import { PropsWithChildren, useRef } from 'react';
-import { AuthState, setAuthData } from '@/store/authSlice';
+import { setAuthData } from '@/store/authSlice';
 import { Session } from '@ory/client';
 
 export const Provider = (

From b8462dea2a6223be186cadd407f9d79d7770f77c Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 20 Sep 2023 14:12:36 -0400
Subject: [PATCH 40/42] Testing change of title and environment apply

---
 app/(home)/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(home)/page.tsx b/app/(home)/page.tsx
index d6c7dd4..bb27b45 100644
--- a/app/(home)/page.tsx
+++ b/app/(home)/page.tsx
@@ -5,7 +5,7 @@ import { PageHeader } from '../_components/page-header';
 import { HomeYeetForm } from './home-yeet-form';
 
 export const metadata: Metadata = {
-  title: 'The Y Feed',
+  title: 'Y Feed',
   description: 'A list of messages yeeted into the ether!',
 };
 

From 59b8d2bb2c85d325a1e85a92d677dc20861e8cdf Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 20 Sep 2023 15:43:29 -0400
Subject: [PATCH 41/42] Bump arcctl version

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b01c769..dc071e3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.2.4 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.3.0 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test

From f4cf1deb7cc0eee39b60e79cba493eaac35118ba Mon Sep 17 00:00:00 2001
From: Tyler Aldrich <tyler.aldrich@architect.io>
Date: Wed, 20 Sep 2023 15:53:51 -0400
Subject: [PATCH 42/42] Bump dependency again

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dc071e3..8ba7517 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  ARCCTL_CACHE_KEY: arcctl-0.3.0 # Hardcoding a version number here so we don't keep downloading this
+  ARCCTL_CACHE_KEY: arcctl-0.3.1 # Hardcoding a version number here so we don't keep downloading this
   ARC_DATACENTER: gh-datacenter # gh-serverless-dc
   ARC_ENVIRONMENT: ./environments/qa.yml
   GCP_ACCOUNT_NAME: gcp-test