Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions client/.github/workflows/ci.yml → .github/workflows/client.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 .
4 changes: 0 additions & 4 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export const AsideMenu = memo((props: AsideMenuProps) => {
}
}, [locale]);

//testt

return (
<aside className={clsx(styles.aside, [className])}>
<div>
Expand Down
1 change: 0 additions & 1 deletion server/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ generator client {
output = "./generated/prisma"
}


datasource db {
provider = "postgresql"
}
Expand Down
Loading