2 Commits

Author SHA1 Message Date
99196c6dba add template in hard
Some checks failed
Build Docker Image Front / run (pull_request) Failing after 52s
Build Docker Image Back / run (pull_request) Successful in 25s
JsDocs / coverage (pull_request) Successful in 22s
Test and coverage / coverage (pull_request) Successful in 1m26s
2024-05-20 12:23:41 +02:00
738381ee16 update config
All checks were successful
Build Docker Image Front / run (pull_request) Successful in 1m9s
Build Docker Image Back / run (pull_request) Successful in 21s
JsDocs / coverage (pull_request) Successful in 23s
Test and coverage / coverage (pull_request) Successful in 1m29s
2024-05-20 12:13:11 +02:00
122 changed files with 3450 additions and 7742 deletions

View File

@ -47,8 +47,7 @@ WORKDIR /home/node
EXPOSE 3000 EXPOSE 3000
# Add Healthcheck # Add Healthcheck
# FIXME: faire en sorte que le healthcheck fonctionne HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
# 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 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/node_modules ./node_modules

View File

@ -1,8 +1,5 @@
/** @type {import('ts-jest').JestConfigWithTsJest} */ /** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = { module.exports = {
testPathIgnorePatterns: [
"<rootDir>/dist/"
],
testTimeout: 10000, testTimeout: 10000,
preset: 'ts-jest', preset: 'ts-jest',
testEnvironment: 'node', testEnvironment: 'node',

View File

@ -8,7 +8,6 @@
"@types/express": "^4.17.21", "@types/express": "^4.17.21",
"@types/node": "^20.12.7", "@types/node": "^20.12.7",
"axios": "^1.6.8", "axios": "^1.6.8",
"cors": "^2.8.5",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"express": "^4.19.2", "express": "^4.19.2",
"rimraf": "^5.0.5", "rimraf": "^5.0.5",
@ -16,7 +15,6 @@
"swagger-ui-express": "^5.0.0" "swagger-ui-express": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.17",
"@types/jest": "^29.5.12", "@types/jest": "^29.5.12",
"@types/rewire": "^2.5.30", "@types/rewire": "^2.5.30",
"@types/supertest": "^6.0.2", "@types/supertest": "^6.0.2",
@ -1970,15 +1968,6 @@
"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==", "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
"dev": true "dev": true
}, },
"node_modules/@types/cors": {
"version": "2.8.17",
"resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
"integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/express": { "node_modules/@types/express": {
"version": "4.17.21", "version": "4.17.21",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
@ -4756,18 +4745,6 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"node_modules/cors": {
"version": "2.8.5",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
"integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
"dependencies": {
"object-assign": "^4",
"vary": "^1"
},
"engines": {
"node": ">= 0.10"
}
},
"node_modules/create-jest": { "node_modules/create-jest": {
"version": "29.7.0", "version": "29.7.0",
"resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
@ -9271,6 +9248,7 @@
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"dev": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }

View File

@ -14,7 +14,6 @@
"@types/express": "^4.17.21", "@types/express": "^4.17.21",
"@types/node": "^20.12.7", "@types/node": "^20.12.7",
"axios": "^1.6.8", "axios": "^1.6.8",
"cors": "^2.8.5",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"express": "^4.19.2", "express": "^4.19.2",
"rimraf": "^5.0.5", "rimraf": "^5.0.5",
@ -22,7 +21,6 @@
"swagger-ui-express": "^5.0.0" "swagger-ui-express": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.17",
"@types/jest": "^29.5.12", "@types/jest": "^29.5.12",
"@types/rewire": "^2.5.30", "@types/rewire": "^2.5.30",
"@types/supertest": "^6.0.2", "@types/supertest": "^6.0.2",

View File

@ -1,13 +1,11 @@
import { getCity, getRadius, getPoiId, getBox } from "./openTripMaps" import { getCity, getRadius, getPoiId, getBox } from "./openTripMaps"
import express from "express" import express from "express"
import cors from "cors"
/** /**
* Initialize Express application instance. * Initialize Express application instance.
* @returns An initialized Express application object. * @returns An initialized Express application object.
*/ */
const app = express() const app = express()
app.use(cors())
/** /**

View File

@ -13,7 +13,7 @@ const key = process.env.OPEN_TRIP_MAPS_KEY
* @param {string} lat2 Latitude 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#)) * @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, rate: string) { async function callBox(lon1:string, lat1:string, lon2: string, lat2: string) {
const lonMin = Math.min(parseFloat(lon1), parseFloat(lon2)) const lonMin = Math.min(parseFloat(lon1), parseFloat(lon2))
const lonMax = Math.max(parseFloat(lon1), parseFloat(lon2)) const lonMax = Math.max(parseFloat(lon1), parseFloat(lon2))
const latMin = Math.min(parseFloat(lat1), parseFloat(lat2)) const latMin = Math.min(parseFloat(lat1), parseFloat(lat2))
@ -27,7 +27,6 @@ async function callBox(lon1:string, lat1:string, lon2: string, lat2: string, rat
lon_max: lonMax, lon_max: lonMax,
lat_min: latMin, lat_min: latMin,
lat_max: latMax, lat_max: latMax,
rate: rate,
apikey: key, apikey: key,
kinds: 'bars,cafes,pubs,biergartens' kinds: 'bars,cafes,pubs,biergartens'
}, },
@ -183,16 +182,12 @@ export async function getBox(req:express.Request, res: express.Response) {
const lat1 = req.query["lat1"] as string const lat1 = req.query["lat1"] as string
const lon2 = req.query["lon2"] as string const lon2 = req.query["lon2"] as string
const lat2 = req.query["lat2"] as string const lat2 = req.query["lat2"] as string
let rate = req.query["rate"] as string
if(!lon1 || !lat1 || !lon2 || !lat2){ if(!lon1 || !lat1 || !lon2 || !lat2){
res.status(400).send("Missing Argument") res.status(400).send("Missing Argument")
return return
} }
if(!rate){ res.send( await callBox(lon1, lat1, lon2, lat2))
rate = "1";
}
res.send( await callBox(lon1, lat1, lon2, lat2, rate))
} }
//TODO: fair une route ou l'on donne 2 coordonée

View File

@ -21,7 +21,7 @@ const options = {
} }
], ],
}, },
apis: ['./src/*.ts','./dist/src/*.js'], apis: ['./src/*.ts'],
explorer: true explorer: true
} }

View File

@ -219,14 +219,6 @@ describe("Test the otm city path", () => {
} }
] ]
} }
function sleep(milliseconds: number) {
const date = Date.now();
let currentDate = null;
do {
currentDate = Date.now();
} while (currentDate - date < milliseconds);
}
sleep(2000);
request(app) request(app)
.get("/otm/box") .get("/otm/box")
.query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'}) .query({'lon1':'-1.435199','lon2':'-1.43519', 'lat1':'46.668460', 'lat2':'46.668461'})

View File

@ -1,18 +0,0 @@
{
"folders": [
{
"name": "Ratrapage_WEB",
"path": "."
},
{
"name": "barAndCafe",
"path": "Express/barAndCafe"
},
{
"path": "front"
}
],
"settings": {
"typescript.tsdk": "node_modules/typescript/lib"
}
}

View File

@ -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
}
}
}
}

View File

@ -1,9 +1,7 @@
vars { vars {
TRIPMAP_URL: https://api.opentripmap.com/0.1 TRIPMAP_URL: https://api.opentripmap.com/0.1
EXPRESS_API: http://localhost:3001
} }
vars:secret [ vars:secret [
app_key, app_key,
OTM_KEY, OTM_KEY
GOOGLE_API_KEY
] ]

View File

@ -1,8 +0,0 @@
vars {
EXPRESS_API: https://drink-tweb.cb85.fr
PB_URL: https://pb-tweb.cb85.fr
TRIPMAP_URL: https://api.opentripmap.com/0.1/
}
vars:secret [
OTM_KEY
]

View File

@ -5,7 +5,7 @@ meta {
} }
get { get {
url: {{EXPRESS_API}}/otm/city?name=La roche sur yon&radius=300 url: http://localhost:3001/otm/city?name=La roche sur yon&radius=300
body: none body: none
auth: none auth: none
} }

View File

@ -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
}

View File

@ -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"
}
}

View File

@ -1,16 +0,0 @@
meta {
name: otm_city
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}}
}

View File

@ -1,18 +0,0 @@
meta {
name: connexion
type: http
seq: 1
}
post {
url: {{PB_URL}}/api/collections/users/auth-with-password
body: json
auth: none
}
body:json {
{
"identity": "michel.biche@aptatio.com",
"password": "123456789"
}
}

View File

@ -1,27 +0,0 @@
meta {
name: get all poi
type: http
seq: 5
}
get {
url: {{PB_URL}}/api/collections/user_poi/records?filter=owner='vvy93m1hoaeshwy'&&poi_list='cabkkovmjsfoapa'
body: json
auth: bearer
}
query {
filter: owner
poi_list: 'cabkkovmjsfoapa'
}
auth:bearer {
token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
}
body:json {
{
"owner": "vvy93m1hoaeshwy",
"poi_list": "sh430u0im37cxm5"
}
}

View File

@ -1,22 +0,0 @@
meta {
name: link user to poi
type: http
seq: 3
}
post {
url: {{PB_URL}}/api/collections/user_poi/records
body: json
auth: bearer
}
auth:bearer {
token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
}
body:json {
{
"owner": "vvy93m1hoaeshwy",
"poi_list": "sh430u0im37cxm5"
}
}

View File

@ -1,40 +0,0 @@
meta {
name: send a poi
type: http
seq: 2
}
post {
url: {{PB_URL}}/api/collections/POI/records
body: json
auth: bearer
}
auth:bearer {
token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4Mjg0NzEsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.pC7u-QaZ_BYqWA5wG8wu1lRbbd4mKuKeAveWe_IBnfU
}
body:json {
{
"Poi_id": "11472887",
"Poi": {
"type": "Feature",
"id": "11472887",
"geometry": {
"type": "Point",
"coordinates": [
-0.0626024,
51.4924088
]
},
"properties": {
"xid": "W544344833",
"name": "The Blue Anchor",
"rate": 2,
"osm": "way/544344833",
"wikidata": "Q7718716",
"kinds": "pubs,foods,shops,marketplaces,tourist_facilities"
}
}
}
}

View File

@ -1,37 +0,0 @@
meta {
name: send fav to astro
type: http
seq: 4
}
post {
url: http://localhost:3000/maps/save_poi
body: json
auth: bearer
}
auth:bearer {
token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MTg4ODY2OTIsImlkIjoidnZ5OTNtMWhvYWVzaHd5IiwidHlwZSI6ImF1dGhSZWNvcmQifQ.R9PBGlHn6aBHt89g6G0NykMh_Vye24OpKEUYtz6R6Og
}
body:json {
{
"type": "Feature",
"id": "11472888",
"geometry": {
"type": "Point",
"coordinates": [
-0.0626024,
51.4924088
]
},
"properties": {
"xid": "W544344833",
"name": "The Blue Anchor",
"rate": 2,
"osm": "way/544344833",
"wikidata": "Q7718716",
"kinds": "pubs,foods,shops,marketplaces,tourist_facilities"
}
}
}

View File

@ -18,9 +18,7 @@ services:
- public - public
front: front:
image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-16-head image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head
environment:
- POCKETBASE_URL=https://${POCKET_BASE_URL}
depends_on: depends_on:
- pocketbase - pocketbase
labels: labels:
@ -32,10 +30,9 @@ services:
- public - public
back_drink: back_drink:
image: git.lab-ouest.org/epitech/ratrapage_t-web_back:master image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head
environment: environment:
- port=${BACK_BASE_PORT} - port=${BACK_BASE_PORT}
- OPEN_TRIP_MAPS_KEY=${OPEN_TRIP_MAPS_KEY}
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`) - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`)
@ -95,4 +92,4 @@ x-dockge:
- https://${FRONT_URL}/ - https://${FRONT_URL}/
- https://${DOCS_DRINK_URL}/ - https://${DOCS_DRINK_URL}/
- https://${DRINK_URL}/ - https://${DRINK_URL}/
- https://${DATA_TOURISME_URL}/ - https://${DATA_TOURISME_URL}/

View File

@ -1,8 +0,0 @@
node_modules
out
.next
next-env.d.ts
*.js
__tests__

View File

@ -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"
}
}

View File

@ -1,20 +1,13 @@
{ {
"prettier.documentSelectors": ["**/*.astro"],
"[astro]": {
"editor.defaultFormatter": "astro-build.astro-vscode"
},
"css.customData": ["./vscode.tailwind.json"], "css.customData": ["./vscode.tailwind.json"],
"eslint.validate": ["javascript", "javascriptreact", "astro", "typescript", "typescriptreact"], "eslint.validate": ["javascript", "javascriptreact", "astro", "typescript", "typescriptreact"],
"files.associations": { "files.associations": {
"*.mdx": "markdown" "*.mdx": "markdown"
}, },
"editor.quickSuggestions": { "prettier.documentSelectors": ["**/*.astro"],
"strings": "on" "[astro]": {
}, "editor.defaultFormatter": "astro-build.astro-vscode"
"tailwindCSS.includeLanguages": { },
"astro": "html"
},
"typescript.tsdk": "node_modules/typescript/lib",
"yaml.schemas": { "yaml.schemas": {
"./.vscode/astrowind/config-schema.json": "/src/config.yaml" "./.vscode/astrowind/config-schema.json": "/src/config.yaml"
}, },

View File

@ -1,7 +1,6 @@
import path from 'path'; import path from 'path';
import { fileURLToPath } from 'url'; import { fileURLToPath } from 'url';
import node from '@astrojs/node'
import tailwind from '@astrojs/tailwind'
import { defineConfig, squooshImageService } from 'astro/config'; import { defineConfig, squooshImageService } from 'astro/config';
import sitemap from '@astrojs/sitemap'; import sitemap from '@astrojs/sitemap';
@ -26,21 +25,8 @@ const whenExternalScripts = (items = []) =>
hasExternalScripts ? (Array.isArray(items) ? items.map((item) => item()) : [items()]) : []; hasExternalScripts ? (Array.isArray(items) ? items.map((item) => item()) : [items()]) : [];
export default defineConfig({ export default defineConfig({
output: 'static',
output: 'server',
compressHTML: true,
build: {
assets: 'assets',
inlineStylesheets: 'auto'
},
server: {
host: true,
port: 3000
},
trailingSlash: 'never',
adapter: node({
mode: 'standalone'
}),
integrations: [ integrations: [
tailwind({ tailwind({
applyBaseStyles: false, applyBaseStyles: false,
@ -70,6 +56,19 @@ export default defineConfig({
}) })
), ),
compress({
CSS: true,
HTML: {
'html-minifier-terser': {
removeAttributeQuotes: false,
},
},
Image: false,
JavaScript: true,
SVG: false,
Logger: 1,
}),
astrowind({ astrowind({
config: './src/config.yaml', config: './src/config.yaml',
}), }),
@ -86,9 +85,6 @@ export default defineConfig({
}, },
vite: { vite: {
optimizeDeps: {
include: ['leaflet']
},
resolve: { resolve: {
alias: { alias: {
'~': path.resolve(__dirname, './src'), '~': path.resolve(__dirname, './src'),

7100
front/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
{ {
"name": "front", "name": "@onwidget/astrowind",
"version": "1.0.0-beta.34", "version": "1.0.0-beta.34",
"description": "AstroWind: A free template using Astro 4.0 and Tailwind CSS. Astro starter theme.",
"type": "module", "type": "module",
"private": true, "private": true,
"engines": { "engines": {
@ -8,40 +9,27 @@
}, },
"scripts": { "scripts": {
"dev": "astro dev", "dev": "astro dev",
"start": "node ./dist/server/entry.mjs", "start": "astro dev",
"build": "astro check && astro build", "build": "astro build",
"preview": "astro preview", "preview": "astro preview",
"astro": "astro", "astro": "astro",
"check:lint": "eslint src" "format": "prettier -w .",
"lint:eslint": "eslint ."
}, },
"dependencies": { "dependencies": {
"@astrojs/node": "^8.2.5",
"@astrojs/rss": "^4.0.5", "@astrojs/rss": "^4.0.5",
"@astrojs/sitemap": "^3.1.4", "@astrojs/sitemap": "^3.1.4",
"@astrojs/tailwind": "^5.1.0",
"@astrolib/analytics": "^0.5.0", "@astrolib/analytics": "^0.5.0",
"@astrolib/seo": "^1.0.0-beta.5", "@astrolib/seo": "^1.0.0-beta.5",
"@fontsource-variable/inter": "^5.0.18", "@fontsource-variable/inter": "^5.0.18",
"@tailwindcss/typography": "^0.5.12",
"astro": "^4.8.3", "astro": "^4.8.3",
"astro-embed": "^0.7.2", "astro-embed": "^0.7.2",
"astro-icon": "^1.1.0", "astro-icon": "^1.1.0",
"leaflet": "^1.9.4",
"leaflet-control-geocoder": "^2.4.0",
"leaflet-geosearch": "^4.0.0",
"leaflet-routing-machine": "^3.2.12",
"limax": "4.1.0", "limax": "4.1.0",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"lucide-astro": "^0.372.0",
"pocketbase": "^0.21.1",
"react-leaflet": "^4.2.1",
"simple-icons-astro": "^11.12.0",
"tailwind-merge": "^2.3.0",
"tailwindcss": "^3.4.3",
"unpic": "^3.18.0" "unpic": "^3.18.0"
}, },
"devDependencies": { "devDependencies": {
"@astrojs/check": "^0",
"@astrojs/mdx": "^3.0.0", "@astrojs/mdx": "^3.0.0",
"@astrojs/partytown": "^2.1.0", "@astrojs/partytown": "^2.1.0",
"@astrojs/tailwind": "5.1.0", "@astrojs/tailwind": "5.1.0",
@ -52,16 +40,12 @@
"@tailwindcss/typography": "^0.5.13", "@tailwindcss/typography": "^0.5.13",
"@types/eslint__js": "^8.42.3", "@types/eslint__js": "^8.42.3",
"@types/js-yaml": "^4.0.9", "@types/js-yaml": "^4.0.9",
"@types/leaflet": "^1.9.12",
"@types/leaflet-routing-machine": "^3.2.8",
"@types/lodash.merge": "^4.6.9", "@types/lodash.merge": "^4.6.9",
"@types/node": "^20", "@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/eslint-plugin": "^6.21.0", "@typescript-eslint/parser": "^7.9.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitest/coverage-v8": "^1",
"astro-eslint-parser": "^1.0.2", "astro-eslint-parser": "^1.0.2",
"eslint": "^8.57.0", "eslint": "8.57.0",
"eslint-plugin-astro": "^0.31.4", "eslint-plugin-astro": "^1.2.0",
"eslint-plugin-jsx-a11y": "^6.8.0", "eslint-plugin-jsx-a11y": "^6.8.0",
"globals": "^15.2.0", "globals": "^15.2.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
@ -71,9 +55,9 @@
"reading-time": "^1.5.0", "reading-time": "^1.5.0",
"rehype-plugin-image-native-lazy-loading": "^1.2.0", "rehype-plugin-image-native-lazy-loading": "^1.2.0",
"sharp": "0.33.3", "sharp": "0.33.3",
"tailwind-merge": "^2.3.0",
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"typescript": "^5", "typescript": "^5.4.5",
"typescript-eslint": "^7.9.0", "typescript-eslint": "^7.9.0"
"vitest": "^1"
} }
} }

View File

@ -1,30 +0,0 @@
---
import type { Input as Props } from 'types';
const {value, checked ,name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props;
---
<>
{
name && (
<div class={"flex flex-row items-center " + divClass}>
<input
type="checkbox"
name={name}
id={name}
checked={checked}
value={value}
autocomplete={autocomplete}
placeholder={placeholder}
class={"mr-2 size-5 " + inputClass}
/>
{label && (
<label for={name} class="block text-lg font-medium">
{label}
</label>
)}
</div>
)
}
</>

View File

@ -1,7 +1,7 @@
--- ---
import favIcon from 'assets/favicons/favicon.ico'; import favIcon from '~/assets/favicons/favicon.ico';
import favIconSvg from 'assets/favicons/favicon.svg'; import favIconSvg from '~/assets/favicons/favicon.svg';
import appleTouchIcon from 'assets/favicons/apple-touch-icon.png'; import appleTouchIcon from '~/assets/favicons/apple-touch-icon.png';
--- ---
<link rel="shortcut icon" href={favIcon} /> <link rel="shortcut icon" href={favIcon} />

View File

@ -1,28 +0,0 @@
---
import type { Input as Props } from 'types';
const { type, name, label, autocomplete, placeholder, divClass, inputClass} = Astro.props;
---
<>
{
name && (
<div class={divClass}>
{label && (
<label for={name} class="block text-sm font-medium">
{label}
</label>
)}
<input
type={type}
name={name}
id={name}
autocomplete={autocomplete}
placeholder={placeholder}
class={"py-3 px-4 block w-full text-md rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-slate-900" + inputClass}
/>
</div>
)
}
</>

View File

@ -1,53 +0,0 @@
---
import ContactUs from 'components/widgets/Contact.astro';
import CallToAction from 'components/widgets/CallToAction.astro';
const pb = Astro.locals.pb
const oauths = (await pb.collection('users').listAuthMethods()).authProviders;
const discordProvider = oauths.find(item => item.name === 'discord');
const googleProvider = oauths.find(item => item.name === 'google');
---
<>
<CallToAction
actions={[
{
variant: 'primary',
text: 'Discord',
href: discordProvider!.authUrl + Astro.url.protocol + "//" + Astro.url.host + '/account/oauth',
icon: 'tabler:brand-discord',
class: "oauth-btn",
"data-cookie": encodeURIComponent(JSON.stringify(discordProvider))
},
{
variant: 'primary',
text: 'Google',
href: googleProvider!.authUrl + Astro.url.protocol + "//" + Astro.url.host + '/account/oauth',
icon: 'tabler:brand-google',
class: "oauth-btn",
"data-cookie": encodeURIComponent(JSON.stringify(googleProvider))
}
]}
>
<Fragment slot="title">
Oauth
</Fragment>
<Fragment slot="subtitle">
Connecter Vous aussi avec
</Fragment>
</CallToAction>
</>
<script>
// import { date } from "astro/zod";
document.cookie = "provider" + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';
// console.log(date.toString)
const btn = document.querySelectorAll('.oauth-btn')
btn.forEach((item: Element) =>(item.addEventListener('click', (ev) =>{
document.cookie = "provider" + "=" + item.getAttribute('data-cookie') + "; path=/;"// expires=" + ;
})))
</script>

View File

@ -1,19 +0,0 @@
---
export interface Props {
values: Array<{label:String, name:string, checked?:boolean | undefined}>
}
const fields = Astro.props.values
---
<>
<div class="flex, flex-col">
{fields.map(value => (
<input type="radio" id={value.name} name="note-min" value={value.name} checked={value.checked}>
<label for={value.name} class="ml-1">{value.label}</label><br>
))}
</div>
</>

View File

@ -1,6 +1,6 @@
--- ---
import Item from 'components/blog/GridItem.astro'; import Item from '~/components/blog/GridItem.astro';
import type { Post } from 'types'; import type { Post } from '~/types';
export interface Props { export interface Props {
posts: Array<Post>; posts: Array<Post>;

View File

@ -1,11 +1,11 @@
--- ---
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import type { Post } from 'types'; import type { Post } from '~/types';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import { findImage } from 'utils/images'; import { findImage } from '~/utils/images';
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
export interface Props { export interface Props {
post: Post; post: Post;

View File

@ -1,6 +1,6 @@
--- ---
import Item from 'components/blog/ListItem.astro'; import Item from '~/components/blog/ListItem.astro';
import type { Post } from 'types'; import type { Post } from '~/types';
export interface Props { export interface Props {
posts: Array<Post>; posts: Array<Post>;

View File

@ -1,15 +1,15 @@
--- ---
import type { ImageMetadata } from 'astro'; import type { ImageMetadata } from 'astro';
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import PostTags from 'components/blog/Tags.astro'; import PostTags from '~/components/blog/Tags.astro';
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import type { Post } from 'types'; import type { Post } from '~/types';
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
import { findImage } from 'utils/images'; import { findImage } from '~/utils/images';
import { getFormattedDate } from 'utils/utils'; import { getFormattedDate } from '~/utils/utils';
export interface Props { export interface Props {
post: Post; post: Post;

View File

@ -1,7 +1,7 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
export interface Props { export interface Props {
prevUrl?: string; prevUrl?: string;

View File

@ -1,10 +1,10 @@
--- ---
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import { getRelatedPosts } from 'utils/blog'; import { getRelatedPosts } from '~/utils/blog';
import BlogHighlightedPosts from '../widgets/BlogHighlightedPosts.astro'; import BlogHighlightedPosts from '../widgets/BlogHighlightedPosts.astro';
import type { Post } from 'types'; import type { Post } from '~/types';
import { getBlogPermalink } from 'utils/permalinks'; import { getBlogPermalink } from '~/utils/permalinks';
export interface Props { export interface Props {
post: Post; post: Post;

View File

@ -1,14 +1,14 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import PostTags from 'components/blog/Tags.astro'; import PostTags from '~/components/blog/Tags.astro';
import SocialShare from 'components/common/SocialShare.astro'; import SocialShare from '~/components/common/SocialShare.astro';
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
import { getFormattedDate } from 'utils/utils'; import { getFormattedDate } from '~/utils/utils';
import type { Post } from 'types'; import type { Post } from '~/types';
export interface Props { export interface Props {
post: Post; post: Post;

View File

@ -1,8 +1,8 @@
--- ---
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import type { Post } from 'types'; import type { Post } from '~/types';
export interface Props { export interface Props {
tags: Post['tags']; tags: Post['tags'];

View File

@ -1,8 +1,8 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { getBlogPermalink } from 'utils/permalinks'; import { getBlogPermalink } from '~/utils/permalinks';
import { I18N } from 'astrowind:config'; import { I18N } from 'astrowind:config';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
const { textDirection } = I18N; const { textDirection } = I18N;
--- ---

View File

@ -1,5 +1,5 @@
--- ---
import { getAsset } from 'utils/permalinks'; import { getAsset } from '~/utils/permalinks';
--- ---
<meta charset="UTF-8" /> <meta charset="UTF-8" />

View File

@ -1,5 +1,5 @@
--- ---
import { findImage } from 'utils/images'; import { findImage } from '~/utils/images';
import { import {
getImagesOptimized, getImagesOptimized,
astroAsseetsOptimizer, astroAsseetsOptimizer,
@ -7,7 +7,7 @@ import {
isUnpicCompatible, isUnpicCompatible,
type ImageProps, type ImageProps,
type AttributesProps, type AttributesProps,
} from 'utils/images-optimization'; } from '~/utils/images-optimization';
type Props = ImageProps; type Props = ImageProps;
type ImageType = { type ImageType = {

View File

@ -5,10 +5,10 @@ import { AstroSeo } from '@astrolib/seo';
import type { Props as AstroSeoProps } from '@astrolib/seo'; import type { Props as AstroSeoProps } from '@astrolib/seo';
import { SITE, METADATA, I18N } from 'astrowind:config'; import { SITE, METADATA, I18N } from 'astrowind:config';
import type { MetaData } from 'types'; import type { MetaData } from '~/types';
import { getCanonical } from 'utils/permalinks'; import { getCanonical } from '~/utils/permalinks';
import { adaptOpenGraphImages } from 'utils/images'; import { adaptOpenGraphImages } from '~/utils/images';
export interface Props extends MetaData { export interface Props extends MetaData {
dontUseTitleTemplate?: boolean; dontUseTitleTemplate?: boolean;

View File

@ -1,7 +1,7 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import type { CallToAction as Props } from 'types'; import type { CallToAction as Props } from '~/types';
const { const {
variant = 'secondary', variant = 'secondary',

View File

@ -1,11 +1,11 @@
--- ---
import type { Form as Props } from 'types'; import type { Form as Props } from '~/types';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
const { inputs, textarea, disclaimer, button = 'Contact us', description = '', id, method, enctype } = Astro.props; const { inputs, textarea, disclaimer, button = 'Contact us', description = '' } = Astro.props;
--- ---
<form id={id} method={method} enctype={enctype}> <form>
{ {
inputs && inputs &&
inputs.map( inputs.map(

View File

@ -1,5 +1,5 @@
--- ---
import type { Headline as Props } from 'types'; import type { Headline as Props } from '~/types';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
const { const {

View File

@ -1,5 +1,5 @@
--- ---
import type { ItemGrid as Props } from 'types'; import type { ItemGrid as Props } from '~/types';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import Button from './Button.astro'; import Button from './Button.astro';
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';

View File

@ -1,5 +1,5 @@
--- ---
import type { ItemGrid as Props } from 'types'; import type { ItemGrid as Props } from '~/types';
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import Button from './Button.astro'; import Button from './Button.astro';

View File

@ -1,7 +1,7 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import type { Item } from 'types'; import type { Item } from '~/types';
export interface Props { export interface Props {
items?: Array<Item>; items?: Array<Item>;

View File

@ -1,6 +1,6 @@
--- ---
import type { HTMLTag } from 'astro/types'; import type { HTMLTag } from 'astro/types';
import type { Widget } from 'types'; import type { Widget } from '~/types';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import Background from './Background.astro'; import Background from './Background.astro';

View File

@ -1,12 +1,12 @@
--- ---
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import Grid from 'components/blog/Grid.astro'; import Grid from '~/components/blog/Grid.astro';
import { getBlogPermalink } from 'utils/permalinks'; import { getBlogPermalink } from '~/utils/permalinks';
import { findPostsByIds } from 'utils/blog'; import { findPostsByIds } from '~/utils/blog';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import type { Widget } from 'types'; import type { Widget } from '~/types';
export interface Props extends Widget { export interface Props extends Widget {
title?: string; title?: string;

View File

@ -1,12 +1,12 @@
--- ---
import { APP_BLOG } from 'astrowind:config'; import { APP_BLOG } from 'astrowind:config';
import Grid from 'components/blog/Grid.astro'; import Grid from '~/components/blog/Grid.astro';
import { getBlogPermalink } from 'utils/permalinks'; import { getBlogPermalink } from '~/utils/permalinks';
import { findLatestPosts } from 'utils/blog'; import { findLatestPosts } from '~/utils/blog';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import type { Widget } from 'types'; import type { Widget } from '~/types';
import Button from '../ui/Button.astro'; import Button from '../ui/Button.astro';
export interface Props extends Widget { export interface Props extends Widget {

View File

@ -1,10 +1,10 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import type { Brands as Props } from 'types'; import type { Brands as Props } from '~/types';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
const { const {
title = '', title = '',
subtitle = '', subtitle = '',

View File

@ -1,8 +1,8 @@
--- ---
import WidgetWrapper from '../ui/WidgetWrapper.astro'; import WidgetWrapper from '../ui/WidgetWrapper.astro';
import type { CallToAction, Widget } from 'types'; import type { CallToAction, Widget } from '~/types';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
interface Props extends Widget { interface Props extends Widget {
title?: string; title?: string;
@ -45,7 +45,7 @@ const {
{Array.isArray(actions) ? ( {Array.isArray(actions) ? (
actions.map((action) => ( actions.map((action) => (
<div class="flex w-full sm:w-auto"> <div class="flex w-full sm:w-auto">
<Button {...(action || {})} class:list={["w-full", "sm:mb-0", action.class]} /> <Button {...(action || {})} class="w-full sm:mb-0" />
</div> </div>
)) ))
) : ( ) : (

View File

@ -1,8 +1,8 @@
--- ---
import FormContainer from 'components/ui/Form.astro'; import FormContainer from '~/components/ui/Form.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import type { Contact as Props } from 'types'; import type { Contact as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),
@ -13,9 +13,6 @@ const {
disclaimer, disclaimer,
button, button,
description, description,
formid,
method,
enctype,
id, id,
isDark = false, isDark = false,
@ -36,9 +33,6 @@ const {
disclaimer={disclaimer} disclaimer={disclaimer}
button={button} button={button}
description={description} description={description}
id={formid}
method={method}
enctype={enctype}
/> />
</div> </div>
) )

View File

@ -1,9 +1,9 @@
--- ---
import type { Content as Props } from 'types'; import type { Content as Props } from '~/types';
import Headline from '../ui/Headline.astro'; import Headline from '../ui/Headline.astro';
import WidgetWrapper from '../ui/WidgetWrapper.astro'; import WidgetWrapper from '../ui/WidgetWrapper.astro';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import ItemGrid from '../ui/ItemGrid.astro'; import ItemGrid from '../ui/ItemGrid.astro';
const { const {

View File

@ -1,8 +1,8 @@
--- ---
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import ItemGrid from 'components/ui/ItemGrid.astro'; import ItemGrid from '~/components/ui/ItemGrid.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import type { Faqs as Props } from 'types'; import type { Faqs as Props } from '~/types';
const { const {
title = '', title = '',

View File

@ -1,8 +1,8 @@
--- ---
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import ItemGrid from 'components/ui/ItemGrid.astro'; import ItemGrid from '~/components/ui/ItemGrid.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import type { Features as Props } from 'types'; import type { Features as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),

View File

@ -1,8 +1,8 @@
--- ---
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import ItemGrid2 from 'components/ui/ItemGrid2.astro'; import ItemGrid2 from '~/components/ui/ItemGrid2.astro';
import type { Features as Props } from 'types'; import type { Features as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),

View File

@ -1,9 +1,9 @@
--- ---
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import ItemGrid from 'components/ui/ItemGrid.astro'; import ItemGrid from '~/components/ui/ItemGrid.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import type { Features as Props } from 'types'; import type { Features as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),

View File

@ -1,7 +1,7 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import { SITE } from 'astrowind:config'; import { SITE } from 'astrowind:config';
import { getHomePermalink } from 'utils/permalinks'; import { getHomePermalink } from '~/utils/permalinks';
interface Link { interface Link {
text?: string; text?: string;
@ -26,7 +26,7 @@ export interface Props {
const { socialLinks = [], secondaryLinks = [], links = [], footNote = '', theme = 'light' } = Astro.props; const { socialLinks = [], secondaryLinks = [], links = [], footNote = '', theme = 'light' } = Astro.props;
--- ---
<footer class:list={[{ dark: theme === 'dark' }, 'relative border-t border-gray-200 dark:border-slate-800 not-prose, mt-auto, h-{11rem}']}> <footer class:list={[{ dark: theme === 'dark' }, 'relative border-t border-gray-200 dark:border-slate-800 not-prose']}>
<div class="dark:bg-dark absolute inset-0 pointer-events-none" aria-hidden="true"></div> <div class="dark:bg-dark absolute inset-0 pointer-events-none" aria-hidden="true"></div>
<div class="relative max-w-7xl mx-auto px-4 sm:px-6 dark:text-slate-300"> <div class="relative max-w-7xl mx-auto px-4 sm:px-6 dark:text-slate-300">
<div class="grid grid-cols-12 gap-4 gap-y-8 sm:gap-8 py-8 md:py-12"> <div class="grid grid-cols-12 gap-4 gap-y-8 sm:gap-8 py-8 md:py-12">

View File

@ -1,173 +1,166 @@
--- ---
import { Icon } from 'astro-icon/components' import { Icon } from 'astro-icon/components';
import Logo from 'components/Logo.astro' import Logo from '~/components/Logo.astro';
import ToggleTheme from 'components/common/ToggleTheme.astro' import ToggleTheme from '~/components/common/ToggleTheme.astro';
import ToggleMenu from 'components/common/ToggleMenu.astro' import ToggleMenu from '~/components/common/ToggleMenu.astro';
import Button from 'components/ui/Button.astro' import Button from '~/components/ui/Button.astro';
import { getHomePermalink } from 'utils/permalinks' import { getHomePermalink } from '~/utils/permalinks';
import { trimSlash, getAsset } from 'utils/permalinks' import { trimSlash, getAsset } from '~/utils/permalinks';
import type { CallToAction } from 'types' import type { CallToAction } from '~/types';
const pb = Astro.locals.pb
const connected = pb.authStore.isValid
interface Link { interface Link {
text?: string text?: string;
href?: string href?: string;
ariaLabel?: string ariaLabel?: string;
icon?: string icon?: string;
} }
interface ActionLink extends CallToAction {} interface ActionLink extends CallToAction {}
interface MenuLink extends Link { interface MenuLink extends Link {
links?: Array<MenuLink> links?: Array<MenuLink>;
} }
export interface Props { export interface Props {
id?: string id?: string;
links?: Array<MenuLink> links?: Array<MenuLink>;
actions?: Array<ActionLink> actions?: Array<ActionLink>;
isSticky?: boolean isSticky?: boolean;
isDark?: boolean isDark?: boolean;
isFullWidth?: boolean isFullWidth?: boolean;
showToggleTheme?: boolean showToggleTheme?: boolean;
showRssFeed?: boolean showRssFeed?: boolean;
position?: string position?: string;
} }
const { const {
id = 'header', id = 'header',
links = [], links = [],
actions = [], actions = [],
isSticky = false, isSticky = false,
isDark = false, isDark = false,
isFullWidth = false, isFullWidth = false,
showToggleTheme = false, showToggleTheme = false,
showRssFeed = false, showRssFeed = false,
position = 'center', position = 'center',
} = Astro.props } = Astro.props;
const currentPath = `/${trimSlash(new URL(Astro.url).pathname)}` const currentPath = `/${trimSlash(new URL(Astro.url).pathname)}`;
--- ---
<header <header
class:list={[ class:list={[
{ sticky: isSticky, relative: !isSticky, dark: isDark }, { sticky: isSticky, relative: !isSticky, dark: isDark },
'top-0 z-[1001] h-[5rem] bg-page flex-none mx-auto w-full border-b border-gray-50/0 transition-[opacity] ease-in-out', 'top-0 z-40 flex-none mx-auto w-full border-b border-gray-50/0 transition-[opacity] ease-in-out',
]} ]}
{...isSticky ? { 'data-aw-sticky-header': true } : {}} {...isSticky ? { 'data-aw-sticky-header': true } : {}}
{...id ? { id } : {}} {...id ? { id } : {}}
> >
<div class="absolute inset-0"></div> <div class="absolute inset-0"></div>
<div <div
class:list={[ class:list={[
'relative text-default py-3 px-3 md:px-6 mx-auto w-full', 'relative text-default py-3 px-3 md:px-6 mx-auto w-full',
{ {
'md:flex md:justify-between': position !== 'center', 'md:flex md:justify-between': position !== 'center',
}, },
{ {
'md:grid md:grid-cols-3 md:items-center': position === 'center', 'md:grid md:grid-cols-3 md:items-center': position === 'center',
}, },
{ {
'max-w-7xl': !isFullWidth, 'max-w-7xl': !isFullWidth,
}, },
]} ]}
> >
<div class:list={[{ 'mr-auto rtl:mr-0 rtl:ml-auto': position === 'right' }, 'flex justify-between']}> <div class:list={[{ 'mr-auto rtl:mr-0 rtl:ml-auto': position === 'right' }, 'flex justify-between']}>
<a class="flex items-center" href={getHomePermalink()}> <a class="flex items-center" href={getHomePermalink()}>
<Logo /> <Logo />
</a> </a>
<div class="flex items-center md:hidden"> <div class="flex items-center md:hidden">
<ToggleMenu /> <ToggleMenu />
</div> </div>
</div> </div>
<nav <nav
class="items-center w-full md:w-auto hidden md:flex md:mx-5 text-default overflow-y-auto overflow-x-hidden md:overflow-y-visible md:overflow-x-auto md:justify-self-center" class="items-center w-full md:w-auto hidden md:flex md:mx-5 text-default overflow-y-auto overflow-x-hidden md:overflow-y-visible md:overflow-x-auto md:justify-self-center"
aria-label="Main navigation" aria-label="Main navigation"
> >
<ul <ul
class="flex flex-col bg-page md:flex-row md:self-center w-full md:w-auto text-xl md:text-[0.9375rem] tracking-[0.01rem] font-medium md:justify-center" class="flex flex-col md:flex-row md:self-center w-full md:w-auto text-xl md:text-[0.9375rem] tracking-[0.01rem] font-medium md:justify-center"
> >
{ {
links.map(({ text, href, links }) => ( links.map(({ text, href, links }) => (
<li class={links?.length ? 'dropdown' : ''}> <li class={links?.length ? 'dropdown' : ''}>
{links?.length ? ( {links?.length ? (
<> <>
<button type="button" class="hover:text-link dark:hover:text-white px-4 py-3 flex items-center"> <button type="button" class="hover:text-link dark:hover:text-white px-4 py-3 flex items-center">
{text}{' '} {text}{' '}
<Icon name="tabler:chevron-down" class="w-3.5 h-3.5 ml-0.5 rtl:ml-0 rtl:mr-0.5 hidden md:inline" /> <Icon name="tabler:chevron-down" class="w-3.5 h-3.5 ml-0.5 rtl:ml-0 rtl:mr-0.5 hidden md:inline" />
</button> </button>
<ul class="dropdown-menu md:backdrop-blur-md dark:md:bg-dark rounded md:absolute pl-4 md:pl-0 md:hidden font-medium md:bg-white/90 md:min-w-[200px] drop-shadow-xl"> <ul class="dropdown-menu md:backdrop-blur-md dark:md:bg-dark rounded md:absolute pl-4 md:pl-0 md:hidden font-medium md:bg-white/90 md:min-w-[200px] drop-shadow-xl">
{links.map(({ text: text2, href: href2 }) => ( {links.map(({ text: text2, href: href2 }) => (
<li> <li>
<a <a
class:list={[ class:list={[
'first:rounded-t last:rounded-b md:hover:bg-gray-100 hover:text-link dark:hover:text-white dark:hover:bg-gray-700 py-2 px-5 block whitespace-no-wrap', 'first:rounded-t last:rounded-b md:hover:bg-gray-100 hover:text-link dark:hover:text-white dark:hover:bg-gray-700 py-2 px-5 block whitespace-no-wrap',
{ 'aw-link-active': href2 === currentPath }, { 'aw-link-active': href2 === currentPath },
]} ]}
href={href2} href={href2}
> >
{text2} {text2}
</a> </a>
</li> </li>
))} ))}
</ul> </ul>
</> </>
) : ( ) : (
<a <a
class:list={[ class:list={[
'hover:text-link dark:hover:text-white px-4 py-3 flex items-center', 'hover:text-link dark:hover:text-white px-4 py-3 flex items-center',
{ 'aw-link-active': href === currentPath }, { 'aw-link-active': href === currentPath },
]} ]}
href={href} href={href}
> >
{text} {text}
</a> </a>
)} )}
</li> </li>
)) ))
} }
</ul> </ul>
</nav> </nav>
<div <div
class:list={[ class:list={[
{ 'ml-auto rtl:ml-0 rtl:mr-auto': position === 'left' }, { 'ml-auto rtl:ml-0 rtl:mr-auto': position === 'left' },
'hidden md:self-center md:flex items-center md:mb-0 fixed w-full md:w-auto md:static justify-end left-0 rtl:left-auto rtl:right-0 bottom-0 p-3 md:p-0 md:justify-self-end', 'hidden md:self-center md:flex items-center md:mb-0 fixed w-full md:w-auto md:static justify-end left-0 rtl:left-auto rtl:right-0 bottom-0 p-3 md:p-0 md:justify-self-end',
]} ]}
> >
<div class="items-center flex justify-between w-full md:w-auto"> <div class="items-center flex justify-between w-full md:w-auto">
<div class="flex"> <div class="flex">
{showToggleTheme && <ToggleTheme iconClass="w-6 h-6 md:w-5 md:h-5 md:inline-block" />} {showToggleTheme && <ToggleTheme iconClass="w-6 h-6 md:w-5 md:h-5 md:inline-block" />}
{ {
showRssFeed && ( showRssFeed && (
<a <a
class="text-muted dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center" class="text-muted dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center"
aria-label="RSS Feed" aria-label="RSS Feed"
href={getAsset('/rss.xml')} href={getAsset('/rss.xml')}
> >
<Icon name="tabler:rss" class="w-5 h-5" /> <Icon name="tabler:rss" class="w-5 h-5" />
</a> </a>
) )
} }
</div> </div>
{ !connected && ( {
<span class="ml-4 rtl:ml-0 rtl:mr-4"> actions?.length ? (
<Button href='/account/login' variant='primary' class="ml-2 py-2.5 px-5.5 md:px-6 font-semibold shadow-none text-sm w-auto"> <span class="ml-4 rtl:ml-0 rtl:mr-4">
Connexion {actions.map((btnProps) => (
</Button> <Button {...btnProps} class="ml-2 py-2.5 px-5.5 md:px-6 font-semibold shadow-none text-sm w-auto" />
<Button href='/account/register' variant='secondary' class="ml-2 py-2.5 px-5.5 md:px-6 font-semibold shadow-none text-sm w-auto"> ))}
Inscription </span>
</Button> ) : (
</span> ''
)} )
{ connected && ( }
<Button href='/account/logout' variant='primary' class="ml-2 py-2.5 px-5.5 md:px-6 font-semibold shadow-none text-sm w-auto"> </div>
Déconnexion </div>
</Button> </div>
)}
</div>
</div>
</div>
</header> </header>

View File

@ -1,7 +1,7 @@
--- ---
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import type { CallToAction } from 'types'; import type { CallToAction } from '~/types';
export interface Props { export interface Props {
id?: string; id?: string;

View File

@ -1,7 +1,7 @@
--- ---
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import type { CallToAction } from 'types'; import type { CallToAction } from '~/types';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
export interface Props { export interface Props {
title?: string; title?: string;

View File

@ -1,6 +1,6 @@
--- ---
import type { CallToAction } from 'types'; import type { CallToAction } from '~/types';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
export interface Props { export interface Props {
title?: string; title?: string;

View File

@ -1,9 +1,9 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import type { Pricing as Props } from 'types'; import type { Pricing as Props } from '~/types';
const { const {
title = '', title = '',

View File

@ -1,5 +1,5 @@
--- ---
import type { Stats as Props } from 'types'; import type { Stats as Props } from '~/types';
import WidgetWrapper from '../ui/WidgetWrapper.astro'; import WidgetWrapper from '../ui/WidgetWrapper.astro';
import Headline from '../ui/Headline.astro'; import Headline from '../ui/Headline.astro';
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';

View File

@ -1,9 +1,9 @@
--- ---
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import Timeline from 'components/ui/Timeline.astro'; import Timeline from '~/components/ui/Timeline.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import type { Steps as Props } from 'types'; import type { Steps as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),

View File

@ -1,9 +1,9 @@
--- ---
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import type { Steps as Props } from 'types'; import type { Steps as Props } from '~/types';
const { const {
title = await Astro.slots.render('title'), title = await Astro.slots.render('title'),

View File

@ -1,9 +1,9 @@
--- ---
import Headline from 'components/ui/Headline.astro'; import Headline from '~/components/ui/Headline.astro';
import WidgetWrapper from 'components/ui/WidgetWrapper.astro'; import WidgetWrapper from '~/components/ui/WidgetWrapper.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
import type { Testimonials as Props } from 'types'; import type { Testimonials as Props } from '~/types';
const { const {
title = '', title = '',

View File

@ -1,6 +1,6 @@
site: site:
name: EpicRoadTrip name: AstroWind
site: 'https://front-tweb.cb85.fr' site: 'https://astrowind.vercel.app'
base: '/' base: '/'
trailingSlash: false trailingSlash: false

View File

@ -12,8 +12,8 @@ metadata:
canonical: https://astrowind.vercel.app/astrowind-template-in-depth canonical: https://astrowind.vercel.app/astrowind-template-in-depth
--- ---
import DListItem from 'components/ui/DListItem.astro'; import DListItem from '~/components/ui/DListItem.astro';
import ToggleTheme from 'components/common/ToggleTheme.astro'; import ToggleTheme from '~/components/common/ToggleTheme.astro';
## Overview ## Overview

View File

@ -8,7 +8,7 @@ tags:
- Astro - Astro
--- ---
import Logo from 'components/Logo.astro'; import Logo from '~/components/Logo.astro';
import { YouTube, Tweet, Vimeo } from 'astro-embed'; import { YouTube, Tweet, Vimeo } from 'astro-embed';
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

22
front/src/env.d.ts vendored
View File

@ -3,25 +3,3 @@
/// <reference types="astro/client" /> /// <reference types="astro/client" />
/// <reference types="vite/client" /> /// <reference types="vite/client" />
/// <reference types="../vendor/integration/types.d.ts" /> /// <reference types="../vendor/integration/types.d.ts" />
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 global {
namespace App {
interface Locals {
pb: PocketBase
}
}
}

View File

@ -1,9 +1,9 @@
--- ---
import PageLayout from 'layouts/PageLayout.astro'; import PageLayout from '~/layouts/PageLayout.astro';
import Header from 'components/widgets/Header.astro'; import Header from '~/components/widgets/Header.astro';
import { headerData } from 'navigation'; import { headerData } from '~/navigation';
import type { MetaData } from 'types'; import type { MetaData } from '~/types';
export interface Props { export interface Props {
metadata?: MetaData; metadata?: MetaData;

View File

@ -3,19 +3,19 @@ import '~/assets/styles/tailwind.css';
import { I18N } from 'astrowind:config'; import { I18N } from 'astrowind:config';
import CommonMeta from 'components/common/CommonMeta.astro'; import CommonMeta from '~/components/common/CommonMeta.astro';
import Favicons from 'components/Favicons.astro'; import Favicons from '~/components/Favicons.astro';
import CustomStyles from 'components/CustomStyles.astro'; import CustomStyles from '~/components/CustomStyles.astro';
import ApplyColorMode from 'components/common/ApplyColorMode.astro'; import ApplyColorMode from '~/components/common/ApplyColorMode.astro';
import Metadata from 'components/common/Metadata.astro'; import Metadata from '~/components/common/Metadata.astro';
import SiteVerification from 'components/common/SiteVerification.astro'; import SiteVerification from '~/components/common/SiteVerification.astro';
import Analytics from 'components/common/Analytics.astro'; import Analytics from '~/components/common/Analytics.astro';
import BasicScripts from 'components/common/BasicScripts.astro'; import BasicScripts from '~/components/common/BasicScripts.astro';
// Comment the line below to disable View Transitions // Comment the line below to disable View Transitions
import { ViewTransitions } from 'astro:transitions'; import { ViewTransitions } from 'astro:transitions';
import type { MetaData as MetaDataType } from 'types'; import type { MetaData as MetaDataType } from '~/types';
export interface Props { export interface Props {
metadata?: MetaDataType; metadata?: MetaDataType;

View File

@ -1,7 +1,7 @@
--- ---
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import type { MetaData } from 'types'; import type { MetaData } from '~/types';
export interface Props { export interface Props {
frontmatter: { frontmatter: {

View File

@ -1,12 +1,12 @@
--- ---
import Layout from 'layouts/Layout.astro'; import Layout from '~/layouts/Layout.astro';
import Header from 'components/widgets/Header.astro'; import Header from '~/components/widgets/Header.astro';
import Footer from 'components/widgets/Footer.astro'; import Footer from '~/components/widgets/Footer.astro';
import Announcement from 'components/widgets/Announcement.astro'; import Announcement from '~/components/widgets/Announcement.astro';
import { headerData, footerData } from 'navigation'; import { headerData, footerData } from '~/navigation';
import type { MetaData } from 'types'; import type { MetaData } from '~/types';
export interface Props { export interface Props {
metadata?: MetaData; metadata?: MetaData;
@ -16,18 +16,16 @@ const { metadata } = Astro.props;
--- ---
<Layout metadata={metadata}> <Layout metadata={metadata}>
<div id="posts" class="flex flex-col min-h-screen"> <slot name="announcement">
<!-- <slot name="announcement"> <Announcement />
<Announcement /> </slot>
</slot> --> <slot name="header">
<slot name="header"> <Header {...headerData} isSticky showRssFeed showToggleTheme />
<Header {...headerData} isSticky showToggleTheme /> </slot>
</slot> <main>
<main> <slot />
<slot /> </main>
</main> <slot name="footer">
<slot name="footer"> <Footer {...footerData} />
<Footer {...footerData} /> </slot>
</slot>
</div>
</Layout> </Layout>

View File

@ -1,5 +0,0 @@
export default class AstroUtils {
public static async wrap<T = void>(fn: () => T | Promise<T>) {
return await fn()
}
}

View File

@ -0,0 +1,12 @@
//référence a loop
//fonction get user pour récupéré un utilisateur (notament coté client)
//sessionID = JWS
//fonction set user crée un cookies de session
//passé le cookies astro dans les paramètre
//utiliser cookie.set pour crée un nouveau cookies

View File

@ -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
}

View File

@ -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
})

View File

@ -1,63 +1,183 @@
import { getPermalink, getBlogPermalink } from './utils/permalinks' import { getPermalink, getBlogPermalink, getAsset } from './utils/permalinks';
export const headerData = { export const headerData = {
links: [ links: [
{
text: 'Explorer POI',
href: '/maps',
},
{ {
text: 'itinéraire', text: 'Homes',
href: '/maps/find_route', links: [
}, {
text: 'SaaS',
href: getPermalink('/homes/saas'),
},
{
text: 'Startup',
href: getPermalink('/homes/startup'),
},
{
text: 'Mobile App',
href: getPermalink('/homes/mobile-app'),
},
{
text: 'Personal',
href: getPermalink('/homes/personal'),
},
],
},
{ {
text: 'Compte', text: 'Pages',
href: '/account', links: [
}, {
], text: 'Features (Anchor Link)',
// actions: [ href: getPermalink('/#features'),
// { },
// text: 'Connexion', {
// href: '', text: 'Services',
// target: '_blank', href: getPermalink('/services'),
// }, },
// ], {
} text: 'Pricing',
href: getPermalink('/pricing'),
},
{
text: 'About us',
href: getPermalink('/about'),
},
{
text: 'Contact',
href: getPermalink('/contact'),
},
{
text: 'Terms',
href: getPermalink('/terms'),
},
{
text: 'Privacy policy',
href: getPermalink('/privacy'),
},
],
},
{
text: 'Landing',
links: [
{
text: 'Lead Generation',
href: getPermalink('/landing/lead-generation'),
},
{
text: 'Long-form Sales',
href: getPermalink('/landing/sales'),
},
{
text: 'Click-Through',
href: getPermalink('/landing/click-through'),
},
{
text: 'Product Details (or Services)',
href: getPermalink('/landing/product'),
},
{
text: 'Coming Soon or Pre-Launch',
href: getPermalink('/landing/pre-launch'),
},
{
text: 'Subscription',
href: getPermalink('/landing/subscription'),
},
],
},
{
text: 'Blog',
links: [
{
text: 'Blog List',
href: getBlogPermalink(),
},
{
text: 'Article',
href: getPermalink('get-started-website-with-astro-tailwind-css', 'post'),
},
{
text: 'Article (with MDX)',
href: getPermalink('markdown-elements-demo-post', 'post'),
},
{
text: 'Category Page',
href: getPermalink('tutorials', 'category'),
},
{
text: 'Tag Page',
href: getPermalink('astro', 'tag'),
},
],
},
{
text: 'Widgets',
href: '#',
},
],
actions: [{ text: 'Download', href: 'https://github.com/onwidget/astrowind', target: '_blank' }],
};
export const footerData = { export const footerData = {
links: [ links: [
{ {
title: 'Product', title: 'Product',
links: [ links: [
{ text: 'Features', href: '#' }, { text: 'Features', href: '#' },
{ text: 'Security', href: '#' }, { text: 'Security', href: '#' },
], { text: 'Team', href: '#' },
}, { text: 'Enterprise', href: '#' },
{ { text: 'Customer stories', href: '#' },
title: 'Platform', { text: 'Pricing', href: '#' },
links: [ { text: 'Resources', href: '#' },
{ text: 'Developer API', href: '#' }, ],
{ text: 'Partners', href: '#' }, },
], {
}, title: 'Platform',
{ links: [
title: 'Support', { text: 'Developer API', href: '#' },
links: [ { text: 'Partners', href: '#' },
{ text: 'Docs', href: '#' }, { text: 'Atom', href: '#' },
{ text: 'Community Forum', href: '#' }, { text: 'Electron', href: '#' },
], { text: 'AstroWind Desktop', href: '#' },
}, ],
{ },
title: 'Company', {
links: [ title: 'Support',
{ text: 'About', href: '#' }, links: [
{ text: 'Blog', href: '#' }, { text: 'Docs', href: '#' },
], { text: 'Community Forum', href: '#' },
}, { text: 'Professional Services', href: '#' },
], { text: 'Skills', href: '#' },
secondaryLinks: [ { text: 'Status', href: '#' },
{ text: 'Terms', href: getPermalink('/terms') }, ],
{ text: 'Privacy Policy', href: getPermalink('/privacy') }, },
], {
socialLinks:[] title: 'Company',
} links: [
{ text: 'About', href: '#' },
{ text: 'Blog', href: '#' },
{ text: 'Careers', href: '#' },
{ text: 'Press', href: '#' },
{ text: 'Inclusion', href: '#' },
{ text: 'Social Impact', href: '#' },
{ text: 'Shop', href: '#' },
],
},
],
secondaryLinks: [
{ text: 'Terms', href: getPermalink('/terms') },
{ text: 'Privacy Policy', href: getPermalink('/privacy') },
],
socialLinks: [
{ ariaLabel: 'X', icon: 'tabler:brand-x', href: '#' },
{ ariaLabel: 'Instagram', icon: 'tabler:brand-instagram', href: '#' },
{ ariaLabel: 'Facebook', icon: 'tabler:brand-facebook', href: '#' },
{ ariaLabel: 'RSS', icon: 'tabler:rss', href: getAsset('/rss.xml') },
{ ariaLabel: 'Github', icon: 'tabler:brand-github', href: 'https://github.com/onwidget/astrowind' },
],
footNote: `
<img class="w-5 h-5 md:w-6 md:h-6 md:-mt-0.5 bg-cover mr-1.5 rtl:mr-0 rtl:ml-1.5 float-left rtl:float-right rounded-sm" src="https://onwidget.com/favicon/favicon-32x32.png" alt="onWidget logo" loading="lazy"></img>
Made by <a class="text-blue-600 underline dark:text-muted" href="https://onwidget.com/"> onWidget</a> · All rights reserved.
`,
};

View File

@ -1,6 +1,6 @@
--- ---
import Layout from 'layouts/Layout.astro'; import Layout from '~/layouts/Layout.astro';
import { getHomePermalink } from 'utils/permalinks'; import { getHomePermalink } from '~/utils/permalinks';
const title = `Error 404`; const title = `Error 404`;
--- ---

View File

@ -1,13 +1,13 @@
--- ---
import type { InferGetStaticPropsType, GetStaticPaths } from 'astro'; import type { InferGetStaticPropsType, GetStaticPaths } from 'astro';
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import BlogList from 'components/blog/List.astro'; import BlogList from '~/components/blog/List.astro';
import Headline from 'components/blog/Headline.astro'; import Headline from '~/components/blog/Headline.astro';
import Pagination from 'components/blog/Pagination.astro'; import Pagination from '~/components/blog/Pagination.astro';
// import PostTags from "~/components/blog/Tags.astro"; // import PostTags from "~/components/blog/Tags.astro";
import { blogListRobots, getStaticPathsBlogList } from 'utils/blog'; import { blogListRobots, getStaticPathsBlogList } from '~/utils/blog';
export const prerender = true; export const prerender = true;

View File

@ -1,11 +1,11 @@
--- ---
import type { InferGetStaticPropsType, GetStaticPaths } from 'astro'; import type { InferGetStaticPropsType, GetStaticPaths } from 'astro';
import { blogCategoryRobots, getStaticPathsBlogCategory } from 'utils/blog'; import { blogCategoryRobots, getStaticPathsBlogCategory } from '~/utils/blog';
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import BlogList from 'components/blog/List.astro'; import BlogList from '~/components/blog/List.astro';
import Headline from 'components/blog/Headline.astro'; import Headline from '~/components/blog/Headline.astro';
import Pagination from 'components/blog/Pagination.astro'; import Pagination from '~/components/blog/Pagination.astro';
export const prerender = true; export const prerender = true;

View File

@ -1,11 +1,11 @@
--- ---
import type { InferGetStaticPropsType, GetStaticPaths } from 'astro'; import type { InferGetStaticPropsType, GetStaticPaths } from 'astro';
import { blogTagRobots, getStaticPathsBlogTag } from 'utils/blog'; import { blogTagRobots, getStaticPathsBlogTag } from '~/utils/blog';
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import BlogList from 'components/blog/List.astro'; import BlogList from '~/components/blog/List.astro';
import Headline from 'components/blog/Headline.astro'; import Headline from '~/components/blog/Headline.astro';
import Pagination from 'components/blog/Pagination.astro'; import Pagination from '~/components/blog/Pagination.astro';
export const prerender = true; export const prerender = true;

View File

@ -3,15 +3,15 @@ import type { InferGetStaticPropsType, GetStaticPaths } from 'astro';
import merge from 'lodash.merge'; import merge from 'lodash.merge';
import type { ImageMetadata } from 'astro'; import type { ImageMetadata } from 'astro';
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import SinglePost from 'components/blog/SinglePost.astro'; import SinglePost from '~/components/blog/SinglePost.astro';
import ToBlogLink from 'components/blog/ToBlogLink.astro'; import ToBlogLink from '~/components/blog/ToBlogLink.astro';
import { getCanonical, getPermalink } from 'utils/permalinks'; import { getCanonical, getPermalink } from '~/utils/permalinks';
import { getStaticPathsBlogPost, blogPostRobots } from 'utils/blog'; import { getStaticPathsBlogPost, blogPostRobots } from '~/utils/blog';
import { findImage } from 'utils/images'; import { findImage } from '~/utils/images';
import type { MetaData } from 'types'; import type { MetaData } from '~/types';
import RelatedPosts from 'components/blog/RelatedPosts.astro'; import RelatedPosts from '~/components/blog/RelatedPosts.astro';
export const prerender = true; export const prerender = true;

View File

@ -1,10 +1,10 @@
--- ---
import Features2 from 'components/widgets/Features2.astro'; import Features2 from '~/components/widgets/Features2.astro';
import Features3 from 'components/widgets/Features3.astro'; import Features3 from '~/components/widgets/Features3.astro';
import Hero from 'components/widgets/Hero.astro'; import Hero from '~/components/widgets/Hero.astro';
import Stats from 'components/widgets/Stats.astro'; import Stats from '~/components/widgets/Stats.astro';
import Steps2 from 'components/widgets/Steps2.astro'; import Steps2 from '~/components/widgets/Steps2.astro';
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
const metadata = { const metadata = {
title: 'About us', title: 'About us',

View File

@ -1,23 +0,0 @@
---
import Layout from 'layouts/PageLayout.astro';
//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");
}
const metadata = {
title: 'Account',
ignoreTitleTemplate: true,
};
---
<Layout metadata={metadata}>
<h1>Bonjour {user!.username}</h1>
</Layout>

View File

@ -1,65 +0,0 @@
---
import Layout from 'layouts/PageLayout.astro';
//import Layout from 'layouts/Layout.astro';
import AstroUtils from "libs/AstroUtils";
import PocketBase from 'pocketbase'
import ContactUs from 'components/widgets/Contact.astro';
import CallToAction from 'components/widgets/CallToAction.astro';
import Oauth from 'components/Oauth.astro';
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();
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
}
})
const metadata = {
title: 'Login',
ignoreTitleTemplate: true,
};
---
<Layout metadata={metadata}>
<ContactUs
formid="login"
title="Connexion"
subtitle="Connectez vous pour sauvegardez vos recherche"
button='Connexion'
method='post'
enctype="multipart/form-data"
inputs={[
{
type: 'text',
name: 'username',
label: 'Nom d\'utilisateur ou e-mail',
placeholder: "michel@example.com"
},
{
type: "password",
name: "password"
}
]}
/>
<Oauth/>
</Layout>

View File

@ -1,13 +0,0 @@
---
import PocketBase from 'pocketbase'
const pb = Astro.locals.pb
if(pb.authStore.isValid){
pb.authStore.clear()
}
return Astro.redirect('/')
---

View File

@ -1,63 +0,0 @@
---
const pb = Astro.locals.pb
const redirectUrl = Astro.url.protocol + "//" + Astro.url.host + '/account/oauth';
const params = Astro.url.searchParams
const code = params.get('code')
// 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')) {
console.log(provider.state)
console.log(params.get('state'))
throw "State parameters don't match.";
}
let authenticated = false
await pb.collection('users').authWithOAuth2Code(
provider.name,
code,
provider.codeVerifier,
redirectUrl,
{
emailVisibility: false,
}
).then((authData) => {
//REDIRECT
console.log("oauth OK !!");
authenticated = true
}).catch((err) => {
console.log("oauth fail !!");
console.log(err);
});
if (authenticated) {
return Astro.redirect("/account")
}
---
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>OAuth2 redirect page</title>
</head>
<body>
</body>
</html>

View File

@ -1,83 +0,0 @@
---
import Layout from 'layouts/PageLayout.astro';
//import Layout from 'layouts/Layout.astro';
import AstroUtils from 'libs/AstroUtils';
import { getEnv } from 'libs/Env';
import ContactUs from 'components/widgets/Contact.astro';
import Oauth from 'components/Oauth.astro';
const pb = Astro.locals.pb
if(pb.authStore.isValid){
return Astro.redirect("/account")
}
let loged = false
await AstroUtils.wrap(async () => {
if (Astro.request.method !== 'POST'){
return
}
const form = await Astro.request.formData()
const request = {
username: form.get("username") as string,
name: form.get("name") as string,
email: form.get("email") as string,
password: form.get("password") as string,
passwordConfirm: form.get("passwordConfirm") as string,
}
try{
await pb.collection('users').create(request)
loged = true
}catch(e){
console.log(e);
}
})
if (loged) {
return Astro.redirect('/account/login')
}
const metadata = {
title: 'Register',
ignoreTitleTemplate: true,
};
---
<Layout metadata={metadata}>
<ContactUs
formid='account-creation'
title='Inscription'
subtitle="inscrivez vous pour sauvegardez vos recherche"
button='Créer un compte'
method='post'
enctype="multipart/form-data"
inputs={[
{
type: 'text',
name: 'name',
label: 'Prénom Nom',
placeholder: "Michel Biche"
},{
type: 'text',
name: 'username',
label: 'Nom d\'utilisateur',
placeholder: "michel85"
},{
type: 'email',
name: 'email',
label: 'Adresse email',
placeholder: "michel@example.com"
},{
type: 'password',
name: 'password',
label: 'Créez un mot de passe',
},{
type: 'password',
name: 'passwordConfirm',
label: 'Confirmer votre mot de passe',
},
]}
/>
<Oauth/>
</Layout>

View File

@ -1,8 +1,8 @@
--- ---
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import HeroText from 'components/widgets/HeroText.astro'; import HeroText from '~/components/widgets/HeroText.astro';
import ContactUs from 'components/widgets/Contact.astro'; import ContactUs from '~/components/widgets/Contact.astro';
import Features2 from 'components/widgets/Features2.astro'; import Features2 from '~/components/widgets/Features2.astro';
const metadata = { const metadata = {
title: 'Contact', title: 'Contact',

View File

@ -1,18 +1,18 @@
--- ---
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import Header from 'components/widgets/Header.astro'; import Header from '~/components/widgets/Header.astro';
import Hero2 from 'components/widgets/Hero2.astro'; import Hero2 from '~/components/widgets/Hero2.astro';
import CallToAction from 'components/widgets/CallToAction.astro'; import CallToAction from '~/components/widgets/CallToAction.astro';
import Features3 from 'components/widgets/Features3.astro'; import Features3 from '~/components/widgets/Features3.astro';
import Content from 'components/widgets/Content.astro'; import Content from '~/components/widgets/Content.astro';
import Testimonials from 'components/widgets/Testimonials.astro'; import Testimonials from '~/components/widgets/Testimonials.astro';
import FAQs from 'components/widgets/FAQs.astro'; import FAQs from '~/components/widgets/FAQs.astro';
import Stats from 'components/widgets/Stats.astro'; import Stats from '~/components/widgets/Stats.astro';
import Button from 'components/ui/Button.astro'; import Button from '~/components/ui/Button.astro';
import Image from 'components/common/Image.astro'; import Image from '~/components/common/Image.astro';
const appStoreImg = '~/assets/images/app-store.png'; const appStoreImg = '~/assets/images/app-store.png';
const appStoreDownloadLink = 'https://github.com/onwidget/astrowind'; const appStoreDownloadLink = 'https://github.com/onwidget/astrowind';

View File

@ -1,15 +1,15 @@
--- ---
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import Header from 'components/widgets/Header.astro'; import Header from '~/components/widgets/Header.astro';
import Hero from 'components/widgets/Hero.astro'; import Hero from '~/components/widgets/Hero.astro';
import Content from 'components/widgets/Content.astro'; import Content from '~/components/widgets/Content.astro';
import CallToAction from 'components/widgets/CallToAction.astro'; import CallToAction from '~/components/widgets/CallToAction.astro';
import Features3 from 'components/widgets/Features3.astro'; import Features3 from '~/components/widgets/Features3.astro';
import Testimonials from 'components/widgets/Testimonials.astro'; import Testimonials from '~/components/widgets/Testimonials.astro';
import Steps from 'components/widgets/Steps.astro'; import Steps from '~/components/widgets/Steps.astro';
import BlogLatestPosts from 'components/widgets/BlogLatestPosts.astro'; import BlogLatestPosts from '~/components/widgets/BlogLatestPosts.astro';
import { getPermalink } from 'utils/permalinks'; import { getPermalink } from '~/utils/permalinks';
const metadata = { const metadata = {
title: 'Personal Homepage Demo', title: 'Personal Homepage Demo',

View File

@ -1,16 +1,16 @@
--- ---
import Layout from 'layouts/PageLayout.astro'; import Layout from '~/layouts/PageLayout.astro';
import Header from 'components/widgets/Header.astro'; import Header from '~/components/widgets/Header.astro';
import Hero2 from 'components/widgets/Hero2.astro'; import Hero2 from '~/components/widgets/Hero2.astro';
import Features from 'components/widgets/Features.astro'; import Features from '~/components/widgets/Features.astro';
import Steps2 from 'components/widgets/Steps2.astro'; import Steps2 from '~/components/widgets/Steps2.astro';
import Content from 'components/widgets/Content.astro'; import Content from '~/components/widgets/Content.astro';
import Pricing from 'components/widgets/Pricing.astro'; import Pricing from '~/components/widgets/Pricing.astro';
import { headerData } from 'navigation'; import { headerData } from '~/navigation';
import FAQs from 'components/widgets/FAQs.astro'; import FAQs from '~/components/widgets/FAQs.astro';
import BlogLatestPosts from 'components/widgets/BlogLatestPosts.astro'; import BlogLatestPosts from '~/components/widgets/BlogLatestPosts.astro';
const metadata = { const metadata = {
title: 'SaaS Landing Page', title: 'SaaS Landing Page',

Some files were not shown because too many files have changed in this diff Show More