diff --git a/dev.js b/dev.js
index 113a9bc..e6a25ba 100644
--- a/dev.js
+++ b/dev.js
@@ -28,7 +28,7 @@ app.use('/background', express.static('./background'))
app.use('/', express.static('./src'))
app.use('/dist', express.static('./dist'))
-app.use('/lang', proxy('hongkong.webxoss.com:8080', {
+app.use('/lang', proxy('webxoss.com', {
proxyReqPathResolver: req => '/lang' + url.parse(req.url).path,
https: true,
}))
diff --git a/src/app.vue b/src/app.vue
index e581fea..bb7a82c 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -5,7 +5,7 @@ export default {
let deckFileNames = localStorage.getItem('deck_filenames')
let fileNames = JSON.parse(deckFileNames)
- this.$store.commit('changeWindowWidth', window.innerWidth)
+ this.$store.commit('setWindowData')
this.$store.commit('changeLanguage', localStorage.getItem('language') || 'en')
// if no deck in localStorage, initialize WHITE_HOPE
diff --git a/src/components/ActionButtonBar.vue b/src/components/ActionButtonBar.vue
new file mode 100644
index 0000000..eb9ccd5
--- /dev/null
+++ b/src/components/ActionButtonBar.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/AppHeader/HeaderMenu.vue b/src/components/AppHeader/HeaderMenu.vue
index a935f40..34fdc8a 100644
--- a/src/components/AppHeader/HeaderMenu.vue
+++ b/src/components/AppHeader/HeaderMenu.vue
@@ -9,6 +9,9 @@ export default {
type: Array,
required: true,
},
+ decktopView: {
+ required: false,
+ },
},
computed: {
opened() {
@@ -42,7 +45,7 @@ export default {
-
+
- pid === this.card.pid).length
},
},
+ methods: {
+ handleClick() {
+ this.$emit('click', this.card.pid)
+ },
+ },
}
-
-
-
×{{ count }}
-
+
+
+ ×{{ count }}
+
-
diff --git a/src/components/BoxContainer.vue b/src/components/BoxContainer.vue
new file mode 100644
index 0000000..2c14430
--- /dev/null
+++ b/src/components/BoxContainer.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CardInfoTable.vue b/src/components/CardInfoTable.vue
new file mode 100644
index 0000000..d8420b8
--- /dev/null
+++ b/src/components/CardInfoTable.vue
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+ | {{ meta.key }} |
+ {{ meta.value }} |
+
+
+
+ | {{ cardEffect }} |
+
+
+ | {{ lifeBurst }} |
+
+
+
+
+
+
+
diff --git a/src/components/Cell.vue b/src/components/Cell.vue
index aec47d6..9f3834c 100644
--- a/src/components/Cell.vue
+++ b/src/components/Cell.vue
@@ -193,16 +193,28 @@ export default {
-
diff --git a/src/components/DeckModals.vue b/src/components/DeckModals.vue
index b0b9a68..53cabe4 100644
--- a/src/components/DeckModals.vue
+++ b/src/components/DeckModals.vue
@@ -73,7 +73,13 @@ export default {
},
methods: {
open(type) {
- this.$router.replace({
+ let assignRoute
+ if (Object.getOwnPropertyNames(this.$route.query).length) {
+ assignRoute = this.$router.replace.bind(this.$router)
+ } else {
+ assignRoute = this.$router.push.bind(this.$router)
+ }
+ assignRoute({
path: this.$route.path,
query: Object.assign({}, this.$route.query, {
modal: type,
diff --git a/src/components/DeckSubheader.vue b/src/components/DeckSubheader.vue
new file mode 100644
index 0000000..a4d4d5f
--- /dev/null
+++ b/src/components/DeckSubheader.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index a876102..aba61e7 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -25,6 +25,9 @@ export default {
cancelText() {
return this.config.cancelText || L('cancel')
},
+ opened() {
+ return this.$route.query.modal
+ },
},
methods: {
setInputValue(value) {
@@ -44,6 +47,11 @@ export default {
this.$emit('ok', this.input)
},
},
+ watch: {
+ opened(opened) {
+ document.body.style.overflow = opened ? 'hidden' : 'auto'
+ },
+ },
}
@@ -52,6 +60,7 @@ export default {
ref="wrapper"
:class="$style.wrapper"
tabindex="0"
+ @click.self="cancel"
@keyup.esc="cancel">