19 Commits

Author SHA1 Message Date
de3ab9a529 fix rm file 2 form other branch
All checks were successful
Build Docker Image / run (pull_request) Successful in 46s
2024-04-21 15:22:34 +02:00
d876439b50 fix: remove file from other branch
All checks were successful
Build Docker Image / run (pull_request) Successful in 48s
2024-04-21 15:19:08 +02:00
07d105c71e WIP update docker compose (dont work)
All checks were successful
Build Docker Image / run (pull_request) Successful in 47s
2024-04-20 15:10:28 +02:00
ab5bad37c0 add front and env variable
All checks were successful
Build Docker Image / run (pull_request) Successful in 23s
2024-04-20 14:50:31 +02:00
e3449076b3 feat: docker prod pocketbase
All checks were successful
Build Docker Image / run (pull_request) Successful in 24s
2024-04-20 14:19:50 +02:00
ccb31a172d fix build error
All checks were successful
Build Docker Image / run (pull_request) Successful in 1m12s
2024-04-20 13:57:37 +02:00
19edb3472f fix: build and push
Some checks failed
Build Docker Image / run (pull_request) Failing after 1m3s
2024-04-20 13:34:17 +02:00
bca06eef2c fix: build and push
Some checks failed
Build Docker Image / run (pull_request) Failing after 22s
2024-04-20 13:18:58 +02:00
77f26f42e6 fix CI/CD
Some checks failed
Build Docker Image / run (pull_request) Failing after 16s
2024-04-20 13:15:38 +02:00
28f47a933a add docker ci
Some checks failed
Build Docker Image / run (pull_request) Failing after 20s
2024-04-20 12:22:59 +02:00
4caafb8c55 feat: add dockerfile front 2024-04-20 12:22:46 +02:00
5a49f5beda rm some log 2024-04-20 12:09:05 +02:00
70382d7bd8 feat: login page test 2024-04-20 12:08:49 +02:00
a724c1270f fix: change register form name 2024-04-20 12:07:37 +02:00
7c68628456 add register form test 2024-04-20 11:45:39 +02:00
a2290c21e1 add astro util 2024-04-20 11:45:17 +02:00
79656cfccd fix: site output type 2024-04-20 11:15:33 +02:00
65d52eb8fa add pb dependancie 2024-04-20 11:15:12 +02:00
65ddbe976f rm default style 2024-04-20 11:14:48 +02:00
20 changed files with 123 additions and 1153 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_front git.lab-ouest.org/Epitech/ratrapage_T-WEB
tags: | tags: |
type=edge type=edge
type=ref,event=pr type=ref,event=pr

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "datatourisme"]
path = datatourisme
url = https://git.lab-ouest.org/Epitech/fork-open-data-tourism

View File

@ -1,4 +1 @@
Original repo : https://git.lab-ouest.org/Epitech/ratrapage_T-WEB Original repo : https://git.lab-ouest.org/Epitech/ratrapage_T-WEB
Submodule repo : https://git.lab-ouest.org/Epitech/fork-open-data-tourism/

View File

@ -1,5 +0,0 @@
{
"version": "1",
"name": "OpenData datatourisme",
"type": "collection"
}

View File

@ -1,3 +0,0 @@
vars:secret [
app_key
]

View File

@ -1,11 +0,0 @@
meta {
name: test opendata
type: http
seq: 1
}
get {
url: https://diffuseur.datatourisme.fr/webservice/adb00e7893763e3196afe9a3da1c9e41/{{app_key}}
body: none
auth: none
}

View File

@ -1,15 +0,0 @@
meta {
name: test pays de la loire
type: graphql
seq: 2
}
post {
url: http://localhost:8080
body: graphql
auth: none
}
body:graphql {
{poi() {results{dc_identifier rdfs_label}}}
}

Submodule datatourisme deleted from 5175e1fdf1

View File

@ -8,22 +8,3 @@ services:
- ./.pb/pocketbase-hooks:/app/pb_hooks - ./.pb/pocketbase-hooks:/app/pb_hooks
ports: ports:
- 3001:8080 - 3001:8080
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:
build: datatourisme/docker
ports:
- "8080:80"
depends_on:
- blazegraph

View File

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

View File

@ -1,30 +1,21 @@
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({
// integrations: [tailwind(), test, routing(), version(), buildInfos()], // integrations: [tailwind(), test, routing(), version(), buildInfos()],
compressHTML: true, compressHTML: true,
build: { build: {
assets: 'assets', assets: 'assets',
inlineStylesheets: 'auto' inlineStylesheets: 'auto'
}, },
server: { server: {
host: true, host: true,
port: 3000 port: 3000
}, },
trailingSlash: 'never', trailingSlash: 'never',
output: 'server', output: 'server',
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,39 +5,30 @@
"private": "true", "private": "true",
"scripts": { "scripts": {
"dev": "astro dev", "dev": "astro dev",
"start": "node ./dist/server/entry.mjs", "start": "astro dev",
"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",
"@types/react": "^18.2.79", "astro": "^4.6.3",
"@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.21.0", "@typescript-eslint/eslint-plugin": "^6",
"@typescript-eslint/parser": "^6.21.0", "@typescript-eslint/parser": "^6",
"@vitest/coverage-v8": "^1", "@vitest/coverage-v8": "^1",
"eslint": "^8.57.0", "eslint": "^8",
"eslint-plugin-astro": "^0.31.4", "eslint-plugin-astro": "^0.31",
"typescript": "^5", "typescript": "^5",
"vitest": "^1" "vitest": "^1"
} }

View File

@ -1,55 +0,0 @@
---
import type { string } from 'astro/zod'
import type { Marker } from 'leaflet'
export interface Props {
latitude: number
longitude: number
zoom: number
/** the DOM ID of a <div> element */
container: string
/** https://leafletjs.com/reference.html#tilelayer */
tileLayer: string
/** Most tile servers require attribution. */
attribution: string
containerstyle?: string
}
const { latitude, longitude, zoom, container, tileLayer, attribution, containerstyle = "height: 61.8vh", class } = Astro.props
---
<leaflet-map
data-latitude={latitude}
data-longitude={longitude}
data-zoom={zoom}
data-container={container}
data-tiles={tileLayer}
data-attribution={attribution}
data-containerstyle={containerstyle}
>
<div id={container} style={containerstyle}></div>
<script>
import L, { type LatLngTuple } from "leaflet"
import "leaflet/dist/leaflet"
import "leaflet/dist/leaflet.css"
class LeafletMap extends HTMLElement {
constructor() {
super()
const latlng = [Number(this.dataset.latitude), Number(this.dataset.longitude)] as LatLngTuple
var map = L.map(this.dataset.container as string).setView(latlng, Number(this.dataset.zoom))
L.tileLayer(
this.dataset.tiles as string,
{attribution: this.dataset.attribution}
).addTo(map)
var marker = L.marker([51.5, -0.09]).addTo(map);
}
}
window.customElements.define("leaflet-map", LeafletMap);
</script>

View File

@ -20,3 +20,32 @@ const { title } = Astro.props;
<slot /> <slot />
</body> </body>
</html> </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>

View File

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

@ -1,32 +0,0 @@
---
import Leaflet from 'components/Leaflet.astro';
import Layout from 'layouts/Layout.astro';
// import { Marker, Popup } from 'leaflet';
// import type { only } from 'node:test';
// import { MapContainer, TileLayer } from 'react-leaflet'
---
<Layout title="maps test">
<!-- <MapContainer client:only="react" center={[51.505, -0.09]} zoom={13} scrollWheelZoom={false}>
<TileLayer
client:only="react"
attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
/>
<Marker client:only="react" lat={51.505} lng={-0.09}>
<Popup client:only="react">
A pretty CSS3 popup. <br /> Easily customizable.
</Popup>
</Marker>
</MapContainer> -->
<Leaflet
latitude={51.505}
longitude={-0.09}
zoom={13}
container="leafletmap"
tileLayer="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
attribution="© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors">
</Leaflet>
</Layout>

View File

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

View File

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