Skip to content

Commit 128d854

Browse files
Mise à jour de la gstion des images montees en volume
1 parent 085d60a commit 128d854

File tree

7 files changed

+47
-20
lines changed

7 files changed

+47
-20
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"moment": "^2.30.1",
2727
"openapi-fetch": "^0.8.2",
2828
"pinia": "^2.1.7",
29-
"quasar": "^2.14.3",
29+
"quasar": "^2.15.4",
3030
"radash": "^12.1.0",
3131
"sass": "^1.70.0",
3232
"vue-eslint-parser": "^9.4.2"
@@ -42,6 +42,7 @@
4242
"@vueuse/nuxt": "^10.7.2",
4343
"dayjs-nuxt": "^2.1.9",
4444
"eslint": "^8.56.0",
45+
"memfs": "^4.8.2",
4546
"nuxt": "^3.9.3",
4647
"nuxt-quasar-ui": "^2.0.7",
4748
"openapi-typescript": "^6.7.4",

src/components/appbar/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ q-header
66

77
q-btn(flat @click="backToIndex()")
88
q-avatar(square)
9-
img(src="/sesame-logo.svg")
9+
q-img(src="/config/logo.png" error-src="/default.png" alt="Sesame logo")
1010
q-toolbar-title SESAME
1111
//q-separator(vertical dark inset).q-mx-md
1212
//sesame-AppbarMenu

src/layouts/simple-centered.vue

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
<template lang="pug">
2-
q-layout(view="lHh Lpr fff")
3-
q-page-container
4-
q-page.window-height.window-width.row.justify-center.items-center(
5-
:style='{background: "linear-gradient(#5274C5, #9A4A9F)"}'
6-
)
7-
nuxt-page
2+
q-layout(view="lHh Lpr fff")
3+
q-page-container
4+
q-page.window-height.window-width.row.justify-center.items-center(
5+
:style-fn="getStyle"
6+
)
7+
nuxt-page
88
</template>
9+
10+
<script lang="ts" setup>
11+
const getStyle = () => {
12+
return {
13+
backgroundImage: `url('/config/login-background.png'), linear-gradient(#5274C5, #9A4A9F)`,
14+
backgroundSize: 'cover',
15+
}
16+
}
17+
</script>

src/pages/login.vue

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
<template lang="pug">
2-
q-card.column.shadow-24(:style='{width: "250px"}')
3-
q-toolbar.bg-primary.text-white
4-
q-toolbar-title Connexion
2+
q-card.shadow-24.row(style="max-width: 800px;")
3+
q-toolbar.bg-primary.text-white
4+
q-toolbar-title Connexion
5+
q-card-section.col-6.flex.items-center
6+
q-img(src="/config/login-side.png" error-src="/default.png" alt="Ecole logo" style="max-width: 100%;")
7+
q-card-section.col-6.column
58
form(@submit.prevent='submit')
69
q-card.no-shadow
710
q-card-section.q-pt-sm.q-px-lg.q-pb-lg
811
q-input(v-model="formData.username" label="Username" type="text")
912
q-input(v-model="formData.password" label="Password" type="password" auto-complete='current-password')
1013
q-inner-loading(:showing='pending')
1114
q-spinner-grid(color='primary' size='50px')
12-
q-card-actions
13-
q-space
14-
q-btn(@click.prevent='submit' type='submit' color='primary') Se connecter
15-
q-space
15+
q-card-actions.column.justify-between
16+
.col.q-my-sm.flex.items-center
17+
q-btn(@click.prevent='submit' type='submit' color='primary') Se connecter
18+
.col.row
19+
q-separator
20+
.col.row.q-my-sm.justify-between
21+
.col-4
22+
q-btn(@click="" color="primary" style="height:100%" disabled) Se connecter avec CAS
23+
.col-4
24+
q-btn(@click="" color="primary" style="height:100%" disabled) Se connecter avec microsoft
25+
1626
</template>
1727

1828
<script lang="ts" setup>

src/public/config/.gitkeep

Whitespace-only changes.

src/public/default.png

143 KB
Loading

yarn.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4575,6 +4575,13 @@ mdn-data@2.0.30:
45754575
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
45764576
integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
45774577

4578+
memfs@^4.8.2:
4579+
version "4.8.2"
4580+
resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.8.2.tgz#9bb7c3e43647348451082557f05fb170b7442949"
4581+
integrity sha512-j4WKth315edViMBGkHW6NTF0QBjsTrcRDmYNcGsPq+ozMEyCCCIlX2d2mJ5wuh6iHvJ3FevUrr48v58YRqVdYg==
4582+
dependencies:
4583+
tslib "^2.0.0"
4584+
45784585
merge-stream@^2.0.0:
45794586
version "2.0.0"
45804587
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5837,10 +5844,10 @@ punycode@^2.1.0:
58375844
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
58385845
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
58395846

5840-
quasar@^2.14.3:
5841-
version "2.14.3"
5842-
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.14.3.tgz#0956f6bcdc9ce5a76728e1d7b235e9ce963f1d89"
5843-
integrity sha512-7WzbtZxykLn2ic5oNpepZ2ZjDVpmxyVD4KC9rWe+Ia+4Er61svGr4jOuttN+Ok7IerLSCmKIRyjQMgasF60rFA==
5847+
quasar@^2.15.4:
5848+
version "2.15.4"
5849+
resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.15.4.tgz#764bd886671f98d75f682b1df917adaf7dc4a849"
5850+
integrity sha512-6Rtj0KrsVA0IV9zMZ6R7U7hOpwLS/6E06hsISVHRPn21KEm3XAwHdvy9xWz5kwqWraHRlcisFSDu/KPL4VQK1w==
58445851

58455852
queue-microtask@^1.2.2:
58465853
version "1.2.3"
@@ -6599,7 +6606,7 @@ ts-api-utils@^1.0.1:
65996606
resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
66006607
integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
66016608

6602-
tslib@^2.0.1:
6609+
tslib@^2.0.0, tslib@^2.0.1:
66036610
version "2.6.2"
66046611
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
66056612
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

0 commit comments

Comments
 (0)