From 2ecc5c86cab407d294d55895126a48d5ce5587fe Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 11:07:36 +0200 Subject: [PATCH 01/47] fix: remove ex register form --- front/src/pages/account/register.astro | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/front/src/pages/account/register.astro b/front/src/pages/account/register.astro index 8300037..a4bec63 100644 --- a/front/src/pages/account/register.astro +++ b/front/src/pages/account/register.astro @@ -80,18 +80,4 @@ const metadata = { ]} /> -
- - - - - - - -
- - -
- -
-- 2.47.1 From c93141e68fa91a83219457401dabf67292c9258a Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 11:34:19 +0200 Subject: [PATCH 02/47] fix: prod issue --- front/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/package.json b/front/package.json index 4e12158..294a99f 100644 --- a/front/package.json +++ b/front/package.json @@ -34,7 +34,8 @@ "astro-icon": "^1.1.0", "limax": "4.1.0", "lodash.merge": "^4.6.2", - "unpic": "^3.18.0" + "unpic": "^3.18.0", + "tailwind-merge": "^2.3.0" }, "devDependencies": { "@astrojs/check": "^0", -- 2.47.1 From c348e2b2ac9fffd9ac3f55a4a72add5d4c9c26a6 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 11:42:14 +0200 Subject: [PATCH 03/47] fix: tailwing config --- front/tailwind.config.cjs | 45 ++++++++++++++++++++------------------- front/tailwind.config.mjs | 8 ------- 2 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 front/tailwind.config.mjs diff --git a/front/tailwind.config.cjs b/front/tailwind.config.cjs index 32b3139..7e37089 100644 --- a/front/tailwind.config.cjs +++ b/front/tailwind.config.cjs @@ -1,24 +1,25 @@ -import defaultTheme from 'tailwindcss/defaultTheme'; -import typographyPlugin from '@tailwindcss/typography'; +import defaultTheme from 'tailwindcss/defaultTheme' +import typographyPlugin from '@tailwindcss/typography' module.exports = { - content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'], - theme: { - extend: { - colors: { - primary: 'var(--aw-color-primary)', - secondary: 'var(--aw-color-secondary)', - accent: 'var(--aw-color-accent)', - default: 'var(--aw-color-text-default)', - muted: 'var(--aw-color-text-muted)', - }, - fontFamily: { - sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans], - serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif], - heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans], - }, - }, - }, - plugins: [typographyPlugin], - darkMode: 'class', -}; + content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'], + theme: { + extend: { + colors: { + primary: 'var(--aw-color-primary)', + secondary: 'var(--aw-color-secondary)', + accent: 'var(--aw-color-accent)', + default: 'var(--aw-color-text-default)', + muted: 'var(--aw-color-text-muted)', + }, + fontFamily: { + sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans], + serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif], + heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans], + }, + }, + }, + plugins: [typographyPlugin], + darkMode: 'class', +} + diff --git a/front/tailwind.config.mjs b/front/tailwind.config.mjs deleted file mode 100644 index 19f0614..0000000 --- a/front/tailwind.config.mjs +++ /dev/null @@ -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: [], -} -- 2.47.1 From e13cb9bbb989415bc462989c1913d9a107b2e99e Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 11:42:42 +0200 Subject: [PATCH 04/47] add imput composant --- front/src/components/Input.astro | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 front/src/components/Input.astro diff --git a/front/src/components/Input.astro b/front/src/components/Input.astro new file mode 100644 index 0000000..db17398 --- /dev/null +++ b/front/src/components/Input.astro @@ -0,0 +1,28 @@ +--- +import type { Input as Props } from 'types'; + +const { type, name, label, autocomplete, placeholder} = Astro.props; + +--- + +<> + { + name && ( +
+ {label && ( + + )} + +
+ ) + } + -- 2.47.1 From 0849ffe42cc6da7fbeb22bd17a9ac90893753837 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 12:13:39 +0200 Subject: [PATCH 05/47] fix: type issue --- front/src/types.d.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/front/src/types.d.ts b/front/src/types.d.ts index ee2a0c5..03682a4 100644 --- a/front/src/types.d.ts +++ b/front/src/types.d.ts @@ -1,5 +1,5 @@ import type { AstroComponentFactory } from 'astro/runtime/server/index.js' -import type { HTMLAttributes, ImageMetadata } from 'astro/types' +import type { HTMLAttributes, ImageMetadata, HTMLInputTypeAttribute } from 'astro/types' export interface Post { /** A unique ID number that identifies a post. */ @@ -26,7 +26,7 @@ export interface Post { /** */ category?: Taxonomy /** */ - tags?: Taxonomy[] + tags?: Array /** */ author?: string @@ -167,6 +167,8 @@ export interface Input { label?: string autocomplete?: string placeholder?: string + class?: string + inputClass?: string } export interface Textarea { -- 2.47.1 From aec568d0c713355a067cff393696787215a3b4b6 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 12:24:23 +0200 Subject: [PATCH 06/47] change class to div class --- front/src/types.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/types.d.ts b/front/src/types.d.ts index 03682a4..f260e83 100644 --- a/front/src/types.d.ts +++ b/front/src/types.d.ts @@ -167,7 +167,7 @@ export interface Input { label?: string autocomplete?: string placeholder?: string - class?: string + divClass?: string inputClass?: string } -- 2.47.1 From 20ebad74fb2bf1d72de2ff8408ce82f53b063b14 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 12:24:45 +0200 Subject: [PATCH 07/47] add div class to input --- front/src/components/Input.astro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/src/components/Input.astro b/front/src/components/Input.astro index db17398..a565dd4 100644 --- a/front/src/components/Input.astro +++ b/front/src/components/Input.astro @@ -1,14 +1,14 @@ --- import type { Input as Props } from 'types'; -const { type, name, label, autocomplete, placeholder} = Astro.props; +const { type, name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props; --- <> { name && ( -
+
{label && (
) -- 2.47.1 From 07ee4b9e57690987bef71d55abefb6667ab997be Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 16:01:00 +0200 Subject: [PATCH 08/47] fix tailwind merge error --- front/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/front/package.json b/front/package.json index 294a99f..df48fa5 100644 --- a/front/package.json +++ b/front/package.json @@ -69,7 +69,6 @@ "reading-time": "^1.5.0", "rehype-plugin-image-native-lazy-loading": "^1.2.0", "sharp": "0.33.3", - "tailwind-merge": "^2.3.0", "tailwindcss": "^3.4.3", "typescript-eslint": "^7.9.0" } -- 2.47.1 From 7f1986e765ebee9f850a198ba96cafeaddfec9b7 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 16:14:09 +0200 Subject: [PATCH 09/47] fix: docker compose for prod --- docker-compose.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6d262d5..3c4df98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,9 @@ services: - public front: - image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head + image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-16-head + environment: + - POCKETBASE_URL=https://${POCKET_BASE_URL} depends_on: - pocketbase labels: @@ -30,7 +32,7 @@ services: - public back_drink: - image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head + image: git.lab-ouest.org/epitech/ratrapage_t-web_back:master environment: - port=${BACK_BASE_PORT} labels: -- 2.47.1 From 0fec2417a9c280abda9610436cb3e2e35e895e92 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 16:15:12 +0200 Subject: [PATCH 10/47] fix astro output type --- front/astro.config.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/astro.config.mjs b/front/astro.config.mjs index 159bf75..112ae4f 100644 --- a/front/astro.config.mjs +++ b/front/astro.config.mjs @@ -26,7 +26,8 @@ const whenExternalScripts = (items = []) => hasExternalScripts ? (Array.isArray(items) ? items.map((item) => item()) : [items()]) : []; export default defineConfig({ - + + output: 'server', compressHTML: true, build: { assets: 'assets', @@ -37,7 +38,6 @@ export default defineConfig({ port: 3000 }, trailingSlash: 'never', - output: 'server', adapter: node({ mode: 'standalone' }), -- 2.47.1 From f4a2e8cbf9a4e4eed6eba91c84b65303365db795 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 16:15:46 +0200 Subject: [PATCH 11/47] fix: env var and conf file --- front/src/config.yaml | 4 ++-- front/src/env.d.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/front/src/config.yaml b/front/src/config.yaml index 8dab37c..eb6bf26 100644 --- a/front/src/config.yaml +++ b/front/src/config.yaml @@ -1,6 +1,6 @@ site: - name: AstroWind - site: 'https://astrowind.vercel.app' + name: EpicRoadTrip + site: 'https://front-tweb.cb85.fr' base: '/' trailingSlash: false diff --git a/front/src/env.d.ts b/front/src/env.d.ts index 8924c40..e697683 100644 --- a/front/src/env.d.ts +++ b/front/src/env.d.ts @@ -6,10 +6,10 @@ import PocketBase from 'pocketbase' export interface ImportMetaEnv { - NODE_ENV: string - APP_URL: string + NODE_ENV: string + APP_URL: string - POCKETBASE_URL: string + POCKETBASE_URL: string GOOGLE_API_KEY: string } -- 2.47.1 From 7f9a9965d237a511b1861377601dc500595f9d2d Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 21 May 2024 17:04:50 +0200 Subject: [PATCH 12/47] fix: prod env --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3c4df98..0fc6b8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,6 +35,7 @@ services: image: git.lab-ouest.org/epitech/ratrapage_t-web_back:master environment: - port=${BACK_BASE_PORT} + - OPEN_TRIP_MAPS_KEY=${OPEN_TRIP_MAPS_KEY} labels: - traefik.enable=true - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`) @@ -94,4 +95,4 @@ x-dockge: - https://${FRONT_URL}/ - https://${DOCS_DRINK_URL}/ - https://${DRINK_URL}/ - - https://${DATA_TOURISME_URL}/ \ No newline at end of file + - https://${DATA_TOURISME_URL}/ -- 2.47.1 From aae4f97ff47b10c8ccb50257d9ce6a430694f644 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 22 May 2024 10:02:18 +0200 Subject: [PATCH 13/47] feat: add bru update for prod test --- bruno/OpenData datatourisme/environments/dev.bru | 1 + bruno/OpenData datatourisme/environments/prod.bru | 3 +++ bruno/OpenData datatourisme/express/otm_ex_city.bru | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 bruno/OpenData datatourisme/environments/prod.bru diff --git a/bruno/OpenData datatourisme/environments/dev.bru b/bruno/OpenData datatourisme/environments/dev.bru index 4226836..08d7ebb 100644 --- a/bruno/OpenData datatourisme/environments/dev.bru +++ b/bruno/OpenData datatourisme/environments/dev.bru @@ -1,5 +1,6 @@ vars { TRIPMAP_URL: https://api.opentripmap.com/0.1 + EXPRESS_API: http://localhost:3001 } vars:secret [ app_key, diff --git a/bruno/OpenData datatourisme/environments/prod.bru b/bruno/OpenData datatourisme/environments/prod.bru new file mode 100644 index 0000000..78bb9e6 --- /dev/null +++ b/bruno/OpenData datatourisme/environments/prod.bru @@ -0,0 +1,3 @@ +vars { + EXPRESS_API: https://drink-tweb.cb85.fr +} diff --git a/bruno/OpenData datatourisme/express/otm_ex_city.bru b/bruno/OpenData datatourisme/express/otm_ex_city.bru index 15bda16..5904d18 100644 --- a/bruno/OpenData datatourisme/express/otm_ex_city.bru +++ b/bruno/OpenData datatourisme/express/otm_ex_city.bru @@ -5,7 +5,7 @@ meta { } get { - url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300 + url: {{EXPRESS_API}}/otm/city?name=La roche sur yon&radius=300 body: none auth: none } -- 2.47.1 From 3d9e2b1977b5a8d74194b3dd5380b67a29964b4e Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 22 May 2024 14:38:44 +0200 Subject: [PATCH 14/47] fix: back add cors --- Express/barAndCafe/package-lock.json | 24 +++++++++++++++++++++++- Express/barAndCafe/package.json | 2 ++ Express/barAndCafe/src/app.ts | 2 ++ Express/barAndCafe/src/openTripMaps.ts | 5 +++-- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/Express/barAndCafe/package-lock.json b/Express/barAndCafe/package-lock.json index 42ae426..3a327db 100644 --- a/Express/barAndCafe/package-lock.json +++ b/Express/barAndCafe/package-lock.json @@ -8,6 +8,7 @@ "@types/express": "^4.17.21", "@types/node": "^20.12.7", "axios": "^1.6.8", + "cors": "^2.8.5", "dotenv": "^16.4.5", "express": "^4.19.2", "rimraf": "^5.0.5", @@ -15,6 +16,7 @@ "swagger-ui-express": "^5.0.0" }, "devDependencies": { + "@types/cors": "^2.8.17", "@types/jest": "^29.5.12", "@types/rewire": "^2.5.30", "@types/supertest": "^6.0.2", @@ -1968,6 +1970,15 @@ "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==", "dev": true }, + "node_modules/@types/cors": { + "version": "2.8.17", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz", + "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/express": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", @@ -4745,6 +4756,18 @@ "dev": true, "optional": true }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/create-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", @@ -9248,7 +9271,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } diff --git a/Express/barAndCafe/package.json b/Express/barAndCafe/package.json index 89ee4da..4ab1c22 100644 --- a/Express/barAndCafe/package.json +++ b/Express/barAndCafe/package.json @@ -14,6 +14,7 @@ "@types/express": "^4.17.21", "@types/node": "^20.12.7", "axios": "^1.6.8", + "cors": "^2.8.5", "dotenv": "^16.4.5", "express": "^4.19.2", "rimraf": "^5.0.5", @@ -21,6 +22,7 @@ "swagger-ui-express": "^5.0.0" }, "devDependencies": { + "@types/cors": "^2.8.17", "@types/jest": "^29.5.12", "@types/rewire": "^2.5.30", "@types/supertest": "^6.0.2", diff --git a/Express/barAndCafe/src/app.ts b/Express/barAndCafe/src/app.ts index 400e92f..3b08a38 100644 --- a/Express/barAndCafe/src/app.ts +++ b/Express/barAndCafe/src/app.ts @@ -1,11 +1,13 @@ import { getCity, getRadius, getPoiId, getBox } from "./openTripMaps" import express from "express" +import cors from "cors" /** * Initialize Express application instance. * @returns An initialized Express application object. */ const app = express() +app.use(cors()) /** diff --git a/Express/barAndCafe/src/openTripMaps.ts b/Express/barAndCafe/src/openTripMaps.ts index dd5dd90..2e4e291 100644 --- a/Express/barAndCafe/src/openTripMaps.ts +++ b/Express/barAndCafe/src/openTripMaps.ts @@ -135,8 +135,9 @@ export async function getCity(req: express.Request, res: express.Response) { radius = "1000" } const cityPose = await callCity(cityName as string) - res.send( await callRadius(cityPose.lon,cityPose.lat, radius as string)) -} + const poi = await callRadius(cityPose.lon,cityPose.lat, radius as string) + res.send( {...poi, ...cityPose}) +}//XXX: refaire test avec city /** * Handle GET request for radius search route ('/otm/radius'). -- 2.47.1 From a7dea54dc73be4404b015c82d0e7845c55594bec Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 22 May 2024 15:25:30 +0200 Subject: [PATCH 15/47] feat: map search V1 --- front/src/pages/maps.astro | 71 ++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/front/src/pages/maps.astro b/front/src/pages/maps.astro index af9a433..bdcaf85 100644 --- a/front/src/pages/maps.astro +++ b/front/src/pages/maps.astro @@ -1,31 +1,90 @@ --- -import Layout from 'layouts/PageLayout.astro'; +import Layout from 'layouts/PageLayout.astro' import 'leaflet/dist/leaflet.css' +import FormContainer from 'components/ui/Form.astro' +import Input from 'components/Input.astro' +import Button from 'components/ui/Button.astro' const metadata = { title: 'Maps', ignoreTitleTemplate: true, -}; +} --- +
+ + +
+
-- 2.47.1 From b8c4c6cf17267f60ffa90bece2e18e8649bf7372 Mon Sep 17 00:00:00 2001 From: Clement Date: Wed, 22 May 2024 15:25:36 +0200 Subject: [PATCH 16/47] city test --- bruno/OpenData datatourisme/otm/otm_city.bru | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 bruno/OpenData datatourisme/otm/otm_city.bru diff --git a/bruno/OpenData datatourisme/otm/otm_city.bru b/bruno/OpenData datatourisme/otm/otm_city.bru new file mode 100644 index 0000000..e558ec5 --- /dev/null +++ b/bruno/OpenData datatourisme/otm/otm_city.bru @@ -0,0 +1,16 @@ +meta { + name: otm_city + type: http + seq: 5 +} + +get { + url: {{TRIPMAP_URL}}/en/places/geoname?name=paris&apikey={{OTM_KEY}} + body: none + auth: none +} + +query { + name: paris + apikey: {{OTM_KEY}} +} -- 2.47.1 From 5bec24dc0ce79852e8f42516a3aa31528153173c Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 24 May 2024 12:26:45 +0200 Subject: [PATCH 17/47] add leaflet search ton package --- front/package-lock.json | 28 +++++++++++++++++++------ front/package.json | 45 +++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/front/package-lock.json b/front/package-lock.json index 1f1732a..d29b2c3 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -20,12 +20,14 @@ "astro-embed": "^0.7.2", "astro-icon": "^1.1.0", "leaflet": "^1.9.4", + "leaflet-geosearch": "^4.0.0", "limax": "4.1.0", "lodash.merge": "^4.6.2", "lucide-astro": "^0.372.0", "pocketbase": "^0.21.1", "react-leaflet": "^4.2.1", "simple-icons-astro": "^11.12.0", + "tailwind-merge": "^2.3.0", "tailwindcss": "^3.4.3", "unpic": "^3.18.0" }, @@ -59,7 +61,6 @@ "reading-time": "^1.5.0", "rehype-plugin-image-native-lazy-loading": "^1.2.0", "sharp": "0.33.3", - "tailwind-merge": "^2.3.0", "tailwindcss": "^3.4.3", "typescript": "^5", "typescript-eslint": "^7.9.0", @@ -1129,7 +1130,6 @@ "version": "7.24.5", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1746,6 +1746,15 @@ "resolved": "https://registry.npmjs.org/@fontsource-variable/inter/-/inter-5.0.18.tgz", "integrity": "sha512-rJzSrtJ3b7djiGFvRuTe6stDfbYJGhdQSfn2SI2WfXviee7Er0yKAHE5u7FU7OWVQQQ1x3+cxdmx9NdiAkcrcA==" }, + "node_modules/@googlemaps/js-api-loader": { + "version": "1.16.6", + "resolved": "https://registry.npmjs.org/@googlemaps/js-api-loader/-/js-api-loader-1.16.6.tgz", + "integrity": "sha512-V8p5W9DbPQx74jWUmyYJOerhiB4C+MHekaO0ZRmc6lrOYrvY7+syLhzOWpp55kqSPeNb+qbC2h8i69aLIX6krQ==", + "optional": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", @@ -6318,7 +6327,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "devOptional": true }, "node_modules/fast-glob": { "version": "3.3.2", @@ -8117,6 +8126,15 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==" }, + "node_modules/leaflet-geosearch": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/leaflet-geosearch/-/leaflet-geosearch-4.0.0.tgz", + "integrity": "sha512-a92VNY9gxyv3oyEDqIWoCNoBllajWRYejztzOSNmpLRtzpA6JtGgy/wwl9tsB8+6Eek1fe+L6+W0MDEOaidbXA==", + "optionalDependencies": { + "@googlemaps/js-api-loader": "^1.16.6", + "leaflet": "^1.6.0" + } + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -10899,8 +10917,7 @@ "node_modules/regenerator-runtime": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regexp.prototype.flags": { "version": "1.5.2", @@ -12272,7 +12289,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.3.0.tgz", "integrity": "sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==", - "dev": true, "dependencies": { "@babel/runtime": "^7.24.1" }, diff --git a/front/package.json b/front/package.json index df48fa5..f3bea63 100644 --- a/front/package.json +++ b/front/package.json @@ -16,38 +16,30 @@ }, "dependencies": { "@astrojs/node": "^8.2.5", + "@astrojs/rss": "^4.0.5", + "@astrojs/sitemap": "^3.1.4", "@astrojs/tailwind": "^5.1.0", + "@astrolib/analytics": "^0.5.0", + "@astrolib/seo": "^1.0.0-beta.5", + "@fontsource-variable/inter": "^5.0.18", "@tailwindcss/typography": "^0.5.12", + "astro": "^4.8.3", + "astro-embed": "^0.7.2", + "astro-icon": "^1.1.0", "leaflet": "^1.9.4", + "leaflet-geosearch": "^4.0.0", + "limax": "4.1.0", + "lodash.merge": "^4.6.2", "lucide-astro": "^0.372.0", "pocketbase": "^0.21.1", "react-leaflet": "^4.2.1", "simple-icons-astro": "^11.12.0", + "tailwind-merge": "^2.3.0", "tailwindcss": "^3.4.3", - "@astrojs/rss": "^4.0.5", - "@astrojs/sitemap": "^3.1.4", - "@astrolib/analytics": "^0.5.0", - "@astrolib/seo": "^1.0.0-beta.5", - "@fontsource-variable/inter": "^5.0.18", - "astro": "^4.8.3", - "astro-embed": "^0.7.2", - "astro-icon": "^1.1.0", - "limax": "4.1.0", - "lodash.merge": "^4.6.2", - "unpic": "^3.18.0", - "tailwind-merge": "^2.3.0" + "unpic": "^3.18.0" }, "devDependencies": { "@astrojs/check": "^0", - "@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/mdx": "^3.0.0", "@astrojs/partytown": "^2.1.0", "@astrojs/tailwind": "5.1.0", @@ -58,8 +50,15 @@ "@tailwindcss/typography": "^0.5.13", "@types/eslint__js": "^8.42.3", "@types/js-yaml": "^4.0.9", + "@types/leaflet": "^1.9.12", "@types/lodash.merge": "^4.6.9", + "@types/node": "^20", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", + "@vitest/coverage-v8": "^1", "astro-eslint-parser": "^1.0.2", + "eslint": "^8.57.0", + "eslint-plugin-astro": "^0.31.4", "eslint-plugin-jsx-a11y": "^6.8.0", "globals": "^15.2.0", "js-yaml": "^4.1.0", @@ -70,6 +69,8 @@ "rehype-plugin-image-native-lazy-loading": "^1.2.0", "sharp": "0.33.3", "tailwindcss": "^3.4.3", - "typescript-eslint": "^7.9.0" + "typescript": "^5", + "typescript-eslint": "^7.9.0", + "vitest": "^1" } } -- 2.47.1 From 532b12d4f530e20c79782c8ed299b53aaf996bd5 Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 24 May 2024 16:13:28 +0200 Subject: [PATCH 18/47] fix swagger run in prod --- Express/barAndCafe/src/swaggerDef.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Express/barAndCafe/src/swaggerDef.ts b/Express/barAndCafe/src/swaggerDef.ts index 7194263..654e615 100644 --- a/Express/barAndCafe/src/swaggerDef.ts +++ b/Express/barAndCafe/src/swaggerDef.ts @@ -21,7 +21,7 @@ const options = { } ], }, - apis: ['./src/*.ts'], + apis: ['./src/*.ts','./dist/src/*.js'], explorer: true } -- 2.47.1 From fcd9e3de10a6809f99608373736fd5475b2b007b Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 30 May 2024 15:56:01 +0200 Subject: [PATCH 19/47] make search work --- front/src/components/widgets/Footer.astro | 2 +- front/src/components/widgets/Header.astro | 4 +- front/src/pages/maps.astro | 106 ++++++++++++++++------ 3 files changed, 83 insertions(+), 29 deletions(-) diff --git a/front/src/components/widgets/Footer.astro b/front/src/components/widgets/Footer.astro index fa91dd0..a599610 100644 --- a/front/src/components/widgets/Footer.astro +++ b/front/src/components/widgets/Footer.astro @@ -26,7 +26,7 @@ export interface Props { const { socialLinks = [], secondaryLinks = [], links = [], footNote = '', theme = 'light' } = Astro.props; --- -