Merge pull request #203 from credebl/109-signin-signup-page

Resolved Success Message Display bug on Sign in page
credebl · Sep 1, 2023 · 4c1ba9f · 4c1ba9f
2 parents 6c6b7f8 + 5eeac8b
commit 4c1ba9f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/app/SideBar.astro b/src/app/SideBar.astro
@@ -428,7 +428,7 @@ import { pathRoutes } from "../config/pathRoutes";
 						<span class="ml-3" sidebar-toggle-item>FAQ's</span>
 					</a>  -->
 					 <a
-						href="https://github.com/credebl/platform/issues"
+						href="https://discord.com/invite/w4hnQT7NJG"
 						target="_blank"
 						class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg hover:bg-gray-100 group dark:text-gray-200 dark:hover:bg-gray-700"
 					>		

diff --git a/src/components/Authentication/SignInUserPasskey.tsx b/src/components/Authentication/SignInUserPasskey.tsx
@@ -11,6 +11,7 @@ import { startAuthentication } from '@simplewebauthn/browser';
 import { useState } from 'react';
 import React from 'react';
 import SignInUserPassword from './SignInUserPassword';
+import { pathRoutes } from '../../config/pathRoutes';
 
 interface signInUserProps {
     email: string
@@ -26,7 +27,7 @@ const SignInUserPasskey = (signInUserProps: signInUserProps) => {
 
 
     const handleSvgClick = () => {
-
+        window.history.pushState(null, '', pathRoutes.auth.sinIn);
         setShowSignInUser(!showSignInUser);
     };
 

diff --git a/src/components/Profile/AddPasskey.tsx b/src/components/Profile/AddPasskey.tsx
@@ -36,13 +36,11 @@ import UpdateUserProfile from './EditUserProfile';
       }
   };
 
-
     const toggleEditProfile = async () => {
       await fetchUserProfile()
       setIsEditProfileOpen(!isEditProfileOpen);
     };
 
-
     const showFidoError = (error: unknown): void => {
       const err = error as AxiosError
       if (err.message.includes("The operation either timed out or was not allowed")) {
@@ -243,12 +241,12 @@ import UpdateUserProfile from './EditUserProfile';
 
                 <div>
 
-                  <button onClick={addDevice} type="button" className="ml-2 mt-2 text-white bg-primary-700 hover:!bg-primary-800 focus:ring-4 focus:outline-none focus:ring-[#3b5998]/50 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-[#3b5998]/55 mr-2 mb-2">
+                  {/* <button onClick={addDevice} type="button" className="ml-2 mt-2 text-white bg-primary-700 hover:!bg-primary-800 focus:ring-4 focus:outline-none focus:ring-[#3b5998]/50 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:focus:ring-[#3b5998]/55 mr-2 mb-2">
                     <svg className='mr-2 pr-2' xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
                       <path fill="#fff" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z" />
                     </svg>
                     Add Device
-                  </button>
+                  </button> */}
                   {
                     (addSuccess || addfailure || fidoError) &&
                     <div className='p-2'>