@@ -17,7 +11,10 @@
src="/tricoteuses_jacobines_1301x1907.jpg"
/>
-
-
- {/if}
-
-
-{#if error != null}
-
+
+
+ {/if}
+
+
+
@@ -51,18 +51,12 @@
-->
-{#if error != null}
-
-
-->
-{#if error != null}
- Tricoteuses
++ {$page.data.appTitle} + Légifrance +
Un site et des API pour permettre aux développeurs d'utiliser plus
facilement les données publiques légales de la
- import "../app.css"
-
- import Icon from "@iconify/svelte"
- import chevronDown from "@iconify-icons/codicon/chevron-down"
- import chevronRight from "@iconify-icons/codicon/chevron-right"
- import threeBars from "@iconify-icons/codicon/three-bars"
-
- import { session } from "$app/stores"
-
- type MenuItem = MenuItemLink | MenuItemSubMenu
-
- interface MenuItemBase {
- href?: string
- items?: MenuItemLink[]
- label: string
- title?: string
- }
-
- interface MenuItemLink extends MenuItemBase {
- href: string
- }
-
- interface MenuItemSubMenu extends MenuItemBase {
- items: MenuItemLink[]
- }
-
- const menuItems: MenuItem[] = [
- { href: "/recherche", label: "Recherche" },
- {
- items: [
- { href: "/article", label: "ARTICLE" },
- { href: "/dossier_legislatif", label: "DOSSIER_LEGISLATIF" },
- { href: "/id", label: "ID" },
- { href: "/idcc", label: "IDCC" },
- { href: "/jo", label: "JO" },
- { href: "/section_ta", label: "SECTION_TA" },
- { href: "/texte_version", label: "TEXTE_VERSION" },
- { href: "/textekali", label: "TEXTEKALI" },
- { href: "/textelr", label: "TEXTELR" },
- { href: "/versions", label: "VERSIONS" },
- ],
- label: "Données",
- },
- // {
- // items: [
- // { href: "/jo", label: "JO" },
- // ],
- // label: "JORF",
- // title: "Textes publiés au Journal officiel de la République française",
- // },
- // {
- // items: [
- // { href: "/article", label: "ARTICLE" },
- // // { href: "/eli/ids", label: "ID" },
- // { href: "/section_ta", label: "SECTION_TA" },
- // { href: "/texte_version", label: "TEXTE_VERSION" },
- // { href: "/textelr", label: "TEXTELR" },
- // // { href: "/eli/versions", label: "VERSIONS" },
- // ],
- // label: "LEGI",
- // title: "Codes, lois et règlements consolidés",
- // },
- ]
- const title = $session.title
-
-
-
-
-
-
diff --git a/src/routes/article/index.ts b/src/routes/article/+page.server.ts
similarity index 79%
rename from src/routes/article/index.ts
rename to src/routes/article/+page.server.ts
index 6edae89..eceb122 100644
--- a/src/routes/article/index.ts
+++ b/src/routes/article/+page.server.ts
@@ -1,11 +1,12 @@
import { type Audit, auditSetNullish, cleanAudit } from "@auditors/core"
-import type { RequestHandler } from "@sveltejs/kit"
-import type { JSONObject } from "@sveltejs/kit/types/private"
+import { error } from "@sveltejs/kit"
import { auditSearchQueryContent } from "$lib/auditors/queries"
import type { Article } from "$lib/legal"
import { db } from "$lib/server/database"
+import type { PageServerLoad } from "./$types"
+
export function auditQuery(
audit: Audit,
query: URLSearchParams,
@@ -33,7 +34,7 @@ export function auditQuery(
return audit.reduceRemaining(data, errors, remainingKeys, auditSetNullish({}))
}
-export const GET: RequestHandler = async ({ url }) => {
+export const load: PageServerLoad = async ({ url }) => {
const [query, queryError] = auditQuery(cleanAudit, url.searchParams) as [
{ limit: number; offset: number; q?: string },
unknown,
@@ -46,15 +47,7 @@ export const GET: RequestHandler = async ({ url }) => {
2,
)}\n\nError:\n${JSON.stringify(queryError, null, 2)}`,
)
- return {
- // status: 400,
-
- body: {
- error: {
- query: queryError as unknown as JSONObject,
- },
- },
- }
+ throw error(400, JSON.stringify(queryError, null, 2))
}
const { limit, offset } = query
@@ -65,7 +58,5 @@ export const GET: RequestHandler = async ({ url }) => {
LIMIT ${limit}
`
).map(({ data }) => data)
- return {
- body: { article: articles as unknown as JSONObject[] },
- }
+ return { article: articles }
}
diff --git a/src/routes/article/index.svelte b/src/routes/article/+page.svelte
similarity index 73%
rename from src/routes/article/index.svelte
rename to src/routes/article/+page.svelte
index 2b357a0..4b04c5b 100644
--- a/src/routes/article/index.svelte
+++ b/src/routes/article/+page.svelte
@@ -4,14 +4,14 @@
import { TreeView } from "augmented-data-viewer"
// import { page } from "$app/stores"
- import ErrorAlert from "$lib/components/errors/ErrorAlert.svelte"
import Pagination from "$lib/components/Pagination.svelte"
- import type { Article } from "$lib/legal"
import { summarizeArticleProperties } from "$lib/summaries"
- let articles: Article[]
- export { articles as article }
- export let error: unknown
+ import type { PageData } from "./$types"
+
+ export let data: PageData
+
+ $: ({ article: articles } = data)
ARTICLE
- {#if summary !== undefined} -
-
- {/if}
-ARTICLE
+ {#if summary !== undefined} +
+
+ {/if}
+DOSSIER_LEGISLATIF
- {#if summary !== undefined} -
-
- {/if}
-DOSSIER_LEGISLATIF
+ {#if summary !== undefined} +
+
+ {/if}
+ID
- {#if summary !== undefined} -
-
- {/if}
-ID
+ {#if summary !== undefined} +
+
+ {/if}
+IDCC
- {#if summary !== undefined} -
-
- {/if}
-IDCC
+ {#if summary !== undefined} +
+
+ {/if}
+JO
- {#if summary !== undefined} -
-
- {/if}
-JO
+ {#if summary !== undefined} +
+
+ {/if}
+Aucun article trouvé
{:else} diff --git a/src/routes/section_ta/index.ts b/src/routes/section_ta/+page.server.ts similarity index 79% rename from src/routes/section_ta/index.ts rename to src/routes/section_ta/+page.server.ts index 4ecfea0..e115eea 100644 --- a/src/routes/section_ta/index.ts +++ b/src/routes/section_ta/+page.server.ts @@ -1,11 +1,12 @@ import { type Audit, auditSetNullish, cleanAudit } from "@auditors/core" -import type { RequestHandler } from "@sveltejs/kit" -import type { JSONObject } from "@sveltejs/kit/types/private" +import { error } from "@sveltejs/kit" import { auditSearchQueryContent } from "$lib/auditors/queries" import type { SectionTa } from "$lib/legal" import { db } from "$lib/server/database" +import type { PageServerLoad } from "./$types" + export function auditQuery( audit: Audit, query: URLSearchParams, @@ -33,7 +34,7 @@ export function auditQuery( return audit.reduceRemaining(data, errors, remainingKeys, auditSetNullish({})) } -export const GET: RequestHandler = async ({ url }) => { +export const load: PageServerLoad = async ({ url }) => { const [query, queryError] = auditQuery(cleanAudit, url.searchParams) as [ { limit: number; offset: number; q?: string }, unknown, @@ -46,15 +47,7 @@ export const GET: RequestHandler = async ({ url }) => { 2, )}\n\nError:\n${JSON.stringify(queryError, null, 2)}`, ) - return { - // status: 400, - - body: { - error: { - query: queryError as unknown as JSONObject, - }, - }, - } + throw error(400, JSON.stringify(queryError, null, 2)) } const { limit, offset } = query @@ -65,7 +58,5 @@ export const GET: RequestHandler = async ({ url }) => { LIMIT ${limit} ` ).map(({ data }) => data) - return { - body: { section_ta: sectionTaArray as unknown as JSONObject[] }, - } + return { section_ta: sectionTaArray } } diff --git a/src/routes/section_ta/index.svelte b/src/routes/section_ta/+page.svelte similarity index 71% rename from src/routes/section_ta/index.svelte rename to src/routes/section_ta/+page.svelte index 31870c1..d19e2fe 100644 --- a/src/routes/section_ta/index.svelte +++ b/src/routes/section_ta/+page.svelte @@ -4,14 +4,14 @@ import { TreeView } from "augmented-data-viewer" // import { page } from "$app/stores" - import ErrorAlert from "$lib/components/errors/ErrorAlert.svelte" import Pagination from "$lib/components/Pagination.svelte" - import type { SectionTa } from "$lib/legal" import { summarizeSectionTaProperties } from "$lib/summaries" - export let error: unknown - let sectionTaArray: SectionTa[] - export { sectionTaArray as section_ta } + import type { PageData } from "./$types" + + export let data: PageData + + $: ({ section_ta: sectionTaArray } = data)