diff --git a/src/.env b/src/.env new file mode 100644 index 0000000000000000000000000000000000000000..6a131deef540f30ffe556a9413821271e7c337ca --- /dev/null +++ b/src/.env @@ -0,0 +1 @@ +NUXT_ENABLED_PROCONNECT=false \ No newline at end of file diff --git a/src/client/pages/index.vue b/src/client/pages/index.vue index dcdc19d561fb90f57ef791cb2e87f70657f5b4a1..c10e38582f6848c0c2881b53db187b57da31ea56 100644 --- a/src/client/pages/index.vue +++ b/src/client/pages/index.vue @@ -113,7 +113,6 @@ import qs from 'qs'; export default { data() { return { - enabledProconnect: false, passwordShowActive: false, formActive: false, username: '', @@ -121,11 +120,11 @@ export default { staySignedIn : true, error: '', nextStepLogin: false, + enabledProconnect: false, }; }, methods: { async login() { - console.log(this.password, this.nextStepLogin); if (this.password === '' || !this.nextStepLogin) { return ; } @@ -192,6 +191,10 @@ export default { }, }, mounted() { + const runtimeConfig = useRuntimeConfig() + this.enabledProconnect = runtimeConfig.public.proconnect.enabled; + console.log(runtimeConfig); + this.formActive = true; const script = document.createElement("script"); @@ -215,8 +218,8 @@ export default { .lasuite-homepage__description { width: 100%; max-width: 450px; - } + .error { display: block; border: 1px solid #ce0500; @@ -253,6 +256,14 @@ export default { } } + .lasuite-btn { + cursor: pointer; + } + + .lasuite-btn:hover { + background-color: rgb(18, 18, 255); + } + .password-show { display: inline; width: 50px; diff --git a/src/debian/changelog b/src/debian/changelog index 3af703001a0257f36350d0a7d999892990231fd5..870a39c9dcf5fbe233fcb872a356c67b70f74d3f 100644 --- a/src/debian/changelog +++ b/src/debian/changelog @@ -1,3 +1,9 @@ +dimail-login (0.0.12-1) unstable; urgency=low + + * Add env proconnect_enabled + + -- Éléonore Voisin <eleonore.voisin@mail.numerique.gouv.fr> Tue, 26 Nov 2024 18:26:57 +0200 + dimail-login (0.0.11-1) unstable; urgency=low * Add params for proconnect diff --git a/src/nuxt.config.ts b/src/nuxt.config.ts index bc375acbf702fc2c06a975e6e70d305fe3385eab..cd6ecb7a8d0fb83acc06a73aa1604039660d5987 100644 --- a/src/nuxt.config.ts +++ b/src/nuxt.config.ts @@ -32,22 +32,30 @@ export default defineNuxtConfig({ // buildAssetsDir: './_nuxt/', cdnURL: './', }, + build: { publicPath: '.', }, + devtools: { enabled: true }, ssr: true, srcDir: 'client/', + modules: [ 'vue-dsfr-nuxt-module', ], + runtimeConfig: { public: { vueDsfr: { icons: Object.values(icons), - }, + }, + proconnect: { + enabled: process.env.NUXT_ENABLED_PROCONNECT === 'true', + }, }, }, + css: [ '@gouvfr/dsfr/dist/core/core.main.min.css', '@gouvfr/dsfr/dist/component/component.main.min.css', @@ -57,9 +65,12 @@ export default defineNuxtConfig({ '@gouvminint/vue-dsfr/styles', ], + ignore: [ '**/*.test.*', '**/*.spec.*', '**/*.cy.*', ], -}) + + compatibilityDate: '2024-11-26', +}) \ No newline at end of file