Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
leximpact-socio-fiscal-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
leximpact
Simulateur socio-fiscal
leximpact-socio-fiscal-ui
Commits
92899339
Commit
92899339
authored
2 years ago
by
Dorine Lambinet
Browse files
Options
Downloads
Patches
Plain Diff
Ajoute flowbite svelte et popover sur bouton impact budget indisponible
parent
a6f384a4
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!90
Carte budget etat
Pipeline
#7228
passed
2 years ago
Stage: build
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
package.json
+4
-0
4 additions, 0 deletions
package.json
src/routes/+page.svelte
+33
-9
33 additions, 9 deletions
src/routes/+page.svelte
tailwind.config.cjs
+5
-1
5 additions, 1 deletion
tailwind.config.cjs
with
42 additions
and
10 deletions
package.json
+
4
−
0
View file @
92899339
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
"
@leximpact/socio-fiscal-openfisca-json
"
:
"
^0.0.85
"
,
"
@leximpact/socio-fiscal-openfisca-json
"
:
"
^0.0.85
"
,
"
@openfisca/json-model
"
:
"
^3.0.2
"
,
"
@openfisca/json-model
"
:
"
^3.0.2
"
,
"
@playwright/test
"
:
"
^1.28.1
"
,
"
@playwright/test
"
:
"
^1.28.1
"
,
"
@popperjs/core
"
:
"
^2.11.6
"
,
"
@rgossiaux/svelte-headlessui
"
:
"
^1.0.0-beta.12
"
,
"
@rgossiaux/svelte-headlessui
"
:
"
^1.0.0-beta.12
"
,
"
@rollup/plugin-yaml
"
:
"
^4.0.1
"
,
"
@rollup/plugin-yaml
"
:
"
^4.0.1
"
,
"
@sveltejs/adapter-node
"
:
"
^1.0.0-next.102
"
,
"
@sveltejs/adapter-node
"
:
"
^1.0.0-next.102
"
,
...
@@ -37,12 +38,15 @@
...
@@ -37,12 +38,15 @@
"
@typescript-eslint/eslint-plugin
"
:
"
^5.0.0
"
,
"
@typescript-eslint/eslint-plugin
"
:
"
^5.0.0
"
,
"
@typescript-eslint/parser
"
:
"
^5.0.0
"
,
"
@typescript-eslint/parser
"
:
"
^5.0.0
"
,
"
autoprefixer
"
:
"
^10.2.5
"
,
"
autoprefixer
"
:
"
^10.2.5
"
,
"
classnames
"
:
"
^2.3.2
"
,
"
d3-scale
"
:
"
^4.0.0
"
,
"
d3-scale
"
:
"
^4.0.0
"
,
"
dedent-js
"
:
"
^1.0.1
"
,
"
dedent-js
"
:
"
^1.0.1
"
,
"
dotenv
"
:
"
^16.0.0
"
,
"
dotenv
"
:
"
^16.0.0
"
,
"
eslint
"
:
"
^8.0.0
"
,
"
eslint
"
:
"
^8.0.0
"
,
"
eslint-config-prettier
"
:
"
^8.1.0
"
,
"
eslint-config-prettier
"
:
"
^8.1.0
"
,
"
eslint-plugin-svelte3
"
:
"
^4.0.0
"
,
"
eslint-plugin-svelte3
"
:
"
^4.0.0
"
,
"
flowbite
"
:
"
^1.5.5
"
,
"
flowbite-svelte
"
:
"
^0.28.11
"
,
"
fs-extra
"
:
"
^11.1.0
"
,
"
fs-extra
"
:
"
^11.1.0
"
,
"
fuse.js
"
:
"
^6.4.6
"
,
"
fuse.js
"
:
"
^6.4.6
"
,
"
iconify-icon
"
:
"
^1.0.2
"
,
"
iconify-icon
"
:
"
^1.0.2
"
,
...
...
This diff is collapsed.
Click to expand it.
src/routes/+page.svelte
+
33
−
9
View file @
92899339
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
import
{
openModal
}
from
"
svelte-modals
"
import
{
openModal
}
from
"
svelte-modals
"
import
type
{
Writable
}
from
"
svelte/store
"
import
type
{
Writable
}
from
"
svelte/store
"
import
{
Popover
}
from
"
flowbite-svelte
"
import
{
browser
}
from
"
$app/environment
"
import
{
browser
}
from
"
$app/environment
"
import
{
goto
}
from
"
$app/navigation
"
import
{
goto
}
from
"
$app/navigation
"
import
{
page
}
from
"
$app/stores
"
import
{
page
}
from
"
$app/stores
"
...
@@ -64,6 +66,8 @@
...
@@ -64,6 +66,8 @@
export
let
data
:
PageData
export
let
data
:
PageData
let
placement
const
billName
=
getContext
(
"
billName
"
)
as
Writable
<
string
|
undefined
>
const
billName
=
getContext
(
"
billName
"
)
as
Writable
<
string
|
undefined
>
const
budgetSimulation
=
getContext
(
"
budgetSimulation
"
)
as
Writable
<
const
budgetSimulation
=
getContext
(
"
budgetSimulation
"
)
as
Writable
<
BudgetSimulation
|
undefined
BudgetSimulation
|
undefined
...
@@ -1079,22 +1083,42 @@
...
@@ -1079,22 +1083,42 @@
<div>
<div>
<h2
class=
"flex"
>
<h2
class=
"flex"
>
<div
<div
class=
"flex h-14 items-center px-3
text-2xl text-black sm:text-3xl md:px-1 md:text-xl lg:px-2 lg:text-2xl xl:px-3 xl:text-3xl"
class=
"flex h-14 items-center
border-b-4 border-black
px-3 text-2xl text-black sm:text-3xl md:px-1 md:text-xl lg:px-2 lg:text-2xl xl:px-3 xl:text-3xl"
>
>
<span
class=
"pb-2 font-bold tracking-wide text-black"
>
<span
class=
"pb-2 font-bold tracking-wide text-black"
>
Impact cas type
Impact cas type
</span>
</span>
</div>
</div>
<div
<div
id=
"placement-bottom"
on:mouseenter=
{
()
=>
(
placement
=
"
bottom
"
)
}
class=
"flex h-14 items-center px-3 text-2xl text-black sm:text-3xl md:px-1 md:text-xl lg:px-2 lg:text-2xl xl:px-3 xl:text-3xl"
class=
"flex h-14 items-center px-3 text-2xl text-black sm:text-3xl md:px-1 md:text-xl lg:px-2 lg:text-2xl xl:px-3 xl:text-3xl"
>
>
<span
<span
class=
"pb-2 tracking-wide text-gray-300"
>
title=
"Le calcul budgétaire n'est pas disponible pour ce dispositif"
class=
"pb-2 tracking-wide text-gray-300"
>
Impact budgétaires
Impact budgétaires
</span>
</span>
</div>
</div>
<Popover
triggeredBy=
"[id^='placement-']"
{
placement
}
class="m-10 w-80 text-sm font-light shadow-2xl"
title="Impact budgétaire indisponible"
>
<span
class=
"text-black"
>
Le calcul des impacts budgétaires du dispositif «
{
displayMode
.
parametersVariableName
}
»
n'est pas encore disponible.
<span
class=
"font-normal"
>
Ce sujet vous intéresse ? Écrivez-nous à
<a
class=
"link"
href=
"mailto:leximpact@assemblee-nationale.fr"
>
leximpact@assemblee-nationale.fr
</a
></span
>
</span>
</Popover>
</h2>
</h2>
</div>
</div>
{
/if
}
{
/if
}
...
@@ -1111,7 +1135,7 @@
...
@@ -1111,7 +1135,7 @@
</h3>
</h3>
<div
class=
"my-5 flex justify-center"
>
<div
class=
"my-5 flex justify-center"
>
<div
<div
class=
"mx-6 grow-0 items-center rounded-lg bg-le-bleu py-2 text-lg uppercase text-white shadow-md hover:bg-
gray-300 hover:text-black
focus:outline-none md:mx-0"
class=
"mx-6 grow-0 items-center rounded-lg bg-le-bleu py-2
px-4
text-lg uppercase text-white shadow-md hover:bg-
blue-900
focus:outline-none md:mx-0"
>
>
<a
<a
href=
{
`/auth/login?redirect=$
{
encodeURIComponent(
href=
{
`/auth/login?redirect=$
{
encodeURIComponent(
...
@@ -1153,13 +1177,13 @@
...
@@ -1153,13 +1177,13 @@
</h3>
</h3>
<div
class=
"my-5 flex justify-center"
>
<div
class=
"my-5 flex justify-center"
>
<div
<div
class=
"mx-6 grow-0 items-center rounded-lg bg-le-bleu py-2 text-lg uppercase text-white shadow-md hover:bg-
gray-300 hover:text-black
focus:outline-none md:mx-0"
class=
"mx-6 grow-0 items-center rounded-lg bg-le-bleu py-2 text-lg uppercase text-white shadow-md hover:bg-
blue-900
focus:outline-none md:mx-0"
>
>
<a
<a
href=
"https://budget.leximpact.an.fr/authentication/signin/leximpact?redirect=/budget"
href=
"https://budget.leximpact.an.fr/authentication/signin/leximpact?redirect=/budget"
title=
"Vers le simulateur CSG Budget de la Sécurité sociale"
title=
"Vers le simulateur CSG Budget de la Sécurité sociale"
>
>
<div
class=
"flex h-1
2
items-center px-4 py-1"
>
<div
class=
"flex h-1
0
items-center px-4 py-1"
>
<PictoBudgetEtat
/>
<PictoBudgetEtat
/>
<span
class=
"pl-1 text-lg"
>
Simulateur budget CSG
</span>
<span
class=
"pl-1 text-lg"
>
Simulateur budget CSG
</span>
<iconify-icon
class=
"ml-2 h-4 w-4"
icon=
"ri-share-box-line"
/>
<iconify-icon
class=
"ml-2 h-4 w-4"
icon=
"ri-share-box-line"
/>
...
...
This diff is collapsed.
Click to expand it.
tailwind.config.cjs
+
5
−
1
View file @
92899339
...
@@ -3,8 +3,12 @@ const typography = require("@tailwindcss/typography")
...
@@ -3,8 +3,12 @@ const typography = require("@tailwindcss/typography")
const
colors
=
require
(
"
tailwindcss/colors
"
)
const
colors
=
require
(
"
tailwindcss/colors
"
)
const
config
=
{
const
config
=
{
content
:
[
"
./src/**/*.{html,js,svelte,ts}
"
],
content
:
[
"
./src/**/*.{html,js,svelte,ts}
"
,
"
./src/**/*.{html,js,svelte,ts}
"
,
"
./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}
"
,],
plugins
:
[
plugins
:
[
[
require
(
'
flowbite/plugin
'
)
],
typography
,
typography
,
function
({
addUtilities
})
{
function
({
addUtilities
})
{
const
extendLineThrough
=
{
const
extendLineThrough
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment