Compare commits

..

No commits in common. "c61692cc321167816b16c40fd319f02ba12c7713" and "603b57b303929a3532bfcd58fed4c61719721b47" have entirely different histories.

4 changed files with 3 additions and 54 deletions

37
Cargo.lock generated
View File

@ -1783,7 +1783,6 @@ version = "0.1.0"
dependencies = [
"futures",
"rocket",
"rocket_cors",
"sea-orm",
"serde",
]
@ -1805,23 +1804,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "rocket_cors"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfac3a1df83f8d4fc96aa41dba3b86c786417b7fc0f52ec76295df2ba781aa69"
dependencies = [
"http",
"log",
"regex",
"rocket",
"serde",
"serde_derive",
"unicase",
"unicase_serde",
"url",
]
[[package]]
name = "rocket_http"
version = "0.5.0"
@ -2800,25 +2782,6 @@ dependencies = [
"version_check",
]
[[package]]
name = "unicase"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
dependencies = [
"version_check",
]
[[package]]
name = "unicase_serde"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1"
dependencies = [
"serde",
"unicase",
]
[[package]]
name = "unicode-bidi"
version = "0.3.14"

View File

@ -10,4 +10,3 @@ rocket = {version = "0.5.0", features = ["json"] }
serde = { version = "1.0", features = ["derive"] }
sea-orm = { version = "^0.12.0", features = [ "sqlx-sqlite", "runtime-tokio-native-tls", "macros", "mock" ] }
futures = "0.3.28"
rocket_cors = "0.6.0"

View File

@ -1,21 +1,12 @@
// Webserver
#[macro_use] extern crate rocket;
// Import the data models
pub mod models;
// Import the database setup
mod database;
pub mod models;
use database::set_up_db;
// Import the member functions
mod webserver_member;
use webserver_member::*;
// Handle CORS
use rocket_cors::{AllowedOrigins, CorsOptions};
// Serve the very exiting main page
#[get("/")]
fn index() -> &'static str {
"Hello, world!\nNothing useful is served here."
@ -28,12 +19,8 @@ async fn rocket() -> _ {
Err(err) => panic!("{}", err)
};
let cors = CorsOptions::default().allowed_origins(AllowedOrigins::all())
.to_cors().unwrap();
rocket::build()
.manage(db)
.attach(cors)
.mount("/", routes![
index,
get_member_by_id,

View File

@ -40,7 +40,7 @@ pub struct Member {
pub balance: i32,
#[serde(rename = "imagePreference")]
pub image_preference: String,
#[serde(rename = "rfidCards")]
#[serde(rename = "lastName")]
pub rfid_cards: Vec<RfidCard>
}