Compare commits
3 Commits
6346077eea
...
feat--run-
| Author | SHA1 | Date | |
|---|---|---|---|
| be9e7e302b | |||
| 36319ea002 | |||
| f7dd45450b |
53
.github/workflows/build_docker_astro.yml
vendored
53
.github/workflows/build_docker_astro.yml
vendored
@ -1,53 +0,0 @@
|
|||||||
name: Build Docker Image Front # 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 }}
|
|
||||||
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,58 +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
|
|
||||||
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,20 +0,0 @@
|
|||||||
{
|
|
||||||
"opts": {
|
|
||||||
"template": "node_modules/better-docs"
|
|
||||||
},
|
|
||||||
"tags": {
|
|
||||||
"allowUnknownTags": true
|
|
||||||
},
|
|
||||||
"plugins": [
|
|
||||||
"node_modules/better-docs/typescript",
|
|
||||||
"plugins/markdown",
|
|
||||||
"jsdoc-mermaid"
|
|
||||||
],
|
|
||||||
"source": {
|
|
||||||
"include": ["./src"],
|
|
||||||
"includePattern": "\\.(jsx|js|ts|tsx)$"
|
|
||||||
},
|
|
||||||
"templates": {
|
|
||||||
"search": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12395
Express/barAndCafe/package-lock.json
generated
12395
Express/barAndCafe/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,42 +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",
|
|
||||||
"jsdoc-mermaid": "^1.0.0",
|
|
||||||
"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,167 +0,0 @@
|
|||||||
import { getCity, getRadius, getPoiId, getBox } 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)
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @openapi
|
|
||||||
* /otm/radius:
|
|
||||||
* get:
|
|
||||||
* summary: return the drinks in a radius
|
|
||||||
* description: return the drinks in a defined radius
|
|
||||||
* parameters:
|
|
||||||
* - name: lon
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: longitude of the center of the radius
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -180
|
|
||||||
* maximum: 180
|
|
||||||
* - name: lat
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: latitude of the center of the radius
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -90
|
|
||||||
* maximum: 90
|
|
||||||
* - name: radius
|
|
||||||
* in: query
|
|
||||||
* description: size of the radius
|
|
||||||
* 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/radius", getRadius)
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @openapi
|
|
||||||
* /otm/poidetaill:
|
|
||||||
* get:
|
|
||||||
* summary: detail of a POI
|
|
||||||
* description: detail of a POI link name, kind, rate,...
|
|
||||||
* parameters:
|
|
||||||
* - name: id
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: Unique identifier of the object in OpenTripMap
|
|
||||||
* schema:
|
|
||||||
* type: string
|
|
||||||
* responses:
|
|
||||||
* 200:
|
|
||||||
* description: Return the detaill of an POI in otm
|
|
||||||
* 400:
|
|
||||||
* description: Missing Argument Error
|
|
||||||
* 401:
|
|
||||||
* description: Missing OTM tocken
|
|
||||||
*/
|
|
||||||
app.get("/otm/poidetaill", getPoiId)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @openapi
|
|
||||||
* /otm/box:
|
|
||||||
* get:
|
|
||||||
* summary: return the drinks in a box
|
|
||||||
* description: return the drinks in a defined box
|
|
||||||
* parameters:
|
|
||||||
* - name: lon1
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: longitude 1 of the box
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -180
|
|
||||||
* maximum: 180
|
|
||||||
* - name: lat1
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: latitude 1 of the box
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -90
|
|
||||||
* maximum: 90
|
|
||||||
* - name: lon2
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: longitude 2 of the box
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -180
|
|
||||||
* maximum: 180
|
|
||||||
* - name: lat2
|
|
||||||
* in: query
|
|
||||||
* required: true
|
|
||||||
* description: latitude 2 of the box
|
|
||||||
* schema:
|
|
||||||
* type: number
|
|
||||||
* minimum: -90
|
|
||||||
* maximum: 90
|
|
||||||
* 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/box", getBox)
|
|
||||||
|
|
||||||
export default app
|
|
||||||
@ -1,193 +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
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make a GET request to the OTM for a rectangle search.
|
|
||||||
* @param {string} lon1 Longitude of the 1st point of the box
|
|
||||||
* @param {string} lat1 Latitude of the 1st point of the box
|
|
||||||
* @param {string} lon2 Longitude of the 2nd point of the box
|
|
||||||
* @param {string} lat2 Latitude of the 2nd point of the box
|
|
||||||
* @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
async function callBox(lon1:string, lat1:string, lon2: string, lat2: string) {
|
|
||||||
const lonMin = Math.min(parseFloat(lon1), parseFloat(lon2))
|
|
||||||
const lonMax = Math.max(parseFloat(lon1), parseFloat(lon2))
|
|
||||||
const latMin = Math.min(parseFloat(lat1), parseFloat(lat2))
|
|
||||||
const latMax = Math.max(parseFloat(lat1), parseFloat(lat2))
|
|
||||||
|
|
||||||
const options = {
|
|
||||||
method: 'GET',
|
|
||||||
url: 'https://api.opentripmap.com/0.1/en/places/bbox',
|
|
||||||
params: {
|
|
||||||
lon_min: lonMin,
|
|
||||||
lon_max: lonMax,
|
|
||||||
lat_min: latMin,
|
|
||||||
lat_max: latMax,
|
|
||||||
apikey: key,
|
|
||||||
kinds: 'bars,cafes,pubs,biergartens'
|
|
||||||
},
|
|
||||||
headers: {'Content-Type': 'application/json'}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data } = await axios.request(options)
|
|
||||||
return data
|
|
||||||
} catch (error) {
|
|
||||||
console.error(error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make GET request to the OTM for radius search.
|
|
||||||
* @param {string} lon Longitude of radius center point
|
|
||||||
* @param {string} lat Latitude du point central du rayon
|
|
||||||
* @param {string} radius search radius size in meters
|
|
||||||
* @returns {FeatureCollection} a list of POIs with their type, id, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make GET request to the OTM for city info.
|
|
||||||
* @param {string} name Name of a city
|
|
||||||
* @returns {Geoname} info of a search city their name, country, lat, lon, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* make GET request to the OTM for city info.
|
|
||||||
* @param {string} name Name of a city
|
|
||||||
* @returns {Geoname} info of a search city their name, country, lat, lon, etc. (cf: [opentripmap](https://dev.opentripmap.org/docs#))
|
|
||||||
*/
|
|
||||||
async function callId(id:string) {
|
|
||||||
const optionsId = {
|
|
||||||
method: 'GET',
|
|
||||||
url: 'https://api.opentripmap.com/0.1/en/places/xid/' + id,
|
|
||||||
params: {
|
|
||||||
apikey: key
|
|
||||||
},
|
|
||||||
headers: {'Content-Type': 'application/json'}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { data } = await axios.request(optionsId)
|
|
||||||
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 radius 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")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if(!radius){
|
|
||||||
radius = "1000"
|
|
||||||
}
|
|
||||||
|
|
||||||
res.send( await callRadius(lon,lat,radius as string))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle GET request for radius search route ('/otm/radius').
|
|
||||||
* @param {express.Request} req - HTTP Request object.
|
|
||||||
* @param {express.Response} res - HTTP Response object.
|
|
||||||
*/
|
|
||||||
export async function getPoiId(req: express.Request, res: express.Response){
|
|
||||||
const id = req.query["id"] as string
|
|
||||||
if(!id){
|
|
||||||
res.status(400).send("Missing Argument name")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
res.send( await callId( id as string))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle GET request for radius search route ('/otm/box').
|
|
||||||
* @param {express.Request} req - HTTP Request object.
|
|
||||||
* @param {express.Response} res - HTTP Response object.
|
|
||||||
*/
|
|
||||||
export async function getBox(req:express.Request, res: express.Response) {
|
|
||||||
const lon1 = req.query["lon1"] as string
|
|
||||||
const lat1 = req.query["lat1"] as string
|
|
||||||
const lon2 = req.query["lon2"] as string
|
|
||||||
const lat2 = req.query["lat2"] as string
|
|
||||||
if(!lon1 || !lat1 || !lon2 || !lat2){
|
|
||||||
res.status(400).send("Missing Argument")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
res.send( await callBox(lon1, lat1, lon2, lat2))
|
|
||||||
}
|
|
||||||
|
|
||||||
//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,272 +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()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 200 code for GET method (default radius)", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/radius")
|
|
||||||
.query({'lon':'-1.4344594', 'lat' : '46.6686478'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 400 code for GET method (missing lon and lat)", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/radius")
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(400)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
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()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 200 code for GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/poidetaill")
|
|
||||||
.query({'id':'562635'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("Get bar in radius from API", done => {
|
|
||||||
const out = {
|
|
||||||
"xid": "N4032296324",
|
|
||||||
"name": "Le 27 point carré",
|
|
||||||
"address": {
|
|
||||||
"road": "Rue Raymond Poincaré",
|
|
||||||
"town": "La Roche-sur-Yon",
|
|
||||||
"state": "Pays de la Loire",
|
|
||||||
"county": "La Roche-sur-Yon",
|
|
||||||
"suburb": "Zola",
|
|
||||||
"country": "France",
|
|
||||||
"postcode": "85000",
|
|
||||||
"country_code": "fr",
|
|
||||||
"house_number": "27",
|
|
||||||
"neighbourhood": "Cité des Forges"
|
|
||||||
},
|
|
||||||
"rate": "1",
|
|
||||||
"osm": "node/4032296324",
|
|
||||||
"kinds": "foods,bars,tourist_facilities",
|
|
||||||
"sources": {
|
|
||||||
"geometry": "osm",
|
|
||||||
"attributes": [
|
|
||||||
"osm"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"otm": "https://opentripmap.com/en/card/N4032296324",
|
|
||||||
"point": {
|
|
||||||
"lon": -1.4344594478607178,
|
|
||||||
"lat": 46.66864776611328
|
|
||||||
}
|
|
||||||
}
|
|
||||||
request(app)
|
|
||||||
.get("/otm/poidetaill")
|
|
||||||
.query({'id':'562635'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.text).toEqual(JSON.stringify(out))
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 400 code for GET method (no id)", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/poidetaill")
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(400)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 200 code for GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/box")
|
|
||||||
.query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200)
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("Get bar in box from API", done => {
|
|
||||||
const out = {
|
|
||||||
"type": "FeatureCollection",
|
|
||||||
"features": [
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"id": "562633",
|
|
||||||
"geometry": {
|
|
||||||
"type": "Point",
|
|
||||||
"coordinates": [
|
|
||||||
-1.435197,
|
|
||||||
46.6684608
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"xid": "N4032296323",
|
|
||||||
"name": "Le Cube",
|
|
||||||
"rate": 1,
|
|
||||||
"osm": "node/4032296323",
|
|
||||||
"kinds": "foods,cafes,tourist_facilities"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
request(app)
|
|
||||||
.get("/otm/box")
|
|
||||||
.query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.text).toEqual(JSON.stringify(out))
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("Get bar in box from API lat reversed", done => {
|
|
||||||
const out = {
|
|
||||||
"type": "FeatureCollection",
|
|
||||||
"features": [
|
|
||||||
{
|
|
||||||
"type": "Feature",
|
|
||||||
"id": "562633",
|
|
||||||
"geometry": {
|
|
||||||
"type": "Point",
|
|
||||||
"coordinates": [
|
|
||||||
-1.435197,
|
|
||||||
46.6684608
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"properties": {
|
|
||||||
"xid": "N4032296323",
|
|
||||||
"name": "Le Cube",
|
|
||||||
"rate": 1,
|
|
||||||
"osm": "node/4032296323",
|
|
||||||
"kinds": "foods,cafes,tourist_facilities"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
request(app)
|
|
||||||
.get("/otm/box")
|
|
||||||
.query({'lon1':'-1.435199','lon2':'-1.43519', 'lat2':'46.668460', 'lat1':'46.668461'})
|
|
||||||
.then(response => {
|
|
||||||
expect(response.text).toEqual(JSON.stringify(out))
|
|
||||||
done()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the 400 code for GET method (no coordonaite)", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/otm/box")
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(400)
|
|
||||||
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,30 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: Google API
|
|
||||||
type: http
|
|
||||||
seq: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
url: https://places.googleapis.com/v1/places:searchNearby
|
|
||||||
body: json
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
headers {
|
|
||||||
X-Goog-Api-Key: {{GOOGLE_API_KEY}}
|
|
||||||
}
|
|
||||||
|
|
||||||
body:json {
|
|
||||||
{
|
|
||||||
"includedTypes": ["restaurant"],
|
|
||||||
"maxResultCount": 10,
|
|
||||||
"locationRestriction": {
|
|
||||||
"circle": {
|
|
||||||
"center": {
|
|
||||||
"latitude": 37.7937,
|
|
||||||
"longitude": -122.3965},
|
|
||||||
"radius": 500.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,8 +1,6 @@
|
|||||||
vars {
|
vars {
|
||||||
TRIPMAP_URL: https://api.opentripmap.com/0.1
|
URL: http://localhost:8080
|
||||||
}
|
}
|
||||||
vars:secret [
|
vars:secret [
|
||||||
app_key,
|
app_key
|
||||||
OTM_KEY,
|
|
||||||
GOOGLE_API_KEY
|
|
||||||
]
|
]
|
||||||
|
|||||||
3
bruno/OpenData datatourisme/environments/prod.bru
Normal file
3
bruno/OpenData datatourisme/environments/prod.bru
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
vars:secret [
|
||||||
|
URL
|
||||||
|
]
|
||||||
@ -1,11 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: express Drink OTM
|
|
||||||
type: http
|
|
||||||
seq: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: http://localhost:3000
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_ex_box
|
|
||||||
type: http
|
|
||||||
seq: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: http://localhost:3001/otm/box?lon1=-1.435199&lon2=-1.43519&lat1=46.668460&lat2=46.668461&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
lon1: -1.435199
|
|
||||||
lon2: -1.43519
|
|
||||||
lat1: 46.668460
|
|
||||||
lat2: 46.668461
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
kinds: bars,cafes,pubs,biergartens
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_ex_city
|
|
||||||
type: http
|
|
||||||
seq: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
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,15 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_ex_drink_id
|
|
||||||
type: http
|
|
||||||
seq: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
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_radius
|
|
||||||
type: http
|
|
||||||
seq: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
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,11 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: list oaut methode
|
|
||||||
type: http
|
|
||||||
seq: 5
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: https://pb-tweb.cb85.fr/api/collections/users/auth-methods
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: oauth test
|
|
||||||
type: http
|
|
||||||
seq: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
post {
|
|
||||||
url: https://pb-tweb.cb85.fr/api/collections/users/auth-with-oauth2
|
|
||||||
body: json
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
body:json {
|
|
||||||
{
|
|
||||||
provider: "google"
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_drink
|
|
||||||
type: http
|
|
||||||
seq: 1
|
|
||||||
}
|
|
||||||
|
|
||||||
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,19 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_drink_bbox
|
|
||||||
type: http
|
|
||||||
seq: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
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: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: https://api.opentripmap.com/0.1/en/places/xid/562635?apikey={{OTM_KEY}}
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: otm_location
|
|
||||||
type: http
|
|
||||||
seq: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: https://api.opentripmap.com/0.1/en/places/bbox?lon_min=-1.435199&lon_max=-1.43519&lat_min=46.668460&lat_max=46.668461&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
|
|
||||||
query {
|
|
||||||
lon_min: -1.435199
|
|
||||||
lon_max: -1.43519
|
|
||||||
lat_min: 46.668460
|
|
||||||
lat_max: 46.668461
|
|
||||||
apikey: {{OTM_KEY}}
|
|
||||||
kinds: bars,cafes,pubs,biergartens
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -5,11 +5,11 @@ meta {
|
|||||||
}
|
}
|
||||||
|
|
||||||
post {
|
post {
|
||||||
url: http://localhost:8080
|
url: {{URL}}
|
||||||
body: graphql
|
body: graphql
|
||||||
auth: none
|
auth: none
|
||||||
}
|
}
|
||||||
|
|
||||||
body:graphql {
|
body:graphql {
|
||||||
{poi() {results{dc_identifier rdfs_label}}}
|
{poi() {results{dc_identifier, lastUpdate}}}
|
||||||
}
|
}
|
||||||
|
|||||||
Submodule datatourisme updated: b3bc1fdc68...af7db7d7a5
@ -1,95 +1,20 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
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-1-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
|
|
||||||
|
|
||||||
back_drink:
|
|
||||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head
|
|
||||||
environment:
|
|
||||||
- port=${BACK_BASE_PORT}
|
|
||||||
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:
|
blazegraph:
|
||||||
image: conjecto/blazegraph:2.1.5
|
image: conjecto/blazegraph:2.1.5
|
||||||
# ports:
|
# ports:
|
||||||
# - 9999:9999
|
# - 9999:9999
|
||||||
environment:
|
environment:
|
||||||
JAVA_OPTS: -Xms6G -Xmx6G
|
JAVA_OPTS: "-Xms6G -Xmx6G"
|
||||||
volumes:
|
volumes:
|
||||||
- ./datatourisme/dataset:/docker-entrypoint-initdb.d
|
- ./datatourisme/dataset:/docker-entrypoint-initdb.d
|
||||||
ulimits:
|
ulimits:
|
||||||
nofile:
|
nofile:
|
||||||
soft: 65536
|
soft: 65536
|
||||||
hard: 65536
|
hard: 65536
|
||||||
networks:
|
|
||||||
- graphQL
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
datatourisme:
|
datatourisme:
|
||||||
image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
|
image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
|
||||||
depends_on:
|
# ports:
|
||||||
- blazegraph
|
# - "8080:80"
|
||||||
networks:
|
depends_on:
|
||||||
- graphQL
|
- blazegraph
|
||||||
- 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}/
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
node_modules
|
|
||||||
|
|
||||||
out
|
|
||||||
.next
|
|
||||||
|
|
||||||
next-env.d.ts
|
|
||||||
*.js
|
|
||||||
__tests__
|
|
||||||
@ -1,324 +0,0 @@
|
|||||||
{
|
|
||||||
"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
9
front/.vscode/settings.json
vendored
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"editor.quickSuggestions": {
|
|
||||||
"strings": "on"
|
|
||||||
},
|
|
||||||
"tailwindCSS.includeLanguages": {
|
|
||||||
"astro": "html"
|
|
||||||
},
|
|
||||||
"typescript.tsdk": "node_modules/typescript/lib"
|
|
||||||
}
|
|
||||||
@ -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"]
|
|
||||||
@ -1,11 +1,8 @@
|
|||||||
import node from '@astrojs/node'
|
import { defineConfig } from 'astro/config';
|
||||||
import tailwind from '@astrojs/tailwind'
|
|
||||||
import { defineConfig } from 'astro/config'
|
|
||||||
|
|
||||||
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()],
|
||||||
compressHTML: true,
|
compressHTML: true,
|
||||||
build: {
|
build: {
|
||||||
assets: 'assets',
|
assets: 'assets',
|
||||||
@ -15,15 +12,9 @@ export default defineConfig({
|
|||||||
host: true,
|
host: true,
|
||||||
port: 3000
|
port: 3000
|
||||||
},
|
},
|
||||||
trailingSlash: 'never',
|
trailingSlash: 'never',
|
||||||
output: 'server',
|
output: 'static', //'server',
|
||||||
adapter: node({
|
// adapter: node({
|
||||||
mode: 'standalone'
|
// mode: 'standalone'
|
||||||
}),
|
// }),
|
||||||
integrations: [tailwind(), react()],
|
});
|
||||||
vite: {
|
|
||||||
optimizeDeps: {
|
|
||||||
include: ['leaflet']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|||||||
1948
front/package-lock.json
generated
1948
front/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -2,44 +2,32 @@
|
|||||||
"name": "front",
|
"name": "front",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"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/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",
|
|
||||||
"react": "^18.2.0",
|
|
||||||
"react-dom": "^18.2.0",
|
|
||||||
"simple-icons-astro": "^11.12.0",
|
"simple-icons-astro": "^11.12.0",
|
||||||
"tailwindcss": "^3.4.3",
|
"tailwindcss": "^3.4.3",
|
||||||
"typescript": "^5"
|
"typescript": "^5.2.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@astrojs/check": "^0",
|
"@astrojs/check": "^0",
|
||||||
"@astrojs/ts-plugin": "^1.6.1",
|
"@types/node": "^20",
|
||||||
"@types/leaflet": "^1.9.12",
|
"@typescript-eslint/eslint-plugin": "^6",
|
||||||
"@types/node": "^20",
|
"@typescript-eslint/parser": "^6",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
"@vitest/coverage-v8": "^1",
|
||||||
"@typescript-eslint/parser": "^6.21.0",
|
"eslint": "^8",
|
||||||
"@vitest/coverage-v8": "^1",
|
"eslint-plugin-astro": "^0.31",
|
||||||
"eslint": "^8.57.0",
|
"typescript": "^5",
|
||||||
"eslint-plugin-astro": "^0.31.4",
|
"vitest": "^1"
|
||||||
"eslint-plugin-jsx-a11y": "^6.8.0",
|
}
|
||||||
"typescript": "^5",
|
|
||||||
"vitest": "^1"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
31
front/src/env.d.ts
vendored
31
front/src/env.d.ts
vendored
@ -1,32 +1 @@
|
|||||||
/// <reference path="../.astro/types.d.ts" />
|
|
||||||
/// <reference types="astro/client" />
|
/// <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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// declare namespace App {
|
|
||||||
// interface Locals {
|
|
||||||
// pb: PocketBase
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
declare global {
|
|
||||||
namespace App {
|
|
||||||
interface Locals {
|
|
||||||
pb: PocketBase
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -19,4 +19,33 @@ const { title } = Astro.props;
|
|||||||
<body>
|
<body>
|
||||||
<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>
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
export default class AstroUtils {
|
|
||||||
public static async wrap<T = void>(fn: () => T | Promise<T>) {
|
|
||||||
return await fn()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
import PocketBase from 'pocketbase'
|
|
||||||
|
|
||||||
import { defineMiddleware } from 'astro/middleware'
|
|
||||||
import { getEnv } from 'libs/Env'
|
|
||||||
|
|
||||||
export const onRequest = defineMiddleware(async ({ locals, cookies}, next) => {
|
|
||||||
locals.pb = new PocketBase(getEnv('POCKETBASE_URL','http://localhost:8080'))
|
|
||||||
|
|
||||||
// load the store data from the request cookie string
|
|
||||||
const pbcookie = cookies.get('session')?.value
|
|
||||||
locals.pb.authStore.loadFromCookie('pb_auth=' + pbcookie || '')
|
|
||||||
|
|
||||||
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()
|
|
||||||
|
|
||||||
let secure = true
|
|
||||||
if (getEnv('NODE_ENV', 'production') !== 'production') {
|
|
||||||
secure = false
|
|
||||||
}
|
|
||||||
const pbcookieStr = locals.pb.authStore.exportToCookie()
|
|
||||||
|
|
||||||
cookies.set('session',pbcookieStr.slice(pbcookieStr.indexOf('=')+1,pbcookieStr.indexOf(';')),{
|
|
||||||
httpOnly: true,
|
|
||||||
path: '/',
|
|
||||||
secure: secure,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: 365000
|
|
||||||
})
|
|
||||||
|
|
||||||
return response
|
|
||||||
})
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
import Layout from 'layouts/Layout.astro'
|
|
||||||
import PocketBase from 'pocketbase'
|
|
||||||
|
|
||||||
|
|
||||||
const pb = Astro.locals.pb
|
|
||||||
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>
|
|
||||||
<div>
|
|
||||||
<a href="/account/logout">deconnexion</a>
|
|
||||||
</div>
|
|
||||||
</Layout>
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
---
|
|
||||||
import Layout from "layouts/Layout.astro";
|
|
||||||
import AstroUtils from "libs/AstroUtils";
|
|
||||||
import PocketBase from 'pocketbase'
|
|
||||||
|
|
||||||
|
|
||||||
const pb = Astro.locals.pb
|
|
||||||
|
|
||||||
if(pb.authStore.isValid){
|
|
||||||
return Astro.redirect("/account")
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await AstroUtils.wrap(async () => {
|
|
||||||
if (Astro.request.method !== 'POST') {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const form = await Astro.request.formData();
|
|
||||||
const request = {
|
|
||||||
user: form.get("username") as string,
|
|
||||||
password: form.get("password") as string
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
await pb.collection('users').authWithPassword(request.user,request.password);
|
|
||||||
return Astro.redirect("/account")
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error)
|
|
||||||
console.warn('user password is incorrect')
|
|
||||||
return Astro.redirect("/account/login");// route('/account/login', {message: 'Compte invalide, valider les identifiants'})) //XXX: comprendre comment le system de route fonctionne
|
|
||||||
}
|
|
||||||
})
|
|
||||||
---
|
|
||||||
|
|
||||||
<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>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
---
|
|
||||||
import PocketBase from 'pocketbase'
|
|
||||||
|
|
||||||
|
|
||||||
const pb = Astro.locals.pb
|
|
||||||
|
|
||||||
if(pb.authStore.isValid){
|
|
||||||
pb.authStore.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
return Astro.redirect('/account/login')
|
|
||||||
|
|
||||||
---
|
|
||||||
@ -1,97 +0,0 @@
|
|||||||
---
|
|
||||||
|
|
||||||
const pb = Astro.locals.pb
|
|
||||||
const redirectUrl = Astro.url.protocol + "//" + Astro.url.host + '/account/oauth';
|
|
||||||
|
|
||||||
console.log(redirectUrl)
|
|
||||||
|
|
||||||
const params = Astro.url.searchParams
|
|
||||||
|
|
||||||
const code = params.get('code')
|
|
||||||
|
|
||||||
console.log(Astro.request.headers.get('cookie'))
|
|
||||||
//TODO socké dans les cookies
|
|
||||||
// load the previously stored provider's data
|
|
||||||
const providerstr = Astro.cookies.get('provider')
|
|
||||||
|
|
||||||
if (!providerstr) {
|
|
||||||
console.error("Fail to load provider")
|
|
||||||
console.log(providerstr)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const provider = providerstr.json()
|
|
||||||
|
|
||||||
if (!code) {
|
|
||||||
console.error("Fail to load code params");
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// compare the redirect's state param and the stored provider's one
|
|
||||||
if (provider.state !== params.get('state')) {
|
|
||||||
throw "State parameters don't match.";
|
|
||||||
}
|
|
||||||
|
|
||||||
pb.collection('users').authWithOAuth2Code(
|
|
||||||
provider.name,
|
|
||||||
code,
|
|
||||||
provider.codeVerifier,
|
|
||||||
redirectUrl,
|
|
||||||
// pass optional user create data
|
|
||||||
{
|
|
||||||
emailVisibility: false,
|
|
||||||
}
|
|
||||||
).then((authData) => {
|
|
||||||
//REDIRECT
|
|
||||||
console.log("oauth OK !!");
|
|
||||||
console.log(JSON.stringify(authData, null, 2));
|
|
||||||
}).catch((err) => {
|
|
||||||
console.log("oauth fail !!");
|
|
||||||
console.log(err);
|
|
||||||
});
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>OAuth2 redirect page</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<pre id="content">Authenticating...</pre>
|
|
||||||
|
|
||||||
<script src="https://cdn.jsdelivr.net/gh/pocketbase/js-sdk@master/dist/pocketbase.umd.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
const pb = new PocketBase("http://127.0.0.1:8090");
|
|
||||||
const redirectUrl = 'http://127.0.0.1:8090/redirect.html';
|
|
||||||
|
|
||||||
// parse the query parameters from the redirected url
|
|
||||||
const params = (new URL(window.location)).searchParams;
|
|
||||||
|
|
||||||
// load the previously stored provider's data
|
|
||||||
const provider = JSON.parse(localStorage.getItem('provider'))
|
|
||||||
|
|
||||||
// compare the redirect's state param and the stored provider's one
|
|
||||||
if (provider.state !== params.get('state')) {
|
|
||||||
throw "State parameters don't match.";
|
|
||||||
}
|
|
||||||
|
|
||||||
// authenticate
|
|
||||||
pb.collection('users').authWithOAuth2Code(
|
|
||||||
provider.name,
|
|
||||||
params.get('code'),
|
|
||||||
provider.codeVerifier,
|
|
||||||
redirectUrl,
|
|
||||||
// pass optional user create data
|
|
||||||
{
|
|
||||||
emailVisibility: false,
|
|
||||||
}
|
|
||||||
).then((authData) => {
|
|
||||||
document.getElementById('content').innerText = JSON.stringify(authData, null, 2);
|
|
||||||
}).catch((err) => {
|
|
||||||
document.getElementById('content').innerText = "Failed to exchange code.\n" + err;
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
---
|
|
||||||
import Layout from 'layouts/Layout.astro';
|
|
||||||
import AstroUtils from 'libs/AstroUtils';
|
|
||||||
import { getEnv } from 'libs/Env';
|
|
||||||
|
|
||||||
const pb = Astro.locals.pb
|
|
||||||
|
|
||||||
const oauths = await pb.collection('users').listAuthMethods();
|
|
||||||
|
|
||||||
|
|
||||||
console.log(JSON.stringify(oauths.authProviders[0]));
|
|
||||||
|
|
||||||
let secure = true
|
|
||||||
if (getEnv('NODE_ENV', 'production') !== 'production') {
|
|
||||||
secure = false
|
|
||||||
}
|
|
||||||
|
|
||||||
Astro.cookies.set('provider', oauths.authProviders[0],{
|
|
||||||
httpOnly: true,
|
|
||||||
path: '/',
|
|
||||||
secure: secure,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: 365000
|
|
||||||
})
|
|
||||||
|
|
||||||
if(pb.authStore.isValid){
|
|
||||||
return Astro.redirect("/account")
|
|
||||||
}
|
|
||||||
|
|
||||||
await AstroUtils.wrap(async () => {
|
|
||||||
if (Astro.request.method !== 'POST'){
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const form = await Astro.request.formData()
|
|
||||||
if(form.get("type") == "userPassword"){
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}else if (form.get("type") == "discord2FA") {
|
|
||||||
// console.log("pouet")
|
|
||||||
// await pb.collection('user').authWithOAuth2({provider: 'discord'})
|
|
||||||
// console.log("pouetF");
|
|
||||||
|
|
||||||
}else{
|
|
||||||
Astro.redirect("/404")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
---
|
|
||||||
|
|
||||||
<Layout title="register">
|
|
||||||
<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>
|
|
||||||
<a href={oauths.authProviders[0].authUrl + Astro.url.protocol + "//" + Astro.url.host + '/account/oauth'}>discord?</a>
|
|
||||||
</Layout>
|
|
||||||
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
---
|
|
||||||
import Layout from 'layouts/Layout.astro';
|
|
||||||
import 'leaflet/dist/leaflet.css'
|
|
||||||
---
|
|
||||||
|
|
||||||
<Layout title="maps test">
|
|
||||||
|
|
||||||
<div class="w-52 h-52" id="map" />
|
|
||||||
|
|
||||||
|
|
||||||
</Layout>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import L from 'leaflet'
|
|
||||||
|
|
||||||
const map = L.map('map', {
|
|
||||||
center: [50,0],
|
|
||||||
zoom: 13,
|
|
||||||
preferCanvas: true
|
|
||||||
})
|
|
||||||
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
|
||||||
maxZoom: 19,
|
|
||||||
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
|
|
||||||
}).addTo(map);
|
|
||||||
var marker = L.marker([51.5, -0.09]).addTo(map);
|
|
||||||
</script>
|
|
||||||
@ -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.">
|
||||||
@ -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: [],
|
|
||||||
}
|
|
||||||
@ -1,11 +1,3 @@
|
|||||||
{
|
{
|
||||||
"extends": "astro/tsconfigs/strict",
|
"extends": "astro/tsconfigs/strict"
|
||||||
"compilerOptions": {
|
|
||||||
"baseUrl": "src",
|
|
||||||
// hide an issue with typescript
|
|
||||||
"noUnusedLocals": false
|
|
||||||
},
|
|
||||||
"ts-node": {
|
|
||||||
"esm": true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user