Compare commits
23 Commits
1d6b334c74
...
fix-SSR-wi
Author | SHA1 | Date | |
---|---|---|---|
02e84ed9d6 | |||
06bdeff188 | |||
7a510a53a1 | |||
063660db9d | |||
55740b6219 | |||
459c1252e0 | |||
cd234f5b37 | |||
76755baa1d | |||
2cc3219b30 | |||
b48c842e41 | |||
313c197096 | |||
5776fe08d9 | |||
b1fce87215 | |||
4761fef61b | |||
eed351df0a | |||
5a49f5beda | |||
70382d7bd8 | |||
a724c1270f | |||
7c68628456 | |||
a2290c21e1 | |||
79656cfccd | |||
65d52eb8fa | |||
65ddbe976f |
@ -1,4 +1,4 @@
|
||||
name: Build Docker Image Front # nom du workflow
|
||||
name: Build Docker Image # nom du workflow
|
||||
|
||||
on: #declancheur
|
||||
push:
|
53
.github/workflows/build_docker_express.yml
vendored
53
.github/workflows/build_docker_express.yml
vendored
@ -1,53 +0,0 @@
|
||||
name: Build Docker Image Back # 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_back
|
||||
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 back
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: ./Express/barAndCafe
|
||||
push: true
|
||||
file: ./Express/barAndCafe/Dockerfile
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
46
.github/workflows/build_jsdoc_drink.yml
vendored
46
.github/workflows/build_jsdoc_drink.yml
vendored
@ -1,46 +0,0 @@
|
||||
name: JsDocs
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '*'
|
||||
jobs:
|
||||
coverage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- 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_drink_jsdocs
|
||||
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 docs
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: ./Express/barAndCafe
|
||||
push: true
|
||||
file: ./Express/barAndCafe/Dockerfile_docs
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
21
.github/workflows/run_back_test.yml
vendored
21
.github/workflows/run_back_test.yml
vendored
@ -1,21 +0,0 @@
|
||||
name: Test and coverage
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- '*'
|
||||
jobs:
|
||||
coverage:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: ArtiomTr/jest-coverage-report-action@v2
|
||||
with:
|
||||
working-directory: Express/barAndCafe
|
||||
test-script: npm run test
|
||||
output: comment, report-markdown
|
||||
prnumber: ${{ steps.findPr.outputs.number }}
|
||||
custom-title: Coverage report for backend
|
||||
github-token: ${{ secrets.PR_TOCKEN}}
|
||||
annotations: none #disable annotation
|
||||
env:
|
||||
OPEN_TRIP_MAPS_KEY: ${{ secrets.OPEN_TRIP_MAPS_KEY}}
|
@ -1,59 +0,0 @@
|
||||
#########
|
||||
# Build #
|
||||
#########
|
||||
FROM docker.io/node:20-alpine as BUILD_IMAGE
|
||||
|
||||
# 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
|
||||
|
||||
# run as non root user
|
||||
USER node
|
||||
|
||||
# go to work folder
|
||||
WORKDIR /home/node
|
||||
|
||||
# Expose port
|
||||
EXPOSE 3000
|
||||
|
||||
# Add Healthcheck
|
||||
# FIXME: remttre check avec un port
|
||||
# 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"]
|
@ -1,35 +0,0 @@
|
||||
#########
|
||||
# Build #
|
||||
#########
|
||||
FROM docker.io/node:20-alpine as BUILD_IMAGE
|
||||
|
||||
# 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 docs
|
||||
|
||||
# remove dev deps
|
||||
RUN npm prune --omit=dev
|
||||
|
||||
##############
|
||||
# Production #
|
||||
##############
|
||||
FROM httpd:alpine
|
||||
|
||||
COPY --from=BUILD_IMAGE /home/node/out/ /usr/local/apache2/htdocs/
|
@ -1,21 +0,0 @@
|
||||
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
||||
module.exports = {
|
||||
testTimeout: 10000,
|
||||
preset: 'ts-jest',
|
||||
testEnvironment: 'node',
|
||||
collectCoverage: true,
|
||||
coverageDirectory: 'coverage',
|
||||
collectCoverageFrom: [
|
||||
'**/*.ts',
|
||||
'!/nodemodules/',
|
||||
'!/jest.config.js/',
|
||||
'!/coverage/',
|
||||
'!**/server.ts',
|
||||
'!**/swaggerDef.ts'
|
||||
],
|
||||
coverageThreshold: {
|
||||
global: {
|
||||
lines: 80,
|
||||
},
|
||||
},
|
||||
};
|
@ -1,15 +0,0 @@
|
||||
{
|
||||
"opts": {
|
||||
"template": "node_modules/better-docs"
|
||||
},
|
||||
"tags": {
|
||||
"allowUnknownTags": true
|
||||
},
|
||||
"plugins": [
|
||||
"node_modules/better-docs/typescript"
|
||||
],
|
||||
"source": {
|
||||
"include": ["./src"],
|
||||
"includePattern": "\\.(jsx|js|ts|tsx)$"
|
||||
}
|
||||
}
|
12373
Express/barAndCafe/package-lock.json
generated
12373
Express/barAndCafe/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,41 +0,0 @@
|
||||
{
|
||||
"main": "dist/server.js",
|
||||
"scripts": {
|
||||
"build": "rimraf dist && npx tsc",
|
||||
"start": "node dist/src/server.js",
|
||||
"predev": "npm run build",
|
||||
"dev": "npx tsc -w & nodemon dist/src/server.js",
|
||||
"predocs": "npm run build",
|
||||
"docs": "jsdoc -c jsdoc.json",
|
||||
"pretest": "npm run build",
|
||||
"test": "ts-node -O '{\"module\":\"commonjs\"}' node_modules/jest/bin/jest.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/node": "^20.12.7",
|
||||
"axios": "^1.6.8",
|
||||
"dotenv": "^16.4.5",
|
||||
"express": "^4.19.2",
|
||||
"rimraf": "^5.0.5",
|
||||
"swagger-jsdoc": "^6.2.8",
|
||||
"swagger-ui-express": "^5.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.12",
|
||||
"@types/rewire": "^2.5.30",
|
||||
"@types/supertest": "^6.0.2",
|
||||
"babel-cli": "^6.26.0",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"better-docs": "^2.7.3",
|
||||
"jest": "^29.7.0",
|
||||
"jsdoc": "^4.0.3",
|
||||
"nodemon": "^3.1.0",
|
||||
"rewire": "^7.0.0",
|
||||
"superagent": "^9.0.2",
|
||||
"supertest": "^7.0.0",
|
||||
"ts-jest": "^29.1.2",
|
||||
"ts-node": "^10.9.2",
|
||||
"typedoc": "^0.25.13",
|
||||
"typescript": "^5.4.5"
|
||||
}
|
||||
}
|
@ -1,61 +0,0 @@
|
||||
import { getCity, getRadius } from "./openTripMaps"
|
||||
import express from "express"
|
||||
/**
|
||||
* Initialize Express application instance.
|
||||
* @returns An initialized Express application object.
|
||||
*/
|
||||
const app = express()
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Handle GET request for homepage route ('/welcome').
|
||||
* Send back a simple json response.
|
||||
* @param {express.Request} req - HTTP Request object.
|
||||
* @param {express.Response} res - HTTP Response object.
|
||||
*/
|
||||
function getWelcome(req: express.Request, res: express.Response) {
|
||||
const out = {hello:"world"}
|
||||
res.send(out)
|
||||
}
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
* /welcome:
|
||||
* get:
|
||||
* summary: retun just hello
|
||||
* description: Welcome to swagger-jsdoc!
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Returns a welcome json.
|
||||
*/
|
||||
app.get("/welcome", getWelcome)
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
* /otm/city:
|
||||
* get:
|
||||
* summary: return the drinks in a city
|
||||
* description: return the drinks in a defined perimeter in a city
|
||||
* parameters:
|
||||
* - name: name
|
||||
* in: query
|
||||
* required: true
|
||||
* description: the name of the city
|
||||
* schema:
|
||||
* type: string
|
||||
* responses:
|
||||
* 200:
|
||||
* description: Return a list of bars and coffee in city in geoJSON format
|
||||
* 400:
|
||||
* description: Missing Argument Error
|
||||
* 401:
|
||||
* description: Missing OTM tocken
|
||||
*/
|
||||
app.get("/otm/city", getCity)
|
||||
|
||||
|
||||
//XXX: faire la doc SWAGGER
|
||||
app.get("/otm/radius", getRadius)
|
||||
|
||||
export default app
|
@ -1,93 +0,0 @@
|
||||
import axios from 'axios';
|
||||
import express from "express"
|
||||
import * as dotenv from "dotenv";
|
||||
|
||||
dotenv.config({path: '../../.env'})
|
||||
|
||||
const key = process.env.OPEN_TRIP_MAPS_KEY
|
||||
|
||||
async function callRadius(lon: string, lat: string, radius = '1000') {
|
||||
const optionsDrink = {
|
||||
method: 'GET',
|
||||
url: 'https://api.opentripmap.com/0.1/en/places/radius',
|
||||
params: {
|
||||
radius: radius,
|
||||
lon: lon,
|
||||
lat: lat,
|
||||
apikey: key,
|
||||
kinds: 'bars,cafes,pubs,biergartens'
|
||||
},
|
||||
headers: {'Content-Type': 'application/json'}
|
||||
}
|
||||
|
||||
try {
|
||||
const { data } = await axios.request(optionsDrink);
|
||||
return data
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async function callCity(name:string) {
|
||||
const optionsCity = {
|
||||
method: 'GET',
|
||||
url: 'https://api.opentripmap.com/0.1/en/places/geoname',
|
||||
params: {
|
||||
name: name,
|
||||
apikey: key
|
||||
},
|
||||
headers: {'Content-Type': 'application/json'}
|
||||
};
|
||||
|
||||
try {
|
||||
const { data } = await axios.request(optionsCity);
|
||||
return data
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Handle GET request for city search route ('/otm/city').
|
||||
* @param {express.Request} req - HTTP Request object.
|
||||
* @param {express.Response} res - HTTP Response object.
|
||||
*/
|
||||
export async function getCity(req: express.Request, res: express.Response) {
|
||||
const cityName = req.query["name"]
|
||||
let radius = req.query["radius"]
|
||||
|
||||
if(!cityName){
|
||||
res.status(400).send("Missing Argument name")
|
||||
return
|
||||
}
|
||||
if(!radius){
|
||||
radius = "1000"
|
||||
}
|
||||
const cityPose = await callCity(cityName as string)
|
||||
res.send( await callRadius(cityPose.lon,cityPose.lat, radius as string))
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle GET request for city search route ('/otm/radius').
|
||||
* @param {express.Request} req - HTTP Request object.
|
||||
* @param {express.Response} res - HTTP Response object.
|
||||
*/
|
||||
export async function getRadius(req:express.Request, res: express.Response) {
|
||||
const lon = req.query["lon"] as string
|
||||
const lat = req.query["lat"] as string
|
||||
let radius = req.query["radius"]
|
||||
if(!lon || !lat){
|
||||
res.status(400).send("Missing Argument name")
|
||||
return
|
||||
}
|
||||
if(!radius){
|
||||
radius = "1000"
|
||||
}
|
||||
|
||||
res.send( await callRadius(lon,lat,radius as string))
|
||||
}
|
||||
|
||||
//TODO: fair une route ou l'on donne l'id un établicement pour avoir des détailles
|
||||
//TODO: fair une route ou l'on donne 2 coordonée
|
@ -1,16 +0,0 @@
|
||||
import * as dotenv from "dotenv";
|
||||
import app from "./app";
|
||||
import options from "./swaggerDef";
|
||||
const swaggerJsdoc = require("swagger-jsdoc"),
|
||||
swaggerUi = require("swagger-ui-express");
|
||||
|
||||
dotenv.config({path: '../../.env'})
|
||||
|
||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
||||
|
||||
const specs = swaggerJsdoc(options)
|
||||
app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(specs))
|
||||
|
||||
app.listen(port, () =>{
|
||||
console.log(`serveur running in ${port}`)
|
||||
})
|
@ -1,29 +0,0 @@
|
||||
import * as dotenv from "dotenv";
|
||||
dotenv.config({path: '../../.env'})
|
||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
||||
|
||||
|
||||
const options = {
|
||||
definition: {
|
||||
openapi: "3.1.0",
|
||||
info: {
|
||||
title: "LogRocket Express API with Swagger",
|
||||
version: "0.1.0",
|
||||
description:
|
||||
"This is a simple CRUD API application made with Express and documented with Swagger",
|
||||
},
|
||||
servers: [
|
||||
{
|
||||
url: "http://localhost:"+port.toString(),
|
||||
},
|
||||
{
|
||||
url: "https://drink-tweb.cb85.fr"
|
||||
}
|
||||
],
|
||||
},
|
||||
apis: ['./src/*.ts'],
|
||||
explorer: true
|
||||
}
|
||||
|
||||
|
||||
export default options
|
@ -1,31 +0,0 @@
|
||||
import request from "supertest";
|
||||
import app from "../src/app";
|
||||
import { Server, IncomingMessage, ServerResponse } from "http";
|
||||
import * as dotenv from "dotenv";
|
||||
|
||||
dotenv.config({path: '../../.env'})
|
||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
||||
|
||||
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
||||
|
||||
describe("Test the welcome path", () => {
|
||||
|
||||
test("It should response the 200 code for GET method", done => {
|
||||
request(app)
|
||||
.get("/welcome")
|
||||
.then(response => {
|
||||
expect(response.statusCode).toBe(200);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
test("It should response the GET method with content", done => {
|
||||
const out = {hello:"world"};
|
||||
request(app)
|
||||
.get("/welcome")
|
||||
.then(response => {
|
||||
expect(response.text).toEqual(JSON.stringify(out))
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
@ -1,111 +0,0 @@
|
||||
import request from "supertest";
|
||||
import app from "../src/app";
|
||||
import { Server, IncomingMessage, ServerResponse } from "http";
|
||||
import * as dotenv from "dotenv";
|
||||
|
||||
dotenv.config({path: '../../.env'})
|
||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
||||
|
||||
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
||||
|
||||
describe("Test the otm city path", () => {
|
||||
|
||||
test("It should response the 200 code for GET method", done => {
|
||||
request(app)
|
||||
.get("/otm/city")
|
||||
.query({'name':'La roche sur yon'})
|
||||
.then(response => {
|
||||
expect(response.statusCode).toBe(200);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
test("It should response the GET method with content", done => {
|
||||
const out = {
|
||||
"type": "FeatureCollection",
|
||||
"features": [{
|
||||
"type": "Feature",
|
||||
"id": "562635",
|
||||
"geometry": {
|
||||
"type": "Point",
|
||||
"coordinates": [
|
||||
-1.4344594,
|
||||
46.6686478
|
||||
]
|
||||
},
|
||||
"properties": {
|
||||
"xid": "N4032296324",
|
||||
"name": "Le 27 point carré",
|
||||
"dist": 236.40360026,
|
||||
"rate": 1,
|
||||
"osm": "node/4032296324",
|
||||
"kinds": "foods,bars,tourist_facilities"
|
||||
}
|
||||
}]
|
||||
}
|
||||
|
||||
request(app)
|
||||
.get("/otm/city")
|
||||
.query({'name':'La roche sur yon', "radius": 240})
|
||||
.then(response => {
|
||||
console.log(response.text)
|
||||
expect(response.text).toEqual(JSON.stringify(out))
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
test("It should response the 400 code for GET method", done => {
|
||||
request(app)
|
||||
.get("/otm/city")
|
||||
.then(response => {
|
||||
console.log(response.text)
|
||||
expect(response.statusCode).toBe(400);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
test("It should response the 200 code for GET method", done => {
|
||||
request(app)
|
||||
.get("/otm/radius")
|
||||
.query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'})
|
||||
.then(response => {
|
||||
expect(response.statusCode).toBe(200);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
//TODO faire les test pour les cas d'erreur
|
||||
|
||||
test("Get bar in radius from API", done => {
|
||||
const out = {
|
||||
"type": "FeatureCollection",
|
||||
"features": [{
|
||||
"type": "Feature",
|
||||
"id": "562635",
|
||||
"geometry": {
|
||||
"type": "Point",
|
||||
"coordinates": [
|
||||
-1.4344594,
|
||||
46.6686478
|
||||
]
|
||||
},
|
||||
"properties": {
|
||||
"xid": "N4032296324",
|
||||
"name": "Le 27 point carré",
|
||||
"dist": 0.17652159,
|
||||
"rate": 1,
|
||||
"osm": "node/4032296324",
|
||||
"kinds": "foods,bars,tourist_facilities"
|
||||
}
|
||||
}]
|
||||
}
|
||||
request(app)
|
||||
.get("/otm/radius")
|
||||
.query({'lon':'-1.4344594', 'lat' : '46.6686478', 'radius': '10'})
|
||||
.then(response => {
|
||||
expect(response.text).toEqual(JSON.stringify(out));
|
||||
done();
|
||||
});
|
||||
})
|
||||
|
||||
});
|
@ -1,109 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Visit https://aka.ms/tsconfig to read more about this file */
|
||||
|
||||
/* Projects */
|
||||
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
|
||||
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
|
||||
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
|
||||
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
|
||||
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
|
||||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||
|
||||
/* Language and Environment */
|
||||
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
||||
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
||||
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
|
||||
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
|
||||
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
|
||||
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
|
||||
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
|
||||
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
|
||||
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
||||
|
||||
/* Modules */
|
||||
"module": "commonjs", /* Specify what module code is generated. */
|
||||
// "rootDir": "./", /* Specify the root folder within your source files. */
|
||||
// "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */
|
||||
"baseUrl": "src", /* Specify the base directory to resolve non-relative module names. */
|
||||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
||||
"rootDirs": ["./src"], /* Allow multiple folders to be treated as one when resolving modules. */
|
||||
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
|
||||
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
||||
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
|
||||
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
|
||||
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
|
||||
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
|
||||
// "resolveJsonModule": true, /* Enable importing .json files. */
|
||||
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
|
||||
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
||||
|
||||
/* JavaScript Support */
|
||||
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
|
||||
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
|
||||
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
|
||||
|
||||
/* Emit */
|
||||
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
||||
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
||||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
||||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
||||
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
||||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
||||
"outDir": "./dist", /* Specify an output folder for all emitted files. */
|
||||
// "removeComments": true, /* Disable emitting comments. */
|
||||
// "noEmit": true, /* Disable emitting files from a compilation. */
|
||||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
||||
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
|
||||
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
||||
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
||||
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
||||
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
||||
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
|
||||
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
|
||||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
||||
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
||||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
||||
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
|
||||
|
||||
/* Interop Constraints */
|
||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
|
||||
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
||||
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
||||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
||||
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
||||
|
||||
/* Type Checking */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
||||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
||||
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
|
||||
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
||||
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
|
||||
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
|
||||
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
||||
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
|
||||
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
|
||||
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
||||
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
||||
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
||||
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
|
||||
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
||||
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
|
||||
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
||||
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
||||
|
||||
/* Completeness */
|
||||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
||||
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
||||
}
|
||||
}
|
@ -1,7 +1,3 @@
|
||||
vars {
|
||||
TRIPMAP_URL: https://api.opentripmap.com/0.1
|
||||
}
|
||||
vars:secret [
|
||||
app_key,
|
||||
OTM_KEY
|
||||
app_key
|
||||
]
|
||||
|
@ -1,11 +0,0 @@
|
||||
meta {
|
||||
name: express Drink OTM
|
||||
type: http
|
||||
seq: 4
|
||||
}
|
||||
|
||||
get {
|
||||
url: http://localhost:3000
|
||||
body: none
|
||||
auth: none
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
meta {
|
||||
name: otm_drink
|
||||
type: http
|
||||
seq: 6
|
||||
}
|
||||
|
||||
get {
|
||||
url: {{TRIPMAP_URL}}/en/places/radius?radius=10&lon=-1.4344594&lat=46.6686478&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens
|
||||
body: none
|
||||
auth: none
|
||||
}
|
||||
|
||||
query {
|
||||
radius: 10
|
||||
lon: -1.4344594
|
||||
lat: 46.6686478
|
||||
apikey: {{OTM_KEY}}
|
||||
kinds: bars,cafes,pubs,biergartens
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
meta {
|
||||
name: otm_drink_id
|
||||
type: http
|
||||
seq: 7
|
||||
}
|
||||
|
||||
get {
|
||||
url: https://api.opentripmap.com/0.1/en/places/xid/562635?apikey={{OTM_KEY}}
|
||||
body: none
|
||||
auth: none
|
||||
}
|
||||
|
||||
query {
|
||||
apikey: {{OTM_KEY}}
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
meta {
|
||||
name: otm_ex_city
|
||||
type: http
|
||||
seq: 8
|
||||
}
|
||||
|
||||
get {
|
||||
url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300
|
||||
body: none
|
||||
auth: none
|
||||
}
|
||||
|
||||
query {
|
||||
name: La roche sur yon
|
||||
radius: 300
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
meta {
|
||||
name: otm_ex_radius
|
||||
type: http
|
||||
seq: 9
|
||||
}
|
||||
|
||||
get {
|
||||
url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300
|
||||
body: none
|
||||
auth: none
|
||||
}
|
||||
|
||||
query {
|
||||
name: La roche sur yon
|
||||
radius: 300
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
meta {
|
||||
name: otm_location
|
||||
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}}
|
||||
}
|
@ -1,22 +0,0 @@
|
||||
meta {
|
||||
name: test graphQL
|
||||
type: graphql
|
||||
seq: 3
|
||||
}
|
||||
|
||||
post {
|
||||
url: https://datatour-tweb.cb85.fr
|
||||
body: graphql
|
||||
auth: none
|
||||
}
|
||||
|
||||
body:graphql {
|
||||
{
|
||||
poi {
|
||||
total
|
||||
results {
|
||||
_uri
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Submodule datatourisme updated: b3bc1fdc68...5175e1fdf1
@ -1,14 +1,12 @@
|
||||
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
|
||||
- ./.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}`)
|
||||
@ -16,9 +14,8 @@ services:
|
||||
- traefik.http.routers.poketBaseTweb.tls.certresolver=le
|
||||
networks:
|
||||
- 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-7-head
|
||||
depends_on:
|
||||
- pocketbase
|
||||
labels:
|
||||
@ -28,66 +25,10 @@ services:
|
||||
- traefik.http.routers.astroTweb.tls.certresolver=le
|
||||
networks:
|
||||
- public
|
||||
|
||||
back_drink:
|
||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`)
|
||||
- traefik.http.services.expressDrinkTweb.loadbalancer.server.port=${BACK_BASE_PORT}
|
||||
- traefik.http.routers.expressDrinkTweb.tls.certresolver=le
|
||||
networks:
|
||||
- public
|
||||
|
||||
docs_drink:
|
||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_drink_jsdocs:pr-6-head
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.docsDrinkTweb.rule=Host(`${DOCS_DRINK_URL}`)
|
||||
- traefik.http.services.docsDrinkTweb.loadbalancer.server.port=${DOCS_BACK_BASE_PORT}
|
||||
- traefik.http.routers.docsDrinkTweb.tls.certresolver=le
|
||||
networks:
|
||||
- public
|
||||
|
||||
|
||||
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
|
||||
networks:
|
||||
- graphQL
|
||||
restart: unless-stopped
|
||||
|
||||
datatourisme:
|
||||
image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
|
||||
depends_on:
|
||||
- blazegraph
|
||||
networks:
|
||||
- graphQL
|
||||
- public
|
||||
restart: unless-stopped
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.dataTourisme.rule=Host(`${DATA_TOURISME_URL}`)
|
||||
- traefik.http.services.dataTourisme.loadbalancer.server.port=${DATA_TOURISME_BASE_PORT}
|
||||
- traefik.http.routers.dataTourisme.tls.certresolver=le
|
||||
|
||||
networks:
|
||||
graphQL: {}
|
||||
public:
|
||||
external: true
|
||||
x-dockge:
|
||||
urls:
|
||||
- https://${POCKET_BASE_URL}/
|
||||
- https://${FRONT_URL}/
|
||||
- https://${DOCS_DRINK_URL}/
|
||||
- https://${DRINK_URL}/
|
||||
- https://${DATA_TOURISME_URL}/
|
8
front/.eslintignore
Normal file
8
front/.eslintignore
Normal file
@ -0,0 +1,8 @@
|
||||
node_modules
|
||||
|
||||
out
|
||||
.next
|
||||
|
||||
next-env.d.ts
|
||||
*.js
|
||||
__tests__
|
324
front/.eslintrc.json
Normal file
324
front/.eslintrc.json
Normal file
@ -0,0 +1,324 @@
|
||||
{
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es6": true,
|
||||
"node": true
|
||||
},
|
||||
"extends": [
|
||||
"eslint:recommended",
|
||||
"plugin:astro/recommended",
|
||||
"plugin:@typescript-eslint/strict",
|
||||
"plugin:@typescript-eslint/stylistic"
|
||||
],
|
||||
"globals": {
|
||||
"Atomics": "readonly",
|
||||
"SharedArrayBuffer": "readonly"
|
||||
},
|
||||
"overrides": [
|
||||
{
|
||||
"files": [
|
||||
"*.astro"
|
||||
],
|
||||
"parser": "astro-eslint-parser",
|
||||
"parserOptions": {
|
||||
"extraFileExtensions": [
|
||||
".astro"
|
||||
],
|
||||
"parser": "@typescript-eslint/parser"
|
||||
}
|
||||
},
|
||||
{
|
||||
"files": [
|
||||
"*.ts",
|
||||
"*.tsx",
|
||||
"*.astro"
|
||||
],
|
||||
"rules": {
|
||||
"no-extra-parens": "off",
|
||||
"no-unused-expressions": "off",
|
||||
"no-shadow": "off",
|
||||
"quotes": "off",
|
||||
"semi": "off",
|
||||
"space-before-function-paren": "off"
|
||||
}
|
||||
}
|
||||
],
|
||||
"parser": "@typescript-eslint/parser",
|
||||
"parserOptions": {
|
||||
"ecmaFeatures": {
|
||||
"jsx": true,
|
||||
"project": "tsconfig.json",
|
||||
"sourceType": "module",
|
||||
"ecmaVersion": 2018
|
||||
}
|
||||
},
|
||||
"plugins": [
|
||||
"@typescript-eslint"
|
||||
],
|
||||
"root": true,
|
||||
"rules": {
|
||||
"@typescript-eslint/prefer-for-of": "error",
|
||||
"@typescript-eslint/prefer-function-type": "error",
|
||||
"@typescript-eslint/prefer-namespace-keyword": "error",
|
||||
"@typescript-eslint/space-before-function-paren": [
|
||||
"error",
|
||||
{
|
||||
"anonymous": "never",
|
||||
"asyncArrow": "always",
|
||||
"named": "never"
|
||||
}
|
||||
],
|
||||
"@typescript-eslint/triple-slash-reference": "error",
|
||||
"@typescript-eslint/type-annotation-spacing": "error",
|
||||
"@typescript-eslint/unified-signatures": "error",
|
||||
|
||||
"@typescript-eslint/adjacent-overload-signatures": "error",
|
||||
"@typescript-eslint/array-type": [
|
||||
"error",
|
||||
{
|
||||
"default": "generic"
|
||||
}
|
||||
],
|
||||
"arrow-body-style": "error",
|
||||
"arrow-parens": [
|
||||
"error",
|
||||
"always"
|
||||
],
|
||||
"@typescript-eslint/ban-types": [
|
||||
"error",
|
||||
{
|
||||
"types": {
|
||||
"{}": false
|
||||
}
|
||||
}
|
||||
],
|
||||
"complexity": [
|
||||
"warn",
|
||||
10
|
||||
],
|
||||
"@typescript-eslint/consistent-type-assertions": "error",
|
||||
"@typescript-eslint/consistent-type-definitions": "error",
|
||||
"constructor-super": "error",
|
||||
"curly": "error",
|
||||
"dot-notation": "error",
|
||||
"eol-last": "error",
|
||||
"eqeqeq": [
|
||||
"error",
|
||||
"smart"
|
||||
],
|
||||
"@typescript-eslint/explicit-member-accessibility": [
|
||||
"error",
|
||||
{
|
||||
"accessibility": "explicit"
|
||||
}
|
||||
],
|
||||
"for-direction": "error",
|
||||
"getter-return": "error",
|
||||
"guard-for-in": "error",
|
||||
"id-blacklist": [
|
||||
"error",
|
||||
"any",
|
||||
"Number",
|
||||
"number",
|
||||
"String",
|
||||
"string",
|
||||
"Boolean",
|
||||
"boolean",
|
||||
"Undefined"
|
||||
],
|
||||
"id-length": [
|
||||
"warn",
|
||||
{
|
||||
"exceptions": [
|
||||
"_"
|
||||
]
|
||||
}
|
||||
],
|
||||
"id-match": "error",
|
||||
"indent": [
|
||||
"error",
|
||||
"tab",
|
||||
{
|
||||
"SwitchCase": 1
|
||||
}
|
||||
],
|
||||
"linebreak-style": [
|
||||
"error",
|
||||
"unix"
|
||||
],
|
||||
"max-classes-per-file": [
|
||||
"error",
|
||||
1
|
||||
],
|
||||
"max-depth": [
|
||||
"warn",
|
||||
2
|
||||
],
|
||||
"max-len": [
|
||||
"warn",
|
||||
{
|
||||
"code": 256
|
||||
}
|
||||
],
|
||||
"@typescript-eslint/member-delimiter-style": [
|
||||
"error",
|
||||
{
|
||||
"multiline": {
|
||||
"delimiter": "none",
|
||||
"requireLast": true
|
||||
},
|
||||
"singleline": {
|
||||
"delimiter": "comma",
|
||||
"requireLast": false
|
||||
}
|
||||
}
|
||||
],
|
||||
"@typescript-eslint/member-ordering": "error",
|
||||
"new-parens": "error",
|
||||
|
||||
"no-async-promise-executor": "error",
|
||||
"no-await-in-loop": "warn",
|
||||
"no-bitwise": "error",
|
||||
"no-caller": "error",
|
||||
"no-compare-neg-zero": "error",
|
||||
"no-cond-assign": "error",
|
||||
"no-console": "off",
|
||||
"no-constant-condition": "error",
|
||||
"no-control-regex": "warn",
|
||||
"no-debugger": "error",
|
||||
"no-delete-var": "error",
|
||||
"no-dupe-args": "error",
|
||||
"no-dupe-else-if": "error",
|
||||
"no-dupe-keys": "error",
|
||||
"no-duplicate-case": "error",
|
||||
"no-empty": [
|
||||
"error",
|
||||
{
|
||||
"allowEmptyCatch": true
|
||||
}
|
||||
],
|
||||
"no-empty-character-class": "error",
|
||||
"@typescript-eslint/no-empty-function": "error",
|
||||
"@typescript-eslint/no-empty-interface": "error",
|
||||
"no-eval": "error",
|
||||
"no-ex-assign": "error",
|
||||
"@typescript-eslint/no-explicit-any": "off",
|
||||
|
||||
|
||||
"no-extra-boolean-cast": "error",
|
||||
"no-extra-parens": "off",
|
||||
"@typescript-eslint/no-extra-parens": [
|
||||
"error",
|
||||
"all",
|
||||
{
|
||||
"ignoreJSX": "all"
|
||||
}
|
||||
],
|
||||
"no-extra-semi": "error",
|
||||
"no-fallthrough": "off",
|
||||
"no-func-assign": "error",
|
||||
"no-import-assign": "error",
|
||||
"no-inner-declarations": "error",
|
||||
"no-invalid-regexp": "error",
|
||||
"no-irregular-whitespace": "error",
|
||||
"no-label-var": "error",
|
||||
"no-loss-of-precision": "error",
|
||||
"no-misleading-character-class": "error",
|
||||
"@typescript-eslint/no-misused-new": "error",
|
||||
"no-multiple-empty-lines": "error",
|
||||
"@typescript-eslint/no-namespace": "error",
|
||||
"no-new-wrappers": "error",
|
||||
"no-obj-calls": "error",
|
||||
"no-promise-executor-return": "error",
|
||||
"@typescript-eslint/no-parameter-properties": "off",
|
||||
"no-prototype-builtins": "error",
|
||||
"no-regex-spaces": "error",
|
||||
"no-setter-return": "error",
|
||||
"@typescript-eslint/no-shadow": "error",
|
||||
"no-shadow": [
|
||||
"error",
|
||||
{
|
||||
"builtinGlobals": false,
|
||||
"hoist": "all"
|
||||
}
|
||||
],
|
||||
"no-shadow-restricted-names": "error",
|
||||
"no-sparse-arrays": "error",
|
||||
"no-template-curly-in-string": "warn",
|
||||
"no-throw-literal": "error",
|
||||
"no-trailing-spaces": "error",
|
||||
"no-undef": "error",
|
||||
"no-undef-init": "error",
|
||||
"no-underscore-dangle": "off",
|
||||
"no-unexpected-multiline": "error",
|
||||
"no-unreachable": "warn",
|
||||
"no-unreachable-loop": "warn",
|
||||
"no-unsafe-finally": "error",
|
||||
"no-unsafe-negation": "error",
|
||||
"no-unsafe-optional-chaining": "error",
|
||||
"no-unused-expressions": [
|
||||
"error",
|
||||
{
|
||||
"allowTernary": true
|
||||
}
|
||||
],
|
||||
"@typescript-eslint/no-unused-expressions": [
|
||||
"error",
|
||||
{
|
||||
"allowTernary": true
|
||||
}
|
||||
],
|
||||
"no-unused-labels": "error",
|
||||
"no-unused-vars": "off",
|
||||
"@typescript-eslint/no-unused-vars": ["error", {
|
||||
"args": "all",
|
||||
"argsIgnorePattern": "^_",
|
||||
"caughtErrors": "all",
|
||||
"caughtErrorsIgnorePattern": "^_",
|
||||
"destructuredArrayIgnorePattern": "^_",
|
||||
"varsIgnorePattern": "^_",
|
||||
"ignoreRestSiblings": true
|
||||
}],
|
||||
"@typescript-eslint/no-non-null-assertion": ["warn"],
|
||||
"no-var": "error",
|
||||
"object-shorthand": [
|
||||
"warn",
|
||||
"methods"
|
||||
],
|
||||
"one-var": [
|
||||
"error",
|
||||
"never"
|
||||
],
|
||||
"prefer-const": "error",
|
||||
"quote-props": [
|
||||
"error",
|
||||
"consistent-as-needed"
|
||||
],
|
||||
"quotes": "off",
|
||||
"@typescript-eslint/quotes": [
|
||||
"error",
|
||||
"single",
|
||||
{
|
||||
"avoidEscape": true
|
||||
}
|
||||
],
|
||||
"radix": "error",
|
||||
"require-atomic-updates": "warn",
|
||||
"semi": "off",
|
||||
"@typescript-eslint/semi": [
|
||||
"error",
|
||||
"never"
|
||||
],
|
||||
"space-before-function-paren": [
|
||||
"error",
|
||||
{
|
||||
"anonymous": "never",
|
||||
"asyncArrow": "always",
|
||||
"named": "never"
|
||||
}
|
||||
],
|
||||
"spaced-comment": ["error", "always", { "block": { "exceptions": ["*"] } }],
|
||||
"use-isnan": "error",
|
||||
"valid-typeof": "warn"
|
||||
}
|
||||
}
|
9
front/.vscode/settings.json
vendored
Normal file
9
front/.vscode/settings.json
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"editor.quickSuggestions": {
|
||||
"strings": "on"
|
||||
},
|
||||
"tailwindCSS.includeLanguages": {
|
||||
"astro": "html"
|
||||
},
|
||||
"typescript.tsdk": "node_modules/typescript/lib"
|
||||
}
|
@ -1,12 +1,11 @@
|
||||
import { defineConfig } from 'astro/config';
|
||||
import node from '@astrojs/node';
|
||||
import tailwind from "@astrojs/tailwind";
|
||||
import node from '@astrojs/node'
|
||||
import tailwind from '@astrojs/tailwind'
|
||||
import { defineConfig } from 'astro/config'
|
||||
|
||||
import react from "@astrojs/react";
|
||||
import react from '@astrojs/react'
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({
|
||||
// integrations: [tailwind(), test, routing(), version(), buildInfos()],
|
||||
compressHTML: true,
|
||||
build: {
|
||||
assets: 'assets',
|
||||
@ -27,4 +26,4 @@ export default defineConfig({
|
||||
include: ['leaflet']
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
|
746
front/package-lock.json
generated
746
front/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -27,10 +27,11 @@
|
||||
"react-leaflet": "^4.2.1",
|
||||
"simple-icons-astro": "^11.12.0",
|
||||
"tailwindcss": "^3.4.3",
|
||||
"typescript": "^5.2.2"
|
||||
"typescript": "^5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/check": "^0",
|
||||
"@astrojs/ts-plugin": "^1.6.1",
|
||||
"@types/leaflet": "^1.9.12",
|
||||
"@types/node": "^20",
|
||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||
|
24
front/src/env.d.ts
vendored
24
front/src/env.d.ts
vendored
@ -1 +1,25 @@
|
||||
/// <reference path="../.astro/types.d.ts" />
|
||||
/// <reference types="astro/client" />
|
||||
|
||||
import PocketBase from 'pocketbase'
|
||||
export interface ImportMetaEnv {
|
||||
NODE_ENV: string
|
||||
APP_URL: string
|
||||
|
||||
POCKETBASE_URL: string
|
||||
|
||||
GOOGLE_API_KEY: string
|
||||
}
|
||||
|
||||
interface ImportMeta {
|
||||
readonly env: ImportMetaEnv
|
||||
}
|
||||
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-namespace
|
||||
declare namespace App {
|
||||
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
||||
export interface Locals {
|
||||
pb: PocketBase
|
||||
}
|
||||
}
|
||||
|
@ -20,32 +20,3 @@ const { title } = Astro.props;
|
||||
<slot />
|
||||
</body>
|
||||
</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>
|
||||
|
5
front/src/libs/AstroUtils.ts
Normal file
5
front/src/libs/AstroUtils.ts
Normal file
@ -0,0 +1,5 @@
|
||||
export default class AstroUtils {
|
||||
public static async wrap<T = void>(fn: () => T | Promise<T>) {
|
||||
return await fn()
|
||||
}
|
||||
}
|
@ -1,12 +1,107 @@
|
||||
|
||||
//référence a loop
|
||||
//fonction get user pour récupéré un utilisateur (notament coté client)
|
||||
//sessionID = JWS
|
||||
import type { AstroCookies } from 'astro'
|
||||
import type UserObj from 'models/User'
|
||||
import PocketBase from 'pocketbase'
|
||||
import { getEnv } from 'libs/Env'
|
||||
|
||||
|
||||
//fonction set user crée un cookies de session
|
||||
//passé le cookies astro dans les paramètre
|
||||
const pb = new PocketBase(getEnv('POCKETBASE_URL','https://pb-tweb.cb85.fr')) // XXX: 'https://pb-tweb.cb85.fr'
|
||||
|
||||
//utiliser cookie.set pour crée un nouveau cookies
|
||||
export async function clearUser(cookies: AstroCookies): Promise<void> {
|
||||
const sessionID = cookies.get('session')?.value
|
||||
|
||||
if(!sessionID){
|
||||
return
|
||||
}
|
||||
|
||||
cookies.delete('session',{
|
||||
path: '/'
|
||||
})
|
||||
}
|
||||
|
||||
export async function login(cookies: AstroCookies, user: {user: string, password: string}): Promise<boolean> {
|
||||
|
||||
const authData = await pb.collection('users').authWithPassword(user.user, user.password)
|
||||
|
||||
let secure = true
|
||||
|
||||
if (getEnv('NODE_ENV', 'production') !== 'production') {
|
||||
secure = false
|
||||
}
|
||||
|
||||
if(authData){
|
||||
cookies.set('session', authData.token,{
|
||||
httpOnly: true,
|
||||
path: '/',
|
||||
secure: secure,
|
||||
sameSite: 'strict',
|
||||
maxAge: 365000,
|
||||
})
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
export async function getUser(cookies: AstroCookies): Promise<UserObj | null> {
|
||||
const sessionID = cookies.get('session')?.value
|
||||
|
||||
const bpAuth = pb.authStore
|
||||
|
||||
if(!sessionID){
|
||||
return null
|
||||
}
|
||||
if(!bpAuth.isValid){
|
||||
return null
|
||||
}
|
||||
if(!bpAuth){
|
||||
return null
|
||||
}
|
||||
|
||||
console.log(bpAuth.model)
|
||||
|
||||
if(!bpAuth.model){
|
||||
return null
|
||||
}
|
||||
|
||||
const output: UserObj = {
|
||||
id: bpAuth.model.id as string,
|
||||
collectionId: bpAuth.model.collectionId as string,
|
||||
collectionName: bpAuth.model.collectionName as string,
|
||||
created: bpAuth.model.created as string,
|
||||
updated: bpAuth.model.updated as string,
|
||||
avatar: bpAuth.model.avatar as string,
|
||||
username: bpAuth.model.username as string,
|
||||
email: bpAuth.model.email as string,
|
||||
emailVisibility: false,
|
||||
name: bpAuth.model.name as string,
|
||||
password: undefined,
|
||||
passwordConfirm: undefined,
|
||||
}
|
||||
|
||||
return output
|
||||
|
||||
}
|
||||
|
||||
export async function setUser(cookies: AstroCookies, user: UserObj): Promise<void>{
|
||||
|
||||
const record = await pb.collection('users').create(user)
|
||||
|
||||
console.log(record)
|
||||
|
||||
const session = pb.authStore.token
|
||||
|
||||
console.log(session)
|
||||
|
||||
let secure = true
|
||||
|
||||
if (getEnv('NODE_ENV', 'production') !== 'production') {
|
||||
secure = false
|
||||
}
|
||||
|
||||
cookies.set('session', session,{
|
||||
httpOnly: true,
|
||||
path: '/',
|
||||
secure: secure,
|
||||
sameSite: 'strict',
|
||||
maxAge: 365000,
|
||||
})
|
||||
}
|
||||
|
17
front/src/libs/Env.ts
Normal file
17
front/src/libs/Env.ts
Normal file
@ -0,0 +1,17 @@
|
||||
import type { ImportMetaEnv } from 'env'
|
||||
|
||||
/**
|
||||
* Get the environment variable
|
||||
*
|
||||
* @param key the env variable key
|
||||
* @param defaultValue a default value if applicable
|
||||
* @returns the environment value or undefined if not found
|
||||
*/
|
||||
export function getEnv(key: keyof ImportMetaEnv, defaultValue: string): string
|
||||
export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined
|
||||
export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined {
|
||||
// get the env variable through Astro > NodeJS > input
|
||||
const res = import.meta.env[key] ?? process.env[key] ?? defaultValue
|
||||
|
||||
return res ?? undefined
|
||||
}
|
27
front/src/middleware/index.ts
Normal file
27
front/src/middleware/index.ts
Normal file
@ -0,0 +1,27 @@
|
||||
import PocketBase from 'pocketbase'
|
||||
|
||||
import { defineMiddleware } from 'astro/middleware'
|
||||
import { getEnv } from 'libs/Env'
|
||||
|
||||
export const onRequest = defineMiddleware(async ({ locals, request }: any, next: () => any) => {
|
||||
locals.pb = new PocketBase(getEnv('POCKETBASE_URL','http://localhost:8080'))
|
||||
|
||||
// load the store data from the request cookie string
|
||||
locals.pb.authStore.loadFromCookie(request.headers.get('cookie') || '')
|
||||
|
||||
try {
|
||||
// get an up-to-date auth store state by verifying and refreshing the loaded auth model (if any)
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
|
||||
locals.pb.authStore.isValid && await locals.pb.collection('users').authRefresh()
|
||||
} catch (_) {
|
||||
// clear the auth store on failed refresh
|
||||
locals.pb.authStore.clear()
|
||||
}
|
||||
|
||||
const response = await next()
|
||||
|
||||
// send back the default 'pb_auth' cookie to the client with the latest store state
|
||||
response.headers.append('set-cookie', locals.pb.authStore.exportToCookie())
|
||||
|
||||
return response
|
||||
})
|
19
front/src/models/User/index.ts
Normal file
19
front/src/models/User/index.ts
Normal file
@ -0,0 +1,19 @@
|
||||
|
||||
|
||||
export interface PBData{
|
||||
id?: string | null
|
||||
collectionId?: string | null
|
||||
collectionName?: string | null
|
||||
created?: string | null // TODO: passé ca en date auto
|
||||
updated?: string | null // TODO: passé ca en date auto
|
||||
}
|
||||
|
||||
export default interface UserObj extends PBData{
|
||||
avatar?: string | null
|
||||
username: string
|
||||
email: string
|
||||
emailVisibility?: boolean
|
||||
password?: string | undefined
|
||||
passwordConfirm?: string | undefined
|
||||
name: string | null
|
||||
}
|
18
front/src/pages/account/index.astro
Normal file
18
front/src/pages/account/index.astro
Normal file
@ -0,0 +1,18 @@
|
||||
---
|
||||
import Layout from 'layouts/Layout.astro'
|
||||
import PocketBase from 'pocketbase'
|
||||
|
||||
|
||||
const pb = Astro.locals.pb as PocketBase
|
||||
const auth = pb.authStore
|
||||
const user = auth.model
|
||||
|
||||
if(!auth.isValid){
|
||||
return Astro.redirect("/account/login");
|
||||
}
|
||||
|
||||
---
|
||||
|
||||
<Layout title="Account setting">
|
||||
<h1>Bonjour {user!.name}</h1>
|
||||
</Layout>
|
43
front/src/pages/account/login.astro
Normal file
43
front/src/pages/account/login.astro
Normal file
@ -0,0 +1,43 @@
|
||||
---
|
||||
import Layout from "layouts/Layout.astro";
|
||||
import AstroUtils from "libs/AstroUtils";
|
||||
import PocketBase from 'pocketbase'
|
||||
|
||||
|
||||
const pb = Astro.locals.pb as PocketBase
|
||||
|
||||
if(pb.authStore.isValid){
|
||||
return Astro.redirect("/account")
|
||||
}
|
||||
|
||||
const res = await AstroUtils.wrap(async () => {
|
||||
if (Astro.request.method !== 'POST') {
|
||||
return
|
||||
}
|
||||
// FIXME checké si utilisateur deja connecté
|
||||
const locals = Astro.locals
|
||||
|
||||
const form = await Astro.request.formData();
|
||||
const request = {
|
||||
user: form.get("username") as string,
|
||||
password: form.get("password") as string
|
||||
}
|
||||
|
||||
try {
|
||||
await locals.pb.collection('users').authWithPassword(request.user,request.password);
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
}
|
||||
|
||||
return Astro.redirect("/account")
|
||||
|
||||
})
|
||||
---
|
||||
|
||||
<Layout title="login">
|
||||
<form id="account-creation" method="post" enctype="multipart/form-data">
|
||||
<input required name="username" placeholder="Pseudo ou email"/>
|
||||
<input required name="password" type="password" placeholder="Mot de passe" />
|
||||
<button>Connection</button>
|
||||
</form>
|
||||
</Layout>
|
43
front/src/pages/account/register.astro
Normal file
43
front/src/pages/account/register.astro
Normal file
@ -0,0 +1,43 @@
|
||||
---
|
||||
import Layout from 'layouts/Layout.astro';
|
||||
import AstroUtils from 'libs/AstroUtils';
|
||||
import PocketBase from 'pocketbase'
|
||||
|
||||
|
||||
const pb = Astro.locals.pb as PocketBase
|
||||
|
||||
if(pb.authStore.isValid){
|
||||
return Astro.redirect("/account")
|
||||
}
|
||||
|
||||
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,
|
||||
}
|
||||
try{
|
||||
await pb.collection('users').create(request)
|
||||
return Astro.redirect('account/login')
|
||||
}catch(e){
|
||||
console.log(e);
|
||||
}
|
||||
})
|
||||
---
|
||||
|
||||
<Layout title="register">
|
||||
<form id="account-creation" method="post" enctype="multipart/form-data">
|
||||
<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>
|
||||
</Layout>
|
@ -5,4 +5,7 @@
|
||||
// hide an issue with typescript
|
||||
"noUnusedLocals": false
|
||||
},
|
||||
"ts-node": {
|
||||
"esm": true
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user