diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index a886408..ca57e95 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -25,7 +25,9 @@ jobs: persist-credentials: false - name: Build - run: docker build -t chad-client ./client --build-arg COMMIT_SHA=${{ gitea.sha }} + run: docker build -t chad-client ./client \ + --build-arg COMMIT_SHA=${{ gitea.sha }} + --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} - name: Stop old container run: docker rm -f chad-client || true diff --git a/client/.gitignore b/client/.gitignore index cd8fe73..8fb5f0f 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -28,4 +28,7 @@ logs !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions + +scripts/release.ps1 +.tauri \ No newline at end of file diff --git a/client/.yarn/install-state.gz b/client/.yarn/install-state.gz index 3fcd296..c9134bb 100644 Binary files a/client/.yarn/install-state.gz and b/client/.yarn/install-state.gz differ diff --git a/client/Dockerfile b/client/Dockerfile index d0d5545..ef17c22 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -11,7 +11,10 @@ RUN yarn install COPY . . ARG COMMIT_SHA=unknown -ENV COMMIT_SHA=$COMMIT_SHA +ARG API_BASE_URL + +ENV COMMIT_SHA=$COMMIT_SHA \ + API_BASE_URL=$API_BASE_URL RUN yarn generate diff --git a/client/app/app.vue b/client/app/app.vue index b804a20..b7d78f0 100644 --- a/client/app/app.vue +++ b/client/app/app.vue @@ -5,3 +5,9 @@ + + diff --git a/client/app/components.d.ts b/client/app/components.d.ts index fe327c4..71909e0 100644 --- a/client/app/components.d.ts +++ b/client/app/components.d.ts @@ -17,6 +17,8 @@ declare module 'vue' { PrimeFloatLabel: typeof import('primevue/floatlabel')['default'] PrimeInputText: typeof import('primevue/inputtext')['default'] PrimeMenu: typeof import('primevue/menu')['default'] + PrimePassword: typeof import('primevue/password')['default'] + PrimeSelectButton: typeof import('primevue/selectbutton')['default'] PrimeSlider: typeof import('primevue/slider')['default'] PrimeToast: typeof import('primevue/toast')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/client/app/components/ClientRow.vue b/client/app/components/ClientRow.vue index 6f0992b..8752f1f 100644 --- a/client/app/components/ClientRow.vue +++ b/client/app/components/ClientRow.vue @@ -8,17 +8,17 @@
- {{ client.username }} + {{ client.displayName }}
-
- {{ client.id }} +
+ {{ client.username }}
- - + + -