Compare commits
19 Commits
7dcc5e1d29
...
b5674622aa
| Author | SHA1 | Date | |
|---|---|---|---|
| b5674622aa | |||
| 3ded39f6fc | |||
| d8695d62b8 | |||
| 33f7d64e7e | |||
| d3983edf11 | |||
| a84391b583 | |||
| 9f83183d2c | |||
| 8652007906 | |||
| 29c18807d8 | |||
| eb00b4e7b8 | |||
| f16bee5927 | |||
| 61082619fe | |||
| 79126ebbd7 | |||
| d87f04b76b | |||
| da476ea4d7 | |||
| 0266c0c8b3 | |||
| 5863c346d0 | |||
| b0087f2dfb | |||
| 97340b4ae8 |
25
geneit_app/package-lock.json
generated
25
geneit_app/package-lock.json
generated
@@ -1064,10 +1064,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@fontsource/roboto": {
|
||||
"version": "5.0.8",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.8.tgz",
|
||||
"integrity": "sha512-XxPltXs5R31D6UZeLIV1td3wTXU3jzd3f2DLsXI8tytMGBkIsGcc9sIyiupRtA8y73HAhuSCeweOoBqf6DbWCA==",
|
||||
"license": "Apache-2.0"
|
||||
"version": "5.0.12",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.12.tgz",
|
||||
"integrity": "sha512-x0o17jvgoSSbS9OZnUX2+xJmVRvVCfeaYJjkS7w62iN7CuJWtMf5vJj8LqgC7ibqIkitOHVW+XssRjgrcHn62g=="
|
||||
},
|
||||
"node_modules/@jridgewell/gen-mapping": {
|
||||
"version": "0.3.3",
|
||||
@@ -1187,9 +1186,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@mui/icons-material": {
|
||||
"version": "5.15.9",
|
||||
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.9.tgz",
|
||||
"integrity": "sha512-6tLQoM6RylQuDnHR6qQay0G0pJgKmrhn5MIm0IfrwtmSO8eV5iUFR+nNUTXsWa24gt7ZbIKnJ962UlYaeXa4bg==",
|
||||
"version": "5.15.12",
|
||||
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.12.tgz",
|
||||
"integrity": "sha512-3BXiDlOd3AexZoEXa/VqpIpVIvosCzjLHsdMWzKMXbZdnBiJjmb9ECdqfjn5SpTClO49qvkKLhkTqdBH3fSFGw==",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.9"
|
||||
},
|
||||
@@ -1464,9 +1463,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@mui/x-data-grid": {
|
||||
"version": "6.19.4",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.4.tgz",
|
||||
"integrity": "sha512-qXBe2mSetdsl3ZPqB/1LpKNkEiaYUiFXIaMHTIjuzLyusXgt+w7UsHYO7R+aJYUU7c3FeHla0R1nwRMY3kZ5ng==",
|
||||
"version": "6.19.6",
|
||||
"resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-6.19.6.tgz",
|
||||
"integrity": "sha512-jpZkX1Gnlo87gKcD10mKMY8YoAzUD8Cv3/IvedH3FINDKO3hnraMeOciKDeUk0tYSj8RUDB02kpTHCM8ojLVBA==",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2",
|
||||
"@mui/utils": "^5.14.16",
|
||||
@@ -4308,9 +4307,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "5.1.1",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.1.1.tgz",
|
||||
"integrity": "sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==",
|
||||
"version": "5.1.6",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz",
|
||||
"integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==",
|
||||
"dependencies": {
|
||||
"esbuild": "^0.19.3",
|
||||
"postcss": "^8.4.35",
|
||||
|
||||
1254
geneit_backend/Cargo.lock
generated
1254
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
|
||||
|
||||
[dependencies]
|
||||
log = "0.4.20"
|
||||
env_logger = "0.10.1"
|
||||
clap = { version = "4.4.12", features = ["derive", "env"] }
|
||||
log = "0.4.21"
|
||||
env_logger = "0.11.3"
|
||||
clap = { version = "4.5.2", features = ["derive", "env"] }
|
||||
lazy_static = "1.4.0"
|
||||
anyhow = "1.0.75"
|
||||
anyhow = "1.0.80"
|
||||
actix-web = "4.5.1"
|
||||
actix-cors = "0.7.0"
|
||||
actix-multipart = "0.6.1"
|
||||
actix-remote-ip = "0.1.0"
|
||||
futures-util = "0.3.29"
|
||||
futures-util = "0.3.30"
|
||||
diesel = { version = "2.1.4", features = ["postgres"] }
|
||||
serde = { version = "1.0.194", features = ["derive"] }
|
||||
serde_json = "1.0.110"
|
||||
serde = { version = "1.0.197", features = ["derive"] }
|
||||
serde_json = "1.0.114"
|
||||
mailchecker = "6.0.1"
|
||||
redis = "0.23.3"
|
||||
lettre = "0.11.2"
|
||||
redis = "0.25.0"
|
||||
lettre = "0.11.4"
|
||||
rand = "0.8.5"
|
||||
bcrypt = "0.15.0"
|
||||
light-openid = "1.0.1"
|
||||
thiserror = "1.0.57"
|
||||
serde_with = "3.4.0"
|
||||
rust_iso3166 = "0.1.11"
|
||||
thiserror = "1.0.58"
|
||||
serde_with = "3.6.1"
|
||||
rust_iso3166 = "0.1.12"
|
||||
rust-s3 = "0.33.0"
|
||||
sha2 = "0.10.8"
|
||||
image = "0.24.8"
|
||||
uuid = { version = "1.6.1", features = ["v4"] }
|
||||
image = "0.25.0"
|
||||
uuid = { version = "1.7.0", features = ["v4"] }
|
||||
httpdate = "1.0.3"
|
||||
zip = "0.6.6"
|
||||
mime_guess = "2.0.4"
|
||||
tempfile = "3.10.0"
|
||||
base64 = "0.21.7"
|
||||
tempfile = "3.10.1"
|
||||
base64 = "0.22.0"
|
||||
|
||||
@@ -45,7 +45,7 @@ where
|
||||
{
|
||||
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(())
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ use crate::utils::time_utils::time;
|
||||
use actix_multipart::form::tempfile::TempFile;
|
||||
use diesel::prelude::*;
|
||||
use image::imageops::FilterType;
|
||||
use image::ImageOutputFormat;
|
||||
use image::ImageFormat;
|
||||
use mime_guess::Mime;
|
||||
use std::fs::File;
|
||||
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![]);
|
||||
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 photo = NewPhoto {
|
||||
|
||||
Reference in New Issue
Block a user