diff --git a/client/src/App.vue b/client/src/App.vue index c250ddb..83d0232 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -9,6 +9,7 @@ diff --git a/client/src/assets/css/main.css b/client/src/assets/css/main.css index 6d611e1..47e9dc6 100644 --- a/client/src/assets/css/main.css +++ b/client/src/assets/css/main.css @@ -1,3 +1,4 @@ @import 'tailwind.css'; @import 'base.css'; @import 'transition.css'; +@import 'match.css'; diff --git a/client/src/assets/css/match.css b/client/src/assets/css/match.css new file mode 100644 index 0000000..22f2845 --- /dev/null +++ b/client/src/assets/css/match.css @@ -0,0 +1,23 @@ +.Win { + background-image: linear-gradient( + 90deg, + rgba(1, 97, 28, 0.3) 0%, + rgba(44, 82, 130, 0) 45% + ); +} + +.Fail { + background-image: linear-gradient( + 90deg, + rgba(140, 0, 0, 0.3) 0%, + rgba(44, 82, 130, 0) 45% + ); +} + +.Remake { + background-image: linear-gradient( + 90deg, + rgba(233, 169, 75, 0.3) 0%, + rgba(44, 82, 130, 0) 45% + ); +} diff --git a/client/src/components/Match/DetailedMatch.vue b/client/src/components/Match/DetailedMatch.vue index c095bd9..2a65022 100644 --- a/client/src/components/Match/DetailedMatch.vue +++ b/client/src/components/Match/DetailedMatch.vue @@ -3,8 +3,9 @@
| + | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
- K | -D | -A | -cs/m | -vs/m | -gold | -+ | K | +D | +A | +{{ statsFormat === 'stats' ? 'cs' : 'cs/m' }} | +{{ statsFormat === 'stats' ? 'vs' : 'vs/m' }} | +gold | +
dmg
champ |
- + |
dmg
obj |
- + |
dmg
taken |
- kp | +kp |
|
-
+ {{ player.champion.name }}
-
+
+
@@ -124,27 +124,27 @@
-
S2
+ S2
{{ player.percentStats.minions }} |
+ >{{ player[statsFormat].minions }} |
{{ player.percentStats.vision }} | + >{{ player[statsFormat].vision }}{{ player.stats.gold }} | + >{{ player[statsFormat].gold }}{{ player.stats.dmgChamp }} | + >{{ player[statsFormat].dmgChamp }}{{ player.stats.dmgObj }} | + >{{ player[statsFormat].dmgObj }}{{ player.stats.dmgTaken }} | + >{{ player[statsFormat].dmgTaken }}
diff --git a/client/src/components/Match/Match.vue b/client/src/components/Match/Match.vue
index 87542d1..9a6c19e 100644
--- a/client/src/components/Match/Match.vue
+++ b/client/src/components/Match/Match.vue
@@ -3,7 +3,7 @@
@@ -161,13 +161,6 @@ export default {
},
computed: {
- matchResultClass() {
- return {
- 'win': this.data.result === 'Win',
- 'loss': this.data.result === 'Fail',
- 'remake': this.data.result === 'Remake',
- }
- },
...mapState({
roles: state => state.roles
}),
@@ -199,30 +192,6 @@ export default {
transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
}
-.loss {
- background-image: linear-gradient(
- 90deg,
- rgba(140, 0, 0, 0.3) 0%,
- rgba(44, 82, 130, 0) 45%
- );
-}
-
-.remake {
- background-image: linear-gradient(
- 90deg,
- rgba(233, 169, 75, 0.3) 0%,
- rgba(44, 82, 130, 0) 45%
- );
-}
-
-.win {
- background-image: linear-gradient(
- 90deg,
- rgba(1, 97, 28, 0.3) 0%,
- rgba(44, 82, 130, 0) 45%
- );
-}
-
.game-status {
top: 50%;
left: 6px;
diff --git a/client/src/components/Match/MatchItems.vue b/client/src/components/Match/MatchItems.vue
index 61a1975..fbcd6ee 100644
--- a/client/src/components/Match/MatchItems.vue
+++ b/client/src/components/Match/MatchItems.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 520edf1..00faafd 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -3,6 +3,7 @@ import Vuex from 'vuex'
import * as ddragon from '@/store/modules/ddragon'
import * as detailedMatch from '@/store/modules/detailedMatch'
import * as notification from '@/store/modules/notification'
+import * as settings from '@/store/modules/settings'
import * as summoner from '@/store/modules/summoner'
Vue.use(Vuex)
@@ -14,6 +15,7 @@ export default new Vuex.Store({
ddragon,
detailedMatch,
notification,
+ settings,
summoner
},
state: {
diff --git a/client/src/store/modules/settings.js b/client/src/store/modules/settings.js
new file mode 100644
index 0000000..fcd9992
--- /dev/null
+++ b/client/src/store/modules/settings.js
@@ -0,0 +1,22 @@
+export const namespaced = true
+
+export const state = {
+ percent: 'true'
+}
+
+export const mutations = {
+ UPDATE_PERCENT(state, percent) {
+ state.percent = percent
+ }
+}
+
+export const actions = {
+ async updatePercent({ commit }, percent) {
+ if (!percent) {
+ percent = localStorage.getItem('settings-percent') || 'true'
+ } else {
+ localStorage.setItem('settings-percent', percent)
+ }
+ commit('UPDATE_PERCENT', percent)
+ }
+}
|