Compare commits
14 Commits
eb00b4e7b8
...
e72ecc3265
| Author | SHA1 | Date | |
|---|---|---|---|
| e72ecc3265 | |||
| ab13b06738 | |||
| 4cf26ce551 | |||
| 3e1f5f0076 | |||
| b5674622aa | |||
| 3ded39f6fc | |||
| d8695d62b8 | |||
| 33f7d64e7e | |||
| d3983edf11 | |||
| a84391b583 | |||
| 9f83183d2c | |||
| 8652007906 | |||
| 29c18807d8 | |||
| f16bee5927 |
25
geneit_app/package-lock.json
generated
25
geneit_app/package-lock.json
generated
@@ -1064,10 +1064,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@fontsource/roboto": {
|
"node_modules/@fontsource/roboto": {
|
||||||
"version": "5.0.8",
|
"version": "5.0.12",
|
||||||
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.8.tgz",
|
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.12.tgz",
|
||||||
"integrity": "sha512-XxPltXs5R31D6UZeLIV1td3wTXU3jzd3f2DLsXI8tytMGBkIsGcc9sIyiupRtA8y73HAhuSCeweOoBqf6DbWCA==",
|
"integrity": "sha512-x0o17jvgoSSbS9OZnUX2+xJmVRvVCfeaYJjkS7w62iN7CuJWtMf5vJj8LqgC7ibqIkitOHVW+XssRjgrcHn62g=="
|
||||||
"license": "Apache-2.0"
|
|
||||||
},
|
},
|
||||||
"node_modules/@jridgewell/gen-mapping": {
|
"node_modules/@jridgewell/gen-mapping": {
|
||||||
"version": "0.3.3",
|
"version": "0.3.3",
|
||||||
@@ -1187,9 +1186,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mui/icons-material": {
|
"node_modules/@mui/icons-material": {
|
||||||
"version": "5.15.11",
|
"version": "5.15.14",
|
||||||
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.11.tgz",
|
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.14.tgz",
|
||||||
"integrity": "sha512-R5ZoQqnKpd+5Ew7mBygTFLxgYsQHPhgR3TDXSgIHYIjGzYuyPLmGLSdcPUoMdi6kxiYqHlpPj4NJxlbaFD0UHA==",
|
"integrity": "sha512-vj/51k7MdFmt+XVw94sl30SCvGx6+wJLsNYjZRgxhS6y3UtnWnypMOsm3Kmg8TN+P0dqwsjy4/fX7B1HufJIhw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.23.9"
|
"@babel/runtime": "^7.23.9"
|
||||||
},
|
},
|
||||||
@@ -1464,9 +1463,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@mui/x-data-grid": {
|
"node_modules/@mui/x-data-grid": {
|
||||||
"version": "6.19.6",
|
"version": "6.19.8",
|
||||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.6.tgz",
|
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.8.tgz",
|
||||||
"integrity": "sha512-jpZkX1Gnlo87gKcD10mKMY8YoAzUD8Cv3/IvedH3FINDKO3hnraMeOciKDeUk0tYSj8RUDB02kpTHCM8ojLVBA==",
|
"integrity": "sha512-QsOW9GhJdhvagJfUb5jpZE1MMaCLugxx0l89amxJAthMia95BlGS7jndiDEh8IQNthgzfxjAzrSv8GZpcgSEaA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.23.2",
|
"@babel/runtime": "^7.23.2",
|
||||||
"@mui/utils": "^5.14.16",
|
"@mui/utils": "^5.14.16",
|
||||||
@@ -4308,9 +4307,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "5.1.4",
|
"version": "5.1.6",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.1.4.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz",
|
||||||
"integrity": "sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==",
|
"integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.19.3",
|
"esbuild": "^0.19.3",
|
||||||
"postcss": "^8.4.35",
|
"postcss": "^8.4.35",
|
||||||
|
|||||||
1244
geneit_backend/Cargo.lock
generated
1244
geneit_backend/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -6,34 +6,34 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
log = "0.4.20"
|
log = "0.4.21"
|
||||||
env_logger = "0.10.1"
|
env_logger = "0.11.3"
|
||||||
clap = { version = "4.4.12", features = ["derive", "env"] }
|
clap = { version = "4.5.2", features = ["derive", "env"] }
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
anyhow = "1.0.75"
|
anyhow = "1.0.80"
|
||||||
actix-web = "4.5.1"
|
actix-web = "4.5.1"
|
||||||
actix-cors = "0.7.0"
|
actix-cors = "0.7.0"
|
||||||
actix-multipart = "0.6.1"
|
actix-multipart = "0.6.1"
|
||||||
actix-remote-ip = "0.1.0"
|
actix-remote-ip = "0.1.0"
|
||||||
futures-util = "0.3.29"
|
futures-util = "0.3.30"
|
||||||
diesel = { version = "2.1.4", features = ["postgres"] }
|
diesel = { version = "2.1.5", features = ["postgres"] }
|
||||||
serde = { version = "1.0.194", features = ["derive"] }
|
serde = { version = "1.0.197", features = ["derive"] }
|
||||||
serde_json = "1.0.110"
|
serde_json = "1.0.114"
|
||||||
mailchecker = "6.0.1"
|
mailchecker = "6.0.1"
|
||||||
redis = "0.23.3"
|
redis = "0.25.0"
|
||||||
lettre = "0.11.2"
|
lettre = "0.11.4"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
bcrypt = "0.15.0"
|
bcrypt = "0.15.0"
|
||||||
light-openid = "1.0.1"
|
light-openid = "1.0.1"
|
||||||
thiserror = "1.0.57"
|
thiserror = "1.0.58"
|
||||||
serde_with = "3.4.0"
|
serde_with = "3.6.1"
|
||||||
rust_iso3166 = "0.1.11"
|
rust_iso3166 = "0.1.12"
|
||||||
rust-s3 = "0.33.0"
|
rust-s3 = "0.33.0"
|
||||||
sha2 = "0.10.8"
|
sha2 = "0.10.8"
|
||||||
image = "0.24.9"
|
image = "0.25.0"
|
||||||
uuid = { version = "1.6.1", features = ["v4"] }
|
uuid = { version = "1.7.0", features = ["v4"] }
|
||||||
httpdate = "1.0.3"
|
httpdate = "1.0.3"
|
||||||
zip = "0.6.6"
|
zip = "0.6.6"
|
||||||
mime_guess = "2.0.4"
|
mime_guess = "2.0.4"
|
||||||
tempfile = "3.10.1"
|
tempfile = "3.10.1"
|
||||||
base64 = "0.21.7"
|
base64 = "0.22.0"
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ where
|
|||||||
{
|
{
|
||||||
let value_str = serde_json::to_string(value)?;
|
let value_str = serde_json::to_string(value)?;
|
||||||
|
|
||||||
execute_request(|conn| Ok(conn.set_ex(key, value_str, lifetime.as_secs() as usize)?))?;
|
execute_request(|conn| Ok(conn.set_ex(key, value_str, lifetime.as_secs())?))?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use crate::utils::time_utils::time;
|
|||||||
use actix_multipart::form::tempfile::TempFile;
|
use actix_multipart::form::tempfile::TempFile;
|
||||||
use diesel::prelude::*;
|
use diesel::prelude::*;
|
||||||
use image::imageops::FilterType;
|
use image::imageops::FilterType;
|
||||||
use image::ImageOutputFormat;
|
use image::ImageFormat;
|
||||||
use mime_guess::Mime;
|
use mime_guess::Mime;
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::{Cursor, Read, Seek, Write};
|
use std::io::{Cursor, Read, Seek, Write};
|
||||||
@@ -80,7 +80,7 @@ pub async fn finalize_upload(mut file: UploadedFile) -> anyhow::Result<Photo> {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let mut thumb_cursor = Cursor::new(vec![]);
|
let mut thumb_cursor = Cursor::new(vec![]);
|
||||||
thumbnail_image.write_to(&mut thumb_cursor, ImageOutputFormat::Png)?;
|
thumbnail_image.write_to(&mut thumb_cursor, ImageFormat::Png)?;
|
||||||
let thumb_img = thumb_cursor.into_inner();
|
let thumb_img = thumb_cursor.into_inner();
|
||||||
|
|
||||||
let photo = NewPhoto {
|
let photo = NewPhoto {
|
||||||
|
|||||||
Reference in New Issue
Block a user