diff --git a/package-lock.json b/package-lock.json index e217e26..c00326d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2284,6 +2284,43 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, + "axios": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", + "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "requires": { + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -14786,6 +14823,11 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" }, + "vue-axios": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-2.1.5.tgz", + "integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA==" + }, "vue-eslint-parser": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz", diff --git a/package.json b/package.json index 99b9ec8..b0d8bbb 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "axios": "^0.19.0", "core-js": "^2.6.5", "prerender-spa-plugin": "^3.4.0", "register-service-worker": "^1.6.2", @@ -17,6 +18,7 @@ "stylelint-prettier": "^1.1.1", "stylelint-scss": "^3.11.1", "vue": "^2.6.10", + "vue-axios": "^2.1.5", "vue-meta": "^2.3.0", "vue-router": "^3.0.3", "vuex": "^3.0.1" @@ -37,6 +39,7 @@ "eslint-loader": "^3.0.2", "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-vue": "^5.0.0", + "html-webpack-plugin": "^3.2.0", "node-sass": "^4.9.0", "prettier": "^1.18.2", "sass-loader": "^7.1.0", diff --git a/src/App.vue b/src/App.vue index 7b901f5..39dff70 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,6 +17,12 @@ export default { computed: { ...mapState(['windowHeight']), }, + mounted() { + const path = this.$route.fullPath; + if (path !== '/') { + this.$router.push('/'); + } + }, }; @@ -34,7 +40,7 @@ export default { font-family: 'Roboto', 'Avenir', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - min-height: 400px; + min-height: 500px; position: relative; text-align: center; width: 100%; diff --git a/src/components/Form.vue b/src/components/Form.vue index cfcd0a6..9f098d7 100644 --- a/src/components/Form.vue +++ b/src/components/Form.vue @@ -1,18 +1,23 @@ @@ -32,6 +37,19 @@ export default { type: Function, default: () => 1, }, + loading: { + type: Boolean, + default: false, + }, + email: { + type: String, + default: '', + }, + }, + methods: { + updateEmail(e) { + this.$store.state.email = e.target.value; + }, }, }; @@ -39,14 +57,26 @@ export default { diff --git a/src/components/Twitter.vue b/src/components/Twitter.vue index a435bf6..cce1514 100644 --- a/src/components/Twitter.vue +++ b/src/components/Twitter.vue @@ -43,7 +43,7 @@ export default { .twitter-link { color: white; text-decoration: none; - transition: transform 0.2s; + transition-duration: 0.2s; @include flex(center, center); &:hover { diff --git a/src/main.js b/src/main.js index e03c751..038f90f 100644 --- a/src/main.js +++ b/src/main.js @@ -1,11 +1,13 @@ import Vue from 'vue'; +import axios from 'axios'; +import VueAxios from 'vue-axios'; import App from './App.vue'; import router from './router'; import store from './store'; import './registerServiceWorker'; Vue.config.productionTip = false; - +Vue.use(VueAxios, axios); new Vue({ router, store, diff --git a/src/store.js b/src/store.js index 21aaaf8..828ab89 100644 --- a/src/store.js +++ b/src/store.js @@ -6,6 +6,9 @@ Vue.use(Vuex); export default new Vuex.Store({ state: { windowHeight: '', + api: 'https://testing.nachonight.tv/', + alert: '', + email: '', }, mutations: {}, actions: {}, diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 5589449..1687894 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,3 +1,3 @@ $purple: #5a4d9f; -$green: #16a736; +$green: rgb(5, 145, 5); $desktop: 1000; \ No newline at end of file diff --git a/src/views/ComingSoon.vue b/src/views/ComingSoon.vue index ffbee33..e5ebacb 100644 --- a/src/views/ComingSoon.vue +++ b/src/views/ComingSoon.vue @@ -1,10 +1,13 @@