5 Commits

Author SHA1 Message Date
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
23 changed files with 142 additions and 1303 deletions

View File

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

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
Submodule repo : https://git.lab-ouest.org/Epitech/fork-open-data-tourism/
Original repo : https://git.lab-ouest.org/Epitech/ratrapage_T-WEB

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
ports:
- 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

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

View File

@ -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"]

View File

@ -1,30 +1,21 @@
import { defineConfig } from 'astro/config';
import node from '@astrojs/node';
import tailwind from "@astrojs/tailwind";
import react from "@astrojs/react";
// https://astro.build/config
export default defineConfig({
// integrations: [tailwind(), test, routing(), version(), buildInfos()],
compressHTML: true,
build: {
assets: 'assets',
inlineStylesheets: 'auto'
},
server: {
host: true,
port: 3000
},
trailingSlash: 'never',
output: 'server',
adapter: node({
mode: 'standalone'
}),
integrations: [tailwind(), react()],
vite: {
optimizeDeps: {
include: ['leaflet']
}
}
});
// integrations: [tailwind(), test, routing(), version(), buildInfos()],
compressHTML: true,
build: {
assets: 'assets',
inlineStylesheets: 'auto'
},
server: {
host: true,
port: 3000
},
trailingSlash: 'never',
output: 'server',
adapter: node({
mode: 'standalone'
}),
});

999
front/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -5,39 +5,30 @@
"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.2.2"
},
"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",
"@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"
}

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

@ -19,4 +19,4 @@ const { title } = Astro.props;
<body>
<slot />
</body>
</html>
</html>

View File

@ -0,0 +1,5 @@
export default class AstroUtils {
public static async wrap<T = void>(fn: () => T | Promise<T>) {
return await fn()
}
}

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

@ -0,0 +1,44 @@
---
import PocketBase from 'pocketbase';
import Layout from '../../layouts/Layout.astro';
import AstroUtils from '../../libs/AstroUtils';
//const connected = await getUser(Astro.cookies)
// if(connected) {
// return Astro.redirect(route('/'))
// }
const res = 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,
emailVisibility: false
}
const pb = new PocketBase('http://127.0.0.1:3001');
console.log(request);
const record = await pb.collection('users').create(request);
console.log(record);
})
---
<Layout title="register">
<form id="account-creation" method="post" enctype="multipart/form-data">
<input required name="name" placeholder="Nom"/>
<input required name="username" placeholder="Prénom"/>
<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>

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

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",
"compilerOptions": {
"baseUrl": "src",
// hide an issue with typescript
"noUnusedLocals": false
},
"extends": "astro/tsconfigs/strict"
}