Client: Header & Menu & Icons (#8770)

* header revamp - wip

* fix webpack fonts

* wip icons

* fix compilation errors

* implement icons loading without iconmoo

* new svg implementation

* wip

* fix issues with svgs

* fix issues with svgs

* fix bits svg

* fix displaying of pet in avatar

* avatar class icon

* no party header

* update navigation

* split code by route

* round gems and gp

* add string for faqs

* fix icons in css
This commit is contained in:
Matteo Pagliazzi
2017-06-08 12:04:19 -07:00
committed by GitHub
parent e3c1eaa9d2
commit 706de95458
97 changed files with 1634 additions and 672 deletions

View File

@@ -1,53 +1,67 @@
<template lang="pug">
div
avatar#header-avatar(:user="user", style='float:left;')
div(style='float:left;')
span.character-name {{user.profile.name}}
span.character-level Lvl {{user.stats.lvl}}
.d-flex
avatar#header-avatar(:user="user")
div
h3.character-name
| {{user.profile.name}}
.is-buffed(v-if="isBuffed")
.svg-icon(v-html="icons.buff")
span.small-text.character-level {{ characterLevel }}
.progress-container.d-flex
img.icon(src="~assets/header/png/health@3x.png")
.svg-icon(v-html="icons.health")
.progress
.progress-bar.bg-danger(:style="{width: `${percent(user.stats.hp, MAX_HEALTH)}%`}")
span {{user.stats.hp | round}} / {{MAX_HEALTH}}
.progress-bar.bg-health(:style="{width: `${percent(user.stats.hp, MAX_HEALTH)}%`}")
span.small-text {{user.stats.hp | round}} / {{MAX_HEALTH}}
.progress-container.d-flex
img.icon(src="~assets/header/png/experience@3x.png")
.svg-icon(v-html="icons.experience")
.progress
.progress-bar.bg-warning(:style="{width: `${percent(user.stats.exp, toNextLevel)}%`}")
span {{user.stats.exp | round}} / {{toNextLevel}}
.progress-container.d-flex(ng-if="user.flags.classSelected && !user.preferences.disableClasses")
img.icon(src="~assets/header/png/magic@3x.png")
.progress-bar.bg-experience(:style="{width: `${percent(user.stats.exp, toNextLevel)}%`}")
span.small-text {{user.stats.exp | round}} / {{toNextLevel}}
.progress-container.d-flex(v-if="user.flags.classSelected && !user.preferences.disableClasses")
.svg-icon(v-html="icons.mana")
.progress
.progress-bar(:style="{width: `${percent(user.stats.mp, maxMP)}%`}")
span {{user.stats.mp | round}} / {{maxMP}}
.progress-bar.bg-mana(:style="{width: `${percent(user.stats.mp, maxMP)}%`}")
span.small-text {{user.stats.mp | round}} / {{maxMP}}
</template>
<style lang="scss" scoped>
@import '~client/assets/scss/colors.scss';
// TODO move to colors.scss if used in other places
$header-dark-background: #271B3D;
$header-text-color: #D5C8FF;
.small-text {
color: $header-color;
}
.character-name {
display: block;
font-size: 16px;
margin-top: 32px;
line-height: 1.5;
margin-top: 24px;
margin-bottom: 1px;
color: $white;
font-weight: bold;
}
.character-level {
display: block;
font-size: 12px;
margin-top: 4px;
margin-bottom: 20px;
line-height: 1;
font-style: normal;
margin-bottom: 16px;
}
.is-buffed {
width: 20px;
height: 20px;
background: $header-dark-background;
display: inline-block;
margin-left: 16px;
vertical-align: middle;
.svg-icon {
display: block;
width: 10px;
height: 12px;
margin: 0 auto;
}
}
#header-avatar {
margin-top: 24px;
margin-right: 1rem;
margin-right: 16px;
}
.progress-container {
@@ -55,58 +69,87 @@ $header-text-color: #D5C8FF;
}
.progress-container > span {
font-size: 12px;
margin-left: 10px;
line-height: 1em;
color: $header-color;
margin-left: 16px;
font-style: normal;
}
.progress-container > .icon {
width: 12px;
height: 12px;
margin-right: 10px;
.progress-container > .svg-icon {
width: 24px;
height: 24px;
margin-right: 8px;
margin-top: -4px;
}
.progress-container > .progress {
width: 203px;
margin: 0px;
border-radius: 0px;
height: 12px;
border-radius: 2px;
height: 16px;
background-color: $header-dark-background;
}
.progress-container > .progress > .progress-bar {
border-radius: 0px;
height: 12px;
border-radius: 2px;
height: 16px;
min-width: 0px;
}
</style>
<script>
import Avatar from './avatar';
import { mapState } from 'client/libs/store';
import { mapState, mapGetters } from 'client/libs/store';
import { toNextLevel } from '../../common/script/statHelpers';
import statsComputed from '../../common/script/libs/statsComputed';
import percent from '../../common/script/libs/percent';
import buffIcon from 'assets/svg/buff.svg';
import healthIcon from 'assets/svg/health.svg';
import experienceIcon from 'assets/svg/experience.svg';
import manaIcon from 'assets/svg/mana.svg';
export default {
components: {
Avatar,
},
props: {
user: {
type: Object,
required: true,
},
},
data () {
return {
icons: Object.freeze({
buff: buffIcon,
health: healthIcon,
experience: experienceIcon,
mana: manaIcon,
}),
};
},
methods: {
percent,
},
computed: {
...mapState({
user: 'user.data',
MAX_HEALTH: 'constants.MAX_HEALTH',
}),
...mapGetters({
isBuffed: 'user:isBuffed',
}),
maxMP () {
return statsComputed(this.user).maxMP;
},
toNextLevel () { // Exp to next level
return toNextLevel(this.user.stats.lvl);
},
characterLevel () {
return `${this.$t('level')} ${this.user.stats.lvl} ${
this.user.stats.class ? this.$t(this.user.stats.class) : ''
}`;
},
},
};
</script>