diff --git a/.eslintrc.js b/.eslintrc.js index f8a2f0f5..c77d8f75 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,19 +1,22 @@ module.exports = { - root: true, - env: { - node: true, - }, - extends: [ - 'plugin:vue/essential', - '@vue/airbnb', - ], - rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'import/extensions': 'off', - 'max-len': ['error', { code: 120, ignoreUrls: true }], - }, - parserOptions: { - parser: 'babel-eslint', - }, + root: true, + env: { + node: true, + }, + extends: [ + 'plugin:vue/essential', + '@vue/airbnb', + ], + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'import/extensions': 'off', + 'max-len': ['error', + { code: 120, ignoreUrls: true + } + ], + }, + parserOptions: { + parser: 'babel-eslint', + }, }; diff --git a/package.json b/package.json index 89d2ba85..c029647c 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,30 @@ { - "name": "27-1hoursite", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "core-js": "^2.6.5", - "vue": "^2.6.10", - "vue-router": "^3.0.3", - "vuetify": "^2.0.0" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "^3.11.0", - "@vue/cli-plugin-eslint": "^3.11.0", - "@vue/cli-service": "^3.11.0", - "@vue/eslint-config-airbnb": "^4.0.0", - "babel-eslint": "^10.0.1", - "eslint": "^5.16.0", - "eslint-plugin-vue": "^5.0.0", - "sass": "^1.17.4", - "sass-loader": "^7.1.0", - "vue-cli-plugin-vuetify": "^0.6.3", - "vue-template-compiler": "^2.6.10", - "vuetify-loader": "^1.2.2" - } + "name": "csesoc-website", + "version": "0.9.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" + }, + "dependencies": { + "core-js": "^2.6.5", + "vue": "^2.6.10", + "vue-router": "^3.0.3", + "vuetify": "^2.0.0" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^3.11.0", + "@vue/cli-plugin-eslint": "^3.11.0", + "@vue/cli-service": "^3.11.0", + "@vue/eslint-config-airbnb": "^4.0.0", + "babel-eslint": "^10.0.1", + "eslint": "^5.16.0", + "eslint-plugin-vue": "^5.0.0", + "sass": "^1.17.4", + "sass-loader": "^7.1.0", + "vue-cli-plugin-vuetify": "^0.6.3", + "vue-template-compiler": "^2.6.10", + "vuetify-loader": "^1.2.2" + } } diff --git a/public/index.html b/public/index.html index a7375d79..f001c098 100644 --- a/public/index.html +++ b/public/index.html @@ -12,6 +12,8 @@ +
+ diff --git a/src/App.vue b/src/App.vue index 7cb6350f..010dc707 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,19 +2,109 @@ - +
+ + + +
+ + + + + +
+ + + + +
- diff --git a/src/components/Events.vue b/src/components/Events.vue new file mode 100644 index 00000000..cac425f9 --- /dev/null +++ b/src/components/Events.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 63513a64..92240a9e 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -13,17 +13,17 @@
- +
- +
- +
@@ -120,7 +120,7 @@ export default { }, }, mounted() { - fetch('') + fetch('https://gistcdn.githack.com/esyw/4e35cd5fe73fa024020e67855ca733fb/raw/e85c9ae58a6323a4214ffa4ad89b0a5ebe404e31/sponsors.json') .then(r => r.json()) .then((responseJson) => { console.log(responseJson); diff --git a/src/components/ListComponent.vue b/src/components/ListComponent.vue new file mode 100644 index 00000000..54e7aaa1 --- /dev/null +++ b/src/components/ListComponent.vue @@ -0,0 +1,77 @@ + + + + + + + diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue new file mode 100644 index 00000000..1baa0d9d --- /dev/null +++ b/src/components/LoginForm.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/components/NavGrid.vue b/src/components/NavGrid.vue index 79ea6247..1a17b705 100644 --- a/src/components/NavGrid.vue +++ b/src/components/NavGrid.vue @@ -2,7 +2,7 @@ - + diff --git a/src/components/NavGridSquare.vue b/src/components/NavGridSquare.vue new file mode 100644 index 00000000..58308383 --- /dev/null +++ b/src/components/NavGridSquare.vue @@ -0,0 +1,37 @@ + + + + + + diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue new file mode 100644 index 00000000..f6a4c009 --- /dev/null +++ b/src/components/Sidebar.vue @@ -0,0 +1,209 @@ + + + + + + + diff --git a/src/components/Slider.vue b/src/components/Slider.vue index 00674783..739013b9 100644 --- a/src/components/Slider.vue +++ b/src/components/Slider.vue @@ -2,7 +2,7 @@

#!/{{ title }}

- + import('./views/About.vue'), }, + { + path: '/contact', + name: 'contact', + component: () => import('./views/Contact.vue'), + }, + { + path: '/events', + name: 'events', + component: () => import('./views/Events.vue'), + }, + { + path: '/media', + name: 'media', + component: () => import('./views/Media.vue'), + }, + { + path: '/members', + name: 'members', + component: () => import('./views/Members.vue'), + }, + { + path: '/merch', + name: 'merch', + component: () => import('./views/Merch.vue'), + }, + { + path: '/projects', + name: 'projects', + component: () => import('./views/Projects.vue'), + }, + { + path: '/resources', + name: 'resources', + component: () => import('./views/Resources.vue'), + }, ], }); diff --git a/src/views/About.vue b/src/views/About.vue index 0b0bc42e..f60ee8e2 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -1,13 +1,110 @@ diff --git a/src/views/Contact.vue b/src/views/Contact.vue new file mode 100644 index 00000000..8ce24323 --- /dev/null +++ b/src/views/Contact.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/views/ContentPage.vue b/src/views/ContentPage.vue new file mode 100644 index 00000000..e84a32bf --- /dev/null +++ b/src/views/ContentPage.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/Events.vue b/src/views/Events.vue new file mode 100644 index 00000000..09d1bf41 --- /dev/null +++ b/src/views/Events.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/Home.vue b/src/views/Home.vue index e996ef42..a18706e0 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,31 +1,150 @@ + diff --git a/src/views/Media.vue b/src/views/Media.vue new file mode 100644 index 00000000..72f6fdd3 --- /dev/null +++ b/src/views/Media.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/Members.vue b/src/views/Members.vue new file mode 100644 index 00000000..59add3d7 --- /dev/null +++ b/src/views/Members.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/Merch.vue b/src/views/Merch.vue new file mode 100644 index 00000000..46614f92 --- /dev/null +++ b/src/views/Merch.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/Projects.vue b/src/views/Projects.vue new file mode 100644 index 00000000..6c28613f --- /dev/null +++ b/src/views/Projects.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/Resources.vue b/src/views/Resources.vue new file mode 100644 index 00000000..b9701a0f --- /dev/null +++ b/src/views/Resources.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/ResourcesPage.vue b/src/views/ResourcesPage.vue new file mode 100644 index 00000000..e84a32bf --- /dev/null +++ b/src/views/ResourcesPage.vue @@ -0,0 +1,127 @@ + + + + +