Merge pull request #10 from ResEmCode/ci/vercel-pipeline

Ci/vercel pipeline

Author: otsairaze

.github/workflows/client-deploy.yml

@@ -0,0 +1,32 @@
+name: client-deploy.ci
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+on:
+  workflow_run:
+    workflows: ['client.ci']
+    types:
+      - completed
+
+jobs:
+
+  Deploy-Preview:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: Install Vercel
+        run: npm install --global vercel@latest
+
+      - name: Pull Vercel
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}

client/src/shared/ui/Skeleton/Skeleton.module.scss

@@ -16,7 +16,7 @@
     background: linear-gradient(
       to right,
       transparent 0%,
-      rgba(129 128 128) 50%,
+      rgb(129 128 128) 50%,
       transparent 100%
     );
     content: "";

client/src/shared/ui/Stack/Flex/Flex.module.scss

@@ -10,6 +10,7 @@
   justify-content: flex-start;
 }
 
+<<<<<<< HEAD
 .justify_center {
   justify-content: center;
 }
@@ -19,18 +20,37 @@
 }
 
 .justify_between {
+=======
+.justifyCenter {
+  justify-content: center;
+}
+
+.justifyEnd {
+  justify-content: flex-end;
+}
+
+.justifyBetween {
+>>>>>>> 49a49fd (fix: client lint error)
   justify-content: space-between;
 }
 
 .align_start {
   align-items: flex-start;
 }
 
+<<<<<<< HEAD
 .align_center {
   align-items: center;
 }
 
 .align_end {
+=======
+.alignCenter {
+  align-items: center;
+}
+
+.alignEnd {
+>>>>>>> 49a49fd (fix: client lint error)
   align-items: flex-end;
 }
 

server/docker/entrypoint.sh

@@ -1,11 +1,11 @@
-#!/bin/sh
-set -e
+ #!/bin/sh
+ set -e
 
-echo "[DEBUG] Waiting for postgres (sleeping 5s)..."
-sleep 5
+ echo "[DEBUG] Waiting for postgres (sleeping 5s)..."
+ sleep 5
 
-echo "[DEBUG] Start prisma migration"
-npx prisma migrate deploy
+ echo "[DEBUG] Start prisma migration"
+ npx prisma migrate deploy
 
-echo "[DEBUG] Starting application..."
-exec node dist/src/main.js
+ echo "[DEBUG] Starting application..."
+ exec node dist/src/main.js