Merge branch 'dev'

Lazzzer · Jun 3, 2020 · 4a2e749 · 4a2e749
2 parents e335309 + 542be77
commit 4a2e749
Show file tree

Hide file tree

Showing 13 changed files with 420 additions and 658 deletions.
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.16.3-alpine
+FROM node:12-alpine
 
 USER node
 

diff --git a/client/components/movie/Card.vue b/client/components/movie/Card.vue
@@ -22,7 +22,7 @@
       </VueLoadImage>
 
       <span
-        :class="movieInfos.vote_average > 5.1 ? 'bg-green-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
+        :class="movieInfos.vote_average >= 6.0 ? 'bg-green-500' : movieInfos.vote_average >= 4.0 ? 'bg-orange-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
         class="absolute flex items-center justify-center w-8 h-8 text-xs border border-gray-300 rounded-full right-1 bottom-1"
       >
         <span class="font-bold text-m-blue-900">{{ movieInfos.vote_count === 0 ? 'N/A' : movieInfos.vote_average }}</span>

diff --git a/client/components/movie/DetailedCard.vue b/client/components/movie/DetailedCard.vue
@@ -49,7 +49,7 @@
 
         <div>
           <span
-            :class="movieInfos.vote_average > 5.1 ? 'bg-green-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
+            :class="movieInfos.vote_average >= 6.0 ? 'bg-green-500' : movieInfos.vote_average >= 4.0 ? 'bg-orange-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
             class="inline-flex items-center justify-center w-6 h-6 -mr-1 text-xs rounded-full right-1 bottom-1"
           >
             <span class="font-bold text-m-blue-900">{{ movieInfos.vote_count === 0 ? 'N/A' : movieInfos.vote_average }}</span>

diff --git a/client/components/movie/MobileMovieDetails.vue b/client/components/movie/MobileMovieDetails.vue
@@ -6,7 +6,7 @@
         :style="movieInfos.backdrop_path !== null ? 'background:url('+ backdropPath + movieInfos.backdrop_path + ') top center / cover no-repeat,linear-gradient(#000E1B,#02182B);opacity:0.2;' : ''"
       ></div>
       <span
-        :class="movieInfos.vote_average > 5.1 ? 'bg-green-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
+        :class="movieInfos.vote_average >= 6.0 ? 'bg-green-500' : movieInfos.vote_average >= 4.0 ? 'bg-orange-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
         class="absolute flex items-center justify-center w-10 h-10 text-sm border border-gray-300 rounded-full right-3 bottom-3"
       >
         <span class="font-bold text-m-blue-900">{{ movieInfos.vote_count === 0 ? 'N/A' : movieInfos.vote_average }}</span>

diff --git a/client/components/movie/MovieDetails.vue b/client/components/movie/MovieDetails.vue
@@ -34,7 +34,7 @@
       <div class="flex items-center mt-2">
         <span class="mr-1 font-bold">User score:</span>
         <span
-          :class="movieInfos.vote_average > 5.1 ? 'bg-green-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
+          :class="movieInfos.vote_average >= 6.0 ? 'bg-green-500' : movieInfos.vote_average >= 4.0 ? 'bg-orange-500' : movieInfos.vote_count === 0 ? 'bg-gray-500' : 'bg-red-500'"
           class="inline-flex items-center justify-center w-8 h-8 text-sm border border-gray-300 rounded-full"
         >
           <span class="font-bold text-m-blue-900">{{ movieInfos.vote_count === 0 ? 'N/A' : movieInfos.vote_average }}</span>