Skip to content

Commit

Permalink
Add more styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@Got17
Got17 committed Oct 24, 2024
1 parent 736071e commit 53a89bf
Show file tree
Hide file tree
Showing 4 changed files with 230 additions and 109 deletions.
14 changes: 7 additions & 7 deletions FingerAuth/Client.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ module Logic =
let login() = promise {
if not (String.IsNullOrWhiteSpace(username.Value)) && not (String.IsNullOrWhiteSpace(password.Value)) then
try
let! isValid = Server.verifyUser(username.Value, password.Value)
if isValid then
saveCredentials(username.Value, password.Value) |> ignore
ToPicDrawPage()
else
showAlert("Alert", "Invalid username or password.") |> ignore
//let! isValid = Server.verifyUser(username.Value, password.Value)
//if isValid then
saveCredentials(username.Value, password.Value) |> ignore
ToPicDrawPage()
//else
//showAlert("Alert", "Invalid username or password.") |> ignore
with ex ->
// Log the error to the browser console
printfn($"Error during login: {ex.Message}")
Expand Down Expand Up @@ -256,7 +256,7 @@ module Pages =
.Doc()

let PicDrawPage() =
showToast("Log in Successfully") |> ignore
showToast("Login Successfully") |> ignore

IndexTemplate.PicDraw()
.PenColor(colorStroke)
Expand Down
2 changes: 1 addition & 1 deletion FingerAuth/Server.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ module Server =
with ex ->
//Log the error to the server console
printfn $"Error during user verification: {ex.Message}"
return false // Return false or an appropriate response if there's an error
return false
}

96 changes: 62 additions & 34 deletions FingerAuth/wwwroot/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,80 @@
<script type="module" src="Content/FingerAuth.head.js"></script>
</head>
<body>
<a class="pic-draw-header" href="/#">PicDraw App</a>
<div ws-replace="PageContent"></div>
<!--Home Page-->
<div id="text" ws-children-template="Home">
<form id="loginForm" ws-onsubmit="LogIn" action="javascript:void(0)">
<p class="authenticate-text">Please authenticate</p>
<input id="username" placeholder="Username" ws-var="Username" /><br />
<input id="password" type="password" placeholder="Password" ws-var="Password" />
<div class="login-button-container">
<button role="button" class="login-button">Log in</button>
</div>
</form>
<div class="login-button-container">
<button role="button" ws-onclick="BiometricAuthenticate" href="${ToPicDrawPage}" class="authenticate-button">Authorize with Biometric</button>
</div>
<div id="Home" ws-children-template="Home">
<div class="login-container container">
<form id="loginForm" ws-onsubmit="LogIn" action="javascript:void(0)">
<div class="header">
<a class="header-text login-text" href="/#">Login</a>
</div>

<div class="input-container">
<span class="icon"><ion-icon name="person-circle-outline"></ion-icon></span>
<input id="username" class="text" ws-var="Username" required/>
<label for="username" class="text">Username</label>
</div>

<div class="input-container">
<span class="icon"><ion-icon name="lock-closed"></ion-icon></span>
<input id="password" class="text" type="password" ws-var="Password" required/>
<label for="password" class="text">Password</label>
</div>

<a href="#" class="forgot-password text">Forgot password?</a>

<button type="submit" class="login-button text">Login</button>

<button role="button" ws-onclick="BiometricAuthenticate" href="${ToPicDrawPage}" class="authenticate-button text">Authorize with Biometric
<ion-icon name="finger-print-outline"></ion-icon>
</button>

<div class="signup-link text">
<p>Don't have an account? <a href="#">SIGN UP</a></p>
</div>
</form>
</div>
</div>
<!--PicDraw Page-->
<div id="main" ws-children-template="PicDraw">
<p class="choose-color-text">Choose your pen color.
<span class="color-picker">
<label for="colorPicker">
<input type="color" value="#1DB8CE" id="colorPicker" ws-var="PenColor"> ${ColorLabel}
</label>
</span>
</p>
<br />
<div class="capture-button">
<div class="draw-container container">
<div class="header">
<a class="header-text pic-draw-text" href="/#">PicDraw App</a>
</div>

<div>
<p class="choose-color-text">
Choose your pen color.
<span class="color-picker">
<label for="colorPicker">
<input type="color" value="#1DB8CE" id="colorPicker" ws-var="PenColor"> ${ColorLabel}
</label>
</span>
</p>
</div>

<button role="button" id="captureBtn" ws-onclick="CaptureBtn">Capture Image</button>
</div>
<br />
<div class="canvas-container">
<canvas id="annotationCanvas" width="300" height="400" ws-hole="canvas"
ws-onmouseDown="canvasMouseDown" ws-onmouseup="canvasMouseUp"
ws-onmouseout="canvasMouseOut" ws-onmousemove="canvasMouseMove"
ws-onafterrender="canvasInit"></canvas>
</div>
<div class="save-share-button">

<br />
<div class="canvas-container">
<canvas id="annotationCanvas" width="300" height="400" ws-hole="canvas"
ws-onmouseDown="canvasMouseDown" ws-onmouseup="canvasMouseUp"
ws-onmouseout="canvasMouseOut" ws-onmousemove="canvasMouseMove"
ws-onafterrender="canvasInit"></canvas>
</div>

<button role="button" id="saveShareBtn" ws-onclick="SaveShareBtn">Save & Share</button>
</div>
<div class="logout-container">
<a role="button" ws-onclick="LogOut" href="${ToHomePage}" class="logout-button">Log out</a>

<div class="logout-container">
<a role="button" ws-onclick="LogOut" href="${ToHomePage}" class="logout-button">Log out</a>
</div>
</div>
</div>

<script type="module" src="Content/FingerAuth.min.js"></script>
<script type="module" src="https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js"></script>
<script nomodule src="https://unpkg.com/[email protected]/dist/ionicons/ionicons.js"></script>
<script type="module"
src="https://unpkg.com/@ionic/pwa-elements@latest/dist/ionicpwaelements/ionicpwaelements.esm.js"></script>
<script nomodule
Expand Down
Loading

0 comments on commit 53a89bf

Please sign in to comment.