Merge branch 'master' of edugit.org:enrichment-2024/qivip

core/accounts/templates/accounts/home.html

@@ -1,11 +1,25 @@
 {% extends 'accounts/base.html'%}
 {% block title %}Home{% endblock %}
 {% block content %}
-<div class="grid place-content-center h-120">
-<h1 class="text-center m-4 text-6xl">Moin moin!</h1>
-<form action="{% url 'accounts:logout' %}" method="post">
-    {% csrf_token %}
-    <button class="bg-red-600 text-white p-3 rounded-full font-black" type="submit">Abmelden</button>
-</form>
+
+
+<div class="max-w-screen-lg mx-auto mt-12">
+<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
+    <div class="grid place-content-center h-120">
+      
+        <h1 class="text-center m-4 text-3xl lg:text-6xl">Willkommen,  <b>{{ request.user.username }}</b>!</h1>
+       
+        <form action="{% url 'accounts:logout' %}" method="post">
+            {% csrf_token %}
+            <button class="bg-red-600 text-white p-3 rounded-full font-black" type="submit">Abmelden</button>
+            </form>
+        </div>
+        <div class="flex justify-end">
+            <span class="text-[clamp(0.6rem,5vw,1rem)] font-black overflow-x-auto mt-1 ml-0.75 text-blue-600 p-0.75 bg-white">qivip
+            </span>
+            </div>
 </div>
+</div>
+
+
 {% endblock %}

core/accounts/templates/accounts/login.html

@@ -2,12 +2,12 @@
 {% load static %}
 {% block title %}Anmeldung{% endblock %}
 {% block content %}
-    <div class="grid place-content-center h-120">
-    <div class="p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
+    <div class="grid place-content-center h-120 mt-12 mb-12 ">
+    <div class="w-80 p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md lg:w-90">
         <h2 class="text-2xl text-center p-4 font-black">Anmeldung</h2>
         <form class="space-y-4" method="post">
             {% if form.errors %}
-            <div class="text-red-600 font-black overflow-x-auto break-words text-center">
+            <div class=" items-center text-red-600 font-black overflow-x-auto break-words text-center">
                 <ul>
                     {% for field, errors in form.errors.items %}
                         {% for error in errors %}
@@ -18,11 +18,11 @@
             </div>
             {% endif %}
             {% csrf_token %}
-            <div class="">
-                <input class="p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="text" name="username" id="username" required placeholder="BENUTZERNAME">
+            <div class="items-center w-full">
+                <input class=" w-full p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="text" name="username" id="username" required placeholder="BENUTZERNAME">
             </div>
-            <div class="">
-                <input class="p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="password" name="password" id="password" required placeholder="PASSWORT">
+            <div class="items-center w-full">
+                <input class=" w-full p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="password" name="password" id="password" required placeholder="PASSWORT">
             </div>
             <button class="w-full p-3 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200" type="submit" class="login-button">Anmelden</button>
         </form>

core/accounts/templates/accounts/register.html

@@ -1,8 +1,9 @@
 {% extends 'accounts/base.html' %}
 {% block title %}Registrierung{% endblock %}
 {% block content %}
-<div class="grid place-content-center h-120">
-    <div class=" p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
+<div class="grid place-content-center h-120 mt-12 mb-12">
+
+        <div class="w-80 p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md lg:w-90">
         <h2 class="text-2xl text-center p-4 font-black">Registrieren</h2>
 
         <form class=" space-y-4" method="post">

core/core/settings.py

@@ -127,4 +127,4 @@ BASE_DIR='static'  #von ben8 hinzugefügt
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-LOGIN_URL = '/login/'
+LOGIN_URL = '/account/login/'

core/homepage/templates/homepage/base.html

@@ -2,6 +2,7 @@
 <!DOCTYPE html>
 <html lang="de">
 <head>
+    <link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">