Skip to content
This repository has been archived by the owner on May 14, 2022. It is now read-only.

Commit

Permalink
Merge pull request #26 from Sybit-Education/main
Browse files Browse the repository at this point in the history
main --> dev, wrong branch
  • Loading branch information
mirkopleli authored Dec 10, 2020
2 parents 6bdbd26 + e71c01e commit 70e7072
Show file tree
Hide file tree
Showing 12 changed files with 379 additions and 85 deletions.
176 changes: 97 additions & 79 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-brands-svg-icons": "^5.15.1",
"@fortawesome/free-regular-svg-icons": "^5.15.1",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/vue-fontawesome": "^2.0.0",
"bootstrap": "^4.5.3",
Expand Down
24 changes: 23 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
<template>
<div id="app" class="container">
<div id="app">
<sitenav />
<div class="container" :class="{'main-container': showNavbar}">
<router-view/>
<notifications group="error" position="top center"/>
</div>
</div>
</template>

<script>
import sitenav from '@/components/base/Sitenav'
export default {
components: {
sitenav
},
computed: {
showNavbar () {
return this.$route.meta.displayNavbar ?? true
}
}
}
</script>
<style lang="sass" scoped>
@import 'assets/variables'
.main-container
margin-left: $sitenav-size
width: auto
</style>
4 changes: 1 addition & 3 deletions src/assets/app.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
@import 'node_modules/bootstrap/scss/bootstrap.scss'
@import 'node_modules/bootstrap-vue/src/index.scss'
@import url('https://fonts.googleapis.com/css2?family=Titillium+Web:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700&display=swap')


$primary: #b51683
@import 'variables'


body
Expand Down
Binary file added src/assets/img/sitenav-bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/variables.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// colors:
$primary: #b51683

//layout
$sitenav-size: 200px
57 changes: 57 additions & 0 deletions src/components/base/DashboardCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<template>
<div>
<b-card
:img-src="this.imgLink"
img-alt="Card Image"
img-height="200"
:title="this.title"
class="card my-4"
@click="router()"
>
<b-card-text>
{{text}}
</b-card-text>
</b-card>
</div>
</template>

<script>
export default {
props: {
title: {
type: String,
default: 'title'
},
text: {
type: String,
default: 'text'
},
link: {
type: String,
default: 'link'
},
imgLink: {
type: String,
default: ''
}
},
methods: {
router () {
this.$router.push(this.link)
}
}
}
</script>

<style scoped>
.card {
transition: box-shadow .2s ;
transition: all .2s ease;
}
.card:hover {
transform: scale(1.03);
transition: all .2s ease;
box-shadow: 0 0 30px rgba(33,33,33,.2);
cursor: pointer;
}
</style>
Loading

0 comments on commit 70e7072

Please sign in to comment.