feat rooting WIP

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"
       }

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",

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())
 
 
 /**

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').

Express/barAndCafe/src/swaggerDef.ts

@@ -21,7 +21,7 @@ const options = {
 			}
 		],
 	},
-	apis: ['./src/*.ts'],
+	apis: ['./src/*.ts','./dist/src/*.js'],
 	explorer: true
 }
 

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,

bruno/OpenData datatourisme/environments/prod.bru

@@ -0,0 +1,3 @@
+vars {
+  EXPRESS_API: https://drink-tweb.cb85.fr
+}

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
 }

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}}
+}

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,9 +32,10 @@ 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}
+      - OPEN_TRIP_MAPS_KEY=${OPEN_TRIP_MAPS_KEY}
     labels:
       - traefik.enable=true
       - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`)

front/astro.config.mjs

@@ -27,6 +27,7 @@ const whenExternalScripts = (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'
 	}),

front/package-lock.json

@@ -20,12 +20,15 @@
         "astro-embed": "^0.7.2",
         "astro-icon": "^1.1.0",
         "leaflet": "^1.9.4",
+        "leaflet-geosearch": "^4.0.0",
+        "leaflet-routing-machine": "^3.2.12",
         "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"
       },
@@ -42,6 +45,7 @@
         "@types/eslint__js": "^8.42.3",
         "@types/js-yaml": "^4.0.9",
         "@types/leaflet": "^1.9.12",
+        "@types/leaflet-routing-machine": "^3.2.8",
         "@types/lodash.merge": "^4.6.9",
         "@types/node": "^20",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -59,7 +63,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 +1132,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 +1748,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",
@@ -2459,6 +2470,22 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@mapbox/corslite": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/@mapbox/corslite/-/corslite-0.0.7.tgz",
+      "integrity": "sha512-w/uS474VFjmqQ7fFWIMZINQM1BAQxDLuoJaZZIPES1BmeYpCtlh9MtbFxKGGDAsfvut8/HircIsVvEYRjQ+iMg=="
+    },
+    "node_modules/@mapbox/polyline": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@mapbox/polyline/-/polyline-0.2.0.tgz",
+      "integrity": "sha512-GCddO0iw6AzOQqZgBmjEQI9Pgo40/yRgkTkikGctE01kNBN0ThWYuAnTD+hRWrAWMV6QJ0rNm4m8DAsaAXE7Pg==",
+      "bin": {
+        "polyline": "bin/polyline.bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/@mdx-js/mdx": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.0.1.tgz",
@@ -3061,6 +3088,15 @@
         "@types/geojson": "*"
       }
     },
+    "node_modules/@types/leaflet-routing-machine": {
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/@types/leaflet-routing-machine/-/leaflet-routing-machine-3.2.8.tgz",
+      "integrity": "sha512-v2pJDv/nqbB769SsytHemhLkqwjVor9UdWvZ1l6Y2SEaXNt1yDwVrktc4sCT8/4n7npuEb8VP+UAk8xrPePqSQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/leaflet": "*"
+      }
+    },
     "node_modules/@types/lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
@@ -6318,7 +6354,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 +8153,25 @@
       "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/leaflet-routing-machine": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/leaflet-routing-machine/-/leaflet-routing-machine-3.2.12.tgz",
+      "integrity": "sha512-HLde58G1YtD9xSIzZavJ6BPABZaV1hHeGst8ouhzuxmSC3s32NVtADT+njbIUMW1maHRCrsgTk/E4hz5QH7FrA==",
+      "dependencies": {
+        "@mapbox/corslite": "0.0.7",
+        "@mapbox/polyline": "^0.2.0",
+        "osrm-text-instructions": "^0.13.2"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -8164,7 +8219,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -8184,7 +8238,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -8204,7 +8257,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
@@ -8224,7 +8276,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8244,7 +8295,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8264,7 +8314,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8284,7 +8333,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8304,7 +8352,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
@@ -8324,7 +8371,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
@@ -10056,6 +10102,11 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/osrm-text-instructions": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/osrm-text-instructions/-/osrm-text-instructions-0.13.4.tgz",
+      "integrity": "sha512-ge4ZTIetMQKAHKq2MwWf83ntzdJN20ndRKRaVNoZ3SkDkBNO99Qddz7r6+hrVx38I+ih6Rk5T1yslczAB6Q9Pg=="
+    },
     "node_modules/p-limit": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
@@ -10899,8 +10950,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==",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-      "dev": true
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.2",
@@ -12272,7 +12322,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"
       },

front/package.json

@@ -16,37 +16,31 @@
   },
   "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",
+    "leaflet-routing-machine": "^3.2.12",
+    "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"
   },
   "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",
@@ -57,8 +51,16 @@
     "@tailwindcss/typography": "^0.5.13",
     "@types/eslint__js": "^8.42.3",
     "@types/js-yaml": "^4.0.9",
+    "@types/leaflet": "^1.9.12",
+    "@types/leaflet-routing-machine": "^3.2.8",
     "@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",
@@ -68,8 +70,9 @@
     "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"
+    "typescript": "^5",
+    "typescript-eslint": "^7.9.0",
+    "vitest": "^1"
   }
 }

front/src/components/Input.astro

@@ -0,0 +1,28 @@
+---
+import type { Input as Props } from 'types';
+
+const { type, name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props;
+
+---
+
+<>
+  {
+    name && (
+      <div class={divClass}>
+        {label && (
+          <label for={name} class="block text-sm font-medium">
+            {label}
+          </label>
+        )}
+        <input
+          type={type}
+          name={name}
+          id={name}
+          autocomplete={autocomplete}
+          placeholder={placeholder}
+          class={"py-3 px-4 block w-full text-md rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-slate-900" + inputClass}
+        />
+      </div>
+    )
+  }
+</>

front/src/components/widgets/Footer.astro

@@ -26,7 +26,7 @@ export interface Props {
 const { socialLinks = [], secondaryLinks = [], links = [], footNote = '', theme = 'light' } = Astro.props;
 ---
 
-<footer class:list={[{ dark: theme === 'dark' }, 'relative border-t border-gray-200 dark:border-slate-800 not-prose, mt-auto']}>
+<footer class:list={[{ dark: theme === 'dark' }, 'relative border-t border-gray-200 dark:border-slate-800 not-prose, mt-auto, h-{11rem}']}>
   <div class="dark:bg-dark absolute inset-0 pointer-events-none" aria-hidden="true"></div>
   <div class="relative max-w-7xl mx-auto px-4 sm:px-6 dark:text-slate-300">
     <div class="grid grid-cols-12 gap-4 gap-y-8 sm:gap-8 py-8 md:py-12">

front/src/components/widgets/Header.astro

@@ -55,7 +55,7 @@ const currentPath = `/${trimSlash(new URL(Astro.url).pathname)}`
 <header
 	class:list={[
 		{ sticky: isSticky, relative: !isSticky, dark: isDark },
-		'top-0 z-40 flex-none mx-auto w-full border-b border-gray-50/0 transition-[opacity] ease-in-out',
+		'top-0 z-[1001] h-[5rem] bg-page flex-none mx-auto w-full border-b border-gray-50/0 transition-[opacity] ease-in-out',
 	]}
 	{...isSticky ? { 'data-aw-sticky-header': true } : {}}
 	{...id ? { id } : {}}
@@ -88,7 +88,7 @@ const currentPath = `/${trimSlash(new URL(Astro.url).pathname)}`
 			aria-label="Main navigation"
 		>
 			<ul
-				class="flex flex-col md:flex-row md:self-center w-full md:w-auto text-xl md:text-[0.9375rem] tracking-[0.01rem] font-medium md:justify-center"
+				class="flex flex-col bg-page md:flex-row md:self-center w-full md:w-auto text-xl md:text-[0.9375rem] tracking-[0.01rem] font-medium md:justify-center"
 			>
 				{
 					links.map(({ text, href, links }) => (

front/src/config.yaml

@@ -1,6 +1,6 @@
 site:
-  name: AstroWind
+  name: EpicRoadTrip
-  site: 'https://astrowind.vercel.app'
+  site: 'https://front-tweb.cb85.fr'
   base: '/'
   trailingSlash: false
 

front/src/env.d.ts

@@ -6,10 +6,10 @@
 
 import PocketBase from 'pocketbase'
 export interface ImportMetaEnv {
-    NODE_ENV: string
+  NODE_ENV: string
-    APP_URL: string
+  APP_URL: string
 
-    POCKETBASE_URL: string
+  POCKETBASE_URL: string
 
 	GOOGLE_API_KEY: string
 }

front/src/pages/account/register.astro

@@ -80,18 +80,4 @@ const metadata = {
     ]}
   />
   <Oauth/>
-  <form id="account-creation" method="post" enctype="multipart/form-data">
-    <input type="hidden" name="type" value="userPassword">
-    <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>
-
-<button id="OauthDiscord">connexion avec discord</button>
-<form method="post" enctype="multipart/form-data">
-    <input type="hidden" name="type" value="discord2FA">
-</form>
 </Layout>

front/src/pages/maps.astro

@@ -1,31 +1,158 @@
 ---
-import Layout from 'layouts/PageLayout.astro';
+import Layout from 'layouts/PageLayout.astro'
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-geosearch/dist/geosearch.css'
+import 'leaflet-routing-machine/dist/leaflet-routing-machine.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,
-};
+}
 ---
 
 <Layout metadata={metadata}>
 
-  <div class="w-full h-96" id="map" />
+  <div class="h-[calc(100vh-16rem)] flex flex-col">
+    <div class="w-full h-96 grow" id="map" />
+  </div>
   
+  <script src='leaflet-routing-machine/dist/leaflet-routing-machine.js'></script>
 
+  <!-- for remouve footer -->
+  <!-- <div slot="footer"></div> -->
+  <!-- penser a rm  11 au rem au dessus pour la taille -->
 </Layout>
 
 <script>
-  import L from 'leaflet'
+  import L, { geoJSON, Icon, Popup, type LatLngTuple } from 'leaflet'
+  import markerShadow from "leaflet/dist/images/marker-shadow.png"
+  import markerIcon from "leaflet/dist/images/marker-icon.png"
+  import { OpenStreetMapProvider } from 'leaflet-geosearch'
+  import { GeoSearchControl } from 'leaflet-geosearch'
+  
+
+  const icon = {icon: new L.Icon({iconUrl: markerIcon.src, shadowUrl: markerShadow.src, iconAnchor: [13,41]})}
+
+  // const BACK_URL = "https://drink-tweb.cb85.fr/"
+  const BACK_URL = "http://localhost:3001/"
+
+  let mapsCenter : L.LatLngTuple
 
   const map = L.map('map', {
-    center: [50,0],
+    center: [51.5, -0.09],
     zoom: 13,
     preferCanvas: true
   })
+
   L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 19,
     attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
-}).addTo(map);
+  }).addTo(map)
-var marker = L.marker([51.5, -0.09]).addTo(map);
+
+  const provider = new OpenStreetMapProvider()
+  
+  map.addControl(
+    GeoSearchControl({
+      notFoundMessage: 'Adresse introuvable !',
+      provider,
+      showMarker: false,
+      style: 'bar',
+    }),
+  )
+  // L.Routing.control({
+  //     waypoints: [
+  //         L.latLng(57.74, 11.94),
+  //         L.latLng(57.6792, 11.949)
+  //     ],
+  //     routeWhileDragging: true
+  // }).addTo(map)
+
+  let poiMarkers = new Array<L.Marker>
+
+  // run api search
+  function searchBox(){
+    const nordWest = map.getBounds().getNorthWest()
+    const southEast = map.getBounds().getSouthEast()
+    const params: URLSearchParams = new URLSearchParams();
+
+    params.append("lon1", nordWest.lng.toString())
+    params.append("lat1", nordWest.lat.toString())
+    params.append("lon2", southEast.lng.toString())
+    params.append("lat2", southEast.lat.toString())
+    
+    fetch(`${BACK_URL}otm/box?${params.toString()}`,{method: 'GET',headers: {'Content-Type': 'application/json'}}).then(function (response) {
+      return response.json();
+    }).then(function (data) {
+      poiMarkers.forEach(element => {
+        element.remove();
+      });
+      console.log(data);
+      data.features.forEach(element => {
+        const prop = element.properties
+        const popup: Popup = new Popup()
+        let tags = new String()
+        prop.kinds.split(",").forEach(element => {
+          tags += "- " + element + "<br/>"
+        });
+        const poiMarker = L.marker([element.geometry.coordinates[1],element.geometry.coordinates[0]],icon)
+          .bindPopup(`<b>${prop.name}</b><br/>note : ${prop.rate} <br/>tags:<br/> ${tags}`)
+        poiMarker.addTo(map)
+        poiMarkers.push(poiMarker);
+      });
+    }).catch(function (err) {
+      console.warn('Something went wrong.', err);
+    });
+  }
+
+  // fonciton pour lancer la recherche de box sur l'api
+  function sender(){
+    console.log("SEND")
+    if(map.getZoom() >= 13){
+      console.log("zoom OKAY")
+      //TODO: mettre un message de recherche en cour
+      searchBox();
+    }else{
+      console.log("zoom more to see result");
+      //TODO: faire en sorte d'avoir un message
+    }
+  }
+  // envent pour lancer la recherche
+  const cooldown = 1000;
+  sender()
+  let timeoutHandle = window.setTimeout(sender, cooldown)
+  
+  window.clearTimeout(timeoutHandle);
+  
+  map.addEventListener("move",() =>{
+    console.log("move")
+    window.clearTimeout(timeoutHandle);
+    timeoutHandle = window.setTimeout(sender, cooldown);
+  })//searchBox)
+
+  function search() {
+    const params: URLSearchParams = new URLSearchParams();
+    params.append("name", input!.value)
+
+    fetch(`${BACK_URL}otm/city?${params.toString()}`,{method: 'GET',headers: {'Content-Type': 'application/json'}}).then(function (response) {
+      // The API call was successful!
+      return response.json();
+    }).then(function (data) {
+      console.log(data);
+      mapsCenter = [data.lat, data.lon]
+      marker.setLatLng(mapsCenter)
+      map.setView(mapsCenter)
+      data.features.forEach(element => {
+        const prop = element.properties
+        const popup: Popup = new Popup()
+        const poiMarker = L.marker([element.geometry.coordinates[1],element.geometry.coordinates[0]],icon).bindPopup(prop.name + "\n" + prop.rate + "\n" + prop.kinds)
+        poiMarker.addTo(map)
+      });
+    }).catch(function (err) {
+      console.warn('Something went wrong.', err);
+    });
+  }
+
 </script>

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<Taxonomy>
   /**  */
   author?: string
 
@@ -167,6 +167,8 @@ export interface Input {
   label?: string
   autocomplete?: string
   placeholder?: string
+  divClass?: string
+  inputClass?: string
 }
 
 export interface Textarea {

front/tailwind.config.cjs

@@ -1,24 +1,25 @@
-import defaultTheme from 'tailwindcss/defaultTheme';
+import defaultTheme from 'tailwindcss/defaultTheme'
-import typographyPlugin from '@tailwindcss/typography';
+import typographyPlugin from '@tailwindcss/typography'
 
 module.exports = {
-  content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'],
+	content: ['./src/**/*.{astro,html,js,jsx,json,md,mdx,svelte,ts,tsx,vue}'],
-  theme: {
+	theme: {
-    extend: {
+		extend: {
-      colors: {
+			colors: {
-        primary: 'var(--aw-color-primary)',
+				primary: 'var(--aw-color-primary)',
-        secondary: 'var(--aw-color-secondary)',
+				secondary: 'var(--aw-color-secondary)',
-        accent: 'var(--aw-color-accent)',
+				accent: 'var(--aw-color-accent)',
-        default: 'var(--aw-color-text-default)',
+				default: 'var(--aw-color-text-default)',
-        muted: 'var(--aw-color-text-muted)',
+				muted: 'var(--aw-color-text-muted)',
-      },
+			},
-      fontFamily: {
+			fontFamily: {
-        sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
+				sans: ['var(--aw-font-sans, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
-        serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif],
+				serif: ['var(--aw-font-serif, ui-serif)', ...defaultTheme.fontFamily.serif],
-        heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
+				heading: ['var(--aw-font-heading, ui-sans-serif)', ...defaultTheme.fontFamily.sans],
-      },
+			},
-    },
+		},
-  },
+	},
-  plugins: [typographyPlugin],
+	plugins: [typographyPlugin],
-  darkMode: 'class',
+	darkMode: 'class',
-};
+}
+

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: [],
-}