Skip to content
This repository has been archived by the owner on Jan 10, 2022. It is now read-only.

Updated template data.gouv, small corrections #59

Merged
merged 3 commits into from
Jul 23, 2019
Merged

Updated template data.gouv, small corrections #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
033b085
Added .nvmrc for locking node version with NVM
Samuelfaure Jul 19, 2019
52b7a66
upgraded template data gouv package
Samuelfaure Jul 22, 2019
70e32a9
boyscout
Samuelfaure Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.10.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pourquoi la 11.10.0 ?
Pour moi faut soit la LTS (10.16.0) ou la stable (12.6.0).
J'ai une préférence pour la LTS, mais je pense que pour nous ça ne change rien ; à part que la 11.10.0 > LTS...

En vrai c'est pas super important

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J'ai juste fix sur la version donnée dans le README

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok on ignore pour le moment on verra ça plus tard

6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"jwt-decode": "^2.2.0",
"marked": "^0.6.2",
"moment": "^2.22.1",
"template.data.gouv.fr": "^1.1.6",
"template.data.gouv.fr": "^1.2.2",
"vee-validate": "^2.0.8",
"vue": "^2.6.10",
"vue-clipboard2": "^0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/AccountConfirmation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default {
confirmation_token: this.$route.query.confirmation_token
}
this.$store.dispatch('auth/confirm', payload)
.then(data => {
.then(() => {
this.$router.push({ name: 'application-panel' })
})
.catch(error => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/resource/jwt_api_entreprise/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ul class="token__list">
<li class="panel" v-for="(jwt, index) in jwtList" :key="index">
<jwt-api-entreprise-card :jwt="jwt" />
<jwt-api-entreprise-show :jwt="jwt" />
</li>
</ul>
</template>
Expand All @@ -15,7 +15,7 @@ export default {
props: ['jwtList'],

components: {
'jwt-api-entreprise-card': JwtApiEntrepriseShow
'jwt-api-entreprise-show': JwtApiEntrepriseShow
}
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions src/components/resource/jwt_api_entreprise/Show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ export default {
return date.toLocaleString('fr-FR')
},

clipboardSuccess (e) { this.showClipboardSuccessMsg = true },
clipboardSuccess () { this.showClipboardSuccessMsg = true },

clipboardError (e) { this.showClipboardErrorMsg = true },
clipboardError () { this.showClipboardErrorMsg = true },

blacklistJwt () {
this.$store.dispatch('user/blacklistToken', { id: this.jwt.payload.jti })
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import store from './store'
import 'babel-polyfill'
import Vuetify from 'vuetify'

import 'template.data.gouv.fr/dist/style/main.css'
import 'template.data.gouv.fr/dist/main.css'

require('@/polyfill')
require('@/style/app.scss')
Expand Down