Merge remote-tracking branch 'origin/master'

app.py

@@ -93,6 +93,10 @@ def signup_post():
     if not password:
         errors['password'] = 'Das Passwort ist erforderlich.'
 
+    # Check if email is already in use
+    if User.get_by_email(email):
+        errors['email'] = 'E-Mail Adresse bereits in Benutzung.'
+
     if errors:
         return render_template(
             'auth/signup.html',
@@ -135,10 +139,15 @@ def index():
     for habit_list in habit_lists:
         habit_list.habits = sorted(habit_list.get_habits(), key=lambda habit: (not habit.checked, habit.slot))
 
+    days = {"Monday": "Montag", "Tuesday": "Dienstag", "Wednesday": "Mittwoch", "Thursday": "Donnerstag",
+            "Friday": "Freitag", "Saturday": "Samstag", "Sunday": "Sonntag"}
+
+    date = datetime.datetime.now().strftime("%d.%m.%Y %H:%M ") + days[datetime.datetime.now().strftime("%A")]
+
     return render_template(
         'index.html',
         title=name,
-        utc_dt=datetime.datetime.now().strftime("%d.%m.%Y %H:%M %A"),
+        utc_dt=date,
         habit_lists=habit_lists,
         heatmap_values=heatmap_values,
         errors={},
@@ -571,6 +580,83 @@ def reorder_habits():
     return {}
 
 
+@app.route('/users')
+@login_required
+def users():
+    habit_list_id = request.args.get('habit_list', current_user.get_habitLists()[0].id)
+    habit_list = HabitList.get(int(habit_list_id))
+    users = habit_list.get_users()
+
+    # Remove the current user from the list
+    users = [user for user in users if user.id != current_user.id]
+
+    return render_template(
+        'users.html',
+        title='Teilnehmer',
+        habit_list=habit_list,
+        users=users,
+        errors={},
+    )
+
+@app.route('/users', methods=['POST'])
+@login_required
+def add_user():
+    email = request.form.get('email')
+    habit_list_id = request.form.get('habit_list_id')
+    habit_list = HabitList.get(int(habit_list_id))
+
+    # Check for errors
+    errors = {}
+    if not email:
+        errors['email'] = 'Die E-Mail Adresse ist erforderlich.'
+    if not habit_list_id:
+        errors['habit_list'] = 'Die Habitliste ist erforderlich.'
+
+    if errors:
+        return render_template(
+            'users.html',
+            title='Teilnehmer',
+            email=email,
+            habit_list=habit_list,
+            errors=errors,
+            users=habit_list.get_users(),
+        )
+
+    # Check if user exists
+    user = User.get_by_email(email)
+    if not user:
+        errors['email'] = 'E-Mail Adresse nicht gefunden.'
+
+    if user.id == current_user.id:
+        errors['email'] = 'Du kannst dich nicht selbst hinzufügen.'
+
+    # Check if user is already in the habit list
+    already = False
+    for u in habit_list.get_users():
+        if u.id == user.id:
+            already = True
+            break
+
+    if already:
+        errors['email'] = 'Teilnehmer ist bereits in der Liste.'
+
+    if errors:
+        return render_template(
+            'users.html',
+            title='Teilnehmer',
+            email=email,
+            habit_list=habit_list,
+            errors=errors,
+            users=habit_list.get_users(),
+        )
+
+    # Add user to habit list
+    habit_list = HabitList.get(int(habit_list_id))
+    habit_list.add_user(user)
+
+    return redirect(url_for('index', habit_list=habit_list.id))
+
+
 # Run the application
 if __name__ == '__main__':
     app.run(port=5000, debug=True)

models/HabitList.py

@@ -53,15 +53,14 @@ class HabitList:
         raw_users = get_users(self.id)
         users = []
         for user in raw_users:
-            user = User(user[0], user[1], user[2], user[3])
+            user = User(user[0], user[1], user[2], user[3], user[4])
             users.append(user)
 
         return users
 
 
     # Adds a User by email to the HabitList
-    def add_user(self, email: str):
+    def add_user(self, user: User):
-        user = User.get_by_email(email)
         if user:
             add_user(self.id, user.id)
         else:

templates/auth/login.html

@@ -1,8 +1,8 @@
 {% extends 'layouts/main.html' %}
 
 {% block content %}
-<div class="card">
+<div class="card bg-light mt-4">
-    <h5 class="card-header">Login</h5>
+    <h1 class="card-header">Login</h1>
     <div class="card-body column">
         <form method="POST" action="/login">
             <div class="mb-3 row">

templates/auth/signup.html

@@ -1,26 +1,30 @@
 {% extends 'layouts/main.html' %}
 
 {% block content %}
+<div class="card bg-light mt-4 p-5">
     <div class="column">
-    <h3>Registrieren</h3>
+        <h1>Registrieren</h1>
         <form method="POST" action="/signup">
             <div class="mb-3">
                 <label for="email" class="form-label">Email-Adresse</label>
-            <input type="email" class="form-control {% if errors.get('email') %} is-invalid {% endif %}" id="email" name="email" placeholder="name@example.com" value="{{ email }}">
+                <input type="email" class="form-control {% if errors.get('email') %} is-invalid {% endif %}" id="email"
+                       name="email" placeholder="name@example.com" value="{{ email }}">
                 <div class="invalid-feedback">
                     {{ errors.get('email', '') }}
                 </div>
             </div>
             <div class="mb-3">
                 <label for="name" class="form-label">Name</label>
-            <input type="text" class="form-control {% if errors.get('name') %} is-invalid {% endif %}" id="name" name="name" placeholder="Max" value="{{ name }}">
+                <input type="text" class="form-control {% if errors.get('name') %} is-invalid {% endif %}" id="name"
+                       name="name" placeholder="Max" value="{{ name }}">
                 <div class="invalid-feedback">
                     {{ errors.get('name', '') }}
                 </div>
             </div>
             <div class="mb-3">
                 <label for="password" class="form-label">Passwort</label>
-            <input type="password" class="form-control {% if errors.get('password') %} is-invalid {% endif %}" id="password" name="password" value="{{ password }}">
+                <input type="password" class="form-control {% if errors.get('password') %} is-invalid {% endif %}"
+                       id="password" name="password" value="{{ password }}">
                 <div class="invalid-feedback">
                     {{ errors.get('password', '') }}
                 </div>
@@ -30,4 +34,5 @@
             </div>
         </form>
     </div>
+</div>
 {% endblock %}

templates/components/habit_lists.html

@@ -66,24 +66,30 @@
             <div class="row mb-3 align-items-center">
 
                 <!-- Personen die zur Liste gehören -->
-                <div class="col-2">
+                {% if habit_list.get_users()[0].id == current_user.id %}
+                {% if habit_list.get_users()|length > 1 %}
+                <div class="col">
                     <div class="avatar-stack">
-                        <img class="avatar" src="/images/avatar/1.jpg"/>
+                        {% for user in habit_list.get_users() %}
-                        <img class="avatar" src="/images/avatar/2.jpg"/>
+                        {% if current_user.id != user.id %}
-                        <img class="avatar" src="/images/avatar/4.jpg"/>
+                        <img class="avatar" src="/{{user.profile_image}}" data-toggle="tooltip" data-placement="top" title="{{user.name}}"/>
-                        <img class="avatar" src="/images/avatar/5.jpg"/>
+                        {% endif %}
+                        {% endfor %}
                     </div>
                 </div>
+                {% endif %}
 
                 <!-- Knopf für das Hinzufügen einer Person zur gemeinsamen Liste -->
-                <div class="col-1">
+                <div class="col">
-                    <button type="button" class="btn"
+                    <a href="/users?habit_list={{habit_list.id}}" style="width: 40px; height: 40px; min-height: 3em;" data-toggle="tooltip" data-placement="top" title="Benutzer einladen">
-                            style="width: 40px; height: 40px; min-height: 3em;">
 
-                        <i class="bi bi-plus"></i>
+                        <i class="bi bi-plus-circle"></i>
 
-                    </button>
+                    </a>
                 </div>
+                {% else %}
+                <div class="col"></div>
+                {% endif %}
 
                 <div class="col-6"></div>
 
@@ -115,7 +121,7 @@
                     </div>
 
                     <!-- Beschreibung -->
-                    <div class="col-md-3 d-none d-md-block text-black text-opacity-50"
+                    <div class="col-md-4 d-none d-md-block text-black text-opacity-50"
                          style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
                         {{ habit.note }}
                     </div>
@@ -123,7 +129,7 @@
                     <!-- Streak -->
                     <div class="col-2" id="streak-{{ habit.id }}" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
                         {% if not habit.streak == 0 %}
-                        {{ habit.streak }} 🔥
+                        {{ habit.streak }}20 🔥
                         {% endif %}
                     </div>
 
@@ -134,7 +140,7 @@
                         <i class="bi bi-trash3"></i>
                     </button>
 
-                    <!--  -->
+                    <!-- Knopf für das Bearbeiten der Gewohnheit -->
                     <a type="button" class="btn" href="{{ url_for('edit_habit') }}?habit={{ habit.id }}" aria-current="page"
                             style="width: 40px; height: 40px; min-height: 3em;">
 

templates/components/scripts.html

@@ -1,4 +1,3 @@
-
 <script>
     function checkCompletionAndAnimate(habitId, percentage) {
         var progressBar = document.getElementById("progress-bar-" + habitId);
@@ -106,6 +105,7 @@
         }
     });
 
-
+    $(function () {
-
+        $('[data-toggle="tooltip"]').tooltip()
+    })
 </script>

templates/habit-list.html

@@ -1,8 +1,8 @@
 {% extends 'layouts/main.html' %}
 
 {% block content %}
-
+<div class="card bg-light p-5 mt-5">
-<h1 class="mt-5">Habitliste erstellen📋</h1>
+<h1>Gewohnheitsliste erstellen📋</h1>
 
 <form action="/habit-list" method="POST">
     <div class="mb-3">
@@ -21,5 +21,5 @@
     </div>
     <button type="submit" class="btn btn-primary">Submit</button>
 </form>
-
+</div>
 {% endblock %}

templates/habit.html

@@ -1,8 +1,8 @@
 {% extends 'layouts/main.html' %}
 
 {% block content %}
-
+<div class="card bg-light p-5 mt-5">
-<h1 class="mt-5">Habit erstellen📋</h1>
+<h1>Gewohnheit erstellen📋</h1>
 
 <form action="/habit" method="POST">
     <div class="mb-3">
@@ -78,5 +78,5 @@
     </script>
     <button type="submit" class="btn btn-primary">Submit</button>
 </form>
-
+</div>
 {% endblock %}

templates/layouts/main.html

@@ -34,11 +34,7 @@
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+            <ul class="me-auto"></ul>
-                <li class="nav-item">
-                    <a class="nav-link text-white {% if title == 'Home' %} active {% endif %}" aria-current="page" href="{{ url_for('index') }}">Home</a>
-                </li>
-            </ul>
             <ul class="navbar-nav mb-2 mb-lg-0">
                 {% if not current_user.is_authenticated %}
                 <li class="nav-item me-2">

templates/users.html

@@ -0,0 +1,25 @@
+{% extends 'layouts/main.html' %}
+
+{% block content %}
+<div class="card bg-light mt-4 p-5">
+    <h1>{{ habit_list.name }}: {{ title }}</h1>
+    <p>Lade Nutzer per ihrer E-Mail-Adresse ein</p>
+
+    <form action="/users" method="POST">
+        <div class="mb-3">
+            <label for="email" class="form-label">E-Mail</label>
+            <input type="text" placeholder="beispiel@cimeyclust.com"
+                   class="form-control {% if errors.get('email') %} is-invalid {% endif %}" id="email" name="email"
+                   value="{{email}}">
+            <div class="invalid-feedback">
+                {{ errors.get('email', '') }}
+            </div>
+        </div>
+
+        <input hidden="hidden" name="habit_list_id" value="{{ habit_list.id }}">
+
+        <!-- submit button -->
+        <button type="submit" class="btn btn-primary">Einladen</button>
+    </form>
+</div>
+{% endblock %}