fix current user endpoint

fix id text area
fix form
2026-04-19 21:06:46 +03:00 · 2026-04-19 20:59:19 +03:00 · 2026-04-19 20:46:20 +03:00 · 2026-04-19 20:36:40 +03:00 · 2026-04-19 17:27:42 +00:00 · 2026-04-19 20:25:06 +03:00
15 changed files with 166 additions and 20 deletions
--- a/9
+++ b/9
@@ -1,12 +1,15 @@
-VENV=source ./.venv/bin/activate;
-ALEMBIC=alembic -c ./server/backend/database/alembic/alembic.ini
+#VENV=source ./.venv/bin/activate;
+#ALEMBIC=alembic -c ./server/backend/database/alembic/alembic.ini
+VENV= .venv\Scripts\activate #Windows
+ALEMBIC=alembic -c server\backend\database\alembic\alembic.ini
 .PHONY: run run_debug migrate_head migrate_down migrate_history migrate_current migrate_heads migrate_stamp migrate
 run:
 	$(VENV) python run.py --user_name admin
 run_debug:
 	$(VENV) python run.py --mode debug --user_name admin
 migrate_head:
-	$(VENV) $(ALEMBIC) upgrade head
+	$(VENV) $(ALEMBIC) 
+	
 migrate_down:
 	$(VENV) $(ALEMBIC) downgrade -1
 migrate_history:
--- a/server/backend/endpoints/endpoints.py
+++ b/server/backend/endpoints/endpoints.py
@@ -8,9 +8,9 @@ security = HTTPBearer(auto_error=False)

 async def get_current_user(
    credentials: HTTPAuthorizationCredentials = Depends(security),
-    token_cookie: str = Cookie(default=None)
+    token: str = Cookie(default=None)
 ):
-    token = credentials.credentials if credentials else token_cookie
+    token = credentials.credentials if credentials else token
    if not token:
        raise HTTPException(status_code=401, detail="Not authenticated")
    user = decodeJWT(token)
--- a/server/frontend/auth/fonts/MurreyC/COPYRIGHT.txt
+++ b/server/frontend/auth/fonts/MurreyC/COPYRIGHT.txt
@@ -0,0 +1 @@
+DoubleRus encoding by Diai; unfinished
--- a/server/frontend/auth/fonts/MurreyC/murreyc.eot
+++ b/server/frontend/auth/fonts/MurreyC/murreyc.eot
--- a/server/frontend/auth/fonts/MurreyC/murreyc.ttf
+++ b/server/frontend/auth/fonts/MurreyC/murreyc.ttf
--- a/server/frontend/auth/fonts/MurreyC/murreyc.woff
+++ b/server/frontend/auth/fonts/MurreyC/murreyc.woff
--- a/server/frontend/auth/fonts/MurreyC/murreyc.woff2
+++ b/server/frontend/auth/fonts/MurreyC/murreyc.woff2
--- a/server/frontend/auth/image/bg.png
+++ b/server/frontend/auth/image/bg.png
--- a/server/frontend/auth/image/hamster.png
+++ b/server/frontend/auth/image/hamster.png
--- a/server/frontend/auth/login.css
+++ b/server/frontend/auth/login.css
@@ -0,0 +1,81 @@
+@font-face {
+    font-family: "MurreyC";
+    src: url("fonts/MurreyC/murreyc.woff2") format("woff2");
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
+}
+@font-face {
+    font-family: "MurreyC";
+    src: url("fonts/MurreyC/murreyc.woff") format("woff");
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
+}
+@font-face {
+    font-family: "MurreyC";
+    src: url("fonts/MurreyC/murreyc.eot") format("eot");
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
+}
+body {
+    font-family: "MurreyC";
+    background: url('./image/bg.png') no-repeat 100% 100% fixed;
+    background-size: cover;
+    margin: 0;
+    padding: 0;
+}
+.glass-container {
+    position: fixed;
+    inset: 0;
+    backdrop-filter: blur(16px);
+    background: rgba(255,255,255,0.1); /* обязательно */
+}
+.login-box {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    background: url('./image/hamster.png') no-repeat 50% 50%;
+    padding-top: 50px;
+}
+form {
+    display: flex;
+    flex-direction: column;
+}
+h2 {
+    font-weight: 900;
+    font-size: 50px;
+    text-decoration: underline;
+    margin: 0;
+    padding: 0;
+}
+input {
+    width: 320px;
+    height: 50px;
+    padding: 0 20px;
+    border-radius: 25px;
+    border: 1px solid #000;
+    background-color: #ffffff;
+    outline: none;
+    font-size: 30px;
+}
+button {
+    margin-top: 10px;
+    font-size: 30px;
+    background-color: #3a1f09;
+    padding: 10px 15px;
+    border-radius: 33px;
+    transition: all .1s;
+    color: #e5b97e;
+    box-shadow: #3a1f09 2px 4px 10px 2px;
+    cursor: pointer;
+}
+button:hover {
+    background-color: #f0c590;
+    color: #b06029;
+    transform: scale(1.015);
+}
--- a/server/frontend/auth/login.html
+++ b/server/frontend/auth/login.html
@@ -9,10 +9,10 @@
 <body>
    <div class="glass-container">
        <div class="login-box">
-            <h2>Login</h2>
+            <h2>Введите код</h2>
            <form id="loginForm">
-                <input type="password" id="password" name="password" required placeholder="Code">
-                <button type="submit">Login</button>
+                <input type="password" id="password" name="password" required placeholder="Код">
+                <button type="submit">Войти</button>
            </form>
        </div>
    </div>
--- a/server/frontend/main/api.js
+++ b/server/frontend/main/api.js
@@ -15,7 +15,7 @@ document.addEventListener("DOMContentLoaded", () => {
        window.location.href = '/';
    });

-    document.querySelector(".form-info").addEventListener("submit", async (e) => {
+    document.querySelector(".form-connect").addEventListener("submit", async (e) => {
        e.preventDefault();

        const guestData = {
--- a/server/frontend/main/index.html
+++ b/server/frontend/main/index.html
@@ -20,7 +20,7 @@
            <ul class="menu">
                <!-- 1 -->
                <li class="item">
-                    <a href="#heading" class="link">
+                    <a href="#" class="link">
                        Добро пожаловать!
                    </a>
                </li>
@@ -87,8 +87,7 @@
        </section>
        <aside>
            <div class="time">
-                <!-- отсчет до даты -->
-                00:00:00
+                <p id="demo"></p>
            </div>
        </aside>
        <section class="people" id="people">
@@ -438,6 +437,11 @@
                <label>Фамилия
                    <input type="text" name="lastName" id="flname" required>
                </label>
+
+                <label class="label_1">Комментарий
+                    <textarea cols="1.5" rows="1" type="text" name="lastName" id="text_field" placeholder="Напишите здесь о ваших особых предпочтениях и аллергиях"></textarea>
+                </label>
+
            </div>

            <!-- Средняя колонка -->
@@ -466,13 +470,16 @@
                <label class="option"><input type="checkbox" name="drink" value="tequila" id="ctequila"> Текила</label>
            </div>

+
+        </form>
+        <form class="form-connect">
            <button type="submit" class="answer_btn" id="bsubmit">
                Подтвердить участие
            </button>
-        </form>
-        <button type="logout" class="answer_btn" id="logoutForm">
+            <button type="logout" class="answer_btn" id="logoutForm">
            Выйти
-        </button>
+            </button>
+        </form>
    </div>
        </section>
    </main>
--- a/server/frontend/main/main.js
+++ b/server/frontend/main/main.js
@@ -28,3 +28,32 @@ const swiper = new Swiper('.swiper', {
  }
  
 });
+
+// Set the date we're counting down to
+var countDownDate = new Date("Aug 22, 2026 12:00:00").getTime();
+
+// Update the count down every 1 second
+var x = setInterval(function() {
+
+  // Get today's date and time
+  var now = new Date().getTime();
+
+  // Find the distance between now and the count down date
+  var distance = countDownDate - now;
+
+  // Time calculations for days, hours, minutes and seconds
+  var days = Math.floor(distance / (1000 * 60 * 60 * 24));
+  var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+  var seconds = Math.floor((distance % (1000 * 60)) / 1000);
+
+  // Display the result in the element with id="demo"
+  document.getElementById("demo").innerHTML = days + "д " + hours + "ч "
+  + minutes + "м " + seconds + "с ";
+
+  // If the count down is finished, write some text
+  if (distance < 0) {
+    clearInterval(x);
+    document.getElementById("demo").innerHTML = "EXPIRED";
+  }
+}, 1000);
--- a/server/frontend/main/style.css
+++ b/server/frontend/main/style.css
@@ -440,8 +440,8 @@ h4 {
 }
 .answer_wrapper {
    background: linear-gradient(135deg, #f3d9c6, #e8c3a4, #d9a77a);
-    padding: 60px;
-    margin: 0 400px;
+    padding: 50px;
+    margin: 0 300px;
    border-radius: 25px;
    box-shadow: 0 15px 40px rgba(0,0,0,0.08);
    margin-top: 20px;
@@ -457,8 +457,15 @@ h4 {

 .form-info {
    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-columns: 2fr 1fr 1fr;
    gap: 50px;
+    margin-bottom: 40px;
+}
+.form-connect {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
 }

 .form_name {
@@ -468,7 +475,18 @@ h4 {
    gap: 20px;
    font-size: 36px;
    font-weight: 700;
+    justify-content: space-between;
+    width: 500px;
 }
+label {
+    display: flex;
+    justify-content: space-between;
+}
+.label_1 {
+    flex-direction: column;
+    gap: 20px;
+}
+

 .block_title {
    font-weight: 700;
@@ -483,6 +501,7 @@ h4 {
    gap: 10px;
    margin-bottom: 12px;
    font-size: 30px;
+    justify-content: start;
 }

 input[type="text"] {
@@ -501,7 +520,6 @@ input[type="checkbox"] {

 .answer_btn {
    grid-column: 1 / -1;
-    margin-top: 40px;
    padding: 18px 40px;
    border-radius: 30px;
    border: none;
@@ -527,6 +545,13 @@ input[type="checkbox"] {
    outline: none;
    font-size: 30px;
 }
+textarea {
+    padding: 0 20px;
+    border-radius: 25px;
+    border: none;
+    background-color: #ffffff;
+    font-size: 30px;
+}

 /* -----------------------------FOOTER---------------------------------- */
Author	SHA1	Message	Date
MH.Dmitrii	9e35fa4d7d	fix current user endpoint All checks were successful Build Docker / deploy (push) Successful in 39s Details Build Docker / build (push) Successful in 1m8s Details	2026-04-19 21:06:46 +03:00
MH.Dmitrii	d206d9421a	fix id text area All checks were successful Build Docker / deploy (push) Successful in 40s Details Build Docker / build (push) Successful in 1m3s Details	2026-04-19 20:59:19 +03:00
MH.Dmitrii	d35bcbe53a	fix form All checks were successful Build Docker / deploy (push) Successful in 45s Details Build Docker / build (push) Successful in 58s Details	2026-04-19 20:46:20 +03:00
MH.Dmitrii	e4690f6e2d	fix class name All checks were successful Build Docker / deploy (push) Successful in 43s Details Build Docker / build (push) Successful in 1m5s Details	2026-04-19 20:36:40 +03:00
Dmitrii Seliakov	472bf3c662	Merge pull request 'final' (#1 ) from dev into main All checks were successful Build Docker / deploy (push) Successful in 1m2s Details Build Docker / build (push) Successful in 1m18s Details Reviewed-on: #1	2026-04-19 17:27:42 +00:00
alena	d58bfbb7c1	final	2026-04-19 20:25:06 +03:00