Skip to content
Snippets Groups Projects
Commit 45344617 authored by Benoît Courty's avatar Benoît Courty Committed by benoit-cty
Browse files

Config

parent 12d46be2
Branches
No related tags found
1 merge request!6Ajout de la section Education
<script lang="ts">
import { page } from "$app/stores"
import { qr } from "@svelte-put/qr/svg"
import { getContext } from "svelte"
// import { getContext } from "svelte"
let numCirco = $page.params.numeroCirco
export let id_ancre: string
const root_url = getContext("PUBLIC_DATACIRCO_ROOT_URL")
// const root_url = getContext("PUBLIC_DATACIRCO_ROOT_URL")
// const root_url = getContext("PUBLIC_DATACIRCO_ROOT_URL")
export let root_url: string
</script>
<div class="mt-10 flex w-full items-end justify-end">
......
......@@ -11,11 +11,14 @@
import { plot_ips_histo } from "$lib/education_graph"
export let counter: number
const root_url = getContext("PUBLIC_DATACIRCO_ROOT_URL")
let numCirco = $page.params.numeroCirco
let subSecCounter = 1
export let config: {
root_url: string
}
let root_url: string = "https://datacirco.leximpact.an.fr"
export let dataPopulation: {
population_nat: number
population_totale: number
......@@ -29,6 +32,11 @@
let pop_total = 0
let pop_total_france = 0
$: if (config) {
console.log("config est rempli")
root_url = config.root_url
}
$: if (dataPopulation) {
console.log("dataPopulation est rempli")
pop_total = dataPopulation.population_totale
......@@ -409,7 +417,9 @@
target="_blank">Ministère de l'Enseignement supérieur</a
>
</Source>
<QrCodeAugmente id_ancre="effectifs">Zoom sur les effectifs</QrCodeAugmente>
<QrCodeAugmente id_ancre="effectifs" {root_url}
>Zoom sur les effectifs</QrCodeAugmente
>
</section>
<SubSection
......@@ -707,7 +717,7 @@
Ministère de l'Éducation nationale
</a>
</Source>
<QrCodeAugmente id_ancre="ips">Zoom sur les IPS</QrCodeAugmente>
<QrCodeAugmente id_ancre="ips" {root_url}>Zoom sur les IPS</QrCodeAugmente>
</section>
<SubSection
sectionNumber="{counter}.{subSecCounter++}"
......@@ -724,7 +734,7 @@
</p>
</div>
<div class="flex justify-end">
<QrCodeAugmente id_ancre="liste-etablissements">
<QrCodeAugmente id_ancre="liste-etablissements" {root_url}>
Liste des établissements
</QrCodeAugmente>
</div>
......
import "dotenv/config"
export interface Config {
dataDir: string
root_url: string
}
const config: Config = { dataDir: process.env.DATA_DIR as string }
const config: Config = { root_url: process.env.PUBLIC_DATACIRCO_ROOT_URL as string }
export default config
......@@ -5,10 +5,6 @@
import { writable, type Writable } from "svelte/store"
import { browser } from "$app/environment"
import { env } from "$env/dynamic/public"
const root_url = env.PUBLIC_DATACIRCO_ROOT_URL
setContext("PUBLIC_DATACIRCO_ROOT_URL", root_url)
let Plotly: Writable<unknown> = writable(undefined)
setContext("Plotly", Plotly)
......
import type { PageServerLoad } from "./$types"
import config from "$lib/server/config"
export const load = (async ({ params }) => {
const url = `https://leximpact.an.fr/datacirco/data-json/${params.numeroCirco}/`
......@@ -28,5 +29,6 @@ export const load = (async ({ params }) => {
dataPopulation,
dataEducation,
sources,
config,
}
}) satisfies PageServerLoad
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment