diff --git a/client/.github/workflows/ci.yml b/.github/workflows/client.yml similarity index 52% rename from client/.github/workflows/ci.yml rename to .github/workflows/client.yml index 0492c59..fce59a9 100644 --- a/client/.github/workflows/ci.yml +++ b/.github/workflows/client.yml @@ -1,27 +1,40 @@ -name: FRONTEND-CI - +name: client.yml on: push: branches: - main + - 'feature/**' + paths: + - 'client/**' pull_request: branches: - main + paths: + - 'client/**' jobs: - build-test: - runs-on: ubuntu-latest + build: + runs-on: ubuntu-22.04 + defaults: + run: + working-directory: ./client steps: - - name: Checkout repository - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + + - name: DEBUG stage + run: | + pwd + ls -la + echo "Current branch: ${GITHUB_REF}" - #Node(Dockerfile) - - name: Setup Node.js + - name: Setup Nodejs uses: actions/setup-node@v4 with: - node-version: 20 - cache: npm + node-version: '20' + cache: 'npm' + cache-dependency-path: 'client/package-lock.json' + #Dependencies - name: Install dependencies @@ -42,15 +55,3 @@ jobs: #Production build - name: Build project run: npm run build - - docker-build: - runs-on: ubuntu-latest - needs: build-test - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - #Docker - - name: Build Docker image - run: docker build -t lango-frontend . diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 6edef7a..6ff736c 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -42,13 +42,9 @@ jobs: run: npm ci - name: Prisma generate - env: - DATABASE_URL: ${{ secrets.DATABASE_URL }} run: npx prisma generate - name: Prisma validate - env: - DATABASE_URL: ${{ secrets.DATABASE_URL }} run: npx prisma validate - name: Build project diff --git a/client/Dockerfile b/client/Dockerfile index fd68d23..e1c089c 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -12,7 +12,7 @@ COPY . . RUN npm run build -FROM alpine:3.19 +FROM alpine:20-alpine WORKDIR /app COPY --from=builder /app/dist ./dist diff --git a/client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx b/client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx index 26fd6da..dac0520 100644 --- a/client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx +++ b/client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx @@ -40,6 +40,8 @@ export const AsideMenu = memo((props: AsideMenuProps) => { } }, [locale]); + //testt + return (