- Добавил активацию нового аккаунта по электронной почте.

https://www.youtube.com/watch?v=yBXs_gtSmUc&list=PLU2ftbIeotGpAYRP9Iv2KLIwK36-o_qYk&index=12
2025-02-16 00:19:45 +03:00
parent 27441efde7
commit 2736f3ddf6
17 changed files with 269 additions and 30 deletions
--- a/src/main/resources/templates/parts/common.ftl
+++ b/src/main/resources/templates/parts/common.ftl
@@ -4,7 +4,6 @@
    <head>
        <title>Sweater</title>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <link href="/static/style.css" rel="stylesheet" type="text/css" />
        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">

--- a/src/main/resources/templates/parts/login.ftl
+++ b/src/main/resources/templates/parts/login.ftl
@@ -1,7 +1,7 @@
 <#macro login path isRegistrationForm=false>
    <form action="${path}" method="post" xmlns="http://www.w3.org/1999/html">
        <div class="row mb-3">
-            <label class="col-sm-2 col-form-label"> User Name :</label>
+            <label class="col-sm-2 col-form-label"> User Name:</label>
            <div class="col-sm-6">
                <input type="text" class="form-control" name="username" placeholder="User name"/>
            </div>
@@ -12,10 +12,20 @@
                <input type="password" class="form-control" name="password" placeholder="Password">
            </div>
        </div>
+        <#if isRegistrationForm>
+            <div class="row mb-3">
+                <label class="col-sm-2 col-form-label"> E-mail:</label>
+                <div class="col-sm-6">
+                    <input type="email" class="form-control" name="email" placeholder="E-mail"/>
+                </div>
+            </div>
+        </#if>
+
        <#if !isRegistrationForm>
            <a href="/registration" class="btn btn-primary">Add new user</a>
        </#if>
-        <input class="btn btn-primary" type="submit" <#if isRegistrationForm> value="Create" <#else> value="Sign in"</#if>/>
+        <input class="btn btn-primary"
+               type="submit" <#if isRegistrationForm> value="Create" <#else> value="Sign in"</#if>/>
        <input type="hidden" name="_csrf" value="${_csrf.token}"/>
    </form>
 </#macro>
--- a/src/main/resources/templates/parts/navbar.ftl
+++ b/src/main/resources/templates/parts/navbar.ftl
@@ -2,6 +2,7 @@
 <#import "login.ftl" as l>

 <nav class="navbar navbar-expand-lg bg-body-tertiary">
+    <link href="/static/custom.css" rel="stylesheet">
    <div class="container-fluid">
        <a class="navbar-brand" href="/">Sweater</a>
        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"