Compare commits
3 Commits
564a18ea28
...
feat--run-
| Author | SHA1 | Date | |
|---|---|---|---|
| be9e7e302b | |||
| 36319ea002 | |||
| f7dd45450b |
53
.github/workflows/build_docker.yml
vendored
53
.github/workflows/build_docker.yml
vendored
@ -1,53 +0,0 @@
|
||||
name: Build Docker Image # nom du workflow
|
||||
|
||||
on: #declancheur
|
||||
push:
|
||||
branches:
|
||||
- '*'
|
||||
tags:
|
||||
- v*
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
run: #jobs ID (nom du jobs)
|
||||
runs-on: ubuntu-latest # environement de run
|
||||
|
||||
steps: # liste des étapes
|
||||
- name: Checkout # rapatrie le depot
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: |
|
||||
git.lab-ouest.org/Epitech/ratrapage_T-WEB_front
|
||||
tags: |
|
||||
type=edge
|
||||
type=ref,event=pr
|
||||
type=ref,event=branch
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=semver,pattern={{major}}
|
||||
type=semver,pattern=latest
|
||||
|
||||
- name: Login to Gitea
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: git.lab-ouest.org
|
||||
username: ${{ secrets.DOCKER_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_TOKEN }}
|
||||
|
||||
# - name: Set up Docker Buildx
|
||||
# uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Build and push front
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: ./front
|
||||
push: true
|
||||
file: ./front/Dockerfile
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
@ -1,3 +1,6 @@
|
||||
vars {
|
||||
URL: http://localhost:8080
|
||||
}
|
||||
vars:secret [
|
||||
app_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
|
||||
]
|
||||
@ -5,11 +5,11 @@ meta {
|
||||
}
|
||||
|
||||
post {
|
||||
url: http://localhost:8080
|
||||
url: {{URL}}
|
||||
body: graphql
|
||||
auth: none
|
||||
}
|
||||
|
||||
body:graphql {
|
||||
{poi() {results{dc_identifier rdfs_label}}}
|
||||
{poi() {results{dc_identifier, lastUpdate}}}
|
||||
}
|
||||
|
||||
Submodule datatourisme updated: 5175e1fdf1...af7db7d7a5
@ -1,34 +1,20 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
pocketbase:
|
||||
image: ghcr.io/coollabsio/pocketbase:latest
|
||||
environment:
|
||||
- SERVICE_FQDN_POCKETBASE_8080
|
||||
volumes:
|
||||
- ./.pb/pocketbase-data:/app/pb_data
|
||||
- ./.pb/pocketbase-hooks:/app/pb_hooks
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`)
|
||||
- traefik.http.services.poketBaseTweb.loadbalancer.server.port=${POCKET_BASE_PORT}
|
||||
- traefik.http.routers.poketBaseTweb.tls.certresolver=le
|
||||
networks:
|
||||
- public
|
||||
front:
|
||||
image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head
|
||||
depends_on:
|
||||
- pocketbase
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.astroTweb.rule=Host(`${FRONT_URL}`)
|
||||
- traefik.http.services.astroTweb.loadbalancer.server.port=${FRONT_BASE_PORT}
|
||||
- traefik.http.routers.astroTweb.tls.certresolver=le
|
||||
networks:
|
||||
- public
|
||||
networks:
|
||||
public:
|
||||
external: true
|
||||
x-dockge:
|
||||
urls:
|
||||
- https://${POCKET_BASE_URL}/
|
||||
- https://${FRONT_URL}/
|
||||
|
||||
blazegraph:
|
||||
image: conjecto/blazegraph:2.1.5
|
||||
# ports:
|
||||
# - 9999:9999
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms6G -Xmx6G"
|
||||
volumes:
|
||||
- ./datatourisme/dataset:/docker-entrypoint-initdb.d
|
||||
ulimits:
|
||||
nofile:
|
||||
soft: 65536
|
||||
hard: 65536
|
||||
datatourisme:
|
||||
image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
|
||||
# ports:
|
||||
# - "8080:80"
|
||||
depends_on:
|
||||
- blazegraph
|
||||
@ -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 tailwind from '@astrojs/tailwind'
|
||||
import { defineConfig } from 'astro/config'
|
||||
|
||||
import react from '@astrojs/react'
|
||||
import { defineConfig } from 'astro/config';
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({
|
||||
// integrations: [tailwind(), test, routing(), version(), buildInfos()],
|
||||
compressHTML: true,
|
||||
build: {
|
||||
assets: 'assets',
|
||||
@ -15,15 +12,9 @@ export default defineConfig({
|
||||
host: true,
|
||||
port: 3000
|
||||
},
|
||||
trailingSlash: 'never',
|
||||
output: 'server',
|
||||
adapter: node({
|
||||
mode: 'standalone'
|
||||
}),
|
||||
integrations: [tailwind(), react()],
|
||||
vite: {
|
||||
optimizeDeps: {
|
||||
include: ['leaflet']
|
||||
}
|
||||
}
|
||||
})
|
||||
trailingSlash: 'never',
|
||||
output: 'static', //'server',
|
||||
// adapter: node({
|
||||
// mode: 'standalone'
|
||||
// }),
|
||||
});
|
||||
|
||||
1901
front/package-lock.json
generated
1901
front/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -2,45 +2,32 @@
|
||||
"name": "front",
|
||||
"type": "module",
|
||||
"version": "0.0.1",
|
||||
"private": "true",
|
||||
"private":"true",
|
||||
"scripts": {
|
||||
"dev": "astro dev",
|
||||
"start": "node ./dist/server/entry.mjs",
|
||||
"start": "astro dev",
|
||||
"build": "astro check && astro build",
|
||||
"preview": "astro preview",
|
||||
"astro": "astro",
|
||||
"check:lint": "eslint src"
|
||||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astrojs/node": "^8.2.5",
|
||||
"@astrojs/react": "^3.3.1",
|
||||
"@astrojs/tailwind": "^5.1.0",
|
||||
"@tailwindcss/typography": "^0.5.12",
|
||||
"@types/react": "^18.2.79",
|
||||
"@types/react-dom": "^18.2.25",
|
||||
"astro": "4.5.12",
|
||||
"leaflet": "^1.9.4",
|
||||
"astro": "^4.6.3",
|
||||
"lucide-astro": "^0.372.0",
|
||||
"pocketbase": "^0.21.1",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-leaflet": "^4.2.1",
|
||||
"simple-icons-astro": "^11.12.0",
|
||||
"tailwindcss": "^3.4.3",
|
||||
"typescript": "^5"
|
||||
"typescript": "^5.2.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/check": "^0",
|
||||
"@astrojs/ts-plugin": "^1.6.1",
|
||||
"@types/leaflet": "^1.9.12",
|
||||
"@types/node": "^20",
|
||||
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
||||
"@typescript-eslint/parser": "^6.21.0",
|
||||
"@vitest/coverage-v8": "^1",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-plugin-astro": "^0.31.4",
|
||||
"eslint-plugin-jsx-a11y": "^6.8.0",
|
||||
"typescript": "^5",
|
||||
"vitest": "^1"
|
||||
}
|
||||
"@astrojs/check": "^0",
|
||||
"@types/node": "^20",
|
||||
"@typescript-eslint/eslint-plugin": "^6",
|
||||
"@typescript-eslint/parser": "^6",
|
||||
"@vitest/coverage-v8": "^1",
|
||||
"eslint": "^8",
|
||||
"eslint-plugin-astro": "^0.31",
|
||||
"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" />
|
||||
|
||||
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>
|
||||
<slot />
|
||||
</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,27 +0,0 @@
|
||||
import PocketBase from 'pocketbase'
|
||||
|
||||
import { defineMiddleware } from 'astro/middleware'
|
||||
import { getEnv } from 'libs/Env'
|
||||
|
||||
export const onRequest = defineMiddleware(async ({ locals, request }: any, next: () => any) => {
|
||||
locals.pb = new PocketBase(getEnv('POCKETBASE_URL','http://localhost:8080'))
|
||||
|
||||
// load the store data from the request cookie string
|
||||
locals.pb.authStore.loadFromCookie(request.headers.get('cookie') || '')
|
||||
|
||||
try {
|
||||
// get an up-to-date auth store state by verifying and refreshing the loaded auth model (if any)
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
|
||||
locals.pb.authStore.isValid && await locals.pb.collection('users').authRefresh()
|
||||
} catch (_) {
|
||||
// clear the auth store on failed refresh
|
||||
locals.pb.authStore.clear()
|
||||
}
|
||||
|
||||
const response = await next()
|
||||
|
||||
// send back the default 'pb_auth' cookie to the client with the latest store state
|
||||
response.headers.append('set-cookie', locals.pb.authStore.exportToCookie())
|
||||
|
||||
return response
|
||||
})
|
||||
@ -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,70 +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")
|
||||
}
|
||||
|
||||
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>
|
||||
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="type" value="discord2FA">
|
||||
<button id="OauthDiscord">connexion avec discord</button>
|
||||
</form>
|
||||
</Layout>
|
||||
|
||||
<script>
|
||||
import PocketBase from 'pocketbase'
|
||||
const pb = Astro.locals.pb
|
||||
const discordBtn = document.querySelector<HTMLButtonElement>("#OauthDiscord")
|
||||
|
||||
if (discordBtn) {
|
||||
discordBtn.addEventListener('onclick', async () =>{
|
||||
await pb.collection('user').authWithOAuth2({provider: 'discord'})
|
||||
})
|
||||
}
|
||||
</script>
|
||||
@ -1,17 +0,0 @@
|
||||
---
|
||||
import Layout from 'layouts/Layout.astro';
|
||||
import { Marker, Popup } from 'leaflet';
|
||||
import { MapContainer } from 'react-leaflet'
|
||||
---
|
||||
|
||||
<Layout title="maps test">
|
||||
|
||||
<MapContainer client:load center={[51.505, -0.09]} zoom={13} scrollWheelZoom={false}>
|
||||
<Marker client:load lat={51.505} lng={-0.09}>
|
||||
<Popup client:load>
|
||||
A pretty CSS3 popup. <br /> Easily customizable.
|
||||
</Popup>
|
||||
</Marker>
|
||||
</MapContainer>
|
||||
|
||||
</Layout>
|
||||
@ -1,6 +1,6 @@
|
||||
---
|
||||
import Layout from 'layouts/Layout.astro';
|
||||
import Card from 'components/Card.astro';
|
||||
import Layout from '../layouts/Layout.astro';
|
||||
import Card from '../components/Card.astro';
|
||||
---
|
||||
|
||||
<Layout title="Welcome to Astro.">
|
||||
@ -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",
|
||||
"compilerOptions": {
|
||||
"baseUrl": "src",
|
||||
// hide an issue with typescript
|
||||
"noUnusedLocals": false
|
||||
},
|
||||
"ts-node": {
|
||||
"esm": true
|
||||
}
|
||||
"extends": "astro/tsconfigs/strict"
|
||||
}
|
||||
Reference in New Issue
Block a user