Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

CaCaoCritics
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3c1132a0

Commit 3c1132a0 authored 2 years ago by Bilel El Yaagoubi

Downloads
- Plain Diff

Merge branch 'master' into 'show_liked_movies'

# Conflicts:
#   frontend/src/router/index.js
#   frontend/src/views/Home.vue

parents 09206b50 a5ef887c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 8
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 0 deletions

.gitlab-ci.yml
.vscode/settings.json 3 additions, 0 deletions

.vscode/settings.json
algo/adreco.py 31 additions, 24 deletions

algo/adreco.py
backend/routes/genres.js 8 additions, 11 deletions

backend/routes/genres.js
backend/routes/movies.js 12 additions, 11 deletions

backend/routes/movies.js
frontend/src/components/MovieType.vue 34 additions, 10 deletions

frontend/src/components/MovieType.vue
frontend/src/router/index.js 1 addition, 1 deletion

frontend/src/router/index.js
frontend/src/views/Home.vue 66 additions, 38 deletions

frontend/src/views/Home.vue

with 156 additions and 95 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