sync bruno test

update bruno file
add datatourism for prod
2024-04-21 15:17:17 +02:00 · 2024-04-21 13:40:01 +02:00 · 2024-04-21 12:49:28 +02:00
27 changed files with 118 additions and 1313 deletions
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@ -1,53 +0,0 @@
-name: Build Docker Image # nom du workflow
-
-on: #declancheur
-  push:
-    branches:
-      - '*'
-    tags:
-      - v*
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  run: #jobs ID (nom du jobs)
-    runs-on: ubuntu-latest # environement de run
-
-    steps: # liste des étapes
-    - name: Checkout # rapatrie le depot
-      uses: actions/checkout@v3
-
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v5
-      with:
-        images: |
-          git.lab-ouest.org/Epitech/ratrapage_T-WEB_front
-        tags: |
-          type=edge
-          type=ref,event=pr
-          type=ref,event=branch
-          type=semver,pattern={{version}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=semver,pattern={{major}}
-          type=semver,pattern=latest
-
-    - name: Login to Gitea
-      uses: docker/login-action@v3
-      with:
-        registry: git.lab-ouest.org
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_TOKEN }}
-
-    # - name: Set up Docker Buildx
-    #   uses: docker/setup-buildx-action@v3
-
-    - name: Build and push front
-      uses: docker/build-push-action@v5
-      with:
-        context: ./front
-        push: true
-        file: ./front/Dockerfile
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
--- a/datatourisme/environments/dev.bru
+++ b/datatourisme/environments/dev.bru
@ -1,3 +1,6 @@
+vars {
+  URL: http://localhost:8080
+}
 vars:secret [
  app_key
 ]
--- a/datatourisme/environments/prod.bru
+++ b/datatourisme/environments/prod.bru
@ -0,0 +1,3 @@
+vars:secret [
+  URL
+]
--- a/datatourisme/test
+++ b/datatourisme/test
@ -5,11 +5,11 @@ meta {
 }

 post {
-  url: http://localhost:8080
+  url: {{URL}}
  body: graphql
  auth: none
 }

 body:graphql {
-  {poi() {results{dc_identifier rdfs_label}}}
+  {poi() {results{dc_identifier, lastUpdate}}}
 }
--- a/2
+++ b/2
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,34 +1,20 @@
-version: "3.8"
 services:
-  pocketbase:
-    image: ghcr.io/coollabsio/pocketbase:latest
-    environment:
-      - SERVICE_FQDN_POCKETBASE_8080
-    volumes:
-      - ./.pb/pocketbase-data:/app/pb_data
-      - ./.pb/pocketbase-hooks:/app/pb_hooks
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`)
-      - traefik.http.services.poketBaseTweb.loadbalancer.server.port=${POCKET_BASE_PORT}
-      - traefik.http.routers.poketBaseTweb.tls.certresolver=le
-    networks:
-      - public
-  front:
-    image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head
-    depends_on: 
-      - pocketbase
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.astroTweb.rule=Host(`${FRONT_URL}`)
-      - traefik.http.services.astroTweb.loadbalancer.server.port=${FRONT_BASE_PORT}
-      - traefik.http.routers.astroTweb.tls.certresolver=le
-    networks:
-      - public
-networks:
-  public:
-    external: true
-x-dockge:
-  urls:
-    - https://${POCKET_BASE_URL}/
-    - https://${FRONT_URL}/
+
+  blazegraph:
+      image: conjecto/blazegraph:2.1.5
+      # ports:
+      #   - 9999:9999
+      environment:
+          JAVA_OPTS: "-Xms6G -Xmx6G"
+      volumes:
+        - ./datatourisme/dataset:/docker-entrypoint-initdb.d
+      ulimits:
+        nofile:
+          soft: 65536
+          hard: 65536
+  datatourisme:
+      image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
+      # ports:
+      #     - "8080:80"
+      depends_on:
+          - blazegraph
--- a/front/.eslintignore
+++ b/front/.eslintignore
@ -1,8 +0,0 @@
-node_modules
-
-out
-.next
-
-next-env.d.ts
-*.js
-__tests__
--- a/front/.eslintrc.json
+++ b/front/.eslintrc.json
@ -1,324 +0,0 @@
-{
-	"env": {
-		"browser": true,
-		"es6": true,
-		"node": true
-	},
-	"extends": [
-		"eslint:recommended",
-		"plugin:astro/recommended",
-		"plugin:@typescript-eslint/strict",
-		"plugin:@typescript-eslint/stylistic"
-	],
-	"globals": {
-		"Atomics": "readonly",
-		"SharedArrayBuffer": "readonly"
-	},
-	"overrides": [
-		{
-			"files": [
-				"*.astro"
-			],
-			"parser": "astro-eslint-parser",
-			"parserOptions": {
-				"extraFileExtensions": [
-					".astro"
-				],
-				"parser": "@typescript-eslint/parser"
-			}
-		},
-		{
-			"files": [
-				"*.ts",
-				"*.tsx",
-				"*.astro"
-			],
-			"rules": {
-				"no-extra-parens": "off",
-				"no-unused-expressions": "off",
-				"no-shadow": "off",
-				"quotes": "off",
-				"semi": "off",
-				"space-before-function-paren": "off"
-			}
-		}
-	],
-	"parser": "@typescript-eslint/parser",
-	"parserOptions": {
-		"ecmaFeatures": {
-			"jsx": true,
-			"project": "tsconfig.json",
-			"sourceType": "module",
-			"ecmaVersion": 2018
-		}
-	},
-	"plugins": [
-		"@typescript-eslint"
-	],
-	"root": true,
-	"rules": {
-		"@typescript-eslint/prefer-for-of": "error",
-		"@typescript-eslint/prefer-function-type": "error",
-		"@typescript-eslint/prefer-namespace-keyword": "error",
-		"@typescript-eslint/space-before-function-paren": [
-			"error",
-			{
-				"anonymous": "never",
-				"asyncArrow": "always",
-				"named": "never"
-			}
-		],
-		"@typescript-eslint/triple-slash-reference": "error",
-		"@typescript-eslint/type-annotation-spacing": "error",
-		"@typescript-eslint/unified-signatures": "error",
-
-		"@typescript-eslint/adjacent-overload-signatures": "error",
-		"@typescript-eslint/array-type": [
-			"error",
-			{
-				"default": "generic"
-			}
-		],
-		"arrow-body-style": "error",
-		"arrow-parens": [
-			"error",
-			"always"
-		],
-		"@typescript-eslint/ban-types": [
-			"error",
-			{
-				"types": {
-					"{}": false
-				}
-			}
-		],
-		"complexity": [
-			"warn",
-			10
-		],
-		"@typescript-eslint/consistent-type-assertions": "error",
-		"@typescript-eslint/consistent-type-definitions": "error",
-		"constructor-super": "error",
-		"curly": "error",
-		"dot-notation": "error",
-		"eol-last": "error",
-		"eqeqeq": [
-			"error",
-			"smart"
-		],
-		"@typescript-eslint/explicit-member-accessibility": [
-			"error",
-			{
-				"accessibility": "explicit"
-			}
-		],
-		"for-direction": "error",
-		"getter-return": "error",
-		"guard-for-in": "error",
-		"id-blacklist": [
-			"error",
-			"any",
-			"Number",
-			"number",
-			"String",
-			"string",
-			"Boolean",
-			"boolean",
-			"Undefined"
-		],
-		"id-length": [
-			"warn",
-			{
-				"exceptions": [
-					"_"
-				]
-			}
-		],
-		"id-match": "error",
-		"indent": [
-			"error",
-			"tab",
-			{
-				"SwitchCase": 1
-			}
-		],
-		"linebreak-style": [
-			"error",
-			"unix"
-		],
-		"max-classes-per-file": [
-			"error",
-			1
-		],
-		"max-depth": [
-			"warn",
-			2
-		],
-		"max-len": [
-			"warn",
-			{
-				"code": 256
-			}
-		],
-		"@typescript-eslint/member-delimiter-style": [
-			"error",
-			{
-				"multiline": {
-					"delimiter": "none",
-					"requireLast": true
-				},
-				"singleline": {
-					"delimiter": "comma",
-					"requireLast": false
-				}
-			}
-		],
-		"@typescript-eslint/member-ordering": "error",
-		"new-parens": "error",
-
-		"no-async-promise-executor": "error",
-		"no-await-in-loop": "warn",
-		"no-bitwise": "error",
-		"no-caller": "error",
-		"no-compare-neg-zero": "error",
-		"no-cond-assign": "error",
-		"no-console": "off",
-		"no-constant-condition": "error",
-		"no-control-regex": "warn",
-		"no-debugger": "error",
-		"no-delete-var": "error",
-		"no-dupe-args": "error",
-		"no-dupe-else-if": "error",
-		"no-dupe-keys": "error",
-		"no-duplicate-case": "error",
-		"no-empty": [
-			"error",
-			{
-				"allowEmptyCatch": true
-			}
-		],
-		"no-empty-character-class": "error",
-		"@typescript-eslint/no-empty-function": "error",
-		"@typescript-eslint/no-empty-interface": "error",
-		"no-eval": "error",
-		"no-ex-assign": "error",
-		"@typescript-eslint/no-explicit-any": "off",
-
-
-		"no-extra-boolean-cast": "error",
-		"no-extra-parens": "off",
-		"@typescript-eslint/no-extra-parens": [
-			"error",
-			"all",
-			{
-				"ignoreJSX": "all"
-			}
-		],
-		"no-extra-semi": "error",
-		"no-fallthrough": "off",
-		"no-func-assign": "error",
-		"no-import-assign": "error",
-		"no-inner-declarations": "error",
-		"no-invalid-regexp": "error",
-		"no-irregular-whitespace": "error",
-		"no-label-var": "error",
-		"no-loss-of-precision": "error",
-		"no-misleading-character-class": "error",
-		"@typescript-eslint/no-misused-new": "error",
-		"no-multiple-empty-lines": "error",
-		"@typescript-eslint/no-namespace": "error",
-		"no-new-wrappers": "error",
-		"no-obj-calls": "error",
-		"no-promise-executor-return": "error",
-		"@typescript-eslint/no-parameter-properties": "off",
-		"no-prototype-builtins": "error",
-		"no-regex-spaces": "error",
-		"no-setter-return": "error",
-		"@typescript-eslint/no-shadow": "error",
-		"no-shadow": [
-			"error",
-			{
-				"builtinGlobals": false,
-				"hoist": "all"
-			}
-		],
-		"no-shadow-restricted-names": "error",
-		"no-sparse-arrays": "error",
-		"no-template-curly-in-string": "warn",
-		"no-throw-literal": "error",
-		"no-trailing-spaces": "error",
-		"no-undef": "error",
-		"no-undef-init": "error",
-		"no-underscore-dangle": "off",
-		"no-unexpected-multiline": "error",
-		"no-unreachable": "warn",
-		"no-unreachable-loop": "warn",
-		"no-unsafe-finally": "error",
-		"no-unsafe-negation": "error",
-		"no-unsafe-optional-chaining": "error",
-		"no-unused-expressions": [
-			"error",
-			{
-				"allowTernary": true
-			}
-		],
-		"@typescript-eslint/no-unused-expressions": [
-			"error",
-			{
-				"allowTernary": true
-			}
-		],
-		"no-unused-labels": "error",
-		"no-unused-vars": "off",
-		"@typescript-eslint/no-unused-vars": ["error", {
-			"args": "all",
-			"argsIgnorePattern": "^_",
-			"caughtErrors": "all",
-			"caughtErrorsIgnorePattern": "^_",
-			"destructuredArrayIgnorePattern": "^_",
-			"varsIgnorePattern": "^_",
-			"ignoreRestSiblings": true
-		}],
-		"@typescript-eslint/no-non-null-assertion": ["warn"],
-		"no-var": "error",
-		"object-shorthand": [
-			"warn",
-			"methods"
-		],
-		"one-var": [
-			"error",
-			"never"
-		],
-		"prefer-const": "error",
-		"quote-props": [
-			"error",
-			"consistent-as-needed"
-		],
-		"quotes": "off",
-		"@typescript-eslint/quotes": [
-			"error",
-			"single",
-			{
-				"avoidEscape": true
-			}
-		],
-		"radix": "error",
-		"require-atomic-updates": "warn",
-		"semi": "off",
-		"@typescript-eslint/semi": [
-			"error",
-			"never"
-		],
-		"space-before-function-paren": [
-			"error",
-			{
-				"anonymous": "never",
-				"asyncArrow": "always",
-				"named": "never"
-			}
-		],
-		"spaced-comment": ["error", "always", { "block": { "exceptions": ["*"] } }],
-		"use-isnan": "error",
-		"valid-typeof": "warn"
-	}
-}
--- a/front/.vscode/settings.json
+++ b/front/.vscode/settings.json
@ -1,9 +0,0 @@
-{
-	"editor.quickSuggestions": {
-		"strings": "on"
-	},
-	"tailwindCSS.includeLanguages": {
-		"astro": "html"
-	},
-	"typescript.tsdk": "node_modules/typescript/lib"
-}
--- a/front/Dockerfile
+++ b/front/Dockerfile
@ -1,64 +0,0 @@
-# This Dockerfile allows you to run AstroJS in server mode
-
-#########
-# Build #
-#########
-FROM docker.io/node:20-alpine as BUILD_IMAGE
-
-# Disable telemetry
-ENV ASTRO_TELEMETRY_DISABLED=1
-
-# External deps (for node-gyp add: "python3 make g++")
-RUN apk add --no-cache git
-
-# run as non root user
-USER node
-
-# go to user repository
-WORKDIR /home/node
-
-# Add package json
-ADD --chown=node:node package.json package-lock.json ./
-
-# install dependencies from package lock
-RUN npm ci
-
-# Add project files
-ADD --chown=node:node . .
-
-# build
-RUN npm run build
-
-# remove dev deps
-RUN npm prune --omit=dev
-
-##############
-# Production #
-##############
-FROM docker.io/node:20-alpine as PROD_IMAGE
-
-# inform software to be in production
-ENV NODE_ENV=production
-ENV HOST=0.0.0.0
-ENV RESOURCES_FOLDER=/home/node/.loop/uploads
-ENV ASTRO_TELEMETRY_DISABLED=1
-
-# run as non root user
-USER node
-
-# go to work folder
-WORKDIR /home/node
-
-# Expose port
-EXPOSE 3000
-
-# Add Healthcheck
-HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
-
-# copy from build image
-COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules
-COPY --chown=node:node --from=BUILD_IMAGE /home/node/dist ./dist
-COPY --chown=node:node --from=BUILD_IMAGE /home/node/package.json /home/node/.env* ./
-
-# run it !
-CMD ["npm", "run", "start"]
--- a/front/astro.config.mjs
+++ b/front/astro.config.mjs
@ -1,11 +1,8 @@
-import node from '@astrojs/node'
-import tailwind from '@astrojs/tailwind'
-import { defineConfig } from 'astro/config'
-
-import react from '@astrojs/react'
+import { defineConfig } from 'astro/config';

 // https://astro.build/config
 export default defineConfig({
+    // integrations: [tailwind(), test, routing(), version(), buildInfos()],
 	compressHTML: true,
 	build: {
 		assets: 'assets',
@ -15,15 +12,9 @@ export default defineConfig({
 		host: true,
 		port: 3000
 	},
-	trailingSlash: 'never',
-	output: 'server',
-	adapter: node({
-		mode: 'standalone'
-	}),
-	integrations: [tailwind(), react()],
-	vite: {
-		optimizeDeps: {
-			include: ['leaflet']
-		}
-	}
-})
+    trailingSlash: 'never',
+    output: 'static', //'server',
+    // adapter: node({
+	// 	mode: 'standalone'
+	// }),
+});
--- a/front/package-lock.json
+++ b/front/package-lock.json
@ -8,33 +8,22 @@
      "name": "front",
      "version": "0.0.1",
      "dependencies": {
-        "@astrojs/node": "^8.2.5",
-        "@astrojs/react": "^3.3.1",
        "@astrojs/tailwind": "^5.1.0",
        "@tailwindcss/typography": "^0.5.12",
-        "@types/react": "^18.2.79",
-        "@types/react-dom": "^18.2.25",
-        "astro": "4.5.12",
-        "leaflet": "^1.9.4",
+        "astro": "^4.6.3",
        "lucide-astro": "^0.372.0",
-        "pocketbase": "^0.21.1",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-leaflet": "^4.2.1",
        "simple-icons-astro": "^11.12.0",
        "tailwindcss": "^3.4.3",
-        "typescript": "^5"
+        "typescript": "^5.2.2"
      },
      "devDependencies": {
        "@astrojs/check": "^0",
-        "@astrojs/ts-plugin": "^1.6.1",
-        "@types/leaflet": "^1.9.12",
        "@types/node": "^20",
-        "@typescript-eslint/eslint-plugin": "^6.21.0",
-        "@typescript-eslint/parser": "^6.21.0",
+        "@typescript-eslint/eslint-plugin": "^6",
+        "@typescript-eslint/parser": "^6",
        "@vitest/coverage-v8": "^1",
-        "eslint": "^8.57.0",
-        "eslint-plugin-astro": "^0.31.4",
+        "eslint": "^8",
+        "eslint-plugin-astro": "^0.31",
        "typescript": "^5",
        "vitest": "^1"
      }
@ -140,11 +129,11 @@
      }
    },
    "node_modules/@astrojs/markdown-remark": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-4.3.2.tgz",
-      "integrity": "sha512-4Oa4VaYiBd0MatB+rWIU/0A8pZH/sK3c2QkRYb+OO2lPl+qzevJtWaZY8hAQc4qurIOlRdn6B6ofDAGhWw+DSg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-5.1.0.tgz",
+      "integrity": "sha512-S6Z3K2hOB7MfjeDoHsotnP/q2UsnEDB8NlNAaCjMDsGBZfTUbWxyLW3CaphEWw08f6KLZi2ibK9yC3BaMhh2NQ==",
      "dependencies": {
-        "@astrojs/prism": "^3.0.0",
+        "@astrojs/prism": "^3.1.0",
        "github-slugger": "^2.0.0",
        "hast-util-from-html": "^2.0.0",
        "hast-util-to-text": "^4.0.0",
@ -164,18 +153,6 @@
        "vfile": "^6.0.1"
      }
    },
-    "node_modules/@astrojs/node": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/@astrojs/node/-/node-8.2.5.tgz",
-      "integrity": "sha512-IdVD4dBNyg+ScmCATZ0FM7vNLAHq0TSdiJ3LpR4jcWIUhpN1ps5Jg+9CfzMaLmCCe/SJUZejK5EnzqUJdnGYyg==",
-      "dependencies": {
-        "send": "^0.18.0",
-        "server-destroy": "^1.0.1"
-      },
-      "peerDependencies": {
-        "astro": "^4.2.0"
-      }
-    },
    "node_modules/@astrojs/prism": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/@astrojs/prism/-/prism-3.1.0.tgz",
@ -187,24 +164,6 @@
        "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
      }
    },
-    "node_modules/@astrojs/react": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/react/-/react-3.3.1.tgz",
-      "integrity": "sha512-dwN6B+C0hQ1jpeQ5EckICpqv76t6RxEslldCP0UQ/ospolNk8GjqL11X/xQSbftiQvGWRMT0Tj5f0Xk17k5qJQ==",
-      "dependencies": {
-        "@vitejs/plugin-react": "^4.2.1",
-        "ultrahtml": "^1.5.3"
-      },
-      "engines": {
-        "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.50 || ^18.0.21",
-        "@types/react-dom": "^17.0.17 || ^18.0.6",
-        "react": "^17.0.2 || ^18.0.0",
-        "react-dom": "^17.0.2 || ^18.0.0"
-      }
-    },
    "node_modules/@astrojs/tailwind": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/@astrojs/tailwind/-/tailwind-5.1.0.tgz",
@ -220,48 +179,20 @@
      }
    },
    "node_modules/@astrojs/telemetry": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.0.4.tgz",
-      "integrity": "sha512-A+0c7k/Xy293xx6odsYZuXiaHO0PL+bnDoXOc47sGDF5ffIKdKQGRPFl2NMlCF4L0NqN4Ynbgnaip+pPF0s7pQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-3.1.0.tgz",
+      "integrity": "sha512-/ca/+D8MIKEC8/A9cSaPUqQNZm+Es/ZinRv0ZAzvu2ios7POQSsVD+VOj7/hypWNsNM3T7RpfgNq7H2TU1KEHA==",
      "dependencies": {
-        "ci-info": "^3.8.0",
+        "ci-info": "^4.0.0",
        "debug": "^4.3.4",
        "dlv": "^1.1.3",
-        "dset": "^3.1.2",
+        "dset": "^3.1.3",
        "is-docker": "^3.0.0",
        "is-wsl": "^3.0.0",
        "which-pm-runs": "^1.1.0"
      },
      "engines": {
-        "node": ">=18.14.1"
-      }
-    },
-    "node_modules/@astrojs/telemetry/node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@astrojs/ts-plugin": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@astrojs/ts-plugin/-/ts-plugin-1.6.1.tgz",
-      "integrity": "sha512-13mkBo5K3J/mUN/pt/4qxbwBJSmm/X2HAzOZaYg2AildnN/JxiZ2rm60LMssUXhHHhrxQoKslCh06l9sHSkCMQ==",
-      "dev": true,
-      "dependencies": {
-        "@astrojs/compiler": "^2.7.0",
-        "@jridgewell/sourcemap-codec": "^1.4.15",
-        "@volar/language-core": "~2.1.5",
-        "@volar/typescript": "~2.1.5",
-        "semver": "^7.3.8",
-        "vscode-languageserver-textdocument": "^1.0.11"
+        "node": "^18.17.1 || ^20.3.0 || >=21.0.0"
      }
    },
    "node_modules/@babel/code-frame": {
@ -553,34 +484,6 @@
        "@babel/core": "^7.0.0-0"
      }
    },
-    "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz",
-      "integrity": "sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.1.tgz",
-      "integrity": "sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
    "node_modules/@babel/template": {
      "version": "7.24.0",
      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
@ -1328,16 +1231,6 @@
        "url": "https://opencollective.com/unts"
      }
    },
-    "node_modules/@react-leaflet/core": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-2.1.0.tgz",
-      "integrity": "sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg==",
-      "peerDependencies": {
-        "leaflet": "^1.9.0",
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
-      }
-    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
      "version": "4.15.0",
      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.15.0.tgz",
@ -1604,6 +1497,11 @@
        "@babel/types": "^7.20.7"
      }
    },
+    "node_modules/@types/cookie": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.5.4.tgz",
+      "integrity": "sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA=="
+    },
    "node_modules/@types/debug": {
      "version": "4.1.12",
      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
@ -1617,12 +1515,6 @@
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
    },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.14",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
-      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==",
-      "dev": true
-    },
    "node_modules/@types/hast": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
@ -1637,15 +1529,6 @@
      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
      "dev": true
    },
-    "node_modules/@types/leaflet": {
-      "version": "1.9.12",
-      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.12.tgz",
-      "integrity": "sha512-BK7XS+NyRI291HIo0HCfE18Lp8oA30H1gpi1tf0mF3TgiCEzanQjOqNZ4x126SXzzi2oNSZhZ5axJp1k0iM6jg==",
-      "dev": true,
-      "dependencies": {
-        "@types/geojson": "*"
-      }
-    },
    "node_modules/@types/mdast": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz",
@ -1681,28 +1564,6 @@
        "undici-types": "~5.26.4"
      }
    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.12",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
-    },
-    "node_modules/@types/react": {
-      "version": "18.2.79",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz",
-      "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.2.25",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz",
-      "integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
    "node_modules/@types/semver": {
      "version": "7.5.8",
      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
@ -1924,24 +1785,6 @@
      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
    },
-    "node_modules/@vitejs/plugin-react": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
-      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
-      "dependencies": {
-        "@babel/core": "^7.23.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
-        "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
-      }
-    },
    "node_modules/@vitest/coverage-v8": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.0.tgz",
@ -2323,14 +2166,14 @@
      }
    },
    "node_modules/astro": {
-      "version": "4.5.12",
-      "resolved": "https://registry.npmjs.org/astro/-/astro-4.5.12.tgz",
-      "integrity": "sha512-xIJcFI2hbyV8+h5pWjL7SKD1jIP0K01fYVAH+gdAt0mJaXy+u8Mj+goD0cPlK6sEaykR+7zxQLYGKJ44U4qarg==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/astro/-/astro-4.6.3.tgz",
+      "integrity": "sha512-p2zs1Gac+ysdc/yFCoc8pOXTZE5L9foAtmqUzUVL22WX68bYTRovd03GRs7J1MDpwzsl9kJtlK20ROpjyIFpNw==",
      "dependencies": {
-        "@astrojs/compiler": "^2.7.0",
+        "@astrojs/compiler": "^2.7.1",
        "@astrojs/internal-helpers": "0.4.0",
-        "@astrojs/markdown-remark": "4.3.2",
-        "@astrojs/telemetry": "3.0.4",
+        "@astrojs/markdown-remark": "5.1.0",
+        "@astrojs/telemetry": "3.1.0",
        "@babel/core": "^7.24.3",
        "@babel/generator": "^7.23.3",
        "@babel/parser": "^7.23.3",
@ -2338,6 +2181,7 @@
        "@babel/traverse": "^7.23.3",
        "@babel/types": "^7.23.3",
        "@types/babel__core": "^7.20.4",
+        "@types/cookie": "^0.5.4",
        "acorn": "^8.11.2",
        "aria-query": "^5.3.0",
        "axobject-query": "^4.0.0",
@ -2394,8 +2238,9 @@
        "astro": "astro.js"
      },
      "engines": {
-        "node": ">=18.14.1",
-        "npm": ">=6.14.0"
+        "node": "^18.17.1 || ^20.3.0 || >=21.0.0",
+        "npm": ">=9.6.5",
+        "pnpm": ">=7.1.0"
      },
      "optionalDependencies": {
        "sharp": "^0.32.6"
@ -3208,11 +3053,6 @@
        "node": ">=4"
      }
    },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
-    },
    "node_modules/debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -3283,14 +3123,6 @@
      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
      "dev": true
    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/dequal": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@ -3299,15 +3131,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
    "node_modules/detect-libc": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@ -3409,11 +3232,6 @@
      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
    "node_modules/electron-to-chromium": {
      "version": "1.4.745",
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.745.tgz",
@ -3434,14 +3252,6 @@
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="
    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/end-of-stream": {
      "version": "1.4.4",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@ -3512,11 +3322,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
    "node_modules/escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@ -3903,14 +3708,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/eventemitter3": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@ -4112,14 +3909,6 @@
        "url": "https://github.com/sponsors/rawify"
      }
    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/fs-constants": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@ -4523,21 +4312,6 @@
      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/human-signals": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
@ -5014,11 +4788,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/leaflet": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
-      "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA=="
-    },
    "node_modules/levn": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@ -5162,17 +4931,6 @@
        "url": "https://github.com/sponsors/wooorm"
      }
    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
    "node_modules/loupe": {
      "version": "2.3.7",
      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
@ -5511,9 +5269,9 @@
      }
    },
    "node_modules/micromark-core-commonmark": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.1.tgz",
-      "integrity": "sha512-CUQyKr1e///ZODyD1U3xit6zXwy1a8q2a1S1HKtIlmgvurrEpaw/Y9y6KSIbF8P59cn/NjzHyO+Q2fAyYLQrAA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.0.tgz",
+      "integrity": "sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==",
      "funding": [
        {
          "type": "GitHub Sponsors",
@ -6248,17 +6006,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@ -6662,11 +6409,6 @@
        "pathe": "^1.1.2"
      }
    },
-    "node_modules/pocketbase": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/pocketbase/-/pocketbase-0.21.1.tgz",
-      "integrity": "sha512-0PvCP4pKtxsV9kwldEGyibEvhwOcx9jSCrz3WN5CgPILJfM0z76f1op9WE8/8UgikDsMdRsc5iBLfKintrJS1g=="
-    },
    "node_modules/postcss": {
      "version": "8.4.38",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
@ -7028,14 +6770,6 @@
      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
      "optional": true
    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
    "node_modules/rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@ -7051,56 +6785,12 @@
        "rc": "cli.js"
      }
    },
-    "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0"
-      }
-    },
    "node_modules/react-is": {
      "version": "18.2.0",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
      "dev": true
    },
-    "node_modules/react-leaflet": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.1.tgz",
-      "integrity": "sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==",
-      "dependencies": {
-        "@react-leaflet/core": "^2.1.0"
-      },
-      "peerDependencies": {
-        "leaflet": "^1.9.0",
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
-      }
-    },
-    "node_modules/react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/read-cache": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@ -7846,14 +7536,6 @@
        }
      ]
    },
-    "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
    "node_modules/section-matter": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
@ -7896,68 +7578,6 @@
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/server-destroy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
-      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ=="
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
    "node_modules/sharp": {
      "version": "0.32.6",
      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
@ -8129,14 +7749,6 @@
      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
      "dev": true
    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
    "node_modules/std-env": {
      "version": "3.7.0",
      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
@ -8596,14 +8208,6 @@
        "node": ">=8.0"
      }
    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
    "node_modules/trim-lines": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@ -8742,11 +8346,6 @@
      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
      "dev": true
    },
-    "node_modules/ultrahtml": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/ultrahtml/-/ultrahtml-1.5.3.tgz",
-      "integrity": "sha512-GykOvZwgDWZlTQMtp5jrD4BVL+gNn2NVlVafjcFUJ7taY20tqYdwdoWBFy6GBJsNTZe1GkGPkSl5knQAjtgceg=="
-    },
    "node_modules/undici-types": {
      "version": "5.26.5",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
--- a/front/package.json
+++ b/front/package.json
@ -2,44 +2,32 @@
  "name": "front",
  "type": "module",
  "version": "0.0.1",
-  "private": "true",
+  "private":"true",
  "scripts": {
    "dev": "astro dev",
-    "start": "node ./dist/server/entry.mjs",
+    "start": "astro dev",
    "build": "astro check && astro build",
    "preview": "astro preview",
-    "astro": "astro",
-    "check:lint": "eslint src"
+    "astro": "astro"
  },
  "dependencies": {
-    "@astrojs/node": "^8.2.5",
-    "@astrojs/react": "^3.3.1",
    "@astrojs/tailwind": "^5.1.0",
    "@tailwindcss/typography": "^0.5.12",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
-    "astro": "4.5.12",
-    "leaflet": "^1.9.4",
+    "astro": "^4.6.3",
    "lucide-astro": "^0.372.0",
-    "pocketbase": "^0.21.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-leaflet": "^4.2.1",
    "simple-icons-astro": "^11.12.0",
    "tailwindcss": "^3.4.3",
-    "typescript": "^5"
+    "typescript": "^5.2.2"
  },
  "devDependencies": {
-    "@astrojs/check": "^0",
-    "@astrojs/ts-plugin": "^1.6.1",
-    "@types/leaflet": "^1.9.12",
-    "@types/node": "^20",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
-    "@vitest/coverage-v8": "^1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-astro": "^0.31.4",
-    "typescript": "^5",
-    "vitest": "^1"
-  }
+		"@astrojs/check": "^0",
+		"@types/node": "^20",
+		"@typescript-eslint/eslint-plugin": "^6",
+		"@typescript-eslint/parser": "^6",
+		"@vitest/coverage-v8": "^1",
+		"eslint": "^8",
+		"eslint-plugin-astro": "^0.31",
+		"typescript": "^5",
+		"vitest": "^1"
+	}
 }
--- a/front/src/env.d.ts
+++ b/front/src/env.d.ts
@ -1,25 +1 @@
-/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
-
-import PocketBase from 'pocketbase'
-export interface ImportMetaEnv {
-    NODE_ENV: string
-    APP_URL: string
-
-    POCKETBASE_URL: string
-
-	GOOGLE_API_KEY: string
-}
-
-interface ImportMeta {
-	readonly env: ImportMetaEnv
-}
-
-
-// eslint-disable-next-line  @typescript-eslint/no-namespace
-declare namespace App {
-	// eslint-disable-next-line  @typescript-eslint/no-empty-interface
-	export interface Locals {
-		pb: PocketBase
-	}
-}
--- a/front/src/layouts/Layout.astro
+++ b/front/src/layouts/Layout.astro
@ -20,3 +20,32 @@ const { title } = Astro.props;
 		<slot />
 	</body>
 </html>
+<style is:global>
+	:root {
+		--accent: 136, 58, 234;
+		--accent-light: 224, 204, 250;
+		--accent-dark: 49, 10, 101;
+		--accent-gradient: linear-gradient(
+			45deg,
+			rgb(var(--accent)),
+			rgb(var(--accent-light)) 30%,
+			white 60%
+		);
+	}
+	html {
+		font-family: system-ui, sans-serif;
+		background: #13151a;
+		background-size: 224px;
+	}
+	code {
+		font-family:
+			Menlo,
+			Monaco,
+			Lucida Console,
+			Liberation Mono,
+			DejaVu Sans Mono,
+			Bitstream Vera Sans Mono,
+			Courier New,
+			monospace;
+	}
+</style>
--- a/front/src/libs/AstroUtils.ts
+++ b/front/src/libs/AstroUtils.ts
@ -1,5 +0,0 @@
-export default class AstroUtils {
-	public static async wrap<T = void>(fn: () => T | Promise<T>) {
-		return await fn()
-	}
-}
--- a/front/src/libs/AuthUtils.ts
+++ b/front/src/libs/AuthUtils.ts
@ -1,107 +0,0 @@
-import type { AstroCookies } from 'astro'
-import type UserObj from 'models/User'
-import PocketBase from 'pocketbase'
-import { getEnv } from 'libs/Env'
-
-
-const pb = new PocketBase(getEnv('POCKETBASE_URL','https://pb-tweb.cb85.fr')) // XXX: 'https://pb-tweb.cb85.fr'
-
-export async function clearUser(cookies: AstroCookies): Promise<void> {
-	const sessionID = cookies.get('session')?.value
-
-	if(!sessionID){
-		return
-	}
-
-	cookies.delete('session',{
-		path: '/'
-	})
-}
-
-export async function login(cookies: AstroCookies, user: {user: string, password: string}): Promise<boolean> {
-
-	const authData = await pb.collection('users').authWithPassword(user.user, user.password)
-
-	let secure = true
-
-	if (getEnv('NODE_ENV', 'production') !== 'production') {
-		secure = false
-	}
-
-	if(authData){
-		cookies.set('session', authData.token,{
-			httpOnly: true,
-			path: '/',
-			secure: secure,
-			sameSite: 'strict',
-			maxAge: 365000,
-		})
-		return true
-	}
-	return false
-}
-
-export async function getUser(cookies: AstroCookies): Promise<UserObj | null> {
-	const sessionID = cookies.get('session')?.value
-
-	const bpAuth = pb.authStore
-
-	if(!sessionID){
-		return null
-	}
-	if(!bpAuth.isValid){
-		return null
-	}
-	if(!bpAuth){
-		return null
-	}
-
-	console.log(bpAuth.model)
-
-	if(!bpAuth.model){
-		return null
-	}
-
-	const output: UserObj = {
-		id: bpAuth.model.id as string,
-		collectionId: bpAuth.model.collectionId as string,
-		collectionName: bpAuth.model.collectionName as string,
-		created: bpAuth.model.created as string,
-		updated: bpAuth.model.updated as string,
-		avatar: bpAuth.model.avatar as string,
-		username: bpAuth.model.username as string,
-		email: bpAuth.model.email as string,
-		emailVisibility: false,
-		name: bpAuth.model.name as string,
-		password: undefined,
-		passwordConfirm: undefined,
-	}
-
-	return output
-
-}
-
-export async function setUser(cookies: AstroCookies, user: UserObj): Promise<void>{
-
-	const record = await pb.collection('users').create(user)
-
-	console.log(record)
-
-	const session = pb.authStore.token
-
-	console.log(session)
-
-	let secure = true
-
-	if (getEnv('NODE_ENV', 'production') !== 'production') {
-		secure = false
-	}
-
-	cookies.set('session', session,{
-		httpOnly: true,
-		path: '/',
-		secure: secure,
-		sameSite: 'strict',
-		maxAge: 365000,
-	})
-}
--- a/front/src/libs/Env.ts
+++ b/front/src/libs/Env.ts
@ -1,17 +0,0 @@
-import type { ImportMetaEnv } from 'env'
-
-/**
- * Get the environment variable
- *
- * @param key the env variable key
- * @param defaultValue a default value if applicable
- * @returns the environment value or undefined if not found
- */
-export function getEnv(key: keyof ImportMetaEnv, defaultValue: string): string
-export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined
-export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined {
-	// get the env variable through Astro > NodeJS > input
-	const res = import.meta.env[key] ?? process.env[key] ?? defaultValue
-
-	return res ?? undefined
-}
--- a/front/src/middleware/index.ts
+++ b/front/src/middleware/index.ts
@ -1,27 +0,0 @@
-import PocketBase from 'pocketbase'
-
-import { defineMiddleware } from 'astro/middleware'
-import { getEnv } from 'libs/Env'
-
-export const onRequest = defineMiddleware(async ({ locals, request }: any, next: () => any) => {
-	locals.pb = new PocketBase(getEnv('POCKETBASE_URL','http://localhost:8080'))
-
-	// load the store data from the request cookie string
-	locals.pb.authStore.loadFromCookie(request.headers.get('cookie') || '')
-
-	try {
-		// get an up-to-date auth store state by verifying and refreshing the loaded auth model (if any)
-		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-		locals.pb.authStore.isValid && await locals.pb.collection('users').authRefresh()
-	} catch (_) {
-		// clear the auth store on failed refresh
-		locals.pb.authStore.clear()
-	}
-
-	const response = await next()
-
-	// send back the default 'pb_auth' cookie to the client with the latest store state
-	response.headers.append('set-cookie', locals.pb.authStore.exportToCookie())
-
-	return response
-})
--- a/front/src/models/User/index.ts
+++ b/front/src/models/User/index.ts
@ -1,19 +0,0 @@
-
-
-export interface PBData{
-    id?: string | null
-    collectionId?: string | null
-    collectionName?: string | null
-    created?: string | null // TODO: passé ca en date auto
-    updated?: string | null // TODO: passé ca en date auto
-}
-
-export default interface UserObj extends PBData{
-    avatar?: string | null
-    username: string
-    email: string
-    emailVisibility?: boolean
-    password?: string | undefined
-    passwordConfirm?: string | undefined
-    name: string | null
-}
--- a/front/src/pages/account/index.astro
+++ b/front/src/pages/account/index.astro
@ -1,18 +0,0 @@
---
-import Layout from 'layouts/Layout.astro'
-import PocketBase from 'pocketbase'
-
-
-const pb = Astro.locals.pb as PocketBase
-const auth = pb.authStore
-const user = auth.model
-
-if(!auth.isValid){
-    return Astro.redirect("/account/login");
-}
-
---
-
-<Layout title="Account setting">
-    <h1>Bonjour {user!.name}</h1>
-</Layout>
--- a/front/src/pages/account/login.astro
+++ b/front/src/pages/account/login.astro
@ -1,43 +0,0 @@
---
-import Layout from "layouts/Layout.astro";
-import AstroUtils from "libs/AstroUtils";
-import PocketBase from 'pocketbase'
-
-
-const pb = Astro.locals.pb as PocketBase
-
-if(pb.authStore.isValid){
-    return Astro.redirect("/account")
-}
-
-const res = await AstroUtils.wrap(async () => {
-    if (Astro.request.method !== 'POST') {
-        return
-    }
-    // FIXME checké si utilisateur deja connecté
-    const locals = Astro.locals
-    
-    const form = await Astro.request.formData();
-    const request = {
-        user: form.get("username") as string,
-        password: form.get("password") as string
-    }
-
-    try {
-        await locals.pb.collection('users').authWithPassword(request.user,request.password);
-    } catch (error) {
-        console.log(error)
-    }
-
-    return Astro.redirect("/account")
-
-})
---
-
-<Layout title="login">
-    <form id="account-creation" method="post" enctype="multipart/form-data">
-        <input required name="username" placeholder="Pseudo ou email"/>
-        <input required name="password" type="password" placeholder="Mot de passe" />
-        <button>Connection</button>
-    </form>
-</Layout>
--- a/front/src/pages/account/register.astro
+++ b/front/src/pages/account/register.astro
@ -1,43 +0,0 @@
---
-import Layout from 'layouts/Layout.astro';
-import AstroUtils from 'libs/AstroUtils';
-import PocketBase from 'pocketbase'
-
-
-const pb = Astro.locals.pb as PocketBase
-
-if(pb.authStore.isValid){
-    return Astro.redirect("/account")
-}
-
-await AstroUtils.wrap(async () => {
-    if (Astro.request.method !== 'POST'){
-        return
-    }
-    const form = await Astro.request.formData()
-    const request = {
-        username: form.get("username") as string,
-        name: form.get("name") as string,
-        email: form.get("email") as string,
-        password: form.get("password") as string,
-        passwordConfirm: form.get("passwordConfirm") as string,
-    }
-    try{
-        await pb.collection('users').create(request)
-        return Astro.redirect('account/login')
-    }catch(e){
-        console.log(e);
-    }
-})
---
-
-<Layout title="register">
-    <form id="account-creation" method="post" enctype="multipart/form-data">
-        <input required name="name" placeholder="Prénom Nom"/>
-        <input required name="username" placeholder="Pseudo"/>
-        <input required name="email" type="email" placeholder="Renseignez votre email" />
-        <input required name="password" type="password" placeholder="Créez un mot de passe" />
-        <input required name="passwordConfirm" type="password" placeholder="Confirmer votre mot de passe" />
-        <button>Créer un compte</button>
-    </form>
-</Layout>
--- a/front/src/pages/maps.astro
+++ b/front/src/pages/maps.astro
@ -1,17 +0,0 @@
---
-import Layout from 'layouts/Layout.astro';
-import { Marker, Popup } from 'leaflet';
-import { MapContainer } from 'react-leaflet'
---
-
-<Layout title="maps test">
-
-    <MapContainer client:load center={[51.505, -0.09]} zoom={13} scrollWheelZoom={false}>
-        <Marker client:load lat={51.505} lng={-0.09}>
-            <Popup client:load>
-              A pretty CSS3 popup. <br /> Easily customizable.
-            </Popup>
-          </Marker>
-    </MapContainer>
-
-</Layout>
--- a/front/src/pages/welcome.astro
+++ b/front/src/pages/welcome.astro
@ -1,6 +1,6 @@
 ---
-import Layout from 'layouts/Layout.astro';
-import Card from 'components/Card.astro';
+import Layout from '../layouts/Layout.astro';
+import Card from '../components/Card.astro';
 ---

 <Layout title="Welcome to Astro.">
--- a/front/tailwind.config.mjs
+++ b/front/tailwind.config.mjs
@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
-	content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
-	theme: {
-		extend: {},
-	},
-	plugins: [],
-}
--- a/front/tsconfig.json
+++ b/front/tsconfig.json
@ -1,11 +1,3 @@
 {
-  "extends": "astro/tsconfigs/strict",
-  "compilerOptions": {
-		"baseUrl": "src",
-		// hide an issue with typescript
-		"noUnusedLocals": false
-	},
-	"ts-node": {
-		"esm": true
-	}
+  "extends": "astro/tsconfigs/strict"
 }
Author	SHA1	Message	Date
Clement	be9e7e302b	sync bruno test	2024-04-21 15:17:17 +02:00
Clement	36319ea002	update bruno file	2024-04-21 13:40:01 +02:00
Clement	f7dd45450b	add datatourism for prod	2024-04-21 12:49:28 +02:00