local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed redirect to login page (#33)

Browse source
This commit is contained in:
konrad 2019-09-09 18:36:30 +00:00 committed by Gitea
parent f6b70bb0a1
commit 568de04a87
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/App.vue
View file

@ -122,6 +122,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- FIXME: This will only be triggered when the root component is already loaded before doing link share auth. Will "fix" itself once we use vuex. -->
<div v-else-if="user.authenticated && user.infos.type === authTypes.LINK_SHARE"> <div v-else-if="user.authenticated && user.infos.type === authTypes.LINK_SHARE">
<div class="container has-text-centered link-share-view"> <div class="container has-text-centered link-share-view">
<div class="column is-10 is-offset-1"> <div class="column is-10 is-offset-1">

5
src/components/lists/ShowList.vue
View file

@ -26,6 +26,7 @@
import ListModel from '../../models/list' import ListModel from '../../models/list'
import ListService from '../../services/list' import ListService from '../../services/list'
import authType from '../../models/authTypes'
export default { export default {
data() { data() {
@ -41,12 +42,12 @@
}, },
beforeMount() { beforeMount() {
// Check if the user is already logged in, if so, redirect him to the homepage // Check if the user is already logged in, if so, redirect him to the homepage
if (!auth.user.authenticated && !auth.user.isLinkShareAuth) { if (!auth.user.authenticated && auth.user.infos.type !== authType.LINK_SHARE) {
router.push({name: 'home'}) router.push({name: 'home'})
} }
// If the type is invalid, redirect the user // If the type is invalid, redirect the user
if (this.$route.params.type !== 'gantt' && this.$route.params.type !== '') { if (auth.user.authenticated && auth.user.infos.type !== authType.LINK_SHARE && this.$route.params.type !== 'gantt' && this.$route.params.type !== '') {
router.push({name: 'showList', params: { id: this.$route.params.id }}) router.push({name: 'showList', params: { id: this.$route.params.id }})
} }
}, },

8
src/components/tasks/ShowListTasks.vue
View file

@ -83,8 +83,6 @@
</template> </template>
<script> <script>
import auth from '../../auth'
import router from '../../router'
import message from '../../message' import message from '../../message'
import ListService from '../../services/list' import ListService from '../../services/list'
@ -121,12 +119,6 @@
this.list = this.theList this.list = this.theList
} }
}, },
beforeMount() {
// Check if the user is already logged in, if so, redirect him to the homepage
if (!auth.user.authenticated) {
router.push({name: 'home'})
}
},
created() { created() {
this.listService = new ListService() this.listService = new ListService()
this.taskService = new TaskService() this.taskService = new TaskService()