From 8cad77ad0d7e0a0d07629087e2ee1709688cb58d Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Fri, 19 Jul 2019 22:27:10 -0700
Subject: Convert comments to flask framework

---
 youtube/templates/comments_page.html | 83 ++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 youtube/templates/comments_page.html

(limited to 'youtube/templates/comments_page.html')

diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
new file mode 100644
index 0000000..a77d2b4
--- /dev/null
+++ b/youtube/templates/comments_page.html
@@ -0,0 +1,83 @@
+{% extends "base.html" %}
+{% import "comments.html" as comments %}
+
+{% block page_title %}{{ 'Replies' if comments_info['is_replies'] else 'Comments page ' + comments_info['page_number'] }}{% endblock %}
+
+
+{% block style %}
+    main{
+        display:grid;
+        grid-template-columns: 3fr 2fr;
+    }
+    #left{
+        background-color:#bcbcbc;
+        
+        display: grid;
+        grid-column: 1;
+        grid-row: 1;
+        grid-template-columns: 1fr 640px;
+        grid-template-rows: 0fr 0fr 0fr;
+    }
+        .comments-area{
+            grid-column:2;
+        }
+            .comment{
+                width:640px;
+            }
+{% endblock style %}
+
+
+{% block main %}
+    <div id="left">
+        <section class="comments-area">
+            {% if not comments_info['is_replies'] %}
+                <section class="video-metadata">
+                    <a class="video-metadata-thumbnail-box" href="{{ comments_info['video_url'] }}" title="{{ comments_info['video_title'] }}">
+                        <img class="video-metadata-thumbnail-img" src="{{ comments_info['video_thumbnail'] }}" height="180px" width="320px">
+                    </a>
+                    <a class="title" href="{{ comments_info['video_url'] }}" title="{{ comments_info['video_title'] }}">{{ comments_info['video_title'] }}</a>
+
+                    <h2>Comments page {{ comments_info['page_number'] }}</h2>
+                    <span>Sorted by {{ comments_info['sort_text'] }}</span>
+                </section>
+            {% endif %}
+
+
+            <form action="{{ form_action }}" method="post" class="comment-form">
+                <div id="comment-account-options">
+                    <label for="account-selection">Account:</label>
+                    <select id="account-selection" name="channel_id">
+                        {% for account in accounts %}
+                            <option value="{{ account['channel_id'] }}">{{ account['display_name'] }}</option>
+                        {% endfor %}
+                    </select>
+                    <a href="/https://youtube.com/login" target="_blank">Add account</a>
+                </div>
+                <textarea name="comment_text"></textarea>
+                {% if include_video_id_input %}
+                    <input type="hidden" name="video_id" value="{{ comments_info['video_id'] }}">
+                {% endif %}
+                <button type="submit" class="post-comment-button">{{ 'Post reply' if comments_info['is_replies'] else 'Post comment' }}</button>
+            </form>
+
+            {% if not comments_info['is_replies'] %}
+                <div class="comment-links">
+                    {% for link_text, link_url in comments_info['comment_links'] %}
+                        <a class="sort-button" href="{{ link_url }}">{{ link_text }}</a>
+                    {% endfor %}
+                </div>
+            {% endif %}
+
+            <div class="comments">
+                {% for comment in comments_info['comments'] %}
+                    {{ comments.render_comment(comment, comments_info['include_avatars']) }}
+                {% endfor %}
+            </div>
+            {% if 'more_comments_url' is in comments_info %}
+                <a class="page-button more-comments" href="{{ comments_info['more_comments_url'] }}">More comments</a>
+            {% endif %}
+        </section>
+    </div>
+{% endblock main %}
+
+
-- 
cgit v1.2.3


From 167483af21fb252622170c4b5e3ae3ce81f58733 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Sun, 21 Jul 2019 00:03:34 -0700
Subject: Convert login to flask framework and fix the login, and fix account
 display

---
 youtube/templates/comments_page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'youtube/templates/comments_page.html')

diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
index a77d2b4..302fcac 100644
--- a/youtube/templates/comments_page.html
+++ b/youtube/templates/comments_page.html
@@ -48,7 +48,7 @@
                     <label for="account-selection">Account:</label>
                     <select id="account-selection" name="channel_id">
                         {% for account in accounts %}
-                            <option value="{{ account['channel_id'] }}">{{ account['display_name'] }}</option>
+                            <option value="{{ account[0] }}">{{ account[1] }}</option>
                         {% endfor %}
                     </select>
                     <a href="/https://youtube.com/login" target="_blank">Add account</a>
-- 
cgit v1.2.3


From fc295ac93d0ad6b0272aa94f2d2ea44002ecbc48 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Sun, 21 Jul 2019 21:48:54 -0700
Subject: Convert comment posting system to flask framework

---
 youtube/templates/comments_page.html | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'youtube/templates/comments_page.html')

diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
index 302fcac..c7947fa 100644
--- a/youtube/templates/comments_page.html
+++ b/youtube/templates/comments_page.html
@@ -42,23 +42,7 @@
                 </section>
             {% endif %}
 
-
-            <form action="{{ form_action }}" method="post" class="comment-form">
-                <div id="comment-account-options">
-                    <label for="account-selection">Account:</label>
-                    <select id="account-selection" name="channel_id">
-                        {% for account in accounts %}
-                            <option value="{{ account[0] }}">{{ account[1] }}</option>
-                        {% endfor %}
-                    </select>
-                    <a href="/https://youtube.com/login" target="_blank">Add account</a>
-                </div>
-                <textarea name="comment_text"></textarea>
-                {% if include_video_id_input %}
-                    <input type="hidden" name="video_id" value="{{ comments_info['video_id'] }}">
-                {% endif %}
-                <button type="submit" class="post-comment-button">{{ 'Post reply' if comments_info['is_replies'] else 'Post comment' }}</button>
-            </form>
+            {{ comments.comment_posting_box(comment_posting_box_info) }}
 
             {% if not comments_info['is_replies'] %}
                 <div class="comment-links">
-- 
cgit v1.2.3


From 74cf3b2135661ae17b4e390c91182c673645cad7 Mon Sep 17 00:00:00 2001
From: James Taylor <user234683@users.noreply.github.com>
Date: Sun, 21 Jul 2019 22:50:57 -0700
Subject: Use variable to set title on base template instead of block

---
 youtube/templates/comments_page.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'youtube/templates/comments_page.html')

diff --git a/youtube/templates/comments_page.html b/youtube/templates/comments_page.html
index c7947fa..68c8537 100644
--- a/youtube/templates/comments_page.html
+++ b/youtube/templates/comments_page.html
@@ -1,9 +1,7 @@
+{% set page_title = ('Replies' if comments_info['is_replies'] else 'Comments page ' + comments_info['page_number']) %}
 {% extends "base.html" %}
 {% import "comments.html" as comments %}
 
-{% block page_title %}{{ 'Replies' if comments_info['is_replies'] else 'Comments page ' + comments_info['page_number'] }}{% endblock %}
-
-
 {% block style %}
     main{
         display:grid;
-- 
cgit v1.2.3