forked from kompetenzinventar/ki-frontend
Compare commits
5 Commits
fix-typos
...
feature-ed
Author | SHA1 | Date | |
---|---|---|---|
fa45a306d5
|
|||
096c317da8 | |||
ac39750cd4 | |||
b0458643bf | |||
12ccbaf860
|
24
.editorconfig
Normal file
24
.editorconfig
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.{json,js,vue}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.{yml,yaml}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.html]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.{css,scss}]
|
||||||
|
indent_size = 2
|
681
package-lock.json
generated
681
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -18,6 +18,8 @@
|
|||||||
"core-js": "^3.6.5",
|
"core-js": "^3.6.5",
|
||||||
"eslint": "^6.7.2",
|
"eslint": "^6.7.2",
|
||||||
"eslint-plugin-vue": "^7.0.0",
|
"eslint-plugin-vue": "^7.0.0",
|
||||||
|
"sass": "^1.37.5",
|
||||||
|
"sass-loader": "^10.2.0",
|
||||||
"vue": "^3.0.0",
|
"vue": "^3.0.0",
|
||||||
"vue-router": "^4.0.0-0"
|
"vue-router": "^4.0.0-0"
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,9 @@
|
|||||||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@import "variables";
|
||||||
|
@import "bootstrap/scss/bootstrap";
|
||||||
|
|
||||||
.container{
|
.container{
|
||||||
min-height: calc(100vh - 70px - 24px);
|
min-height: calc(100vh - 70px - 24px);
|
||||||
}
|
}
|
||||||
|
|
1
src/assets/variables.scss
Normal file
1
src/assets/variables.scss
Normal file
@ -0,0 +1 @@
|
|||||||
|
$primary: #0790a9;
|
@ -5,8 +5,7 @@ import router from './router'
|
|||||||
|
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
import './assets/global.scss'
|
||||||
import './assets/custom.css'
|
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
|
@ -13,10 +13,7 @@ const routes = [
|
|||||||
template: "<router-view/>",
|
template: "<router-view/>",
|
||||||
},
|
},
|
||||||
beforeEnter: (to, from, next) => {
|
beforeEnter: (to, from, next) => {
|
||||||
console.log('test')
|
|
||||||
console.log('token', localStorage.getItem('token'))
|
|
||||||
if(localStorage.getItem('token') !== null){
|
if(localStorage.getItem('token') !== null){
|
||||||
console.log('next')
|
|
||||||
next()
|
next()
|
||||||
}else{
|
}else{
|
||||||
next({path: '/', query: {url: to.fullPath, access: false}})
|
next({path: '/', query: {url: to.fullPath, access: false}})
|
||||||
|
@ -28,9 +28,11 @@
|
|||||||
:values="profile.languages"
|
:values="profile.languages"
|
||||||
type="language"
|
type="language"
|
||||||
></profile-list>
|
></profile-list>
|
||||||
|
<div v-if="profile.address">
|
||||||
<h3>Meine Location:</h3>
|
<h3>Meine Location:</h3>
|
||||||
{{profile.address.city}} ({{profile.address.postcode}}), {{profile.address.country}}
|
{{profile.address.city}} ({{profile.address.postcode}}), {{profile.address.country}}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import ProfileList from "@/components/ProfileList";
|
import ProfileList from "@/components/ProfileList";
|
||||||
|
Reference in New Issue
Block a user