Skip to content

Commit

Permalink
Merge branch 'release/v0.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
jualoppaz committed May 9, 2020
2 parents 1b4e940 + 809c260 commit b4c7e70
Show file tree
Hide file tree
Showing 39 changed files with 1,457 additions and 958 deletions.
2 changes: 1 addition & 1 deletion components/ActorCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:body-style="{ padding: '0px' }"
>
<div class="image-container">
<img :src="actor.image_url" class="image">
<img :src="actor.image_url" class="image" :alt="actor.image_alt">
</div>
<div
class="actor-card-info"
Expand Down
2 changes: 1 addition & 1 deletion components/ChapterCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:body-style="{ padding: '0px' }"
>
<div class="image-container">
<img :src="chapter.image_url" class="image">
<img :src="chapter.image_url" class="image" :alt="chapter.image_alt">
</div>
<div
class="chapter-card-info"
Expand Down
12 changes: 10 additions & 2 deletions components/CharacterCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
:body-style="{ padding: '0px' }"
>
<div class="image-container">
<img :src="character.image_url" class="image">
<img :src="character.image_url" :alt="character.image_alt" class="image">
</div>
<div
class="character-card-info"
style="padding: 14px;"
>
<el-row>
<span class="character-name"><b>{{ character.shortname }}</b></span>
<span class="character-name"><b>{{ characterName }}</b></span>
</el-row>
<el-row>
<nuxt-link
Expand All @@ -22,6 +22,7 @@
slug: character.slug,
},
}"
:title="characterName"
>
<el-button
type="primary"
Expand Down Expand Up @@ -49,6 +50,13 @@ export default {
detailButtonText: this.$t('VIEWS.CHARACTERS.SEE_DETAIL.TEXT'),
};
},
computed: {
characterName() {
let res = this.character.name;
if (this.character.surname) res += ` ${this.character.surname}`;
return res;
},
},
methods: {},
};
</script>
Expand Down
2 changes: 1 addition & 1 deletion components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{ copyrightText }}
</div>
<div id="author">
<a href="https://www.juanmanuellopezpazos.es" target="_blank">{{ authorText }}</a>
<a href="http://www.juanmanuellopezpazos.es" target="_blank">{{ authorText }}</a>
</div>
</div>
</template>
Expand Down
6 changes: 4 additions & 2 deletions components/Header.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div id="header">
<h1>ANHQV STATS</h1>
<span>ANHQV STATS</span>
</div>
</template>

Expand All @@ -15,10 +15,12 @@ export default {
#header{
height: 100%;
h1 {
span {
margin: 0;
line-height: 60px;
padding: 0 20px;
font-weight: bold;
font-size: 1.17em;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down
65 changes: 57 additions & 8 deletions components/Menu.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<template>
<el-aside id="aside-menu">
<div id="logo">
<img src="../assets/banner.gif">
<img src="/images/menu/anhqv.jpg">
</div>
<el-menu :default-openeds="defaultOpeneds" :collapse="isCollapsed">
<el-menu-item index="1">
<nuxt-link
exact
to="/"
:title="homeLinkTitle"
>
<i class="el-icon-s-home" />
<span>{{ homeItemText }}</span>
</nuxt-link>
</el-menu-item>
<el-menu-item index="2">
<nuxt-link :to="{ name: `characters___${$i18n.locale}` }">
<nuxt-link :to="{ name: `characters___${$i18n.locale}` }" :title="charactersLinkTitle">
<i class="el-icon-user-solid" />
<span>{{ charactersItemText }}</span>
</nuxt-link>
</el-menu-item>
<el-menu-item index="3">
<nuxt-link :to="{ name: `actors___${$i18n.locale}` }">
<nuxt-link :to="{ name: `actors___${$i18n.locale}` }" :title="actorsLinkTitle">
<i class="el-icon-star-on" />
<span>{{ actorsItemText }}</span>
</nuxt-link>
Expand All @@ -31,27 +32,67 @@
<span slot="title">{{ seasonsItemText }}</span>
</template>
<el-menu-item index="4-1">
<nuxt-link :to="{ name: `seasons___${$i18n.locale}`, params: { season_number: 1 } }">
<nuxt-link
:to="{
name: `seasons___${$i18n.locale}`,
params: {
season_number: 1
}
}"
:title="firstSeasonLinkTitle"
>
<i class="el-icon-film" />{{ firstSeasonItemText }}
</nuxt-link>
</el-menu-item>
<el-menu-item index="4-2">
<nuxt-link :to="{ name: `seasons___${$i18n.locale}`, params: { season_number: 2 } }">
<nuxt-link
:to="{
name: `seasons___${$i18n.locale}`,
params: {
season_number: 2
}
}"
:title="secondSeasonLinkTitle"
>
<i class="el-icon-film" />{{ secondSeasonItemText }}
</nuxt-link>
</el-menu-item>
<el-menu-item index="4-3">
<nuxt-link :to="{ name: `seasons___${$i18n.locale}`, params: { season_number: 3 } }">
<nuxt-link
:to="{
name: `seasons___${$i18n.locale}`,
params: {
season_number: 3
}
}"
:title="thirdSeasonLinkTitle"
>
<i class="el-icon-film" />{{ thirdSeasonItemText }}
</nuxt-link>
</el-menu-item>
<el-menu-item index="4-4">
<nuxt-link :to="{ name: `seasons___${$i18n.locale}`, params: { season_number: 4 } }">
<nuxt-link
:to="{
name: `seasons___${$i18n.locale}`,
params: {
season_number: 4
}
}"
:title="fourthSeasonLinkTitle"
>
<i class="el-icon-film" />{{ fourthSeasonItemText }}
</nuxt-link>
</el-menu-item>
<el-menu-item index="4-5">
<nuxt-link :to="{ name: `seasons___${$i18n.locale}`, params: { season_number: 5 } }">
<nuxt-link
:to="{
name: `seasons___${$i18n.locale}`,
params: {
season_number: 5
}
}"
:title="fifthSeasonLinkTitle"
>
<i class="el-icon-film" />{{ fifthSeasonItemText }}
</nuxt-link>
</el-menu-item>
Expand Down Expand Up @@ -80,6 +121,14 @@ export default {
thirdSeasonItemText: this.$t('MENU.SEASONS.THIRD_SEASON.TEXT'),
fourthSeasonItemText: this.$t('MENU.SEASONS.FOURTH_SEASON.TEXT'),
fifthSeasonItemText: this.$t('MENU.SEASONS.FIFTH_SEASON.TEXT'),
homeLinkTitle: this.$t('MENU.HOME.LINK.TITLE'),
charactersLinkTitle: this.$t('MENU.CHARACTERS.LINK.TITLE'),
actorsLinkTitle: this.$t('MENU.ACTORS.LINK.TITLE'),
firstSeasonLinkTitle: this.$t('MENU.SEASONS.FIRST_SEASON.LINK.TITLE'),
secondSeasonLinkTitle: this.$t('MENU.SEASONS.SECOND_SEASON.LINK.TITLE'),
thirdSeasonLinkTitle: this.$t('MENU.SEASONS.THIRD_SEASON.LINK.TITLE'),
fourthSeasonLinkTitle: this.$t('MENU.SEASONS.FOURTH_SEASON.LINK.TITLE'),
fifthSeasonLinkTitle: this.$t('MENU.SEASONS.FIFTH_SEASON.LINK.TITLE'),
};
},
mounted() {
Expand Down
46 changes: 46 additions & 0 deletions components/SocialShare.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<template>
<div>
<h2>{{ title }}</h2>
<social-sharing
:url="seoConfig.canonical_url"
:title="seoConfig.title"
:description="seoConfig.description"
inline-template
>
<div class="networks-inline-list">
<network network="twitter">
<font-awesome-icon
class="twitter-icon"
:icon="['fab', 'twitter']"
size="2x"
/>
</network>
<network network="facebook">
<font-awesome-icon
class="facebook-icon"
:icon="['fab', 'facebook']"
size="2x"
/>
</network>
</div>
</social-sharing>
</div>
</template>

<script>
export default {
name: 'SocialShare',
props: {
title: {
type: String,
default: '',
},
seoConfig: {
type: Object,
default() {
return {};
},
},
},
};
</script>
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
'<rootDir>/pages/**/*.vue',
'<rootDir>/plugins/anhqvClient/client.js',
'<rootDir>/store/**/*.js',
'<rootDir>/utils/**/*.js',
],
verbose: true,
};
46 changes: 45 additions & 1 deletion locales/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,64 @@ export default
MENU: {
ACTORS: {
TEXT: 'Actores',
LINK: {
TITLE: 'Sección de Actores',
},
},
CHARACTERS: {
TEXT: 'Personajes',
LINK: {
TITLE: 'Sección de Personajes',
},
},
HOME: {
TEXT: 'Inicio',
LINK: {
TITLE: 'Página de inicio',
},
},
SEASONS: {
TEXT: 'Temporadas',
FIRST_SEASON: {
TEXT: '1ª Temporada',
LINK: {
TITLE: 'Capítulos de la Primera Temporada',
},
},
SECOND_SEASON: {
TEXT: '2ª Temporada',
LINK: {
TITLE: 'Capítulos de la Segunda Temporada',
},
},
THIRD_SEASON: {
TEXT: '3ª Temporada',
LINK: {
TITLE: 'Capítulos de la Tercera Temporada',
},
},
FOURTH_SEASON: {
TEXT: '4ª Temporada',
LINK: {
TITLE: 'Capítulos de la Cuarta Temporada',
},
},
FIFTH_SEASON: {
TEXT: '5ª Temporada',
LINK: {
TITLE: 'Capítulos de la Quinta Temporada',
},
},
},
},
VIEWS: {
HOME: {
TITLE: 'Inicio',
WELCOME: {
TEXT: '<p>Bienvenido a la Web de la Comunidad más loca de la TV. En esta web encontrarás todo tipo de información y estadísticas de la famosa serie de TV <strong>Aquí no hay quien viva</strong>: personajes, actores, capítulos... y mucho más.</p>',
TEXT: '<p>Bienvenido a la Web de la Comunidad más loca de la TV, la de Desengaño 21. En esta web encontrarás todo tipo de información y estadísticas de la famosa serie de TV <strong>Aquí no hay quien viva</strong>: personajes, actores, capítulos... y mucho más.</p><p>Sirva esta web como homenaje a la (considerada por muchos) mejor serie que se ha producido en España. Es sin duda una serie que ha marcado a toda una generación, en la cual me incluyo, ya que nos vemos reflejados en cada escena, ya sea por experiencias vividas o presenciadas en nuestro día a día.</p><p>Sirva esta web de homenaje a todos los actores que han participado en ella, especialmente a los que ya no se encuentran entre nosotros.</p>',
IMAGE: {
ALT: 'Gran parte del elenco de la serie Aquí No Hay Quien Viva',
},
},
CHARACTERS: {
TITLE: 'Personajes',
Expand All @@ -64,15 +91,32 @@ export default
LIST: {
ANHQV: {
TEXT: 'Web oficial de la serie en la que encontrarás mucha información y curiosidades.',
LINK: {
WEB: {
TITLE: 'Web anhqv.es',
},
YOUTUBE: {
TITLE: 'Canal de Youtube de anhqv.es',
},
},
},
ESCENASANHQV: {
TEXT: 'Cuenta que dispone de multitud de escenas y memes de la serie. Síguela en Twitter e Instagram.',
LINK: {
TWITTER: {
TITLE: 'Twitter de Escenas ANHQV',
},
INSTAGRAM: {
TITLE: 'Instagram de Escenas ANHQV',
},
},
},
},
},
},
CHARACTERS: {
TITLE: 'Personajes',
TEXT: '<p>Aquí puedes ver el detalle de todos y cada uno de los personajes que aparecen en la serie, desde los personajes principales y artistas invitados hasta personajes extra.</p>',
SEE_DETAIL: {
TEXT: 'Detalle',
},
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"name": "anhqv-stats",
"version": "0.7.1",
"version": "0.7.2",
"private": true,
"scripts": {
"dev": "nuxt",
"build": "nuxt build",
"start": "nuxt start",
"generate": "nuxt generate",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
"test": "jest",
"heroku-postbuild": "npm run build",
"i18n:report": "vue-cli-service i18n:report --src \"./**/*.?(js|vue)\" --locales \"./locales/**/*.json\""
"test:unit": "jest",
"heroku-postbuild": "npm run build"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "1.2.28",
Expand Down
Loading

0 comments on commit b4c7e70

Please sign in to comment.