Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lazzzer committed Jun 27, 2020
2 parents a9371c3 + 55b9de0 commit 9c7a6ff
Show file tree
Hide file tree
Showing 24 changed files with 1,554 additions and 1,269 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Moviepark is an open-source project using the TMDb API for its movie catalog.
- [Node.js >= 12.0.0](https://nodejs.org/en/)
- [Docker](https://docs.docker.com/get-docker/)
- [a TMDb API key](https://developers.themoviedb.org/3/getting-started/introduction)
- [an Utelly API key](https://rapidapi.com/utelly/api/utelly)

## Project setup

Expand Down Expand Up @@ -43,6 +44,6 @@ To check how it would look like in production with docker (don't forget to add y

- [x] Release version 1.0 Yay!
- [x] Caching
- [ ] Get streaming services for each movie with [Utelly's API](https://rapidapi.com/utelly/api/utelly)
- [x] Get streaming services for each movie with Utelly's API
- [ ] More search filters (ex: search by company...)
- [ ] Watchlist
6 changes: 3 additions & 3 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = {
'vue/max-attributes-per-line': 'off',
'vue/no-v-html': 'off',
'vue/attributes-order': ['error', {
'order': [
order: [
'DEFINITION',
'LIST_RENDERING',
'CONDITIONALS',
Expand All @@ -35,7 +35,7 @@ module.exports = {
'OTHER_ATTR'
]
}],
'quotes': [2, 'single', { 'avoidEscape': true }],
'semi': [2, 'never'],
quotes: [2, 'single', { avoidEscape: true }],
semi: [2, 'never']
}
}
12 changes: 12 additions & 0 deletions client/assets/sprite/svg/amazonInstantVideo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9c7a6ff

Please sign in to comment.