Compare commits
2 Commits
test--test
...
feat/creat
| Author | SHA1 | Date | |
|---|---|---|---|
| 3936d20020 | |||
| 54ac29ff53 |
@ -1,4 +1,4 @@
|
|||||||
name: Build Docker Image Front # nom du workflow
|
name: Build Docker Image # nom du workflow
|
||||||
|
|
||||||
on: #declancheur
|
on: #declancheur
|
||||||
push:
|
push:
|
||||||
@ -6,9 +6,9 @@ on: #declancheur
|
|||||||
- '*'
|
- '*'
|
||||||
tags:
|
tags:
|
||||||
- v*
|
- v*
|
||||||
# pull_request:
|
pull_request:
|
||||||
# branches:
|
branches:
|
||||||
# - master
|
- master
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run: #jobs ID (nom du jobs)
|
run: #jobs ID (nom du jobs)
|
||||||
@ -32,8 +32,6 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=semver,pattern={{major}}
|
type=semver,pattern={{major}}
|
||||||
type=semver,pattern=latest
|
type=semver,pattern=latest
|
||||||
labels: |
|
|
||||||
org.opencontainers.image.title=AstroFront
|
|
||||||
|
|
||||||
- name: Login to Gitea
|
- name: Login to Gitea
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
55
.github/workflows/build_docker_express.yml
vendored
55
.github/workflows/build_docker_express.yml
vendored
@ -1,55 +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
|
|
||||||
labels: |
|
|
||||||
org.opencontainers.image.title=AstroFront
|
|
||||||
|
|
||||||
- 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: ./front
|
|
||||||
push: true
|
|
||||||
file: ./front/Dockerfile
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
19
.github/workflows/run_back_test.yml
vendored
19
.github/workflows/run_back_test.yml
vendored
@ -1,19 +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
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
# This Dockerfile allows you to run AstroJS in server mode
|
|
||||||
|
|
||||||
#########
|
|
||||||
# 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,19 +0,0 @@
|
|||||||
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
|
||||||
module.exports = {
|
|
||||||
preset: 'ts-jest',
|
|
||||||
testEnvironment: 'node',
|
|
||||||
collectCoverage: true,
|
|
||||||
coverageDirectory: 'coverage',
|
|
||||||
collectCoverageFrom: [
|
|
||||||
'**/*.ts',
|
|
||||||
'!/nodemodules/',
|
|
||||||
'!/jest.config.js/',
|
|
||||||
'!/coverage/',
|
|
||||||
'!**/server.ts',
|
|
||||||
],
|
|
||||||
coverageThreshold: {
|
|
||||||
global: {
|
|
||||||
lines: 80,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"opts": {
|
|
||||||
"template": "node_modules/better-docs"
|
|
||||||
},
|
|
||||||
"tags": {
|
|
||||||
"allowUnknownTags": ["optional"]
|
|
||||||
},
|
|
||||||
"plugins": [
|
|
||||||
"node_modules/better-docs/typescript"
|
|
||||||
],
|
|
||||||
"source": {
|
|
||||||
"include": ["./src"],
|
|
||||||
"includePattern": "\\.(jsx|js|ts|tsx)$"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
11059
Express/barAndCafe/package-lock.json
generated
11059
Express/barAndCafe/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
|||||||
{
|
|
||||||
"main": "dist/server.js",
|
|
||||||
"scripts": {
|
|
||||||
"build": "rimraf dist && npx tsc",
|
|
||||||
"start": "node dist/index.js",
|
|
||||||
"predev": "npm run build",
|
|
||||||
"dev": "npx tsc -w & nodemon dist/server.js",
|
|
||||||
"docs": "jsdoc -c jsdoc.json",
|
|
||||||
"test": "jest"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@types/express": "^4.17.21",
|
|
||||||
"@types/node": "^20.12.7",
|
|
||||||
"dotenv": "^16.4.5",
|
|
||||||
"express": "^4.19.2",
|
|
||||||
"rimraf": "^5.0.5"
|
|
||||||
},
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
import express from "express";
|
|
||||||
/**
|
|
||||||
* Initialize Express application instance.
|
|
||||||
* @returns An initialized Express application object.
|
|
||||||
*/
|
|
||||||
const app = express();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle GET request for homepage route ('/').
|
|
||||||
* Send back a simple text response.
|
|
||||||
* @param {express.Request} req - HTTP Request object.
|
|
||||||
* @param {express.Response} res - HTTP Response object.
|
|
||||||
*/
|
|
||||||
function getRoot(req: express.Request, res: express.Response) {
|
|
||||||
res.send("hello world from dev");
|
|
||||||
}
|
|
||||||
|
|
||||||
app.get("/", getRoot);
|
|
||||||
|
|
||||||
export default app;
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
import * as dotenv from "dotenv";
|
|
||||||
import app from "./app";
|
|
||||||
|
|
||||||
dotenv.config({path: '../../.env'})
|
|
||||||
|
|
||||||
const port = parseInt(process.env.BAR_PORT || '3000')
|
|
||||||
|
|
||||||
app.listen(port, () =>{
|
|
||||||
console.log(`serveur running in ${port}`)
|
|
||||||
})
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
import request from "supertest";
|
|
||||||
import app from "../src/app";
|
|
||||||
import { Server, IncomingMessage, ServerResponse } from "http";
|
|
||||||
|
|
||||||
const port = 3000;
|
|
||||||
|
|
||||||
let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
|
|
||||||
|
|
||||||
describe("Test the root path", () => {
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
serveur = app.listen(port, () =>{
|
|
||||||
console.log(`serveur running in ${port}`)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
afterEach((done) => {
|
|
||||||
serveur.close(done)
|
|
||||||
})
|
|
||||||
|
|
||||||
test("It should response the GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/")
|
|
||||||
.then(response => {
|
|
||||||
expect(response.statusCode).toBe(200);
|
|
||||||
done();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("It should response the GET method", done => {
|
|
||||||
request(app)
|
|
||||||
.get("/")
|
|
||||||
.then(response => {
|
|
||||||
expect(response.text).toEqual("hello world from dev")
|
|
||||||
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,11 +0,0 @@
|
|||||||
meta {
|
|
||||||
name: express test
|
|
||||||
type: http
|
|
||||||
seq: 3
|
|
||||||
}
|
|
||||||
|
|
||||||
get {
|
|
||||||
url: http://localhost:3000
|
|
||||||
body: none
|
|
||||||
auth: none
|
|
||||||
}
|
|
||||||
Submodule datatourisme updated: fb594bfd7c...5175e1fdf1
55
front/src/components/Leaflet.astro
Normal file
55
front/src/components/Leaflet.astro
Normal file
@ -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>
|
||||||
@ -20,32 +20,3 @@ const { title } = Astro.props;
|
|||||||
<slot />
|
<slot />
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
<style is:global>
|
|
||||||
:root {
|
|
||||||
--accent: 136, 58, 234;
|
|
||||||
--accent-light: 224, 204, 250;
|
|
||||||
--accent-dark: 49, 10, 101;
|
|
||||||
--accent-gradient: linear-gradient(
|
|
||||||
45deg,
|
|
||||||
rgb(var(--accent)),
|
|
||||||
rgb(var(--accent-light)) 30%,
|
|
||||||
white 60%
|
|
||||||
);
|
|
||||||
}
|
|
||||||
html {
|
|
||||||
font-family: system-ui, sans-serif;
|
|
||||||
background: #13151a;
|
|
||||||
background-size: 224px;
|
|
||||||
}
|
|
||||||
code {
|
|
||||||
font-family:
|
|
||||||
Menlo,
|
|
||||||
Monaco,
|
|
||||||
Lucida Console,
|
|
||||||
Liberation Mono,
|
|
||||||
DejaVu Sans Mono,
|
|
||||||
Bitstream Vera Sans Mono,
|
|
||||||
Courier New,
|
|
||||||
monospace;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@ -1,17 +1,32 @@
|
|||||||
---
|
---
|
||||||
|
import Leaflet from 'components/Leaflet.astro';
|
||||||
import Layout from 'layouts/Layout.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">
|
<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='© <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.
|
A pretty CSS3 popup. <br /> Easily customizable.
|
||||||
</Popup>
|
</Popup>
|
||||||
</Marker>
|
</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>
|
</Layout>
|
||||||
|
|||||||
Reference in New Issue
Block a user