From 6c5a21ca99ceb57fd1a3138af628b55cdfe59874 Mon Sep 17 00:00:00 2001
From: Lior <lior_reytan@milab.idc.ac.il>
Date: Tue, 20 Oct 2020 22:14:49 +0300
Subject: [PATCH 1/2] New Favorites page after selecting them in all-courses
 page

---
 tutor/controllers/course.py                | 17 +++++++++++++----
 tutor/controllers/forms/add_course_form.py |  4 ++--
 tutor/routes/course.py                     |  7 ++++++-
 tutor/templates/addcourse.html             |  2 +-
 tutor/templates/courses.html               | 10 ++++++++--
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/tutor/controllers/course.py b/tutor/controllers/course.py
index b90ff75..a1a7986 100644
--- a/tutor/controllers/course.py
+++ b/tutor/controllers/course.py
@@ -1,15 +1,24 @@
 from flask import render_template, redirect, url_for, flash
 from ..models.course import Course
 from .. import db
-from .forms.add_course_form import AddCourse
+from .forms.add_course_form import AddCourseToTutor
 from flask_login import current_user
 
 
-def addCourse():
+def addCourseToFavorites():
+    #if not current_user.is_authenticated:
+     #   flash("You must be logged in to add course to favorites", 'danger')
+     #   return redirect(url_for('courses_route'))
+    #form = 
+        
+    #return render_template('newfavorites.html', form=form)
+
+
+def addCourseToTutor():
     if not current_user.is_authenticated:
-        flash("You must be logged in to add course", 'danger')
+        flash("You must be logged in to add course to Tutor", 'danger')
         return redirect(url_for('courses_route'))
-    form = AddCourse()
+    form = AddCourseToTutor()
     if form.validate_on_submit():
         course = Course(name=form.name.data)
         db.session.add(course)
diff --git a/tutor/controllers/forms/add_course_form.py b/tutor/controllers/forms/add_course_form.py
index 4d90f75..73c0a70 100644
--- a/tutor/controllers/forms/add_course_form.py
+++ b/tutor/controllers/forms/add_course_form.py
@@ -3,6 +3,6 @@
 from wtforms.validators import DataRequired, Length
 
 
-class AddCourse(FlaskForm):
+class AddCourseToTutor(FlaskForm):
     name = StringField('Course Name', validators=[DataRequired(), Length(max=50)])
-    submit = SubmitField('Add Course')
+    submit = SubmitField('Add Course to Tutor')
diff --git a/tutor/routes/course.py b/tutor/routes/course.py
index 6871beb..d029143 100644
--- a/tutor/routes/course.py
+++ b/tutor/routes/course.py
@@ -14,6 +14,11 @@ def courses_route():
     return course.showCourses()
 
 
+@app.route("/newfavorites", methods=['GET', 'POST'])
+def newFavorites_route():
+    return course.addCourseToFavorites()
+
+ 
 @app.route("/addcourse", methods=['GET', 'POST'])
 def addCourse_route():
-    return course.addCourse()
+    return course.addCourseToTutor()
diff --git a/tutor/templates/addcourse.html b/tutor/templates/addcourse.html
index dd29e89..1f675bf 100644
--- a/tutor/templates/addcourse.html
+++ b/tutor/templates/addcourse.html
@@ -7,7 +7,7 @@
         <form method="POST" action="">
             {{ form.hidden_tag() }}
             <fieldset class="form-group">
-                <legend class="border-bottom mb-4">Add New Course</legend>
+                <legend class="border-bottom mb-4">Add New Course to Tutor</legend>
                 <div class="form-group">
                     {{ form.name.label(class="form-control-label") }}
                     {% if form.name.errors %}
diff --git a/tutor/templates/courses.html b/tutor/templates/courses.html
index bedc44e..bacc329 100644
--- a/tutor/templates/courses.html
+++ b/tutor/templates/courses.html
@@ -6,13 +6,19 @@
     <h2>Courses</h2> <br>
     {% for course in courses %}
         <article class="media content-section">
+            {% if current_user.is_authenticated %}
+                <h3><input type="checkbox">&nbsp;&nbsp;</h3>
+            {% endif %}
             <div class="media-body">
                 <h3><a class="article-title" href="{{ url_for('get_course_info_route', id=course.id) }}">{{ course.name }}</a></h3>
             </div>
         </article>
     {% endfor %}
-    <a class="btn btn-outline-info" style="background-color: white" href="{{ url_for('addCourse_route') }}">Add
-        Courses</a>
+    <br>
+    <a class="btn btn-outline-info" style="background-color: white" href="{{ url_for('newFavorites_route') }}">✯ Add Selected Courses to Favorites ✯</a>
+    <br>
+    <br>
+    <a class="btn btn-outline-info" style="background-color: white" href="{{ url_for('addCourse_route') }}">Add New Course to Tutor</a>
     <br>
 
 {% endblock content %}

From ae3dd891a661397810cd0ec01872f7661719007f Mon Sep 17 00:00:00 2001
From: Lior <lior_reytan@milab.idc.ac.il>
Date: Tue, 20 Oct 2020 22:23:26 +0300
Subject: [PATCH 2/2] Fixed: tutor/controllers/course.py

---
 tutor/controllers/course.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tutor/controllers/course.py b/tutor/controllers/course.py
index ef71363..1bb4a50 100644
--- a/tutor/controllers/course.py
+++ b/tutor/controllers/course.py
@@ -6,15 +6,6 @@
 from flask_login import current_user
 
 
-def addCourseToFavorites():
-    #if not current_user.is_authenticated:
-     #   flash("You must be logged in to add course to favorites", 'danger')
-     #   return redirect(url_for('courses_route'))
-    #form = 
-        
-    #return render_template('newfavorites.html', form=form)
-
-
 def addCourseToTutor():
     if not current_user.is_authenticated:
         flash("You must be logged in to add course to Tutor", 'danger')