3 Commit

15 ha cambiato i file con 672 aggiunte e 492 eliminazioni
  1. +1
    -1
      .nvmrc
  2. +2
    -2
      Dockerfile
  3. +1
    -1
      README.md
  4. +1
    -1
      package.json
  5. +1
    -2
      src/App.vue
  6. +24
    -12
      src/components/Battleground.vue
  7. +1
    -1
      src/components/Objective.vue
  8. +1
    -4
      src/components/TheBattlegroundSelector.vue
  9. +0
    -0
      src/components/Timer.vue
  10. +2
    -2
      src/router/index.js
  11. +2
    -1
      src/styles/main.sass
  12. BIN
      static/backgrounds/alterac-pass.jpg
  13. BIN
      static/backgrounds/battlefieldofeternity.jpg
  14. BIN
      static/backgrounds/blackheartsbay.jpg
  15. +636
    -465
      yarn.lock

+ 1
- 1
.nvmrc Vedi File

@@ -1 +1 @@
12
14

+ 2
- 2
Dockerfile Vedi File

@@ -1,5 +1,5 @@
FROM node:erbium-alpine
RUN apk add python2
FROM node:fermium-alpine
RUN apk add python2 make g++
WORKDIR /home/node
COPY package.json yarn.lock ./
RUN chown node:node -R .


+ 1
- 1
README.md Vedi File

@@ -9,7 +9,7 @@

## Build Setup

This project run on the node 12 LTS version (Erbium)
This project run on the node 14 LTS version (Fermium)

``` bash
# install dependencies


+ 1
- 1
package.json Vedi File

@@ -52,7 +52,7 @@
"rimraf": "^2.6.2",
"sass-loader": "7.3.1",
"semver": "^5.4.1",
"shelljs": "^0.7.8",
"shelljs": "^0.8.4",
"sw-precache-webpack-plugin": "^0.11.4",
"uglify-es": "^3.1.3",
"url-loader": "^0.6.2",


+ 1
- 2
src/App.vue Vedi File

@@ -41,8 +41,7 @@
box-sizing: border-box
padding-top: 16px

main
margin-top: 20px

</style>

<style lang="sass">


+ 24
- 12
src/components/Battleground.vue Vedi File

@@ -1,26 +1,35 @@
<template>
<div class="battleground" v-if="battleground">
<div>Welcome to {{ battleground.name }}</div>
<div class="battleground-content">
<div>Welcome to {{ battleground.name }}</div>

<div id="objectives" class="objectives">
<div class="row" v-for="objectiveRow in battleground.objectives">
<template v-for="objective in objectiveRow">
<Objective :objective="objective"></Objective>
</template>
<div id="objectives" class="objectives">
<div class="row" v-for="objectiveRow in battleground.objectives">
<template v-for="objective in objectiveRow">
<Objective :objective="objective"></Objective>
</template>
</div>
</div>
<router-link to="/battlegrounds">Back to selector</router-link>
</div>
<router-link to="/battlegrounds">Back to selector</router-link>

</div>
</template>

<style lang="sass" scoped>
$border-style: 1px solid #66CCFF

.battleground
background-image: url(/static/backgrounds/alterac-pass.jpg)
background-size: contain
&-content
backdrop-filter: blur(4px)
height: 100vh

.objectives
display: flex
flex-direction: column
height: 70vh
height: 100%

.row
display: flex
justify-content: space-between
@@ -36,8 +45,8 @@

<script>
import BATTLEGROUNDS from '@/gameInfos/battlegrounds'
import Timer from '@/components/Battleground/Timer'
import Objective from '@/components/Battleground/Objective'
import Timer from '@/components/Timer'
import Objective from '@/components/Objective'

export default {
name: 'Battleground',
@@ -46,8 +55,11 @@
}
},
computed: {
battlegroundId () {
return this.$route.params.battlegroundId
},
battleground () {
return BATTLEGROUNDS[this.$route.params.battlegroundId]
return BATTLEGROUNDS[this.battlegroundId]
}
},
watch: {


src/components/Battleground/Objective.vue → src/components/Objective.vue Vedi File

@@ -25,7 +25,7 @@
</style>

<script>
import Timer from '@/components/Battleground/Timer'
import Timer from '@/components/Timer'
export default {
name: 'Objective',
props: {

src/components/BattlegroundSelector.vue → src/components/TheBattlegroundSelector.vue Vedi File

@@ -24,7 +24,7 @@
}
</script>

<style lang="sass">
<style lang="sass" scoped>
.map-selector
&__map-list
list-style-type: none
@@ -34,9 +34,6 @@
padding: 10px 0 10px 10px
border-top: solid #5659aa 1px
border-left: none
</style>

<style lang="sass" scoped>
a
text-decoration: none
color: inherit

src/components/Battleground/Timer.vue → src/components/Timer.vue Vedi File


+ 2
- 2
src/router/index.js Vedi File

@@ -2,7 +2,7 @@ import Vue from 'vue'
import Router from 'vue-router'

import Hello from '@/components/Hello'
import BattlegroundSelector from '@/components/BattlegroundSelector'
import TheBattlegroundSelector from '@/components/TheBattlegroundSelector'
import Battleground from '@/components/Battleground'

Vue.use(Router)
@@ -16,7 +16,7 @@ export default new Router({
},
{
path: '/battlegrounds',
component: BattlegroundSelector
component: TheBattlegroundSelector
},
{
path: '/battleground/:battlegroundId',


+ 2
- 1
src/styles/main.sass Vedi File

@@ -7,7 +7,8 @@
// ## Colors ##
// ############
$blizzard-background-color: #0A020F
$blizzard-font-color: #66CCFF
$blizzard-background-color-transparent: #0A020FCC
$blizzard-font-color: #fff

=blizzard-header-gradient
background: #0d39a0 /* Old browsers */


BIN
static/backgrounds/alterac-pass.jpg Vedi File

Prima Dopo
Larghezza: 6000  |  Altezza: 3375  |  Dimensione: 909 KiB Larghezza: 6000  |  Altezza: 3375  |  Dimensione: 909 KiB

BIN
static/backgrounds/battlefieldofeternity.jpg Vedi File

Prima Dopo
Larghezza: 1920  |  Altezza: 1080  |  Dimensione: 103 KiB Larghezza: 1920  |  Altezza: 1080  |  Dimensione: 103 KiB

BIN
static/backgrounds/blackheartsbay.jpg Vedi File

Prima Dopo
Larghezza: 3300  |  Altezza: 1856  |  Dimensione: 762 KiB Larghezza: 3300  |  Altezza: 1856  |  Dimensione: 762 KiB

+ 636
- 465
yarn.lock
File diff soppresso perché troppo grande
Vedi File


Caricamento…
Annulla
Salva