diff --git a/package.json b/package.json index 245565dc..c220822d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hyperfye-frontend", - "version": "v5.12.0", + "version": "v5.13.0", "private": true, "scripts": { "serve": "vue-cli-service serve --mode production", @@ -56,8 +56,8 @@ "vue-sidebar-menu": "^4.7.4", "vue-stepper": "^1.4.2", "vue-sweetalert2": "^5.0.2", - "vuedraggable": "^2.24.3", "vue-vanilla-datetime-picker": "^1.2.0", + "vuedraggable": "^2.24.3", "vuejs-paginate": "^2.1.0", "vuex": "^3.0.0", "watchify": "^4.0.0", @@ -69,6 +69,7 @@ "@vue/cli-plugin-unit-mocha": "^3.0.0-rc.10", "@vue/cli-service": "^3.0.0-rc.10", "@vue/test-utils": "^1.0.0-beta.20", + "babel-eslint": "^10.1.0", "babel-preset-es2015": "^6.24.1", "babelify": "^7.2.0", "chai": "^4.1.2", diff --git a/src/App.vue b/src/App.vue index 163e7b98..8a852e38 100644 --- a/src/App.vue +++ b/src/App.vue @@ -194,7 +194,7 @@ export default { true : false; }else{ - this.showUserNav = window.location.pathname.includes("/form") || + this.showUserNav = window.location.pathname.includes("/form") || window.location.pathname.includes('/auth/google') || window.location.pathname.includes("/user") || window.location.pathname.includes("/sa/home")?true : false this.isForm= window.location.pathname.includes("/form")? true:false } @@ -221,7 +221,8 @@ export default { window.location.pathname.includes("/admin/createapp") || window.location.pathname.includes("/admin/marketplace") ? true : - false; + false; + this.showUserNav = window.location.pathname.includes("/admin") || window.location.pathname.includes("/auth/google")?false : true }, methods: { diff --git a/src/components/login/Auth.vue b/src/components/login/Auth.vue new file mode 100644 index 00000000..03427764 --- /dev/null +++ b/src/components/login/Auth.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/components/participant/Login.vue b/src/components/participant/Login.vue index 7fe6f382..133745ac 100644 --- a/src/components/participant/Login.vue +++ b/src/components/participant/Login.vue @@ -9,7 +9,7 @@ Session expired. Click to reload. -