maps add in maps

Merge branch 'master' into feat/create-map
2024-04-25 14:59:40 +02:00 · 2024-04-25 14:59:16 +02:00
28 changed files with 83 additions and 12138 deletions
--- a/.github/workflows/build_docker_astro.yml
+++ b/.github/workflows/build_docker_astro.yml
@ -1,4 +1,4 @@
-name: Build Docker Image Front # nom du workflow
+name: Build Docker Image # nom du workflow
 on: #declancheur
  push:
--- a/.github/workflows/build_docker_express.yml
+++ b/.github/workflows/build_docker_express.yml
@ -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 }}
--- a/.github/workflows/build_jsdoc_drink.yml
+++ b/.github/workflows/build_jsdoc_drink.yml
@ -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 }}
--- a/.github/workflows/run_back_test.yml
+++ b/.github/workflows/run_back_test.yml
@ -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}}
--- a/Express/barAndCafe/Dockerfile
+++ b/Express/barAndCafe/Dockerfile
@ -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
 # 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"]
--- a/Express/barAndCafe/Dockerfile_docs
+++ b/Express/barAndCafe/Dockerfile_docs
@ -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/
--- a/Express/barAndCafe/jest.config.js
+++ b/Express/barAndCafe/jest.config.js
@ -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,
    },
  },
 };
--- a/Express/barAndCafe/jsdoc.json
+++ b/Express/barAndCafe/jsdoc.json
@ -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)$"
    }
 }
--- a/Express/barAndCafe/package-lock.json
+++ b/Express/barAndCafe/package-lock.json
--- a/Express/barAndCafe/package.json
+++ b/Express/barAndCafe/package.json
@ -1,38 +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": "jest"
  },
  "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/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",
    "superagent": "^9.0.2",
    "supertest": "^7.0.0",
    "ts-jest": "^29.1.2",
    "typedoc": "^0.25.13",
    "typescript": "^5.4.5"
  }
 }
--- a/Express/barAndCafe/src/app.ts
+++ b/Express/barAndCafe/src/app.ts
@ -1,57 +0,0 @@
 import { getCity } 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)
 export default app
--- a/Express/barAndCafe/src/openTripMaps.ts
+++ b/Express/barAndCafe/src/openTripMaps.ts
@ -1,71 +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
 const optionsDrink = {
    method: 'GET',
    url: 'https://api.opentripmap.com/0.1/en/places/radius',
    params: {
        radius: '1000',
        lon: '-1.43333',
        lat: '46.66667',
        apikey: key,
        kinds: 'bars,cafes,pubs,biergartens'
    },
    headers: {'Content-Type': 'application/json'}
 };
 const optionsCity = {
  method: 'GET',
  url: 'https://api.opentripmap.com/0.1/en/places/geoname',
  params: {
    name: 'Paris',
    apikey: key
  },
  headers: {'Content-Type': 'application/json'}
 };
 /**
 * 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"]
    const radius = req.query["radius"]
    if(!key){
        res.status(401).send("Missing OTM key")
        return
    }
    if(!cityName){
        res.status(400).send("Missing Argument name")
        return
    }
    if(radius){
        optionsDrink.params.radius = radius as string
    }
    optionsCity.params.name = cityName as string
    try {
        const { data } = await axios.request(optionsCity);
        optionsDrink.params.lat = data.lat
        optionsDrink.params.lon = data.lon
    } catch (error) {
        console.error(error);
    }
    try {
        const { data } = await axios.request(optionsDrink);
        res.send(data);
    } catch (error) {
        console.error(error);
    }
 }
--- a/Express/barAndCafe/src/server.ts
+++ b/Express/barAndCafe/src/server.ts
@ -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}`)
 })
--- a/Express/barAndCafe/src/swaggerDef.ts
+++ b/Express/barAndCafe/src/swaggerDef.ts
@ -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
--- a/Express/barAndCafe/test/app.test.ts
+++ b/Express/barAndCafe/test/app.test.ts
@ -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();
        });
    });
 });
--- a/Express/barAndCafe/test/openTripMaps.test.ts
+++ b/Express/barAndCafe/test/openTripMaps.test.ts
@ -1,66 +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();
        });
    });
 });
--- a/Express/barAndCafe/tsconfig.json
+++ b/Express/barAndCafe/tsconfig.json
@ -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. */
  }
 }
--- a/datatourisme/environments/dev.bru
+++ b/datatourisme/environments/dev.bru
@ -1,7 +1,3 @@
 vars {
  TRIPMAP_URL: https://api.opentripmap.com/0.1
 }
 vars:secret [
-  app_key,
+  app_key
  OTM_KEY
 ]
--- a/datatourisme/express
+++ b/datatourisme/express
@ -1,11 +0,0 @@
 meta {
  name: express Drink OTM
  type: http
  seq: 4
 }
 get {
  url: http://localhost:3000
  body: none
  auth: none
 }
--- a/datatourisme/otm_drink.bru
+++ b/datatourisme/otm_drink.bru
@ -1,19 +0,0 @@
 meta {
  name: otm_drink
  type: http
  seq: 6
 }
 get {
  url: {{TRIPMAP_URL}}/en/places/radius?radius=1000&lon=-1.43333&lat=46.66667&apikey={{OTM_KEY}}&kinds=bars,cafes,pubs,biergartens
  body: none
  auth: none
 }
 query {
  radius: 1000
  lon: -1.43333
  lat: 46.66667
  apikey: {{OTM_KEY}}
  kinds: bars,cafes,pubs,biergartens
 }
--- a/datatourisme/otm_ex_city.bru
+++ b/datatourisme/otm_ex_city.bru
@ -1,16 +0,0 @@
 meta {
  name: otm_ex_city
  type: http
  seq: 7
 }
 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
 }
--- a/datatourisme/otm_location.bru
+++ b/datatourisme/otm_location.bru
@ -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}}
 }
--- a/datatourisme/test
+++ b/datatourisme/test
@ -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
      }
    }
  }
 }
--- a/2
+++ b/2
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -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-data:/app/pb_data
-      - ./pb/pocketbase-hooks:/app/pb_hooks
+      - ./.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}/
--- a/front/src/components/Leaflet.astro
+++ b/front/src/components/Leaflet.astro
@ -0,0 +1,55 @@
 ---
 import type { string } from 'astro/zod'
 import type { Marker } from 'leaflet'
 export interface Props {
  latitude: number
  longitude: number
  zoom: number
  /** the DOM ID of a <div> element */
  container: string
  /** https://leafletjs.com/reference.html#tilelayer */
  tileLayer: string
  /** Most tile servers require attribution. */
  attribution: string
  containerstyle?: string
 }
 const { latitude, longitude, zoom, container, tileLayer, attribution, containerstyle = "height: 61.8vh", class } = Astro.props
 ---
 <leaflet-map
  data-latitude={latitude}
  data-longitude={longitude}
  data-zoom={zoom}
  data-container={container}
  data-tiles={tileLayer}
  data-attribution={attribution}
  data-containerstyle={containerstyle}
 >
 <div id={container} style={containerstyle}></div>
 <script>
  import L, { type LatLngTuple } from "leaflet"
  import "leaflet/dist/leaflet"
  import "leaflet/dist/leaflet.css"
  class LeafletMap extends HTMLElement {
    constructor() {
      super()
      const latlng = [Number(this.dataset.latitude), Number(this.dataset.longitude)] as LatLngTuple
      var map = L.map(this.dataset.container as string).setView(latlng, Number(this.dataset.zoom))
      L.tileLayer(
        this.dataset.tiles as string,
        {attribution: this.dataset.attribution}
        ).addTo(map)
      var marker = L.marker([51.5, -0.09]).addTo(map);
    }
  }
  window.customElements.define("leaflet-map", LeafletMap);
 </script>
--- a/front/src/layouts/Layout.astro
+++ b/front/src/layouts/Layout.astro
@ -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>
--- a/front/src/pages/maps.astro
+++ b/front/src/pages/maps.astro
@ -1,17 +1,32 @@
 ---
 import Leaflet from 'components/Leaflet.astro';
 import Layout from 'layouts/Layout.astro';
-import { Marker, Popup } from 'leaflet';
+// import { Marker, Popup } from 'leaflet';
-import { MapContainer } from 'react-leaflet'
+// import type { only } from 'node:test';
 // import { MapContainer, TileLayer } from 'react-leaflet'
 ---
 <Layout title="maps test">
-    <MapContainer client:load center={[51.505, -0.09]} zoom={13} scrollWheelZoom={false}>
+    <!-- <MapContainer client:only="react" center={[51.505, -0.09]} zoom={13} scrollWheelZoom={false}>
-        <Marker client:load lat={51.505} lng={-0.09}>
+      <TileLayer
-            <Popup client:load>
+      client:only="react"
      attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
      url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
    />
        <Marker client:only="react" lat={51.505} lng={-0.09}>
            <Popup client:only="react">
              A pretty CSS3 popup. <br /> Easily customizable.
            </Popup>
          </Marker>
-    </MapContainer>
+    </MapContainer> -->
  <Leaflet
    latitude={51.505}
    longitude={-0.09}
    zoom={13}
    container="leafletmap"
    tileLayer="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
    attribution="© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors">
  </Leaflet>
 </Layout>
Author	SHA1	Message	Date
Clement	3936d20020	maps add in maps	2024-04-25 14:59:40 +02:00
Clement	54ac29ff53	Merge branch 'master' into feat/create-map	2024-04-25 14:59:16 +02:00