2 Commits

Author SHA1 Message Date
LinlyBoi
8b6989f45e thank you clippy very cool 2022-12-30 15:11:13 +02:00
LinlyBoi
97822502c4 ??? 2022-12-30 15:09:45 +02:00
2 changed files with 17 additions and 23 deletions

View File

@@ -48,8 +48,8 @@ impl UseAble for CommonAdmin {
//Wwasm bingdengen code
const DRIVER_URL: &str = "http://db.sewelam.tech/api/driver/50";
const ADMIN_URL: &str = "http://db.sewelam.tech/api/admin/69422";
const TICKET_URL: &str = "http://db.sewelam.tech/api/ticket/32";
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 INCORRECT_URL: &str = "http://libkyy.cf";
//Generic Msg for our states
@@ -58,31 +58,29 @@ pub enum Msg<T> {
GetData,
GetError,
}
pub struct TextRequestComponent {
text_request: FetchState<String>,
pub struct RandomCommit {
commit: FetchState<String>,
}
//This trait is for all yew components
impl Component for TextRequestComponent {
impl Component for RandomCommit {
type Message = Msg<String>;
type Properties = ();
fn create(_ctx: &Context<Self>) -> Self {
Self {
text_request: FetchState::NotFetching, //Default state is not fetching anything
commit: FetchState::NotFetching, //Default state is not fetching anything
}
}
fn update(&mut self, ctx: &Context<Self>, msg: Self::Message) -> bool {
match msg {
Msg::SetDataFetchState(fetch_state) => {
self.text_request = fetch_state;
self.commit = fetch_state;
true
}
Msg::GetData => {
ctx.link().send_future(async {
match fetch_url_text(TICKET_URL).await {
Ok(text_request) => {
Msg::SetDataFetchState(FetchState::Success(text_request))
}
match fetch_url_text(FUNNY_TXT_URL).await {
Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
}
});
@@ -92,10 +90,8 @@ impl Component for TextRequestComponent {
}
Msg::GetError => {
ctx.link().send_future(async {
match fetch_url_text(ADMIN_URL).await {
Ok(text_request) => {
Msg::SetDataFetchState(FetchState::Success(text_request))
}
match fetch_url_text(INCORRECT_URL).await {
Ok(commit) => Msg::SetDataFetchState(FetchState::Success(commit)),
Err(err) => Msg::SetDataFetchState(FetchState::Failed(err)),
}
});
@@ -107,14 +103,11 @@ impl Component for TextRequestComponent {
}
fn view(&self, ctx: &Context<Self>) -> Html {
match &self.text_request {
match &self.commit {
FetchState::NotFetching => html! {
<>
<button onclick={ctx.link().callback(|_| Msg::GetData)}>
{ "Get Example Ticket" }
</button>
<button onclick={ctx.link().callback(|_| Msg::GetError)}>
{ "Get Example Admin " }
{ "Get commit msg" }
</button>
</>
},
@@ -248,4 +241,5 @@ async fn fetch_url_text(url: &'static str) -> Result<String, FetchError> {
Ok(text.as_string().unwrap())
}
//Admin component
//Admin component

View File

@@ -1,7 +1,7 @@
use actix_web::{
get,
http::header::ContentType,
web::{self, Json},
web::{self},
HttpResponse, Responder,
};
use backend::{
@@ -86,7 +86,7 @@ async fn api_test() -> impl Responder {
#[get("api/vehicle/{id}")]
async fn api_vehicle(id: web::Path<String>) -> impl Responder {
let id = id.into_inner();
let fetched_vehicle_data = get_vehicle(&mut establish_connection(), String::from(id));
let fetched_vehicle_data = get_vehicle(&mut establish_connection(), id);
HttpResponse::Ok()
.content_type(ContentType::plaintext())
.insert_header(("Access-Control-Allow-Origin", "*"))