diff --git a/frontend/src/fetching.rs b/frontend/src/fetching.rs index cf4fff8..2371343 100644 --- a/frontend/src/fetching.rs +++ b/frontend/src/fetching.rs @@ -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 { GetData, GetError, } -pub struct TextRequestComponent { - text_request: FetchState, +pub struct RandomCommit { + commit: FetchState, } //This trait is for all yew components -impl Component for TextRequestComponent { +impl Component for RandomCommit { type Message = Msg; type Properties = (); fn create(_ctx: &Context) -> 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, 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) -> Html { - match &self.text_request { + match &self.commit { FetchState::NotFetching => html! { <> - }, @@ -248,4 +241,5 @@ async fn fetch_url_text(url: &'static str) -> Result { Ok(text.as_string().unwrap()) } -//Admin component +//Admin component +