Skip to content

Commit

Permalink
Merge pull request #34 from gheinzer/mail-beta
Browse files Browse the repository at this point in the history
Added the reset password feature and fixed some bugs.
  • Loading branch information
gheinzer committed Oct 13, 2021
2 parents 371d975 + d0e65da commit 0f614a3
Show file tree
Hide file tree
Showing 14 changed files with 684 additions and 340 deletions.
2 changes: 1 addition & 1 deletion officr_db_structure.sql
Expand Up @@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/
--
-- Host: 127.0.0.1
-- Erstellungszeit: 12. Okt 2021 um 18:18
-- Erstellungszeit: 12. Okt 2021 um 19:45
-- Server-Version: 10.4.19-MariaDB
-- PHP-Version: 8.0.6

Expand Down
340 changes: 6 additions & 334 deletions public_html/login/index.html

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion public_html/login/reset_password/index.html
Expand Up @@ -37,6 +37,7 @@
<span>Accounts</span>
</header>
</div>
{includeRes:"loader-overlay.html"}
<div class="main-content">
<div class="flex-container centered">
<form action="/login/reset_password/submit" method="POST">
Expand All @@ -52,6 +53,14 @@ <h1>{label18}</h1>
/>
<label>{label10}</label>
</div>
<p class="important hidden" id="usernameError">{label63}</p>
<script>
if (window.location.search == "?usernotfound") {
document
.getElementById("usernameError")
.classList.remove("hidden");
}
</script>
<input
type="reset"
value="{label9}"
Expand All @@ -65,6 +74,6 @@ <h1>{label18}</h1>
</form>
</div>
</div>
{includeRes:"loader-overlay.html"} {includeRes:"cookie-note.html"}
{includeRes:"cookie-note.html"}
</body>
</html>
82 changes: 82 additions & 0 deletions public_html/login/reset_password/reset/index.html
@@ -0,0 +1,82 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>officr Accounts Login</title>
<link rel="stylesheet" href="/style/style.css" />
<link
rel="shortcut icon"
href="/assets/logo_single.svg"
type="image/x-icon"
/>
<meta
name="description"
content="Your todo list. Anywhere. At any time. On any device."
/>
<meta
name="keywords"
content="officr, todo, todo list, open-source, tasks"
/>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
</head>
<body onload="setTimeout(setLoaderAsFinished, 1200);">
{includeRes:"cookie-note.html"}
<div class="horizontal-container">
<header>
<img
src="/assets/logo_with_text_light.svg"
alt="officr"
class="desktop-only"
/>
<img
src="/assets/logo_single.svg"
alt="officr"
class="mobile-only"
/>
<span>Accounts</span>
</header>
</div>

<div class="main-content">
<div class="flex-container centered">
<form action="/login/reset_password/reset/submit" method="POST">
<input type="hidden" name="privateID" id="privateID" />
<script>
document.getElementById("privateID").value =
window.location.search.replace("?id=", "");
</script>
<div class="input-container">
<input
type="password"
placeholder=""
id="password"
name="password"
required
/>
<label>{label11}</label>
</div>
<p class="important hidden" id="passwordUsernameLabel">
{label66}
</p>

<script>
if (window.location.search === "?error") {
document.getElementById(
"passwordUsernameLabel"
).style.display = "block";
}
</script>
<input
type="submit"
value="{label18}"
class="classic-button"
onclick="showLoader()"
/>
</form>
</div>
</div>
{includeRes:"loader-overlay.html"}
</body>
</html>
70 changes: 70 additions & 0 deletions public_html/login/reset_password/reset/success/index.html
@@ -0,0 +1,70 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="description"
content="Your todo list. Anywhere. At any time. On any device."
/>
<meta
name="keywords"
content="officr, todo, todo list, open-source, tasks"
/>
<title>officr Accounts - Password Reset</title>
<link rel="stylesheet" href="/style/style.css" />
<script src="/js/overlays.js"></script>
<script src="/js/cookies.js"></script>
<link
rel="shortcut icon"
href="/assets/logo_single.svg"
type="image/x-icon"
/>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta property="og:title" content="officr - Your todo list" />
<meta
property="og:image"
content="https://officr.gabrielheinzer.ch/assets/social_preview.jpg"
/>
<meta
property="og:description"
content="officr is a open-source todo software. It can be used for homework, familiy or many other things."
/>
<meta property="og:url" content="https://officr.gabrielheinzer.ch" />
<meta property="og:image:width" content="1354" />
<meta property="og:image:height" content="469" />
</head>
<body onload="setTimeout(setLoaderAsFinished, 1200); showCookieOverlay()">
{includeRes:"cookie-note.html"}
<div class="vertical-container">
<div class="horizontal-container">
<header>
<img
src="/assets/logo_with_text_light.svg"
alt="officr"
class="desktop-only"
/>
<img
src="/assets/logo_single.svg"
alt="officr"
class="mobile-only"
/>
</header>
</div>
<div class="main-content" style="padding: 1rem">
<div id="notfound_message" style="text-align: center">
<img
src="/assets/undraw/done.svg"
alt=""
class="undraw-img"
style="display: block; width: 60vw; max-height: 50vh"
/>
<h1 style="text-align: center">{label65}</h1>
<a href="/login" class="border-button">{label12}</a>
</div>
</div>
</div>
{includeRes:"loader-overlay.html"}
</body>
</html>
72 changes: 72 additions & 0 deletions public_html/login/reset_password/success1/index.html
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="description"
content="Your todo list. Anywhere. At any time. On any device."
/>
<meta
name="keywords"
content="officr, todo, todo list, open-source, tasks"
/>
<title>officr Accounts - Password Reset</title>
<link rel="stylesheet" href="/style/style.css" />
<script src="/js/overlays.js"></script>
<script src="/js/cookies.js"></script>
<link
rel="shortcut icon"
href="/assets/logo_single.svg"
type="image/x-icon"
/>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta property="og:title" content="officr - Your todo list" />
<meta
property="og:image"
content="https://officr.gabrielheinzer.ch/assets/social_preview.jpg"
/>
<meta
property="og:description"
content="officr is a open-source todo software. It can be used for homework, familiy or many other things."
/>
<meta property="og:url" content="https://officr.gabrielheinzer.ch" />
<meta property="og:image:width" content="1354" />
<meta property="og:image:height" content="469" />
</head>
<body onload="setTimeout(setLoaderAsFinished, 1200); showCookieOverlay()">
{includeRes:"cookie-note.html"}
<div class="vertical-container">
<div class="horizontal-container">
<header>
<img
src="/assets/logo_with_text_light.svg"
alt="officr"
class="desktop-only"
/>
<img
src="/assets/logo_single.svg"
alt="officr"
class="mobile-only"
/>
</header>
</div>
<div class="main-content">
<div
id="notfound_message"
style="text-align: center; padding: 1rem"
>
<img
src="/assets/undraw/done.svg"
alt=""
class="undraw-img"
style="display: block; width: 60vw; max-height: 50vh"
/>
<h1 style="text-align: center">{label64}</h1>
</div>
</div>
</div>
{includeRes:"loader-overlay.html"}
</body>
</html>
5 changes: 4 additions & 1 deletion public_html/signup/confirmemail/index.html
Expand Up @@ -53,7 +53,10 @@
</header>
</div>
<div class="main-content">
<div id="notfound_message" style="text-align: center">
<div
id="notfound_message"
style="text-align: center; padding: 1rem"
>
<img
src="/assets/undraw/done.svg"
alt=""
Expand Down
5 changes: 4 additions & 1 deletion public_html/signup/created/index.html
Expand Up @@ -53,7 +53,10 @@
</header>
</div>
<div class="main-content">
<div id="notfound_message" style="text-align: center">
<div
id="notfound_message"
style="text-align: center; padding: 1rem"
>
<img
src="/assets/undraw/confirm.svg"
alt=""
Expand Down
3 changes: 2 additions & 1 deletion public_html/signup/index.html
Expand Up @@ -37,6 +37,7 @@
<span>Accounts</span>
</header>
</div>
{includeRes:"loader-overlay.html"}
<div class="main-content">
<div class="flex-container centered">
<form action="/signup/submit" method="POST">
Expand Down Expand Up @@ -94,6 +95,6 @@
</form>
</div>
</div>
{includeRes:"loader-overlay.html"} {includeRes:"cookie-note.html"}
{includeRes:"cookie-note.html"}
</body>
</html>
1 change: 1 addition & 0 deletions res/loader-overlay.html
Expand Up @@ -242,6 +242,7 @@
align-items: center;
transition: 0.5s;
flex-direction: column;
z-index: 50;
}
.loader {
animation: logo-single-rotate 1.2s;
Expand Down

0 comments on commit 0f614a3

Please sign in to comment.