From 131ab0cf9e454a9f9df10ad36a9f7d2e8bdb75bf Mon Sep 17 00:00:00 2001
From: Vinod J M <vinodjacobmatthew@gmail.com>
Date: Sun, 27 Nov 2022 22:27:07 +0530
Subject: [PATCH] v0.12-searchP4

---
 .env                   |  6 ++++++
 backend/.env           |  1 -
 backend/api/src/lib.rs |  3 +--
 frontend/src/main.rs   | 16 +++++++++-------
 4 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 .env
 delete mode 100644 backend/.env

diff --git a/.env b/.env
new file mode 100644
index 0000000..e06907d
--- /dev/null
+++ b/.env
@@ -0,0 +1,6 @@
+DATABASE_URL="sqlite:./sqlite.db?mode=rwc"
+IMAGES_DIR="../images"
+CORS_URL="http://localhost:8080"
+MEILI_URL="http://meili:7700"
+MEILI_KEY="asdasdasd"
+BACKEND_URL="http://localhost:8081"
diff --git a/backend/.env b/backend/.env
deleted file mode 100644
index c8deed0..0000000
--- a/backend/.env
+++ /dev/null
@@ -1 +0,0 @@
-DATABASE_URL="sqlite:./sqlite.db?mode=rwc"
diff --git a/backend/api/src/lib.rs b/backend/api/src/lib.rs
index b47b6d7..eb72259 100644
--- a/backend/api/src/lib.rs
+++ b/backend/api/src/lib.rs
@@ -215,7 +215,6 @@ pub async fn main() {
     let backend_url = env::var("BACKEND_URL").expect("BACKEND_URL is not set in .env file");
     let images_dir = env::var("IMAGES_DIR").expect("IMAGES_DIR is not set in .env file");
     let cors_url = env::var("CORS_URL").expect("CORS_URL is not set in .env file");
-
     let db_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set in .env file");
     let meili_url = env::var("MEILI_URL").expect("MEILI_URL is not set in .env file");
     let meili_key = env::var("MEILI_KEY").expect("MEILI_KEY is not set in .env file");
@@ -290,7 +289,7 @@ async fn create_by_isbn(
         if !bookfound.clone().is_none() {
             let mut cover_id = "".to_string();
             if !bookfound.unwrap().cover.is_none() {
-                let coverurl = bookfound.clone().unwrap().cover.clone().unwrap().medium.clone()
+                let coverurl = bookfound.clone().unwrap().cover.clone().unwrap().medium.clone();
                     let img_bytes = reqwest::get(coverurl.clone()).await.unwrap().bytes().await.unwrap();
                     let image = image::load_from_memory(&img_bytes).unwrap();
                     let temp_cover = coverurl.clone();
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
index a904317..53ae841 100644
--- a/frontend/src/main.rs
+++ b/frontend/src/main.rs
@@ -234,7 +234,7 @@ pub fn Header<G: Html>(cx: Scope) -> View<G> {
             if !task.is_empty() {
 
             spawn_local(async move {
-                    let temp = add_books_isbns(task).await.unwrap();
+                    let _temp = add_books_isbns(task).await.unwrap();
             });
             }
         }
@@ -248,7 +248,7 @@ pub fn Header<G: Html>(cx: Scope) -> View<G> {
     if !task.is_empty() {
 
             spawn_local(async move {
-                    let temp = add_books_isbns(task).await.unwrap();
+                    let _temp = add_books_isbns(task).await.unwrap();
             });
     }
   };
@@ -345,8 +345,9 @@ pub fn BookDB<G: Html>(cx: Scope, bookitem: BookUIProp) -> View<G> {
     let bookdelete = bookitem.bookitem.clone();
     let bookupdate = bookitem.bookitem.clone();
     let bookdisplay = bookitem.bookitem.clone();
+    let book = bookitem.bookitem.clone();
 
-    let coverurl = bookdisplay.cover.clone().unwrap_or("http://localhost:8081/images/placeholder.jpg".to_string());
+    let coverurl = bookdisplay.clone().cover.clone().unwrap();
     let handle_delete = move |_| {
         spawn_local(async move {
             let temp = delete_book(bookdelete.id).await.unwrap();
@@ -370,7 +371,7 @@ pub fn BookDB<G: Html>(cx: Scope, bookitem: BookUIProp) -> View<G> {
                 div(class="card"){
     img(src=coverurl,width="100")
   
-    (format!("{:?}",bookdisplay))
+    (format!("{:?}",book))
         button(class="delete", on:click=handle_delete){ "-" }
         button(class="update", on:click=handle_update){ "=" }
         button(class="info", on:click=handle_display){ "+" }
@@ -433,7 +434,7 @@ async fn ListOL<G: Html>(cx: Scope<'_>) -> View<G> {
 pub fn BookOL<G: Html>(cx: Scope, bookitem: BookUIProp) -> View<G> {
     let book = bookitem.bookitem.clone();
     let bookdisp=book.clone();
-    let coverurl = book.cover.clone().unwrap_or("http://localhost:8081/images/placeholder.jpg".to_string());
+    let coverurl = bookdisp.cover.clone().unwrap();
     let app_state = use_context::<AppState>(cx);
     let handle_add = move |_| {
         app_state.adding.set(true);
@@ -577,6 +578,7 @@ info!("Adding book");
 async fn SelectedUI<G: Html>(cx: Scope<'_>) -> View<G> {
     let app_state = use_context::<AppState>(cx);
     let displ_book = create_signal(cx, (*app_state.displayingbook.get()).clone());
+    let coverurl = create_signal(cx, app_state.displayingbook.get().clone().cover.clone().unwrap().to_string().clone());
 
     let handle_close = move |_| {
         app_state.displaying.set(false);
@@ -587,8 +589,8 @@ async fn SelectedUI<G: Html>(cx: Scope<'_>) -> View<G> {
                 view!{ cx,
 
         div(class="select-book"){
-                img(src=coverurl,width="100")
-                (format!("{:?}",book))
+                img(src=coverurl.get(),width="100")
+                (format!("{:?}",displ_book.get()))
                 button(class="close", on:click=handle_close){ "CLOSE" }
                 }
                 }