From 5a311d51742c00823d983f79ce0cf6952cd9194f Mon Sep 17 00:00:00 2001
From: Vinod J M <vinodjacobmatthew@gmail.com>
Date: Sun, 4 Dec 2022 21:55:18 +0530
Subject: [PATCH] v0.16-ACTAUL-V0.2

---
 Dockerfile             | 53 +++++++++++++++++++++---------------------
 backend/api/src/lib.rs |  2 +-
 frontend/src/main.rs   | 10 ++++----
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65eedd9..c47efd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,6 @@
-FROM rust:alpine as builder
-
-RUN apk update
-RUN apk add --no-cache openssl-dev musl-dev
+FROM rust:slim as builder
 
 WORKDIR /usr/src/app
-
 ENV CARGO_BUILD_JOBS=1
 
 RUN mkdir backend && mkdir backend/src && mkdir backend/api/ && mkdir backend/entity/ && mkdir backend/migration/ && mkdir backend/orm/ && mkdir backend/search/ && mkdir backend/api/src && mkdir backend/entity/src && mkdir backend/migration/src && mkdir backend/orm/src && mkdir backend/search/src
@@ -18,41 +14,46 @@ COPY ./backend/migration/Cargo.toml /usr/src/app/backend/migration/Cargo.toml
 COPY ./backend/orm/Cargo.toml /usr/src/app/backend/orm/Cargo.toml
 COPY ./backend/search/Cargo.toml /usr/src/app/backend/search/Cargo.toml
 
+RUN apt-get update -y && apt-get install -y pkg-config openssl libssl-dev
 RUN cd backend && cargo build --release 
-COPY . /usr/src/app
+COPY backend /usr/src/app/backend
+COPY .prod /usr/src/app/.prod
 RUN cp .prod .env
 RUN cd backend && cargo build --release 
 
 #######################
-FROM rust:slim as builder-frontend
+#FROM rust:alpine as builder-frontend
 
-WORKDIR /usr/src/app
+#WORKDIR /usr/src/app
 
-RUN rustup target add wasm32-unknown-unknown
-ENV CARGO_BUILD_JOBS=1
-RUN mkdir frontend && mkdir frontend/src && mkdir frontend/css
-#RUN cargo install --locked trunk
-RUN cargo install wasm-bindgen-cli && cargo install --locked trunk
+#RUN rustup target add wasm32-unknown-unknown
+#ENV CARGO_BUILD_JOBS=1
+#RUN mkdir frontend && mkdir frontend/src && mkdir frontend/css
+#RUN cargo install wasm-bindgen-cli && cargo install --locked trunk
 
-COPY ./dummy.rs /usr/src/app/frontend/src/main.rs
-COPY ./frontend/Cargo.toml /usr/src/app/frontend
-COPY ./frontend/index.html /usr/src/app/frontend/
-COPY ./frontend/css/index.css /usr/src/app/frontend/css
-COPY ./frontend/Trunk.toml /usr/src/app/frontend/
+#COPY ./dummy.rs /usr/src/app/frontend/src/main.rs
+#COPY ./frontend/Cargo.toml /usr/src/app/frontend
+#COPY ./frontend/index.html /usr/src/app/frontend/
+#COPY ./frontend/css/index.css /usr/src/app/frontend/css
+#COPY ./frontend/Trunk.toml /usr/src/app/frontend/
 
-RUN cd frontend && cargo install && trunk build --release
-COPY . /usr/src/app
-RUN cp .prod .env
-RUN cd frontend && cargo install && trunk build --release
+#RUN cd frontend && cargo install && trunk build --release
+#COPY frontend /usr/src/app/frontend
+#COPY .prod /usr/src/app/.prod
+#RUN cp .prod .env
+#RUN cd frontend && cargo install && trunk build --release
 
 #######################
-FROM alpine:latest
+#FROM alpine:latest
+FROM debian:bullseye-slim
 
 WORKDIR /usr/src/app
 COPY --from=builder /usr/src/app/backend/target/release/backend /usr/src/app/booksman
-#COPY ./dist /usr/src/dist
-COPY --from=builder-frontend /usr/src/app/dist /usr/src/dist
+COPY ./dist /usr/src/dist
+#COPY --from=builder-frontend /usr/src/app/dist /usr/src/dist
 COPY --from=builder /usr/src/app/.env /usr/src/app/.env
+RUN mkdir /data && mkdir /data/db && mkdir /data/images
 RUN chmod +x /usr/src/app/booksman
+RUN apt-get update -y && apt-get install -y curl
 
-CMD /usr/src/app/booksman
+CMD ./booksman
diff --git a/backend/api/src/lib.rs b/backend/api/src/lib.rs
index d683f46..e1f4638 100644
--- a/backend/api/src/lib.rs
+++ b/backend/api/src/lib.rs
@@ -194,7 +194,7 @@ struct Opt {
     log_level: String,
 
     /// set the listen addr
-    #[clap(short = 'a', long = "addr", default_value = "::1")]
+    #[clap(short = 'a', long = "addr", default_value = "0.0.0.0")]
     addr: String,
 
     /// set the listen port
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
index 0d6e5aa..976bda2 100644
--- a/frontend/src/main.rs
+++ b/frontend/src/main.rs
@@ -143,6 +143,8 @@ async fn list_books(page: u32) -> Result<PaginatedBookUIList, reqwasm::Error> {
     let url = format!("{}/api/list?page={}", backend_url, page);
     let resp = Request::get(&url).send().await?;
     println!("Fetching books\n");
+        info!("BACKEND{}",backend_url);
+
     let body = resp.json::<PaginatedBookUIList>().await?;
     Ok(body)
 }
@@ -904,14 +906,14 @@ async fn SelectedUI<G: Html>(cx: Scope<'_>) -> View<G> {
                 (format!("{}",dpages.get()))
                 br{}
                 label{"Openlibrary Link: "}
-                (format!("{}",dollink.get()))
+                a(href=dollink.get().clone()){(format!("{}",dollink.get()))}
+                br{}
+                label{"GoodReads Link: "}
+                a(href=dgoodread.get().clone()){(format!("{}",dgoodread.get()))}
                 br{}
                 label{"ISBN: "}
                 (format!("{}",disbn.get()))
                 br{}
-                label{"GoodReads Link: "}
-                (format!("{}",dgoodread.get()))
-                br{}
                 label{"Description: "}
                 (format!("{}",ddesc.get()))
                 br{}