Skip to content

Commit d47bb51

Browse files
author
oguzhan.onder
committed
Acces control of menus
1 parent 8bf6b70 commit d47bb51

16 files changed

+356
-64
lines changed

.babelrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"presets": [
33
["env", { "modules": false }],
44
"stage-3"
5-
]
5+
],
6+
"plugins": ["transform-regenerator"]
67
}

package-lock.json

+28-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"bootstrap": "^4.4.1",
1818
"vue": "~2.6.12",
1919
"vue-resource": "^1.5.1",
20-
"vue-router": "^3.4.3",
20+
"vue-router": "^3.4.6",
2121
"vuex": "^3.5.1"
2222
},
2323
"browserslist": [
@@ -28,17 +28,19 @@
2828
"devDependencies": {
2929
"babel-core": "^6.26.0",
3030
"babel-loader": "^7.1.2",
31+
"babel-plugin-transform-regenerator": "^6.26.0",
32+
"babel-polyfill": "^6.26.0",
3133
"babel-preset-env": "^1.6.0",
3234
"babel-preset-stage-3": "^6.24.1",
3335
"cross-env": "^5.0.5",
3436
"css-loader": "^0.28.7",
3537
"file-loader": "^1.1.4",
38+
"js-yaml": ">=3.13.1",
39+
"node-sass": "^4.0.0",
40+
"sass-loader": "^7.2.0",
3641
"vue-loader": "^13.7.3",
3742
"vue-template-compiler": "^2.6.12",
3843
"webpack": "^3.7.1",
39-
"webpack-dev-server": "^2.11.5",
40-
"js-yaml": ">=3.13.1",
41-
"sass-loader": "^7.2.0",
42-
"node-sass": "^4.0.0"
44+
"webpack-dev-server": "^2.11.5"
4345
}
4446
}

src/App.vue

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
created() {
3333
if (this.getIsLogin) {
3434
this.$store.dispatch("getTradeResult");
35+
this.$store.dispatch("getUserAndMenus");
36+
}else{
37+
this.$store.dispatch("initIsLogin");
3538
}
3639
},
3740
computed: {

src/assets/icons/icons.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ import {
7777
cilUser,
7878
cilUserFemale,
7979
cilUserFollow,
80-
cilXCircle
80+
cilXCircle,
81+
cilUserUnfollow,
8182

8283
} from '@coreui/icons'
8384
import { logo } from './logo'
@@ -131,7 +132,8 @@ export const iconsSet = Object.assign(
131132
cilUser,
132133
cilUserFemale,
133134
cilUserFollow,
134-
cilXCircle
135+
cilXCircle,
136+
cilUserUnfollow
135137
},
136138
{
137139
cifUs,

src/components/Login.vue

+7
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@
6969
},
7070
}
7171
},
72+
created(){
73+
if(this.$store.getters.getIsLogin){
74+
this.$store.dispatch("getTradeResult");
75+
this.$store.dispatch("getUserAndMenus");
76+
util.common.routePush("dashboard");
77+
}
78+
},
7279
methods: {
7380
login() {
7481
this.$store.dispatch("login", this.loginRequest)

src/containers/TheSidebar.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/>
2323
</CSidebarBrand>
2424

25-
<CRenderFunction flat :content-to-render="$options.nav"/>
25+
<CRenderFunction flat :content-to-render="this.$store.getters.getShowMenus"/>
2626
<CSidebarMinimizer
2727
class="d-md-down-none"
2828
@click.native="sideBarMinimize( ['sidebarMinimize', !minimize])"
@@ -31,11 +31,9 @@
3131
</template>
3232

3333
<script>
34-
import nav from './menus'
3534
3635
export default {
3736
name: 'TheSidebar',
38-
nav,
3937
methods : {
4038
sideBarMinimize(param){
4139
this.$store.commit("set",param);

0 commit comments

Comments
 (0)