Compare commits
1 Commits
renovate/n
...
94e936e333
| Author | SHA1 | Date | |
|---|---|---|---|
| 94e936e333 |
@ -6,7 +6,7 @@ name: default
|
||||
steps:
|
||||
# Frontend
|
||||
- name: web_build
|
||||
image: node:24
|
||||
image: node:23
|
||||
volumes:
|
||||
- name: web_app
|
||||
path: /tmp/web_build
|
||||
|
||||
16
moneymgr_backend/Cargo.lock
generated
16
moneymgr_backend/Cargo.lock
generated
@ -724,9 +724,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.41"
|
||||
version = "4.5.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
|
||||
checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@ -734,9 +734,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.41"
|
||||
version = "4.5.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
|
||||
checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@ -746,9 +746,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.41"
|
||||
version = "4.5.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
|
||||
checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@ -1100,9 +1100,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "diesel"
|
||||
version = "2.2.12"
|
||||
version = "2.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c"
|
||||
checksum = "ff3e1edb1f37b4953dd5176916347289ed43d7119cc2e6c7c3f7849ff44ea506"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"byteorder",
|
||||
|
||||
@ -6,9 +6,9 @@ edition = "2024"
|
||||
[dependencies]
|
||||
env_logger = "0.11.8"
|
||||
log = "0.4.27"
|
||||
diesel = { version = "2.2.12", features = ["postgres", "r2d2"] }
|
||||
diesel = { version = "2.2.10", features = ["postgres", "r2d2"] }
|
||||
diesel_migrations = "2.2.0"
|
||||
clap = { version = "4.5.41", features = ["env", "derive"] }
|
||||
clap = { version = "4.5.39", features = ["env", "derive"] }
|
||||
actix-web = "4.11.0"
|
||||
actix-cors = "0.7.1"
|
||||
actix-multipart = "0.7.2"
|
||||
|
||||
@ -30,7 +30,7 @@ pub async fn create_bucket_if_required() -> anyhow::Result<()> {
|
||||
log::warn!("The bucket does not seem to exists, trying to create it!")
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Got unexpected error when querying bucket info: {e}");
|
||||
log::error!("Got unexpected error when querying bucket info: {}", e);
|
||||
return Err(BucketServiceError::FailedFetchBucketInfo.into());
|
||||
}
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ impl FromRequest for AccountInPath {
|
||||
Self::load_account_from_path(&auth, account_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract account ID from URL! {e}");
|
||||
log::error!("Failed to extract account ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch account information!")
|
||||
})
|
||||
})
|
||||
|
||||
@ -165,13 +165,13 @@ impl FromRequest for AuthExtractor {
|
||||
// Update last use (if needed)
|
||||
if token.shall_update_time_used() {
|
||||
if let Err(e) = tokens_service::update_time_used(&token).await {
|
||||
log::error!("Failed to refresh last usage of token! {e}");
|
||||
log::error!("Failed to refresh last usage of token! {}", e);
|
||||
}
|
||||
}
|
||||
|
||||
// Handle tokens expiration
|
||||
if token.is_expired() {
|
||||
log::error!("Attempted to use expired token! {token:?}");
|
||||
log::error!("Attempted to use expired token! {:?}", token);
|
||||
return Err(actix_web::error::ErrorBadRequest("Token has expired!"));
|
||||
}
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ impl FromRequest for FileIdExtractor {
|
||||
Self::load_file_from_path(&auth, file_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract file ID from URL! {e}");
|
||||
log::error!("Failed to extract file ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch file information!")
|
||||
})
|
||||
})
|
||||
|
||||
@ -50,7 +50,7 @@ impl FromRequest for InboxEntryInPath {
|
||||
Self::load_inbox_entry_from_path(&auth, entry_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract inbox entry ID from URL! {e}");
|
||||
log::error!("Failed to extract inbox entry ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch inbox entry information!")
|
||||
})
|
||||
})
|
||||
|
||||
@ -57,7 +57,7 @@ impl FromRequest for MovementInPath {
|
||||
Self::load_movement_from_path(&auth, account_id)
|
||||
.await
|
||||
.map_err(|e| {
|
||||
log::error!("Failed to extract movement ID from URL! {e}");
|
||||
log::error!("Failed to extract movement ID from URL! {}", e);
|
||||
actix_web::error::ErrorNotFound("Could not fetch movement information!")
|
||||
})
|
||||
})
|
||||
|
||||
1650
moneymgr_web/package-lock.json
generated
1650
moneymgr_web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -11,37 +11,37 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@emotion/styled": "^11.14.1",
|
||||
"@fontsource/roboto": "^5.2.6",
|
||||
"@emotion/styled": "^11.14.0",
|
||||
"@fontsource/roboto": "^5.2.5",
|
||||
"@jsonjoy.com/base64": "^1.1.2",
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@mdi/react": "^1.6.1",
|
||||
"@mui/icons-material": "^7.1.2",
|
||||
"@mui/material": "^7.1.2",
|
||||
"@mui/x-charts": "^8.7.0",
|
||||
"@mui/x-data-grid": "^8.7.0",
|
||||
"@mui/x-date-pickers": "^8.7.0",
|
||||
"@mui/icons-material": "^7.1.1",
|
||||
"@mui/material": "^7.1.1",
|
||||
"@mui/x-charts": "^8.5.0",
|
||||
"@mui/x-data-grid": "^8.5.0",
|
||||
"@mui/x-date-pickers": "^8.3.1",
|
||||
"date-and-time": "^3.6.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"filesize": "^10.1.6",
|
||||
"qrcode.react": "^4.2.0",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-router": "^7.6.3",
|
||||
"react-router-dom": "^7.6.3",
|
||||
"react-router": "^7.6.1",
|
||||
"react-router-dom": "^7.6.1",
|
||||
"ts-pattern": "^5.7.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.30.1",
|
||||
"@types/react": "^19.1.8",
|
||||
"@types/react-dom": "^19.1.6",
|
||||
"@vitejs/plugin-react": "^4.6.0",
|
||||
"eslint": "^9.26.0",
|
||||
"@eslint/js": "^9.28.0",
|
||||
"@types/react": "^19.1.6",
|
||||
"@types/react-dom": "^19.1.5",
|
||||
"@vitejs/plugin-react": "^4.4.1",
|
||||
"eslint": "^9.28.0",
|
||||
"eslint-plugin-react-dom": "^1.49.0",
|
||||
"eslint-plugin-react-hooks": "^5.2.0",
|
||||
"eslint-plugin-react-refresh": "^00.4.20",
|
||||
"eslint-plugin-react-x": "^1.52.2",
|
||||
"globals": "^16.2.0",
|
||||
"eslint-plugin-react-x": "^1.49.0",
|
||||
"globals": "^16.1.0",
|
||||
"typescript": "~5.8.3",
|
||||
"typescript-eslint": "^8.32.1",
|
||||
"vite": "^6.3.5"
|
||||
|
||||
@ -31,21 +31,12 @@ 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
|
||||
*/
|
||||
static IsBackendSecure(): boolean {
|
||||
return this.ActualBackendURL().startsWith("https");
|
||||
return this.backendURL().startsWith("https");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -268,7 +268,7 @@ function CreatedToken(p: { token: TokenWithSecret }): React.ReactElement {
|
||||
<div style={{ padding: "15px", backgroundColor: "white" }}>
|
||||
<QRCodeCanvas
|
||||
value={`moneymgr://api=${encodeURIComponent(
|
||||
APIClient.ActualBackendURL()
|
||||
APIClient.backendURL()
|
||||
)}&id=${p.token.id}&secret=${p.token.token}`}
|
||||
/>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user