Skip to content

Commit a057eaa

Browse files
committed
profession images moved to assets folder
1 parent f2f862d commit a057eaa

6 files changed

Lines changed: 108 additions & 103 deletions

File tree

imports/ui/components/event/AltChars.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ v-card.elevation-3(outlined v-if="$subReady.charactersByIds")
33
template( v-for="character in charactersByIds")
44
v-list-item( @click.stop="chooseAlt(character._id)")
55
v-avatar.mr-2(tile size="20px")
6-
img( style="pointer-events: none;" :src="`/images/professions/${character['profession']}_tango_icon_20px.png`")
6+
img( style="pointer-events: none;" :src="`${assetsUrl}/professions/${character['profession']}_tango_icon_20px.png`")
77
| {{character['name']}}
88

99
</template>
1010
<script>
1111
export default {
1212
props: ["eventSlotId", "charIds"],
13+
data() {
14+
return {
15+
assetsUrl: Meteor.settings.public.assetsUrl,
16+
};
17+
},
1318
meteor: {
1419
$subscribe: {
1520
charactersByIds() {

imports/ui/components/event/CharacterBox.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template lang="pug">
22
v-card.py-8
33
v-card-title
4-
img.mr-2(:src="`/images/professions/${character['profession']}_tango_icon_48px.png`")
4+
img.mr-2(:src="`${assetsUrl}/professions/${character['profession']}_tango_icon_48px.png`")
55
| {{character.name}}
66
v-card-text
77
v-row
@@ -21,6 +21,7 @@ export default {
2121
data() {
2222
return {
2323
eventType: this.defaultEventType,
24+
assetsUrl: Meteor.settings.public.assetsUrl,
2425
};
2526
},
2627
components: {

imports/ui/components/event/EventSlot.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template lang="pug">
2-
v-list-item.relative
3-
v-avatar.mr-2(tile size="30px" :class="{hasAlts: hasAlts}" @click.stop="toggleShowAlts")
4-
img( style="pointer-events: none;" :src="`/images/professions/${eventSlot['profession']}_tango_icon_20px.png`")
5-
| {{eventSlot['characterName']}}
6-
div.alts(v-if="showAlts&&hasAlts")
7-
AltChars(:charIds="alts" :eventSlotId="eventSlot._id" v-on:altCharacterClicked="showAlts=false")
2+
v-list-item.relative
3+
v-avatar.mr-2(tile size="30px" :class="{hasAlts: hasAlts}" @click.stop="toggleShowAlts")
4+
img( style="pointer-events: none;" :src="`${assetsUrl}/professions/${eventSlot['profession']}_tango_icon_20px.png`")
5+
| {{eventSlot['characterName']}}
6+
div.alts(v-if="showAlts&&hasAlts")
7+
AltChars(:charIds="alts" :eventSlotId="eventSlot._id" v-on:altCharacterClicked="showAlts=false")
88

99

1010
</template>
@@ -17,6 +17,7 @@ export default {
1717
},
1818
data: () => ({
1919
showAlts: false,
20+
assetsUrl: Meteor.settings.public.assetsUrl,
2021
}),
2122
computed: {
2223
alts() {

imports/ui/components/event/SpecializationBox.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template lang="pug">
2-
.spec-branch(:style="`backgroundImage: url(${assetsUrl}/s_bg/${spec.id}.png)`")
3-
.spec-name {{spec.name}}
4-
.spec-icon(:style="`backgroundImage: url(${assetsUrl}/s_icons/${spec.id}.png)`")
5-
SpecTrait(v-for="item,index in spec.minor_traits" :specId="spec.id" :trait="item" type="minor" :index="index+1")
6-
SpecTrait(v-for="item,index in spec.major_traits" :specId="spec.id" :trait="item" type="major" :index="index+1")
2+
.spec-branch(:style="`backgroundImage: url(${assetsUrl}/s_bg/${spec.id}.png)`")
3+
.spec-name {{spec.name}}
4+
.spec-icon(:style="`backgroundImage: url(${assetsUrl}/s_icons/${spec.id}.png)`")
5+
SpecTrait(v-for="item,index in spec.minor_traits" :specId="spec.id" :trait="item" type="minor" :index="index+1")
6+
SpecTrait(v-for="item,index in spec.major_traits" :specId="spec.id" :trait="item" type="major" :index="index+1")
77
</template>
88
<script>
99
import SpecTrait from "/imports/ui/components/event/SpecTrait";

imports/ui/components/event/Subscribe.vue

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
<template lang="pug">
2-
v-card(outlined)
3-
v-card-title Выбери персонажа для участия
4-
span.subtitle-1.ml-3 (Показаны только персонажи выбранные в профиле)
5-
v-card-text
6-
v-row
7-
v-col(v-for="c in characters" cols="12" sm="6" md="4" lg="3" xl="2")
8-
v-card.relative(outlined)
9-
v-card-title
10-
img.ma-auto(:src="`/images/professions/${c.profession}_tango_icon_48px.png`")
11-
v-card-text.text-center {{c.name}}
12-
v-card-actions
13-
v-btn(
14-
text
15-
:class="{'blue darken-1 white--text':c.default}"
16-
@click="setDefaultCharacter(c._id)") Main
17-
v-spacer
18-
v-btn(
19-
v-if="userHasDefaultCharacter && userHasDefaultCharacter._id!==c._id"
20-
text
21-
:class="{alt:isAlt(c._id)}"
22-
@click="toggleAlternative(c._id)") Alt
23-
v-row
24-
v-col(cols="12" sm="4")
25-
v-radio-group.ml-2(v-model="subType")
26-
v-radio(
27-
label='Пойду'
28-
value="3")
29-
v-radio(
30-
label='Под вопросом'
31-
value="2")
32-
v-radio(
33-
label='Не смогу'
34-
value="1")
35-
v-col(cols="12" sm="8")
36-
v-text-field(outlined v-model="comment" label='Послание РЛу')
37-
38-
v-btn(block color="primary" @click="joinEvent" :disabled="!userHasDefaultCharacter") Вписаться
39-
40-
2+
v-card(outlined)
3+
v-card-title Выбери персонажа для участия
4+
span.subtitle-1.ml-3 (Показаны только персонажи выбранные в профиле)
5+
v-card-text
6+
v-row
7+
v-col(v-for="c in characters" cols="12" sm="6" md="4" lg="3" xl="2")
8+
v-card.relative(outlined)
9+
v-card-title
10+
img.ma-auto(:src="`${assetsUrl}/professions/${c.profession}_tango_icon_48px.png`")
11+
v-card-text.text-center {{c.name}}
12+
v-card-actions
13+
v-btn(
14+
text
15+
:class="{'blue darken-1 white--text':c.default}"
16+
@click="setDefaultCharacter(c._id)") Main
17+
v-spacer
18+
v-btn(
19+
v-if="userHasDefaultCharacter && userHasDefaultCharacter._id!==c._id"
20+
text
21+
:class="{alt:isAlt(c._id)}"
22+
@click="toggleAlternative(c._id)") Alt
23+
v-row
24+
v-col(cols="12" sm="4")
25+
v-radio-group.ml-2(v-model="subType")
26+
v-radio(
27+
label='Пойду'
28+
value="3")
29+
v-radio(
30+
label='Под вопросом'
31+
value="2")
32+
v-radio(
33+
label='Не смогу'
34+
value="1")
35+
v-col(cols="12" sm="8")
36+
v-text-field(outlined v-model="comment" label='Послание РЛу')
37+
38+
v-btn(block color="primary" @click="joinEvent" :disabled="!userHasDefaultCharacter") Вписаться
4139
</template>
4240
<script>
4341
// import "/imports/collections/CollectionCharacters";
@@ -46,6 +44,7 @@ export default {
4644
data: () => ({
4745
subType: "3",
4846
comment: "",
47+
assetsUrl: Meteor.settings.public.assetsUrl,
4948
}),
5049
meteor: {
5150
$subscribe: {

imports/ui/pages/Profile.vue

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,52 @@
11
<template lang="pug">
2-
MainLayout
3-
v-row
4-
v-col(sm="4" md="3")
5-
v-card(outlined)
6-
v-card-title GW2 API KEY
7-
v-card-text
8-
ul
9-
li Идем по ссылке <a href="https://account.arena.net/applications" target="_blank">https://account.arena.net/applications</a>
10-
li Жмем кнопочку "New Key"
11-
li Вбиваем любое название в поле Name
12-
li Ставим 4 галочки: account, characters, builds, pvp
13-
li Жмем красную кнопку "CREATE API KEY
14-
li Копируем сюда данный ключ:
15-
v-text-field.pt-6(outlined
16-
v-model="gw2ApiKey"
17-
placeholder="GW2 API KEY"
18-
@input="showError=false"
19-
)
20-
v-alert(
21-
dense
22-
outlined
23-
type="error"
24-
v-show="showError") {{error}}
25-
26-
v-btn(
27-
@click = "saveApiKey"
28-
color = "primary"
29-
) Сохранить
30-
v-col(sm="8" md="9")
31-
v-card(outlined)
32-
v-card-title Characters
33-
v-btn.ml-2(
34-
@click = "updateCharacters"
35-
color="primary"
36-
text
37-
) Обновить
38-
v-spacer
39-
v-btn(small color="primary" @click = "logout") Logout
40-
v-card-subtitle (Выберите активных персонажей для участия в ивентах)
41-
v-card-text
42-
v-container.fluid
43-
v-row
44-
v-col(cols sm="6" md="4" lg="3" v-for="c in characters")
45-
v-card.prof-logo(:class="{'visible': c.visible}" @click="toggleActive(c)")
46-
v-card-text
47-
48-
img(:src="`/images/professions/${c.profession}_tango_icon_48px.png`")
49-
| {{c.name}}
50-
51-
2+
MainLayout
3+
v-row
4+
v-col(sm="4" md="3")
5+
v-card(outlined)
6+
v-card-title GW2 API KEY
7+
v-card-text
8+
ul
9+
li Идем по ссылке <a href="https://account.arena.net/applications" target="_blank">https://account.arena.net/applications</a>
10+
li Жмем кнопочку "New Key"
11+
li Вбиваем любое название в поле Name
12+
li Ставим 4 галочки: account, characters, builds, pvp
13+
li Жмем красную кнопку "CREATE API KEY
14+
li Копируем сюда данный ключ:
15+
v-text-field.pt-6(outlined
16+
v-model="gw2ApiKey"
17+
placeholder="GW2 API KEY"
18+
@input="showError=false"
19+
)
20+
v-alert(
21+
dense
22+
outlined
23+
type="error"
24+
v-show="showError") {{error}}
25+
26+
v-btn(
27+
@click = "saveApiKey"
28+
color = "primary"
29+
) Сохранить
30+
v-col(sm="8" md="9")
31+
v-card(outlined)
32+
v-card-title Characters
33+
v-btn.ml-2(
34+
@click = "updateCharacters"
35+
color="primary"
36+
text
37+
) Обновить
38+
v-spacer
39+
v-btn(small color="primary" @click = "logout") Logout
40+
v-card-subtitle (Выберите активных персонажей для участия в ивентах)
41+
v-card-text
42+
v-container.fluid
43+
v-row
44+
v-col(cols sm="6" md="4" lg="3" v-for="c in characters")
45+
v-card.prof-logo(:class="{'visible': c.visible}" @click="toggleActive(c)")
46+
v-card-text
47+
48+
img(:src="`${assetsUrl}/professions/${c.profession}_tango_icon_48px.png`")
49+
| {{c.name}}
5250
</template>
5351
<script>
5452
import MainLayout from "../layouts/MainLayout";
@@ -57,7 +55,8 @@ export default {
5755
data: () => ({
5856
gw2ApiKey: "",
5957
showError: false,
60-
error: ""
58+
error: "",
59+
assetsUrl: Meteor.settings.public.assetsUrl,
6160
}),
6261
components: {
6362
MainLayout

0 commit comments

Comments
 (0)