Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite #42

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Rewrite #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b12d7c2
Added prettier - starting to rewrite the code so that it makes more s…
aulonm Aug 18, 2020
e036084
Rewrote everything
aulonm Aug 18, 2020
7bf1159
fixed more stuff, updated dependencies, starting to think of removing…
aulonm Aug 29, 2020
79f2939
updated dependencies, removed vue-moment
aulonm Sep 27, 2020
3d58ec7
added tailwindcss and starting to remove vuetify
aulonm Sep 27, 2020
3b4bb95
rewrite: updated dependencies
aulonm Oct 24, 2020
461b995
rewrite: added styles from oslokommune/minside-frontend - rewritten H…
aulonm Oct 25, 2020
248422b
rewrite: removed vuetify in almost every komponent. A couple more left
aulonm Oct 25, 2020
90128d3
rewrite: rewritten everything. Removed vuetify. Need to fix all css..
aulonm Oct 25, 2020
667e950
rewrite: removed last of vuetify
aulonm Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,9 @@ module.exports = {
node: true,
},

plugins: [
'vuetify',
],

parserOptions: {
parser: 'babel-eslint',
},

extends: [
'plugin:vue/recommended',
'@vue/airbnb',
'@vue/prettier',
],
extends: ['plugin:vue/recommended', '@vue/airbnb', '@vue/prettier'],
};
4 changes: 3 additions & 1 deletion .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"tabWidth": 2,
"trailingComma": "es5",
"singleQuote": true,
"printWidth": 120
"printWidth": 120,
"semi": true,
"arrowParens": "always"
}
3,833 changes: 1,584 additions & 2,249 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

47 changes: 22 additions & 25 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,37 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.19.2",
"braces": "^3.0.2",
"@fortawesome/fontawesome-free": "^5.15.1",
"axios": "^0.21.0",
"core-js": "^3.6.5",
"d3": "^5.16.0",
"moment": "^2.27.0",
"serialize-javascript": "^4.0.0",
"vue": "^2.6.11",
"vue-moment": "^4.1.0",
"d3": "^6.2.0",
"flatpickr": "^4.6.6",
"moment": "^2.29.1",
"vue": "^2.6.12",
"vue-flatpickr-component": "^8.1.6",
"vue-resize": "^0.5.0",
"vue-router": "^3.4.3",
"vuetify": "^2.3.9",
"vue-router": "^3.4.7",
"vuex": "^3.5.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.4",
"@vue/cli-plugin-eslint": "^4.5.4",
"@vue/cli-plugin-router": "^4.5.4",
"@vue/cli-plugin-unit-jest": "^4.5.4",
"@vue/cli-plugin-vuex": "^4.5.4",
"@vue/cli-service": "^4.5.4",
"@vue/cli-plugin-babel": "^4.5.8",
"@vue/cli-plugin-eslint": "^4.5.8",
"@vue/cli-plugin-router": "^4.5.8",
"@vue/cli-plugin-unit-jest": "^4.5.8",
"@vue/cli-plugin-vuex": "^4.5.8",
"@vue/cli-service": "^4.5.8",
"@vue/eslint-config-airbnb": "^5.1.0",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "^1.0.4",
"@vue/test-utils": "^1.1.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.8.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.12.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-vue": "^6.2.2",
"eslint-plugin-vuetify": "^1.0.0-beta.7",
"eslint-plugin-vue": "^7.1.0",
"node-sass": "^4.14.1",
"sass": "^1.26.10",
"sass-loader": "^9.0.3",
"vue-cli-plugin-vuetify": "^2.0.7",
"vue-template-compiler": "^2.6.11",
"vuetify-loader": "^1.6.0"
"prettier": "^2.1.2",
"sass": "^1.27.0",
"sass-loader": "^10.0.4",
"vue-template-compiler": "^2.6.12"
}
}
11 changes: 0 additions & 11 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,6 @@
}(window.location))
</script>
<!-- End Single Page Apps for GitHub Pages -->
<!-- Hotjar Tracking Code for Rating.desperate.solutions -->
<script>
(function(h,o,t,j,a,r){
h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
h._hjSettings={hjid:1165267,hjsv:6};
a=o.getElementsByTagName('head')[0];
r=o.createElement('script');r.async=1;
r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
a.appendChild(r);
})(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
</script>
</head>
<body>
<noscript>
Expand Down
52 changes: 22 additions & 30 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,31 @@
<template>
<v-app>
<snackbar />
<v-app-bar app absolute>
<v-toolbar-title v-text="title" />
<v-spacer />
<v-toolbar-items>
<v-btn text @click="changeRoute('leagues')">
Leagues
</v-btn>
</v-toolbar-items>
</v-app-bar>
<v-content>
<router-view />
</v-content>
</v-app>
<div id="app" class="app">
<the-header></the-header>
<router-view class="ds-container" />
</div>
</template>

<script>
import Snackbar from './components/Snackbar.vue';

export default {
name: 'App',
components: { Snackbar },
data() {
return {
drawer: false,
fixed: true,
menuItems: [{ title: 'Leagues', icon: 'dashboard' }],
title: 'Squash Rating',
};
},
methods: {
changeRoute(path) {
this.$router.push({ name: path });
},

components: {
TheHeader: () => import('./components/TheHeader.vue'),
},

data: () => ({
title: 'Squash Rating',
}),
};
</script>

<style lang="scss" scoped>
.app {
display: flex;
flex-direction: column;
min-height: 100vh;
}
.ds-container {
flex-grow: 1;
}
</style>
Loading