MythEclipse/imphnen-frontend-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into hackathon/fix-ui

Browse Source
This commit is contained in:
Hafid Nur
2025-11-25 17:54:41 +07:00
parent fcaa449630 9d24a11c05
commit c6c0d6fded
16 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy-backoffice.yml
+6 -1
View File
@@ -7,6 +7,10 @@ on:
paths: paths:
- 'apps/backoffice/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY - 'apps/backoffice/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
concurrency:
group: deploy-vps
cancel-in-progress: false
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -21,6 +25,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
command_timeout: 30m
script: | script: |
set -e set -e
if [ ! -d ~/imphnen-frontend-service-backoffice ]; then if [ ! -d ~/imphnen-frontend-service-backoffice ]; then
@@ -34,6 +39,6 @@ jobs:
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }} VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
EOF EOF
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml down || true docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml down || true
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml build DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml build --progress=plain
docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml up -d docker compose -f ~/imphnen-frontend-service-backoffice/docker-compose-backoffice.yml up -d
docker image prune -af docker image prune -af
.github/workflows/deploy-dimentorin.yml
+6 -1
View File
@@ -7,6 +7,10 @@ on:
paths: paths:
- 'apps/dimentorin/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY - 'apps/dimentorin/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
concurrency:
group: deploy-vps
cancel-in-progress: false
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -21,6 +25,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
command_timeout: 30m
script: | script: |
set -e set -e
if [ ! -d ~/imphnen-frontend-service-dimentorin ]; then if [ ! -d ~/imphnen-frontend-service-dimentorin ]; then
@@ -34,6 +39,6 @@ jobs:
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }} VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
EOF EOF
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml down || true docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml down || true
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml build DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml build --progress=plain
docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml up -d docker compose -f ~/imphnen-frontend-service-dimentorin/docker-compose-dimentorin.yml up -d
docker image prune -af docker image prune -af
.github/workflows/deploy-gacha.yml
+6 -1
View File
@@ -7,6 +7,10 @@ on:
paths: paths:
- 'apps/gacha/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY - 'apps/gacha/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
concurrency:
group: deploy-vps
cancel-in-progress: false
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -21,6 +25,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
command_timeout: 30m
script: | script: |
set -e set -e
if [ ! -d ~/imphnen-frontend-service-gacha ]; then if [ ! -d ~/imphnen-frontend-service-gacha ]; then
@@ -34,6 +39,6 @@ jobs:
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }} VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
EOF EOF
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml down || true docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml down || true
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml build DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml build --progress=plain
docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml up -d docker compose -f ~/imphnen-frontend-service-gacha/docker-compose-gacha.yml up -d
docker image prune -af docker image prune -af
.github/workflows/deploy-hackathon.yml
+8 -2
View File
@@ -7,6 +7,10 @@ on:
paths: paths:
- 'apps/hackathon/**' # Auto deploy when changes pushed to apps/hackathon - 'apps/hackathon/**' # Auto deploy when changes pushed to apps/hackathon
concurrency:
group: deploy-vps
cancel-in-progress: false
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -21,6 +25,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
command_timeout: 30m
script: | script: |
set -e set -e
if [ ! -d ~/imphnen-frontend-service-hackathon ]; then if [ ! -d ~/imphnen-frontend-service-hackathon ]; then
@@ -28,12 +33,13 @@ jobs:
else else
cd ~/imphnen-frontend-service-hackathon && git fetch origin && git reset --hard origin/develop && git pull cd ~/imphnen-frontend-service-hackathon && git fetch origin && git reset --hard origin/develop && git pull
fi fi
cat > ~/imphnen-frontend-service-hackathon/apps/hackathon/.env << EOF cat > ~/imphnen-frontend-service-hackathon/.env.local << EOF
VITE_API_URL=${{ secrets.VITE_API_URL }} VITE_API_URL=${{ secrets.VITE_API_URL }}
VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }} VITE_SUPABASE_URL=${{ secrets.VITE_SUPABASE_URL }}
VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }} VITE_SUPABASE_ANON_KEY=${{ secrets.VITE_SUPABASE_ANON_KEY }}
EOF EOF
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml down || true docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml down || true
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml build docker builder prune -af || true
DOCKER_BUILDKIT=1 docker compose --env-file ~/imphnen-frontend-service-hackathon/.env.local -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml build --progress=plain
docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml up -d docker compose -f ~/imphnen-frontend-service-hackathon/docker-compose-hackathon.yml up -d
docker image prune -af docker image prune -af
.github/workflows/deploy-landing.yml
+6 -1
View File
@@ -7,6 +7,10 @@ on:
paths: paths:
- 'apps/landing/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY - 'apps/landing/**' # INI BASED ON PATH CHANGES JADI NTAR KALAU ADA PUSH DIISNI OTOMATIS DEPLOY
concurrency:
group: deploy-vps
cancel-in-progress: false
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -21,6 +25,7 @@ jobs:
username: ${{ secrets.SSH_USER }} username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }} key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
command_timeout: 30m
script: | script: |
set -e set -e
if [ ! -d ~/imphnen-frontend-service ]; then if [ ! -d ~/imphnen-frontend-service ]; then
@@ -34,6 +39,6 @@ jobs:
NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }} NEXT_PUBLIC_SUPABASE_ANON_KEY=${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
EOF EOF
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml down || true docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml down || true
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml build DOCKER_BUILDKIT=1 docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml build --progress=plain
docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml up -d docker compose -f ~/imphnen-frontend-service/docker-compose-landing.yml up -d
docker image prune -af docker image prune -af
apps/backoffice/.deploy
+1 -1
View File
@@ -1 +1 @@
Tue, Nov 25, 2025 11:09:55 AM Tue, Nov 25, 2025 4:21:27 PM
apps/dimentorin/.deploy
+1 -1
View File
@@ -1 +1 @@
Tue, Nov 25, 2025 11:09:55 AM Tue, Nov 25, 2025 4:21:27 PM
apps/gacha/.deploy
+1 -1
View File
@@ -1 +1 @@
Tue, Nov 25, 2025 11:09:55 AM Tue, Nov 25, 2025 4:21:27 PM
apps/hackathon/.deploy
+1 -1
View File
@@ -1 +1 @@
Tue, Nov 25, 2025 11:09:55 AM Tue, Nov 25, 2025 16:42:27 PM
apps/hackathon/.deploy-trigger
-2
View File
@@ -1,2 +0,0 @@
# Deployment trigger
# Updated to deploy circular dependency fixes and auth hooks
apps/landing/.deploy
+1 -1
View File
@@ -1 +1 @@
Tue, Nov 25, 2025 11:09:55 AM Tue, Nov 25, 2025 4:21:27 PM
docker/backoffice.Dockerfile
+1
View File
@@ -7,6 +7,7 @@ FROM node:22-alpine AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY . .
ENV NX_DAEMON=false
RUN npm run backoffice:build RUN npm run backoffice:build
FROM nginx:alpine AS runner FROM nginx:alpine AS runner
docker/dimentorin.Dockerfile
+1
View File
@@ -7,6 +7,7 @@ FROM node:22-alpine AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY . .
ENV NX_DAEMON=false
RUN npm run dimentorin:build RUN npm run dimentorin:build
FROM nginx:alpine AS runner FROM nginx:alpine AS runner
docker/gacha.Dockerfile
+1
View File
@@ -7,6 +7,7 @@ FROM node:22-alpine AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY . .
ENV NX_DAEMON=false
RUN npm run gacha:build RUN npm run gacha:build
FROM nginx:alpine AS runner FROM nginx:alpine AS runner
docker/hackathon.Dockerfile
+1
View File
@@ -16,6 +16,7 @@ ARG VITE_SUPABASE_ANON_KEY
ENV VITE_SUPABASE_URL=$VITE_SUPABASE_URL ENV VITE_SUPABASE_URL=$VITE_SUPABASE_URL
ENV VITE_SUPABASE_ANON_KEY=$VITE_SUPABASE_ANON_KEY ENV VITE_SUPABASE_ANON_KEY=$VITE_SUPABASE_ANON_KEY
ENV NX_DAEMON=false
RUN npm run hackathon:build RUN npm run hackathon:build
FROM nginx:alpine AS runner FROM nginx:alpine AS runner
docker/landing.Dockerfile
+1
View File
@@ -4,6 +4,7 @@ WORKDIR /app
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm ci --prefer-offline --no-audit --no-fund RUN npm ci --prefer-offline --no-audit --no-fund
COPY . . COPY . .
ENV NX_DAEMON=false
RUN npm run landing:build RUN npm run landing:build
FROM node:22-alpine AS runner FROM node:22-alpine AS runner