Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit 6a996f6

Browse files
committed
added: header fixed & sidebar fixed variant in Full.vue (issue: #15)
1 parent 346e7d3 commit 6a996f6

File tree

8 files changed

+1538
-421
lines changed

8 files changed

+1538
-421
lines changed

.php_cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?php
22

33
$finder = PhpCsFixer\Finder::create()
4-
->exclude('vendor')
4+
->exclude([
5+
'vendor',
6+
'storage',
7+
'bootstrap/cache',
8+
])
59
->in(__DIR__)
610
;
711

composer.lock

Lines changed: 874 additions & 234 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 616 additions & 172 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"scripts": {
55
"dev": "npm run development",
66
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
@@ -30,25 +30,25 @@
3030
"eslint": "^5.12.0",
3131
"eslint-config-adenvt": "^2.1.0",
3232
"eslint-config-standard": "^12.0.0",
33-
"eslint-formatter-pretty": "^2.0.0",
33+
"eslint-formatter-pretty": "^2.1.0",
3434
"eslint-plugin-import": "^2.14.0",
3535
"eslint-plugin-node": "^8.0.1",
3636
"eslint-plugin-promise": "^4.0.1",
3737
"eslint-plugin-standard": "^4.0.0",
3838
"eslint-plugin-unicorn": "^7.0.0",
3939
"eslint-plugin-varspacing": "^1.2.1",
4040
"eslint-plugin-vue": "^5.1.0",
41-
"laravel-mix": "^4.0.13",
41+
"laravel-mix": "^4.0.14",
4242
"node-sass": "^4.11.0",
4343
"offline-plugin": "^5.0.6",
4444
"pre-commit": "^1.2.2",
4545
"prettier": "1.15.3",
4646
"resolve-url-loader": "^3.0.0",
47-
"sass": "^1.15.3",
47+
"sass": "^1.16.1",
4848
"sass-loader": "^7.1.0",
49-
"stylelint": "^9.9.0",
49+
"stylelint": "^9.10.0",
5050
"stylelint-config-sass-guidelines": "^5.3.0",
51-
"stylelint-scss": "^3.4.4",
51+
"stylelint-scss": "^3.5.1",
5252
"uglifyjs-webpack-plugin": "^2.1.1",
5353
"vue-loader": "^15.5.1",
5454
"vue-template-compiler": "^2.6.6",
@@ -74,10 +74,10 @@
7474
"vue-loading-spinner": "^1.0.11",
7575
"vue-notification": "^1.3.14",
7676
"vue-router": "^3.0.2",
77-
"vue-sweetalert2": "^1.6.3",
77+
"vue-sweetalert2": "^1.6.4",
7878
"vuejs-datepicker": "^1.5.4",
7979
"vuelidate": "^0.7.4",
80-
"vuex": "^3.0.1",
80+
"vuex": "^3.1.0",
8181
"vuex-easy-access": "^3.1.5"
8282
},
8383
"pre-commit": [

resources/js/coreui/components/Header/Header.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,19 @@ import HeaderDropdown from './HeaderDropdown.vue'
6262
export default {
6363
name : 'CHeader',
6464
components: { HeaderDropdown },
65-
methods : {
65+
props : {
66+
fixed: {
67+
type : Boolean,
68+
default: true,
69+
},
70+
},
71+
mounted () {
72+
if (this.fixed) $('body').addClass('header-fixed')
73+
},
74+
beforeDestroy () {
75+
$('body').removeClass('header-fixed')
76+
},
77+
methods: {
6678
sidebarToggle (e) {
6779
e.preventDefault()
6880
document.body.classList.toggle('sidebar-hidden')

resources/js/coreui/components/Sidebar/Sidebar.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,16 @@ export default {
134134
required: true,
135135
default : () => [],
136136
},
137+
fixed: {
138+
type : Boolean,
139+
default: false,
140+
},
141+
},
142+
mounted () {
143+
if (this.fixed) $('body').addClass('sidebar-fixed')
144+
},
145+
beforeDestroy () {
146+
$('body').removeClass('sidebar-fixed')
137147
},
138148
methods: {
139149
handleClick (e) {

resources/js/coreui/containers/Full.vue

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
<template>
22
<div class="app">
3-
<app-header />
3+
<app-header :fixed="fixedHeader || fixedSidebar" />
44
<div class="app-body">
5-
<sidebar :nav-items="nav" />
5+
<sidebar
6+
:nav-items="nav"
7+
:fixed="fixedSidebar"
8+
/>
69
<notifications
710
:style="{ 'margin-top': offset }"
811
class="custom-notifications"
@@ -34,8 +37,10 @@ export default {
3437
},
3538
data () {
3639
return {
37-
nav : nav.items,
38-
offset: true,
40+
nav : nav.items,
41+
offset : true,
42+
fixedHeader : true,
43+
fixedSidebar: true,
3944
}
4045
},
4146
computed: {
@@ -47,9 +52,11 @@ export default {
4752
},
4853
},
4954
mounted () {
55+
$('body').addClass('app sidebar-lg-show pace-done')
5056
$(window).on('scroll', this.setPosNotify)
5157
},
5258
beforeDestroy () {
59+
$('body').removeClass('app sidebar-lg-show pace-done')
5360
$(window).off('scroll', this.setPosNotify)
5461
},
5562
methods: {

resources/sass/coreui/vendors/vue-loading-spinner/spinner.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '~vue-loading-spinner/dist/vue-loading-spinner.css';
1+
// @import '~vue-loading-spinner/dist/vue-loading-spinner.css';
22

33
.spinner-container {
44
align-items: center;

0 commit comments

Comments
 (0)