fix: correction problème divers #7

Merged
Clement merged 9 commits from fix/soiré-avec-flo into master 2024-04-25 08:40:40 +00:00
11 changed files with 1023 additions and 94 deletions

View File

@ -23,7 +23,7 @@ jobs:
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: | images: |
git.lab-ouest.org/Epitech/ratrapage_T-WEB git.lab-ouest.org/Epitech/ratrapage_T-WEB_front
tags: | tags: |
type=edge type=edge
type=ref,event=pr type=ref,event=pr

@ -1 +1 @@
Subproject commit fb594bfd7c715a891f076750403e3a439b804468 Subproject commit 5175e1fdf116eb7c370b629ff96aee7b308d250f

View File

@ -15,7 +15,7 @@ services:
networks: networks:
- public - public
front: front:
image: git.lab-ouest.org/epitech/ratrapage_t-web:pr-2-head image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head
depends_on: depends_on:
- pocketbase - pocketbase
labels: labels:

View File

@ -1,5 +1,8 @@
import { defineConfig } from 'astro/config'; import { defineConfig } from 'astro/config';
import node from '@astrojs/node'; import node from '@astrojs/node';
import tailwind from "@astrojs/tailwind";
import react from "@astrojs/react";
// https://astro.build/config // https://astro.build/config
export default defineConfig({ export default defineConfig({
@ -18,4 +21,10 @@ export default defineConfig({
adapter: node({ adapter: node({
mode: 'standalone' mode: 'standalone'
}), }),
integrations: [tailwind(), react()],
vite: {
optimizeDeps: {
include: ['leaflet']
}
}
}); });

999
front/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -5,30 +5,39 @@
"private": "true", "private": "true",
"scripts": { "scripts": {
"dev": "astro dev", "dev": "astro dev",
"start": "astro dev", "start": "node ./dist/server/entry.mjs",
"build": "astro check && astro build", "build": "astro check && astro build",
"preview": "astro preview", "preview": "astro preview",
"astro": "astro" "astro": "astro",
"check:lint": "eslint src"
}, },
"dependencies": { "dependencies": {
"@astrojs/node": "^8.2.5", "@astrojs/node": "^8.2.5",
"@astrojs/react": "^3.3.1",
"@astrojs/tailwind": "^5.1.0", "@astrojs/tailwind": "^5.1.0",
"@tailwindcss/typography": "^0.5.12", "@tailwindcss/typography": "^0.5.12",
"astro": "^4.6.3", "@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"astro": "4.5.12",
"leaflet": "^1.9.4",
"lucide-astro": "^0.372.0", "lucide-astro": "^0.372.0",
"pocketbase": "^0.21.1", "pocketbase": "^0.21.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-leaflet": "^4.2.1",
"simple-icons-astro": "^11.12.0", "simple-icons-astro": "^11.12.0",
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"typescript": "^5.2.2" "typescript": "^5.2.2"
}, },
"devDependencies": { "devDependencies": {
"@astrojs/check": "^0", "@astrojs/check": "^0",
"@types/leaflet": "^1.9.12",
"@types/node": "^20", "@types/node": "^20",
"@typescript-eslint/eslint-plugin": "^6", "@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6", "@typescript-eslint/parser": "^6.21.0",
"@vitest/coverage-v8": "^1", "@vitest/coverage-v8": "^1",
"eslint": "^8", "eslint": "^8.57.0",
"eslint-plugin-astro": "^0.31", "eslint-plugin-astro": "^0.31.4",
"typescript": "^5", "typescript": "^5",
"vitest": "^1" "vitest": "^1"
} }

View File

@ -0,0 +1,12 @@
//référence a loop
//fonction get user pour récupéré un utilisateur (notament coté client)
//sessionID = JWS
//fonction set user crée un cookies de session
//passé le cookies astro dans les paramètre
//utiliser cookie.set pour crée un nouveau cookies

View File

@ -1,6 +1,6 @@
--- ---
import Layout from '../layouts/Layout.astro'; import Layout from 'layouts/Layout.astro';
import Card from '../components/Card.astro'; import Card from 'components/Card.astro';
--- ---
<Layout title="Welcome to Astro."> <Layout title="Welcome to Astro.">

View File

@ -0,0 +1,17 @@
---
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>

View File

@ -0,0 +1,8 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
theme: {
extend: {},
},
plugins: [],
}

View File

@ -1,3 +1,8 @@
{ {
"extends": "astro/tsconfigs/strict" "extends": "astro/tsconfigs/strict",
"compilerOptions": {
"baseUrl": "src",
// hide an issue with typescript
"noUnusedLocals": false
},
} }