Compare commits
10 Commits
20260402
...
renovate/r
| Author | SHA1 | Date | |
|---|---|---|---|
| 479f770e1b | |||
| f09dafd749 | |||
| 541c9f68e5 | |||
| 7c8ed2b20b | |||
| d21b399e47 | |||
| 0c0f101b1b | |||
| 578fbdc0db | |||
| 3c8b22d642 | |||
| c5da8414f3 | |||
| bd701c687f |
@@ -36,7 +36,7 @@
|
||||
"react-dom": "^19.2.4",
|
||||
"react-easy-crop": "^5.5.7",
|
||||
"react-qr-code": "^2.0.18",
|
||||
"react-router-dom": "^7.13.2",
|
||||
"react-router-dom": "^7.14.0",
|
||||
"react-zoom-pan-pinch": "^3.7.0",
|
||||
"svg2pdf.js": "^2.7.0"
|
||||
},
|
||||
@@ -45,8 +45,8 @@
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@vitejs/plugin-react": "^6.0.1",
|
||||
"eslint": "^10.1.0",
|
||||
"eslint-plugin-react-hooks": "0.0.0-experimental-80b1cab3-20260331",
|
||||
"eslint": "^10.2.0",
|
||||
"eslint-plugin-react-hooks": "0.0.0",
|
||||
"eslint-plugin-react-refresh": "^0.5.2",
|
||||
"globals": "^17.4.0",
|
||||
"typescript": "^6.0.2",
|
||||
|
||||
@@ -25,6 +25,15 @@ export class APIClient {
|
||||
return URL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the full URL at which the backend can be contacted
|
||||
*/
|
||||
static ActualBackendURL(): string {
|
||||
const backendURL = this.backendURL();
|
||||
if (backendURL.startsWith("/")) return `${location.origin}${backendURL}`;
|
||||
else return backendURL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check out whether the backend is accessed through
|
||||
* HTTPS or not
|
||||
|
||||
@@ -38,7 +38,7 @@ export class AccommodationsCalendarURLApi {
|
||||
* Get accommodation calendar URL route
|
||||
*/
|
||||
static CalendarURL(c: AccommodationCalendarURL): string {
|
||||
return `${APIClient.backendURL()}/acccommodations_calendar/${c.token}`;
|
||||
return `${APIClient.ActualBackendURL()}/acccommodations_calendar/${c.token}`;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,7 +12,9 @@ import {
|
||||
OutlinedInput,
|
||||
Typography,
|
||||
} from "@mui/material";
|
||||
import QRCode from "react-qr-code";
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
import { QRCode } from "react-qr-code";
|
||||
import {
|
||||
AccommodationCalendarURL,
|
||||
AccommodationsCalendarURLApi,
|
||||
|
||||
@@ -87,6 +87,7 @@ export function LoginRoute(): React.ReactElement {
|
||||
// eslint-disable-next-line react-hooks/immutability
|
||||
window.location.href = res.url;
|
||||
} catch (e) {
|
||||
setLoading(false);
|
||||
console.error(e);
|
||||
setError("Echec de l'initialisation de l'authentification OpenID !");
|
||||
}
|
||||
|
||||
4
geneit_backend/Cargo.lock
generated
4
geneit_backend/Cargo.lock
generated
@@ -3195,9 +3195,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "redis"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d76e41a79ae5cbb41257d84cf4cf0db0bb5a95b11bf05c62c351de4fe748620d"
|
||||
checksum = "f44e94c96d8870a387d88ce3de3fdd608cbfc0705f03cb343cdde91509d3e49a"
|
||||
dependencies = [
|
||||
"arcstr",
|
||||
"combine",
|
||||
|
||||
@@ -22,7 +22,7 @@ diesel_migrations = "2.3.1"
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = "1.0.149"
|
||||
mailchecker = "6.0.20"
|
||||
redis = "1.1.0"
|
||||
redis = "1.2.0"
|
||||
lettre = "0.11.20"
|
||||
rand = "0.10.0"
|
||||
bcrypt = "0.19.0"
|
||||
|
||||
Reference in New Issue
Block a user