Merge remote-tracking branch 'origin/master'

app.py

@@ -493,6 +493,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/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>
 

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/users.html

@@ -0,0 +1,23 @@
+{% extends 'layouts/main.html' %}
+
+{% block content %}
+
+<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>
+
+{% endblock %}