Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
severineFF-tanaguru committed May 2, 2023
2 parents 4aefccc + ca8acc5 commit 433ff25
Showing 12 changed files with 42 additions and 32 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -51,4 +51,8 @@ Improvements :
- auto set locale

## 1.0.7
- add logout url
- add logout url

## 1.0.8
- remove logout url
- add loader on TestDetail view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tanaguru2020-webapp",
"version": "1.0.7",
"version": "1.0.8",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --mode development",
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ export default {
refreshCurrentDate() {
this.currentDate = new Date();
if (this.isSessionTimedOut) {
this.$router.push('/logout')
this.$store.dispatch('logout')
}
}
},
6 changes: 5 additions & 1 deletion src/components/NavMenu/MobileMenu.vue
Original file line number Diff line number Diff line change
@@ -120,7 +120,11 @@ import ModuleHelper from '../../helper/ModuleHelper';
},
logout : function(event){
this.toggleMenu()
this.$router.push('/logout')
this.$store.dispatch('logout')
.then(() => {
if (this.$route.path !== '/')
this.$router.push('/')
})
},
login : function(event){
this.toggleMenu()
11 changes: 9 additions & 2 deletions src/components/Navbar.vue
Original file line number Diff line number Diff line change
@@ -20,12 +20,12 @@
</li>

<li class="navbar__item" v-if="menuType == 'desktop'">
<router-link to="logout" class="link-independent link-independent--icon">
<button class="btn btn--nude btn--icon" @click="logout">
<icon-base-decorative>
<icon-logout/>
</icon-base-decorative>
<span>{{ $t('action.logout') }}</span>
</router-link>
</button>
</li>
</ul>

@@ -63,6 +63,13 @@ export default {
this.bus.$emit("updateLocale", this.locale)
this.$moment.locale(this.locale)
},
logout: function (event) {
this.$store.dispatch('logout')
.then(() => {
if (this.$route.path !== '/')
this.$router.push('/')
})
},
moduleName(module){
return this.getModuleName(module)
}
6 changes: 4 additions & 2 deletions src/router/TanaguruRouter.js
Original file line number Diff line number Diff line change
@@ -31,9 +31,10 @@ export default class TanaguruRouter extends VueRouter{
this.store.dispatch('logout')
.then(r => router.push('/'));
} else if (err.response.status === 403) {
this.push('/forbidden')
// this.push('/forbidden')
}
return Promise.reject(err)

return Promise.reject(err.message);
}
);
}
@@ -45,6 +46,7 @@ export default class TanaguruRouter extends VueRouter{
next({name: 'Forbidden'});
}
}


checkAuthorisation(to){
return (!to.meta.requireAuthentication || this.store.getters.isLoggedIn) &&
5 changes: 0 additions & 5 deletions src/router/routes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Home from "@/views/Home";
import Login from "@/views/Login";
import Logout from "@/views/Logout";
import Forbidden from "@/views/Errors/Forbidden";
import UserDetail from "@/views/User/UserDetail";
import ContractDetail from "@/views/Contract/ContractDetail";
@@ -27,10 +26,6 @@ export default [
path: '/login',
name: 'Login',
component: Login
},{
path: '/logout',
name: 'Logout',
component: Logout
},{
path: '/forbidden',
name: 'Forbidden',
1 change: 1 addition & 0 deletions src/scss/vendors/_all-vendors.scss
Original file line number Diff line number Diff line change
@@ -3,3 +3,4 @@
*/

@import "prism-overlay";
@import "chartjs";
3 changes: 3 additions & 0 deletions src/scss/vendors/_chartjs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.chartjs-render-monitor {
max-width: 100%;
}
1 change: 1 addition & 0 deletions src/store/auth.js
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ export default {
logout({commit}){
return new Promise((resolve, reject) => {
commit('logout')
axios({url: '/authentication/logout', method: 'GET'})
resolve()
})
},
18 changes: 0 additions & 18 deletions src/views/Logout.vue

This file was deleted.

13 changes: 12 additions & 1 deletion src/views/PageDetail/TestDetail.vue
Original file line number Diff line number Diff line change
@@ -71,6 +71,9 @@
:has-contrast-tag="hasContrastTag"
:index="i"/>

<div id="fetching-data" class="result-loading" v-if="isLoading">
<p aria-live="polite">{{$t('auditDetail.synthesis.loading')}}</p>
</div>
<div v-if="!lastPageLoaded && !isLoading">
<button class="btn btn--default btn-load" type="button" @click="loadMoreElementResults">
{{ $t('action.loadMore') }}
@@ -135,7 +138,7 @@ export default {
toggleContent(showContent) {
this.ruleOpen = showContent;
if (this.ruleOpen) {
if (!this.test.rules) {
this.testHierarchyService.findAllByTestAndReference(
this.test.id,
@@ -330,6 +333,14 @@ export default {
content: "";
}
}
.result-loading {
margin-left: $left-column-mobile;
@media #{$media-md-viewport} {
margin-left: $left-column-desktop;
}
}
}
.list-tags {

0 comments on commit 433ff25

Please sign in to comment.