Merge branch 'release/v0.7.1'

jualoppaz · May 2, 2020 · f9fa9af · f9fa9af
2 parents 34b73cd + ca5d068
commit f9fa9af
Show file tree

Hide file tree

Showing 63 changed files with 2,472 additions and 742 deletions.
diff --git a/assets/styles/_global.scss b/assets/styles/_global.scss
@@ -0,0 +1,38 @@
+.pointer{
+  cursor: pointer;
+}
+
+.fa-twitter {
+  color: $color-brand-twitter;
+}
+
+.fa-link{
+  color: $color-text-gray;
+}
+
+.fa-youtube{
+  color: $color-brand-youtube;
+}
+
+.fa-instagram{
+  color: $color-brand-instagram;
+}
+
+.fa-facebook {
+  color: $color-brand-facebook;
+}
+
+.social-networks {
+  text-align: center;
+
+  .networks-inline-list{
+    span{
+      margin: 10px;
+      cursor: pointer;
+
+      &:active, &:focus{
+        outline: none;
+      }
+    }
+  }
+}
diff --git a/assets/styles/_variables.scss b/assets/styles/_variables.scss
@@ -6,6 +6,7 @@ $color-text-green: #28a745;
 $color-text-gray: #909399;
 $color-border-gray: #e6e6e6;
 
+$color-brand-facebook: #3b5998;
 $color-brand-instagram: #e4405f;
 $color-brand-paypal: #00457C;
 $color-brand-twitter: #00acee;

diff --git a/components/ActorCard.vue b/components/ActorCard.vue
@@ -15,13 +15,21 @@
         <span class="actor-name"><b>{{ actor.shortname }}</b></span>
       </el-row>
       <el-row>
-        <el-button
-          type="primary"
-          plain
-          @click="goToDetail()"
+        <nuxt-link
+          :to="{
+            name: `actors-slug___${$i18n.locale}`,
+            params: {
+              slug: actor.slug,
+            },
+          }"
         >
-          {{ detailButtonText }}
-        </el-button>
+          <el-button
+            type="primary"
+            plain
+          >
+            {{ detailButtonText }}
+          </el-button>
+        </nuxt-link>
         <font-awesome-icon
           v-if="actor.deathdate"
           class="ribbon"
@@ -47,16 +55,7 @@ export default {
       detailButtonText: this.$t('VIEWS.ACTORS.SEE_DETAIL.TEXT'),
     };
   },
-  methods: {
-    goToDetail() {
-      this.$router.push({
-        name: `actors-slug___${this.$i18n.locale}`,
-        params: {
-          slug: this.actor.slug,
-        },
-      });
-    },
-  },
+  methods: {},
 };
 </script>
 

diff --git a/components/ChapterCard.vue b/components/ChapterCard.vue
@@ -15,13 +15,21 @@
         <span class="chapter-name"><b>{{ chapter.natural_id }} - {{ chapter.name }}</b></span>
       </el-row>
       <el-row>
-        <el-button
-          type="primary"
-          plain
-          @click="goToDetail()"
+        <nuxt-link
+          :to="{
+            name: `seasons-season_number-chapters-slug___${$i18n.locale}`,
+            params: {
+              slug: chapter.slug,
+            },
+          }"
         >
-          {{ detailButtonText }}
-        </el-button>
+          <el-button
+            type="primary"
+            plain
+          >
+            {{ detailButtonText }}
+          </el-button>
+        </nuxt-link>
       </el-row>
     </div>
   </el-card>
@@ -41,17 +49,7 @@ export default {
       detailButtonText: this.$t('VIEWS.SEASONS.SEE_DETAIL.TEXT'),
     };
   },
-  methods: {
-    goToDetail() {
-      this.$router.push({
-        name: `seasons-season_number-chapters-slug___${this.$i18n.locale}`,
-        params: {
-          season_number: this.chapter.season,
-          slug: this.chapter.slug,
-        },
-      });
-    },
-  },
+  methods: {},
 };
 </script>
 

diff --git a/components/CharacterCard.vue b/components/CharacterCard.vue
@@ -15,13 +15,21 @@
         <span class="character-name"><b>{{ character.shortname }}</b></span>
       </el-row>
       <el-row>
-        <el-button
-          type="primary"
-          plain
-          @click="goToDetail()"
+        <nuxt-link
+          :to="{
+            name: `characters-slug___${$i18n.locale}`,
+            params: {
+              slug: character.slug,
+            },
+          }"
         >
-          {{ detailButtonText }}
-        </el-button>
+          <el-button
+            type="primary"
+            plain
+          >
+            {{ detailButtonText }}
+          </el-button>
+        </nuxt-link>
       </el-row>
     </div>
   </el-card>
@@ -41,16 +49,7 @@ export default {
       detailButtonText: this.$t('VIEWS.CHARACTERS.SEE_DETAIL.TEXT'),
     };
   },
-  methods: {
-    goToDetail() {
-      this.$router.push({
-        name: `characters-slug___${this.$i18n.locale}`,
-        params: {
-          slug: this.character.slug,
-        },
-      });
-    },
-  },
+  methods: {},
 };
 </script>
 

diff --git a/components/Header.vue b/components/Header.vue
@@ -1,19 +1,13 @@
 <template>
   <div id="header">
-    <h1>{{ title }}</h1>
+    <h1>ANHQV STATS</h1>
   </div>
 </template>
 
 <script>
+
 export default {
   name: 'Header',
-  computed: {
-    title() {
-      return this.$route.meta.title && this.$route.meta.title({
-        route: this.$route,
-      }).toUpperCase();
-    },
-  },
 };
 </script>
 

diff --git a/components/Menu.vue b/components/Menu.vue
@@ -82,12 +82,10 @@ export default {
       fifthSeasonItemText: this.$t('MENU.SEASONS.FIFTH_SEASON.TEXT'),
     };
   },
-  created() {
-    if (process.browser) {
-      // eslint-disable-next-line nuxt/no-globals-in-created
-      window.addEventListener('resize', this.handleResize);
-      this.handleResize();
-    }
+  mounted() {
+    // eslint-disable-next-line nuxt/no-globals-in-created
+    window.addEventListener('resize', this.handleResize);
+    this.handleResize();
   },
   beforeDestroy() {
     window.removeEventListener('resize', this.handleResize);

diff --git a/jest.config.js b/jest.config.js
@@ -18,6 +18,7 @@ module.exports = {
     '<rootDir>/components/**/*.vue',
     '<rootDir>/pages/**/*.vue',
     '<rootDir>/plugins/anhqvClient/client.js',
+    '<rootDir>/store/**/*.js',
   ],
   verbose: true,
 };
diff --git a/layouts/default.vue b/layouts/default.vue
@@ -67,9 +67,38 @@ body{
         }
 
         #main {
+          padding: 0;
 
-          @media screen and (min-width: $tablet-min-width){
-            padding: 50px;
+          .banner {
+            h1 {
+              padding: 5px;
+              height: 75px;
+              line-height: 75px;
+              font-size: 20px;
+              text-align: center;
+              background: $color-text-blue; // #66b3ff;
+              box-shadow: inset 0 8px 8px -8px rgba(0,0,0,.3), inset 0 -8px 8px -8px rgba(0,0,0,.3);
+              color: $color-text-white;
+              margin: 0;
+
+              text-overflow: ellipsis;
+              overflow: hidden;
+              white-space: nowrap;
+
+              @media screen and (min-width: $tablet-min-width){
+                height: 150px;
+                line-height: 150px;
+                font-size: 50px;
+              }
+            }
+          }
+
+          .wrapper {
+            padding: 20px;
+
+            @media screen and (min-width: $tablet-min-width){
+              padding: 50px;
+            }
           }
         }
 

diff --git a/locales/es.js b/locales/es.js
@@ -7,6 +7,9 @@ export default
       TITLE: '🛑 AdBlock detectado',
       TEXT: 'Este sitio web tiene como única financiación los anuncios de Google AdSense. Para visitar este sitio web, por favor, desactiva AdBlock.',
     },
+    SOCIAL_SHARING: {
+      SHARE: 'Comparte y comenta en tu red social favorita',
+    },
   },
   MENU: {
     ACTORS: {
@@ -111,7 +114,7 @@ export default
         TITLE: 'Temporada {number}',
         CHAPTERS: {
           DETAIL: {
-            TITLE: 'Capítulo {slug}',
+            TITLE: '{slug} - {name}',
             INFO: {
               TITLE: 'Datos del capítulo',
               NAME: 'Capítulo',

diff --git a/middleware/scroll-top.js b/middleware/scroll-top.js
@@ -0,0 +1,5 @@
+export default () => {
+  if (!process.server) {
+    window.document.getElementById('main').scrollTop = 0;
+  }
+};
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -14,11 +14,14 @@ export default {
   ** Headers of the page
   */
   head: {
-    title: process.env.npm_package_name || '',
+    htmlAttrs: {
+      lang: 'es',
+    },
+    title: 'ANHQV STATS',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: process.env.npm_package_description || '' },
+      { hid: 'description', name: 'description', content: 'Información y estadísticas Aquí No Hay Quien Viva: personajes, actores, capítulos... y mucho más. ✅ Disponible API REST documentada.' },
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
@@ -40,6 +43,7 @@ export default {
   plugins: [
     '@/plugins/element-ui',
     '@/plugins/nuxt-anhqv-client.js',
+    '@/plugins/nuxt-social-sharing.js',
   ],
   /*
   ** Nuxt.js dev-modules
@@ -87,7 +91,10 @@ export default {
   ],
 
   styleResources: {
-    scss: ['./assets/styles/*.scss'],
+    scss: [
+      './assets/styles/_variables.scss',
+      './assets/styles/_global.scss',
+    ],
   },
   /*
   ** Axios module configuration
@@ -105,4 +112,7 @@ export default {
     */
     extend(config) { },
   },
+  router: {
+    middleware: ['scroll-top'],
+  },
 };