linly/poo-stack.rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I have no idea what I'm dong

Browse Source
This commit is contained in:
LinlyBoi
2022-12-25 21:42:46 +02:00
parent cd2092a7c9
commit 3e9a85a2a7
9 changed files with 72 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/driver_data.rs
View File

@@ -1,13 +1,18 @@
use crate::models::{Driver, NewDriver}; use crate::models::{Driver, NewDriver};
use common::CommonDriver; use common::CommonDriver;
use diesel::prelude::*; use diesel::{prelude::*, query_builder::SqlQuery, sql_query};
pub fn listdrivers(connection: &mut PgConnection) { pub fn listdrivers(connection: &mut PgConnection) -> Vec<CommonDriver> {
use crate::schema::drivers::dsl::*; let query = sql_query("SELECT * FROM drivers WHERE id = 10").load::<Driver>(connection);
let queury = drivers.load::<Driver>(connection).expect("KANKER"); let mut drivers: Vec<CommonDriver> = Vec::new();
for driver in queury { for driver in query.unwrap() {
println!("{} {}", driver.name, driver.address); drivers.push(CommonDriver {
id: driver.id,
name: driver.name,
address: driver.address,
});
} }
return drivers;
} }
pub fn addriver(connection: &mut PgConnection, new_driver: NewDriver) { pub fn addriver(connection: &mut PgConnection, new_driver: NewDriver) {
@@ -31,4 +36,3 @@ pub fn get_driver(connection: &mut PgConnection, driver_id: i32) -> CommonDriver
address: String::from(&driver.address), address: String::from(&driver.address),
}; };
} }

7
backend/src/models.rs
View File

@@ -67,7 +67,8 @@ pub struct AutoIssuedTicket<'a> {
} }
//Drivers //Drivers
#[derive(Queryable, AsChangeset, Identifiable)] #[derive(Queryable, AsChangeset, Identifiable, QueryableByName)]
#[table_name = "drivers"]
pub struct Driver { pub struct Driver {
pub id: i32, pub id: i32,
pub name: String, pub name: String,
@@ -87,8 +88,8 @@ pub struct NewDriver<'a> {
} }
//Vehicles //Vehicles
#[derive(Queryable)] #[derive(Queryable, QueryableByName)]
#[diesel(belongs_to(Driver))] #[diesel(belongs_to(Driver), table_name = vehicles)]
pub struct Vehicle { pub struct Vehicle {
pub model: Option<String>, pub model: Option<String>,
pub color: Option<String>, pub color: Option<String>,

0
backend/src/yes.rs
View File

10
frontend/dist/db-frontend-c0621f030a0450bc.js → frontend/dist/db-frontend-906e3d2c2bbb6313.js vendored
View File

@@ -615,12 +615,12 @@ function getImports() {
imports.wbg.__wbindgen_throw = function(arg0, arg1) { imports.wbg.__wbindgen_throw = function(arg0, arg1) {
throw new Error(getStringFromWasm0(arg0, arg1)); throw new Error(getStringFromWasm0(arg0, arg1));
}; };
imports.wbg.__wbindgen_closure_wrapper4152 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper4026 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 287, __wbg_adapter_18); const ret = makeMutClosure(arg0, arg1, 272, __wbg_adapter_18);
return addHeapObject(ret); return addHeapObject(ret);
}; };
imports.wbg.__wbindgen_closure_wrapper4211 = function(arg0, arg1, arg2) { imports.wbg.__wbindgen_closure_wrapper4088 = function(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 303, __wbg_adapter_21); const ret = makeMutClosure(arg0, arg1, 288, __wbg_adapter_21);
return addHeapObject(ret); return addHeapObject(ret);
}; };
@@ -658,7 +658,7 @@ function initSync(module) {
async function init(input) { async function init(input) {
if (typeof input === 'undefined') { if (typeof input === 'undefined') {
input = new URL('db-frontend-c0621f030a0450bc_bg.wasm', import.meta.url); input = new URL('db-frontend-906e3d2c2bbb6313_bg.wasm', import.meta.url);
} }
const imports = getImports(); const imports = getImports();

BIN
frontend/dist/db-frontend-906e3d2c2bbb6313_bg.wasm vendored Normal file
View File

Binary file not shown.

BIN
frontend/dist/db-frontend-c0621f030a0450bc_bg.wasm vendored
View File

Binary file not shown.

6
frontend/dist/index.html vendored
View File

@@ -2,10 +2,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Ze greatest</title> <title>Ze greatest</title>
<link rel="preload" href="/db-frontend-c0621f030a0450bc_bg.wasm" as="fetch" type="application/wasm" crossorigin=""> <link rel="preload" href="/db-frontend-906e3d2c2bbb6313_bg.wasm" as="fetch" type="application/wasm" crossorigin="">
<link rel="modulepreload" href="/db-frontend-c0621f030a0450bc.js"></head> <link rel="modulepreload" href="/db-frontend-906e3d2c2bbb6313.js"></head>
<body> <body>
<script type="module">import init from '/db-frontend-c0621f030a0450bc.js';init('/db-frontend-c0621f030a0450bc_bg.wasm');</script><script>(function () { <script type="module">import init from '/db-frontend-906e3d2c2bbb6313.js';init('/db-frontend-906e3d2c2bbb6313_bg.wasm');</script><script>(function () {
var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; var protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
var url = protocol + '//' + window.location.host + '/_trunk/ws'; var url = protocol + '//' + window.location.host + '/_trunk/ws';
var poll_interval = 5000; var poll_interval = 5000;

98
frontend/src/fetching.rs
View File

@@ -1,14 +1,13 @@
use gloo::{console::log, utils::format::JsValueSerdeExt}; use common::{CommonAdmin, CommonDriver};
use std::{ use std::{
error::Error, error::Error,
fmt::{self, Debug, Display, Formatter}, fmt::{self, Debug, Display, Formatter},
}; };
use wasm_bindgen::{JsCast, JsValue}; use wasm_bindgen::{JsCast, JsValue};
use common::{CommonAdmin, CommonDriver};
use wasm_bindgen_futures::JsFuture; use wasm_bindgen_futures::JsFuture;
use web_sys::{Request, RequestInit, RequestMode, Response}; use web_sys::{Request, RequestInit, RequestMode, Response};
use yew::{html, Component, Context, Html}; use yew::props;
use yew::{html, Component, Context, Html, Properties};
//Trait to handle Future yew HTMLS //Trait to handle Future yew HTMLS
pub trait UseAble { pub trait UseAble {
//Return HTML if didn't fail return error if not //Return HTML if didn't fail return error if not
@@ -17,13 +16,13 @@ pub trait UseAble {
impl UseAble for CommonDriver { impl UseAble for CommonDriver {
fn use_it(self) -> Result<Html, String> { fn use_it(self) -> Result<Html, String> {
let name = self.name; let name = self.name;
let email = self.address; let address = self.address;
let id = self.id; let id = self.id;
let html = html! { let html = html! {
<div> <div>
<h2> { "Driver:" } </h2> <h2> { "Driver:" } </h2>
<p> { format!("Name: {}", name) } </p> <p> { format!("Name: {}", name) } </p>
<p> { format!("Email: {}", email) } </p> <p> { format!("Address: {}", address) } </p>
<p> { format!("ID: {}", id) } </p> <p> { format!("ID: {}", id) } </p>
</div> </div>
}; };
@@ -33,13 +32,13 @@ impl UseAble for CommonDriver {
impl UseAble for CommonAdmin { impl UseAble for CommonAdmin {
fn use_it(self) -> Result<Html, String> { fn use_it(self) -> Result<Html, String> {
let name = self.name; let name = self.name;
let email = self.address; let address = self.address;
let id = self.id; let id = self.id;
let html = html! { let html = html! {
<div> <div>
<h2> { "Admin:" } </h2> <h2> { "Admin:" } </h2>
<p> { format!("Name: {}", name) } </p> <p> { format!("Name: {}", name) } </p>
<p> { format!("Email: {}", email) } </p> <p> { format!("Address: {}", address) } </p>
<p> { format!("ID: {}", id) } </p> <p> { format!("ID: {}", id) } </p>
</div> </div>
}; };
@@ -48,16 +47,18 @@ impl UseAble for CommonAdmin {
} }
//Wwasm bingdengen code //Wwasm bingdengen code
const DRIVER_URL: &str = "http://db.sewelam.tech/api/driver/1234"; const DRIVER_URL: &str = "http://db.sewelam.tech/api/driver/50";
const ADMIN_URL: &str = "http://db.sewelam.tech/api/admin/";
const TICKET_URL: &str = "http://db.sewelam.tech/api/ticket/";
const FUNNY_TXT_URL: &str = "https://whatthecommit.com/index.txt"; const FUNNY_TXT_URL: &str = "https://whatthecommit.com/index.txt";
const INCORRECT_URL: &str = "http://libkyy.cf"; const INCORRECT_URL: &str = "http://libkyy.cf";
//Generic Msg for our states //Generic Msg for our states
enum Msg<T> { pub enum Msg<T> {
SetDataFetchState(FetchState<T>), SetDataFetchState(FetchState<T>),
GetData, GetData,
GetError, GetError,
} }
struct RandomCommit { pub struct RandomCommit {
commit: FetchState<String>, commit: FetchState<String>,
} }
//This trait is for all yew components //This trait is for all yew components
@@ -78,7 +79,7 @@ impl Component for RandomCommit {
} }
Msg::GetData => { Msg::GetData => {
ctx.link().send_future(async { ctx.link().send_future(async {
match fetch_commit(FUNNY_TXT_URL).await { match fetch_url_text(FUNNY_TXT_URL).await {
Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)), Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)), Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
} }
@@ -89,7 +90,7 @@ impl Component for RandomCommit {
} }
Msg::GetError => { Msg::GetError => {
ctx.link().send_future(async { ctx.link().send_future(async {
match fetch_commit(INCORRECT_URL).await { match fetch_url_text(INCORRECT_URL).await {
Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)), Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)), Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
} }
@@ -108,27 +109,36 @@ impl Component for RandomCommit {
<button onclick={ctx.link().callback(|_| Msg::GetData)}> <button onclick={ctx.link().callback(|_| Msg::GetData)}>
{ "Get commit msg" } { "Get commit msg" }
</button> </button>
<button onclick={ctx.link().callback(|_| Msg::GetError)}>
{ "Get using incorrect URL" }
</button>
</> </>
}, },
FetchState::Fetching => html! { "Fetching" }, FetchState::Fetching => html! { "Fetching" },
FetchState::Success(data) => { FetchState::Success(data) => {
html! { <> <h2> {"Commit Header:"} </h2> {data}</> } html! { <> {data}</> }
} }
FetchState::Failed(err) => html! { err }, FetchState::Failed(err) => html! { err },
} }
} }
} }
//Generate Struct and implement component for driver using CommonDriver //Generate Struct and implement component for driver using CommonDriver
struct Driver { pub struct DriverComponent {
driver: FetchState<String>, driver: FetchState<String>,
} }
#[derive(Default, Properties, PartialEq)]
pub struct ApiParams {
pub entered_id: i32,
}
impl ApiParams {
pub fn new_api_thingy_with_id(id: i32) -> Self {
props! { ApiParams {
entered_id: id
}}
}
}
//implement the component for Driver using a string //implement the component for Driver using a string
impl Component for Driver { impl Component for DriverComponent {
type Message = Msg<String>; type Message = Msg<String>;
type Properties = (); type Properties = ApiParams;
fn create(_ctx: &Context<Self>) -> Self { fn create(_ctx: &Context<Self>) -> Self {
Self { Self {
driver: FetchState::NotFetching, driver: FetchState::NotFetching,
@@ -143,7 +153,7 @@ impl Component for Driver {
} }
Msg::GetData => { Msg::GetData => {
ctx.link().send_future(async { ctx.link().send_future(async {
match fetch_driver(DRIVER_URL).await { match fetch_url_text(DRIVER_URL).await {
Ok(driver) => Msg::SetDataFetchState(FetchState::Success(driver)), Ok(driver) => Msg::SetDataFetchState(FetchState::Success(driver)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)), Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
} }
@@ -154,7 +164,7 @@ impl Component for Driver {
} }
Msg::GetError => { Msg::GetError => {
ctx.link().send_future(async { ctx.link().send_future(async {
match fetch_driver(INCORRECT_URL).await { match fetch_url_text(INCORRECT_URL).await {
Ok(driver) => Msg::SetDataFetchState(FetchState::Success(driver)), Ok(driver) => Msg::SetDataFetchState(FetchState::Success(driver)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)), Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
} }
@@ -170,16 +180,22 @@ impl Component for Driver {
match &self.driver { match &self.driver {
FetchState::NotFetching => html! { FetchState::NotFetching => html! {
<> <>
<label for="id"> {"ID:"} </label>
<input type="text" id="name" name="name"/>
<br/>
<button onclick={ctx.link().callback(|_| Msg::GetData)}> <button onclick={ctx.link().callback(|_| Msg::GetData)}>
{ "Get driver" } { "Get driver" }
</button> </button>
<button onclick={ctx.link().callback(|_| Msg::GetError)}>
{ "Get using incorrect URL" }
</button>
</> </>
}, },
FetchState::Fetching => html! { "Fetching" }, FetchState::Fetching => html! { "Fetching" },
FetchState::Success(data) => html! { <> <h2> {"Driver"} </h2> {data} </> }, FetchState::Success(data) => html! { <> {data} <br/>
<button onclick={ctx.link().callback(|_| Msg::GetData)}>
{ "Get new driver (assuming input works :D)" }
</button>
</> },
FetchState::Failed(err) => html! { err }, FetchState::Failed(err) => html! { err },
} }
} }
@@ -211,26 +227,7 @@ pub enum FetchState<T> {
Failed(FetchError), Failed(FetchError),
} }
//Working example function async fn fetch_url_text(url: &'static str) -> Result<String, FetchError> {
async fn fetch_commit(url: &'static str) -> Result<String, FetchError> {
//initialise request
let mut opts = RequestInit::new();
opts.method("GET");
opts.mode(RequestMode::Cors); //Cors is required for fetch to work
let request = Request::new_with_str_and_init(url, &opts)?;
let window = gloo::utils::window();
//get response value
let resp_value = JsFuture::from(window.fetch_with_request(&request)).await?;
let resp: Response = resp_value.dyn_into().unwrap();
//parse response value as text
let text = JsFuture::from(resp.text()?).await?;
Ok(text.as_string().unwrap())
}
async fn fetch_driver(url: &'static str) -> Result<String, FetchError> {
let mut opts = RequestInit::new(); let mut opts = RequestInit::new();
opts.method("GET"); opts.method("GET");
opts.mode(RequestMode::Cors); //Cors is required for fetch to work opts.mode(RequestMode::Cors); //Cors is required for fetch to work
@@ -243,12 +240,3 @@ async fn fetch_driver(url: &'static str) -> Result<String, FetchError> {
let text = JsFuture::from(resp.text()?).await?; let text = JsFuture::from(resp.text()?).await?;
Ok(text.as_string().unwrap()) Ok(text.as_string().unwrap())
} }
//renders components above
pub fn render_commit() {
yew::Renderer::<RandomCommit>::new().render();
}
pub fn render_driver() {
yew::Renderer::<Driver>::new().render();
}

51
frontend/src/main.rs
View File

@@ -1,59 +1,20 @@
mod driver_list;
mod fetching; mod fetching;
use yew::prelude::*; use yew::prelude::*;
use crate::fetching::DriverComponent;
#[function_component] #[function_component]
fn App() -> Html { fn App() -> Html {
let stdnts = vec![ let entered_id = 50;
Stdnt {
id: 1,
name: "Hamada".to_string(),
email: "Hamada@Gmail.com".to_string(),
gpa: 3.4,
},
Stdnt {
id: 2,
name: "Gamal".to_string(),
email: "Gamal@Gmail.com".to_string(),
gpa: 4.0,
},
Stdnt {
id: 3,
name: "Joe".to_string(),
email: "joe@proton.mail".to_string(),
gpa: 3.8,
},
];
let stdnts_comp = stdnts
.iter()
.map(|stdnt| {
html! {
<>
<p key={stdnt.id}>{format!("Name: {}", stdnt.name)} </p>
<p key={stdnt.id}>{format!("Email: {}", stdnt.email)} </p>
<p key={stdnt.id}>{format!("GPA: {}",stdnt.gpa)} </p>
<br/>
</>
}
})
.collect::<Html>();
html! { html! {
<div> <div>
<h2> { "Students:" } </h2> <h2> {"Better?"} </h2>
<p> { stdnts_comp } </p> <DriverComponent {entered_id}/>
// <p> { driver_comp } </p>
</div> </div>
} }
} }
struct Stdnt {
id: usize,
name: String,
gpa: f32,
email: String,
}
fn main() { fn main() {
yew::Renderer::<App>::new().render(); yew::Renderer::<App>::new().render();
fetching::render_commit();
fetching::render_driver();
} }