Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

PB138 - Film Database Group Project
- Activity
- Members
- Package Registry
- Model registry
- Terraform modules

Snippets Groups Projects

8cff20a5

There was an error fetching the commit references. Please try again later.

Commit 8cff20a5 authored 2 years ago by Tomáš Havlíček

Downloads
- Plain Diff

fix: resolved merge conflict

parents b1b3ea22 0309acc9

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.env.example 3 additions, 0 deletions

.env.example
.gitignore 0 additions, 6 deletions

.gitignore
backend/.eslintrc.js 80 additions, 4 deletions

backend/.eslintrc.js
backend/.gitignore 3 additions, 0 deletions

backend/.gitignore
backend/.prettierrc 2 additions, 1 deletion

backend/.prettierrc
backend/package-lock.json 54 additions, 0 deletions

backend/package-lock.json
backend/package.json 1 addition, 0 deletions

backend/package.json
backend/src/app.module.ts 2 additions, 1 deletion

backend/src/app.module.ts
backend/src/main.ts 8 additions, 2 deletions

backend/src/main.ts
docker-compose.yml 37 additions, 13 deletions

docker-compose.yml
frontend/package-lock.json 10 additions, 0 deletions

frontend/package-lock.json
frontend/vite.config.ts 3 additions, 2 deletions

frontend/vite.config.ts
nginx/nginx.conf 28 additions, 0 deletions

nginx/nginx.conf
nginx/templates/default.conf.template 26 additions, 0 deletions

nginx/templates/default.conf.template

with 257 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment