Fixed enter key issue

Reviewed-on: LibreTunes/LibreTunes#156

docker-compose.yml

@@ -3,7 +3,7 @@ name: libretunes
 services:
   libretunes:
     container_name: libretunes
-    # image: registry.mregirouard.com/libretunes/libretunes:latest
+    # image: git.libretunes.xyz/libretunes/libretunes:latest
     build: .
     ports:
       - "3000:3000"

src/pages/albumpage.rs

@@ -63,7 +63,7 @@ pub fn AlbumPage() -> impl IntoView {
                     }}
                 </Suspense>
             </div>
-            <div class="album-songs">
+        
             <Suspense
                 fallback=move || view! { <p class="loading">"Loading..."</p> }
             >
@@ -82,7 +82,6 @@ pub fn AlbumPage() -> impl IntoView {
                 }}
             </Suspense>
         </div>
-        </div>
     }
 }
 

src/pages/login.rs

@@ -4,6 +4,7 @@ use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
 use crate::users::UserCredentials;
+use crate::components::loading::Loading;
 
 #[component]
 pub fn Login() -> impl IntoView {
@@ -12,9 +13,13 @@ pub fn Login() -> impl IntoView {
 
     let (show_password, set_show_password) = create_signal(false);
 
-    let toggle_password = move |_| {
+    let loading = create_rw_signal(false);
+    let error_msg = create_rw_signal(None);
+
+    let toggle_password = move |ev: leptos::ev::MouseEvent| {
+        ev.prevent_default();
         set_show_password.update(|show_password| *show_password = !*show_password);
-        log!("showing password");
+        log!("Password visibility toggled");
     };    
 
     let on_submit = move |ev: leptos::ev::SubmitEvent| {
@@ -24,6 +29,9 @@ pub fn Login() -> impl IntoView {
         let password1 = password.get();
 
         spawn_local(async move {
+            loading.set(true);
+            error_msg.set(None);
+
             let user_credentials = UserCredentials {
                 username_or_email: username_or_email1,
                 password: password1
@@ -35,6 +43,7 @@ pub fn Login() -> impl IntoView {
             if let Err(err) = login_result {
                 // Handle the error here, e.g., log it or display to the user
                 log!("Error logging in: {:?}", err);
+                error_msg.set(Some(err.to_string()));
 
                 // Since we're not sure what the state is, manually refetch the user
                 user.refetch();
@@ -48,10 +57,13 @@ pub fn Login() -> impl IntoView {
                 log!("Navigated to home page after login");
             } else if let Ok(None) = login_result {
                 log!("Invalid username or password");
+                error_msg.set(Some("Invalid username or password".to_string()));
 
                 // User could be already logged in or not, so refetch the user
                 user.refetch();
             }
+
+            loading.set(false);
         });
     };
 
@@ -83,20 +95,26 @@ pub fn Login() -> impl IntoView {
                         />
                         <span>Password</span>
                         <i></i>
-                        <Show
+                        <Show when=move || { show_password() == false }
-                            when=move || {show_password() == false}
+                            fallback=move || view! {
-                            fallback=move || view!{ <button on:click=toggle_password class="login-password-visibility">
+                                <button on:click=toggle_password class="login-password-visibility">
                                     <Icon icon=icondata::AiEyeInvisibleFilled />
-                                               </button> /> }
+                                </button>
+                            }
                         >
                         <button on:click=toggle_password class="login-password-visibility">
                             <Icon icon=icondata::AiEyeFilled />
                         </button>
-
                     </Show>
                     </div>
                     <a href="" class="forgot-pw">Forgot Password?</a>
+                    <div class="error-msg" >{ move || error_msg.get() }</div>
+                    <Show
+                        when=move || !loading.get()
+                        fallback=move || view! { <Loading /> }
+                    >
                         <input type="submit" value="Login" />
+                    </Show>
                     <span class="go-to-signup">
                         New here? <a href="/signup">Create an Account</a>
                     </span>

src/pages/signup.rs

@@ -4,6 +4,7 @@ use crate::util::state::GlobalState;
 use leptos::leptos_dom::*;
 use leptos::*;
 use leptos_icons::*;
+use crate::components::loading::Loading;
 
 #[component]
 pub fn Signup() -> impl IntoView {
@@ -13,6 +14,9 @@ pub fn Signup() -> impl IntoView {
 
     let (show_password, set_show_password) = create_signal(false);
 
+    let loading = create_rw_signal(false);
+    let error_msg = create_rw_signal(None);
+
     let toggle_password = move |_| {
         set_show_password.update(|show_password| *show_password = !*show_password);
         log!("showing password");
@@ -30,12 +34,16 @@ pub fn Signup() -> impl IntoView {
         };
         log!("new user: {:?}", new_user);
 
+        loading.set(true);
+        error_msg.set(None);
+
         let user = GlobalState::logged_in_user();
 
         spawn_local(async move {
             if let Err(err) = signup(new_user.clone()).await {
                 // Handle the error here, e.g., log it or display to the user
                 log!("Error signing up: {:?}", err);
+                error_msg.set(Some(err.to_string()));
 
                 // Since we're not sure what the state is, manually refetch the user
                 user.refetch();
@@ -49,6 +57,8 @@ pub fn Signup() -> impl IntoView {
                 leptos_router::use_navigate()("/", Default::default());
                 log!("Navigated to home page after signup")
             }
+
+            loading.set(false);
         });
     };
 
@@ -99,7 +109,13 @@ pub fn Signup() -> impl IntoView {
                             </button>
                         </Show>
                     </div>
+                    <div class="error-msg">{ move || error_msg.get() }</div>
+                    <Show
+                        when=move || !loading.get()
+                        fallback=move || view!{ <Loading /> }
+                    >
                         <input type="submit" value="Sign Up" />
+                    </Show>
                     <span class="go-to-login">
                         Already Have an Account? <a href="/login" class="link" >Go to Login</a>
                     </span>

style/album_page.scss

@@ -1,23 +1,15 @@
 @import 'theme.scss';
 
 .album-page-container {
-	$album-header-height: calc(40% - 2px);
+	width: 90vw;
-	
-	width: $center-viewport-width;
-	max-height: $center-viewport-height;
-
-	overflow: hidden;
-
-	margin-top:2px;
 
 	.album-header {
-		$album-header-padding: 20px;
+		height: 40vh;
+		width: 65vw;
+		margin: auto;
 		
-		height: $album-header-height;
-		width: calc(100% - 2*$album-header-padding);
-		margin: 2px;
 
-		padding: $album-header-padding;
+		padding:20px;
 
 		background-image: linear-gradient($accent-color, $background-color);
 		border-radius: 15px;
@@ -27,13 +19,6 @@
 			height: 100%;
 		}
 	}
-
-	.album-songs {
-		width: 100%;
-		max-height: calc(100% - $album-header-height);
-		overflow-x: hidden;
-		overflow-y: scroll;
-	}
 }
 
 .album-info {

style/dashboard.scss

@@ -1,9 +1,6 @@
 @import "theme.scss";
 
 .dashboard-container {
-  max-width: $center-viewport-width;
-  max-height: $center-viewport-height;
-
   .dashboard-header {
     font-size: 1.2rem;
     font-weight: 300;

style/home.scss

@@ -1,20 +1,17 @@
 @import "theme.scss";
 
 .home-container {
-  width: 100vw;
+  margin-top: 0;
+  width: 100%;
   height: 100vh;
   display: flex;
   flex-direction: row;
 }
-
 .home-component {
   background: #1c1c1c;
-
+  width: calc(100% - 22rem - 16rem);
-  width: calc($center-viewport-width - 4px - 2rem);
-  height: calc($center-viewport-height - 4px - 1rem);
-
   margin: 2px;
-  padding: 0.5rem 1rem;
+  padding: 0.2rem 1.5rem $playbar-size 1rem;
   border-radius: 0.5rem;
   overflow: scroll;
 }

style/login.scss

@@ -8,7 +8,7 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 30rem;
+  height: 31rem;
   transform: translate(-50%, -50%);
   background: $auth-containers;
   z-index: 1;
@@ -96,6 +96,17 @@
   color: #fff;
   transition: all 0.2s;
 }
+.login-form .error-msg {
+  color: $error-color;
+  margin-top: 1rem;
+  height: 1rem;
+}
+.login-form .loading {
+  margin-top: 4.5rem;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: calc(1.5rem - 10px);
+}
 .login-form input[type="submit"] {
   margin-top: 3rem;
   width: 100%;

style/main.scss

@@ -16,7 +16,6 @@
 @import 'profile.scss';
 @import 'loading.scss';
 @import 'album_page.scss';
-@import 'scrollbar.scss';
 
 body {
   font-family: sans-serif;

style/personal.scss

@@ -1,9 +1,9 @@
 @import "theme.scss";
 
 .personal-container {
-  width: $personal-width;
+  width: 16rem;
   background: #1c1c1c;
-  margin: $personal-margin;
+  margin: 2px;
   border-radius: 0.5rem;
 
   .profile-container {

style/scrollbar.scss

@@ -1,12 +0,0 @@
-::-webkit-scrollbar {
-    width: 10px;
-    background-blend-mode: $scrollbar-background-color;
-}
-
-::-webkit-scrollbar-thumb {
-    background: $scrollbar-handle-color;
-}
-
-::-webkit-scrollbar-thumb:hover {
-    background: $scrollbar-handle-hover-color;
-}

style/sidebar.scss

@@ -2,15 +2,13 @@
 
 .sidebar-container {
   background-color: transparent;
-  width: $sidebar-width;
+  width: 22rem;
-  height: $center-viewport-height;
+  height: calc(100% - 75px);
-  margin: 2px;
-
   .sidebar-top-container {
     border-radius: 1rem;
     background-color: #1c1c1c;
     height: 9rem;
-    margin: 2px 0px;
+    margin: 3px;
     padding: 0.1rem 1rem 1rem 1rem;
     position: relative;
     .header {
@@ -70,7 +68,7 @@
   .sidebar-bottom-container {
     border-radius: 1rem;
     background-color: #1c1c1c;
-    margin: 2px 0px;
+    margin: 3px;
     margin-top: 6px;
     padding: 0.2rem 1rem 1rem 1rem;
     height: calc(100% - 9rem);

style/signup.scss

@@ -17,7 +17,7 @@
   top: 50%;
   left: 50%;
   width: 27rem;
-  height: 35rem;
+  height: 36rem;
   transform: translate(-50%, -50%);
   background: $auth-containers;
   z-index: 1;
@@ -92,7 +92,17 @@
 .signup-form .input-box input:focus ~ i {
   height: 2.6rem;
 }
-
+.signup-form .error-msg {
+  color: $error-color;
+  margin-top: 1rem;
+  height: 1rem;
+}
+.signup-form .loading {
+  margin-top: 4.5rem;
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: calc(1.5rem - 10px);
+}
 .signup-form input[type="submit"] {
   margin-top: 3.5rem;
   width: 100%;

style/theme.scss

@@ -12,21 +12,10 @@ $play-grad-start: #0a0533;
 $play-grad-end: $accent-color;
 $border-color: #7851ed;
 $queue-background-color: $play-bar-background-color;
-
+$error-color: red;
-$scrollbar-background-color: #101010;
-$scrollbar-handle-color:#292929;
-$scrollbar-handle-hover-color:#5c5b5b;
 
 $auth-inputs: #796dd4;
 $auth-containers: white;
 
 $dashboard-tile-size: 200px;
 $playbar-size: 75px;
-$personal-width: 16rem;
-$sidebar-width: 22rem;
-
-$personal-margin: 2px;
-$sidebar-margin: 2px;
-
-$center-viewport-width: calc(100vw - $personal-width - $sidebar-width - 2*$personal-margin - 2*$sidebar-margin);
-$center-viewport-height: calc(100vh - $playbar-size);