From 3e34d0a5f964bb7931cccdd58b7a360187d35a4d Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 6 May 2021 09:32:11 +0300
Subject: add blogs blueprint

---
 wqflask/wqflask/__init__.py        |  2 ++
 wqflask/wqflask/markdown_routes.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/__init__.py b/wqflask/wqflask/__init__.py
index a2bf3085..bf5e094b 100644
--- a/wqflask/wqflask/__init__.py
+++ b/wqflask/wqflask/__init__.py
@@ -12,6 +12,7 @@ from wqflask.markdown_routes import links_blueprint
 from wqflask.markdown_routes import policies_blueprint
 from wqflask.markdown_routes import environments_blueprint
 from wqflask.markdown_routes import facilities_blueprint
+from wqflask.markdown_routes import blogs_blueprint
 
 app = Flask(__name__)
 
@@ -29,6 +30,7 @@ app.register_blueprint(links_blueprint, url_prefix="/links")
 app.register_blueprint(policies_blueprint, url_prefix="/policies")
 app.register_blueprint(environments_blueprint, url_prefix="/environments")
 app.register_blueprint(facilities_blueprint, url_prefix="/facilities")
+app.register_blueprint(blogs_blueprint, url_prefix="/blogs")
 
 
 @app.before_request
diff --git a/wqflask/wqflask/markdown_routes.py b/wqflask/wqflask/markdown_routes.py
index c27ff143..b9a6f8ce 100644
--- a/wqflask/wqflask/markdown_routes.py
+++ b/wqflask/wqflask/markdown_routes.py
@@ -20,6 +20,8 @@ links_blueprint = Blueprint("links_blueprint", __name__)
 policies_blueprint = Blueprint("policies_blueprint", __name__)
 facilities_blueprint = Blueprint("facilities_blueprint", __name__)
 
+blogs_blueprint = Blueprint("blogs_blueprint", __name__)
+
 
 def render_markdown(file_name, is_remote_file=True):
     """Try to fetch the file name from Github and if that fails, try to
@@ -124,3 +126,36 @@ def policies():
 @facilities_blueprint.route("/")
 def facilities():
     return render_template("facilities.html", rendered_markdown=render_markdown("general/help/facilities.md")), 200
+
+
+@blogs_blueprint.route("/<blog_title>")
+def display_blog(blog_title):
+    # should use the blog title path
+
+    return render_template("blogs.html", rendered_markdown=render_markdown("blog/2021/proteome/Wang_WIlliams_Rat_Brain_Proteome_For_Blog.md"))
+
+
+@blogs_blueprint.route("/")
+def blogs_list():
+
+    # should fetch this from github
+
+    blogs = {"2021": [
+        {
+            "title": "proteome",
+            "subtitle": "Wang_WIlliams_Rat_Brain_Proteome_For_Blog"
+        },
+        { 
+          "title":"xxx",
+          "subtitle":"blog 2"
+        }
+    ],
+        "2020": [
+        {
+            "title": "other",
+            "subtitle": "other"
+        }
+    ]
+    }
+
+    return render_template("blogs_list.html", blogs=blogs)
-- 
cgit v1.2.3


From 2e2e4601f4cebc767854e66af2d2ca8c3e8123c9 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 6 May 2021 09:32:35 +0300
Subject: add  template for blogs

---
 wqflask/wqflask/templates/base.html       |  1 +
 wqflask/wqflask/templates/blogs.html      | 24 ++++++++++++
 wqflask/wqflask/templates/blogs_list.html | 61 +++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 wqflask/wqflask/templates/blogs.html
 create mode 100644 wqflask/wqflask/templates/blogs_list.html

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index e6f22deb..ddb1d272 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -69,6 +69,7 @@
                             <ul class="dropdown-menu">
                               <li><a href="{{ url_for('references_blueprint.references') }}">References</a></li>
                               <li><a href="/tutorials">Tutorials/Primers</a></li>
+                              <li><a href="{{ url_for('blogs_blueprint.blogs_list') }}">Blogs</a></li>
                               <li><a href="{{ url_for('glossary_blueprint.glossary') }}">Glossary of Term</a></li>
                               <li><a href="http://gn1.genenetwork.org/faq.html">FAQ</a></li>
                               <li><a href="{{ url_for('policies_blueprint.policies') }}">Policies</a></li>
diff --git a/wqflask/wqflask/templates/blogs.html b/wqflask/wqflask/templates/blogs.html
new file mode 100644
index 00000000..c3d42e13
--- /dev/null
+++ b/wqflask/wqflask/templates/blogs.html
@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+
+{% block title %}Blogs {% endblock %}
+
+{% block css %}
+<link rel="stylesheet" type="text/css" href="/static/new/css/markdown.css" />
+{% endblock %}
+
+{% block content %}
+
+ <div class="github-btn-container">
+<!--     <div class="github-btn">
+        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/help/facilities.md">
+            Edit Text
+            <img src="/static/images/edit.png">
+        </a>
+    </div> -->
+</div>
+<div id="markdown" class="container">
+   {{ rendered_markdown|safe }}
+
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/blogs_list.html b/wqflask/wqflask/templates/blogs_list.html
new file mode 100644
index 00000000..93cb3d89
--- /dev/null
+++ b/wqflask/wqflask/templates/blogs_list.html
@@ -0,0 +1,61 @@
+{% extends "base.html" %}
+
+{% block title %}Blogs {% endblock %}
+
+{% block css %}
+
+<style type="text/css">
+
+	.container {
+		height: 100vh;
+	}
+	.blog_year {
+		font-weight: bold;
+		opacity: 0.8;
+		/*letter-spacing: 0.2em;*/
+		font-size: 48px;
+		padding:12px 10px;
+		color:#0F75CD;
+	}
+
+	.blog_title {
+		padding: 10px 15px;
+
+	}
+
+
+
+	.blog_title a{
+		text-decoration: none;
+		font-size:16px;
+		color:#333;
+		/*margin: 10px 15px;*/
+		padding-left: 30px;
+		opacity: 0.8;
+
+		/*font-weight: bold;*/
+	}
+</style>
+
+<link rel="stylesheet" type="text/css" href="/static/new/css/markdown.css" />
+{% endblock %}
+
+{% block content %}
+
+<div id="markdown" class="container">
+   <div>
+   	{% for year, year_blogs in blogs.items() %}
+     <div class="blog_year"><h3>{{year}}</h3></div>
+     {%for blog in year_blogs%}
+        <!-- <a href="#" class="blog_subtitle">{{blog['subtitle']}}</a> -->
+        <div class="blog_title"><a href="{{ url_for('blogs_blueprint.display_blog',blog_title = blog.subtitle)}}">{{blog['subtitle']}}</a>
+        </div>
+     {% endfor %}
+
+   	{%endfor%}
+   </div>
+   	
+
+</div>
+
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 19771ba2c54b50313675c7a29ee8a53dcb0802ce Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 6 May 2021 21:39:16 +0300
Subject: add function for fetching blogs

---
 wqflask/wqflask/markdown_routes.py | 62 +++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 25 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/markdown_routes.py b/wqflask/wqflask/markdown_routes.py
index b9a6f8ce..28bd6e4b 100644
--- a/wqflask/wqflask/markdown_routes.py
+++ b/wqflask/wqflask/markdown_routes.py
@@ -57,6 +57,39 @@ def get_file_from_python_search_path(pathname_suffix):
         return None
 
 
+def get_blogs(user="genenetwork", repo_name="gn-docs"):
+
+    blogs = {}
+    github_url = f"https://api.github.com/repos/{user}/{repo_name}/git/trees/master?recursive=1"
+
+    repo_tree = requests.get(github_url).json()["tree"]
+
+    for data in repo_tree:
+        path_name = data["path"]
+        if path_name.startswith("blog") and path_name.endswith(".md"):
+            split_path = path_name.split("/")[1:]
+            try:
+                year, title, file_name = split_path
+            except Exception as e:
+                year, file_name = split_path
+                title = ""
+
+            subtitle = os.path.splitext(file_name)[0]
+
+            blog = {
+                "title": title,
+                "subtitle": subtitle,
+                "full_path": path_name
+            }
+
+            if year in blogs:
+                blogs[int(year)].append(blog)
+            else:
+                blogs[int(year)] = [blog]
+
+    return dict(sorted(blogs.items(), key=lambda x: x[0], reverse=True))
+
+
 @glossary_blueprint.route('/')
 def glossary():
     return render_template(
@@ -128,34 +161,13 @@ def facilities():
     return render_template("facilities.html", rendered_markdown=render_markdown("general/help/facilities.md")), 200
 
 
-@blogs_blueprint.route("/<blog_title>")
-def display_blog(blog_title):
-    # should use the blog title path
-
-    return render_template("blogs.html", rendered_markdown=render_markdown("blog/2021/proteome/Wang_WIlliams_Rat_Brain_Proteome_For_Blog.md"))
+@blogs_blueprint.route("/<path:blog_path>")
+def display_blog(blog_path):
+    return render_template("blogs.html", rendered_markdown=render_markdown(blog_path))
 
 
 @blogs_blueprint.route("/")
 def blogs_list():
-
-    # should fetch this from github
-
-    blogs = {"2021": [
-        {
-            "title": "proteome",
-            "subtitle": "Wang_WIlliams_Rat_Brain_Proteome_For_Blog"
-        },
-        { 
-          "title":"xxx",
-          "subtitle":"blog 2"
-        }
-    ],
-        "2020": [
-        {
-            "title": "other",
-            "subtitle": "other"
-        }
-    ]
-    }
+    blogs = get_blogs()
 
     return render_template("blogs_list.html", blogs=blogs)
-- 
cgit v1.2.3


From 92246a53e63e51a9d54938a5c1a65553545853c2 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 6 May 2021 21:39:37 +0300
Subject: modify blog list ui

---
 wqflask/wqflask/templates/blogs_list.html | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/blogs_list.html b/wqflask/wqflask/templates/blogs_list.html
index 93cb3d89..4e2bfb82 100644
--- a/wqflask/wqflask/templates/blogs_list.html
+++ b/wqflask/wqflask/templates/blogs_list.html
@@ -11,11 +11,8 @@
 	}
 	.blog_year {
 		font-weight: bold;
-		opacity: 0.8;
-		/*letter-spacing: 0.2em;*/
 		font-size: 48px;
 		padding:12px 10px;
-		color:#0F75CD;
 	}
 
 	.blog_title {
@@ -26,14 +23,10 @@
 
 
 	.blog_title a{
-		text-decoration: none;
-		font-size:16px;
-		color:#333;
-		/*margin: 10px 15px;*/
-		padding-left: 30px;
-		opacity: 0.8;
-
-		/*font-weight: bold;*/
+		font-size:1.3em;
+		padding-left: 10px;
+		letter-spacing: 0.07em;
+		text-decoration: underline;
 	}
 </style>
 
@@ -48,8 +41,16 @@
      <div class="blog_year"><h3>{{year}}</h3></div>
      {%for blog in year_blogs%}
         <!-- <a href="#" class="blog_subtitle">{{blog['subtitle']}}</a> -->
-        <div class="blog_title"><a href="{{ url_for('blogs_blueprint.display_blog',blog_title = blog.subtitle)}}">{{blog['subtitle']}}</a>
+        <div>
+        <div class="blog_title">
+        	<ul>
+        		<li>
+        			<a href="{{ url_for('blogs_blueprint.display_blog',blog_path = blog.full_path)}}">{{blog['subtitle']}}</a>
+        		</li>
+        	</ul>
+        	
         </div>
+    </div>
      {% endfor %}
 
    	{%endfor%}
-- 
cgit v1.2.3


From 45ba9ad0b88824fa0aafb7d9378a7f68a2c7ee6c Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Fri, 7 May 2021 00:40:24 +0300
Subject: fix tweets width

---
 wqflask/wqflask/templates/blogs_list.html |  1 -
 wqflask/wqflask/templates/index_page.html | 27 ++++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/blogs_list.html b/wqflask/wqflask/templates/blogs_list.html
index 4e2bfb82..e9255114 100644
--- a/wqflask/wqflask/templates/blogs_list.html
+++ b/wqflask/wqflask/templates/blogs_list.html
@@ -40,7 +40,6 @@
    	{% for year, year_blogs in blogs.items() %}
      <div class="blog_year"><h3>{{year}}</h3></div>
      {%for blog in year_blogs%}
-        <!-- <a href="#" class="blog_subtitle">{{blog['subtitle']}}</a> -->
         <div>
         <div class="blog_title">
         	<ul>
diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html
index 338c8e2f..0a26aede 100755
--- a/wqflask/wqflask/templates/index_page.html
+++ b/wqflask/wqflask/templates/index_page.html
@@ -3,6 +3,31 @@
 {% block css %}
 <style TYPE="text/css">
   p.interact { display: none; }
+
+
+  
+
+  .tweet  {
+
+   padding:5px;
+   color:#000;
+
+  }
+
+  .media {
+    padding-bottom:10px;
+    border-bottom: 1px solid #c8ccc9;
+  }
+
+  .media img {
+
+    width: 95%;
+    height: 100%;
+    border-radius: 5px;
+    /*transform: scale(1.1); image small?*/
+    border:1px solid #c8ccc9;
+
+  }
 </style>
 {% endblock %}
 {% block content %}
@@ -254,7 +279,7 @@
       "showImages": true,
       "lang": 'en'
       };
-      twitterFetcher.fetch(configProfile);
+      twitterFetcher.fetch(configProfile)
     </script>
 
 
-- 
cgit v1.2.3


From 17bb8042eff1be9d7762e30499c1bf58d3505ea8 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Fri, 7 May 2021 00:49:13 +0300
Subject: minor fix

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

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html
index 0a26aede..7b103305 100755
--- a/wqflask/wqflask/templates/index_page.html
+++ b/wqflask/wqflask/templates/index_page.html
@@ -279,7 +279,7 @@
       "showImages": true,
       "lang": 'en'
       };
-      twitterFetcher.fetch(configProfile)
+      twitterFetcher.fetch(configProfile);
     </script>
 
 
-- 
cgit v1.2.3


From b5db22e76677a85055d2f9b22214e9eeea876071 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Fri, 7 May 2021 08:02:36 +0300
Subject: remove comments  prettify html

---
 wqflask/wqflask/templates/blogs.html      | 16 +------
 wqflask/wqflask/templates/blogs_list.html | 73 ++++++++++++++-----------------
 2 files changed, 34 insertions(+), 55 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/blogs.html b/wqflask/wqflask/templates/blogs.html
index c3d42e13..314eb733 100644
--- a/wqflask/wqflask/templates/blogs.html
+++ b/wqflask/wqflask/templates/blogs.html
@@ -1,24 +1,12 @@
 {% extends "base.html" %}
-
 {% block title %}Blogs {% endblock %}
-
 {% block css %}
 <link rel="stylesheet" type="text/css" href="/static/new/css/markdown.css" />
 {% endblock %}
-
 {% block content %}
-
- <div class="github-btn-container">
-<!--     <div class="github-btn">
-        <a href="https://github.com/genenetwork/gn-docs/blob/master/general/help/facilities.md">
-            Edit Text
-            <img src="/static/images/edit.png">
-        </a>
-    </div> -->
+<div class="github-btn-container">
 </div>
 <div id="markdown" class="container">
-   {{ rendered_markdown|safe }}
-
+    {{ rendered_markdown|safe }}
 </div>
-
 {% endblock %}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/blogs_list.html b/wqflask/wqflask/templates/blogs_list.html
index e9255114..6bad4628 100644
--- a/wqflask/wqflask/templates/blogs_list.html
+++ b/wqflask/wqflask/templates/blogs_list.html
@@ -1,61 +1,52 @@
 {% extends "base.html" %}
-
 {% block title %}Blogs {% endblock %}
-
 {% block css %}
-
 <style type="text/css">
+.container {
+    height: 100vh;
+}
 
-	.container {
-		height: 100vh;
-	}
-	.blog_year {
-		font-weight: bold;
-		font-size: 48px;
-		padding:12px 10px;
-	}
+.blog_year {
+    font-weight: bold;
+    font-size: 48px;
+    padding: 12px 10px;
+}
 
-	.blog_title {
-		padding: 10px 15px;
+.blog_title {
+    padding: 10px 15px;
 
-	}
+}
 
 
 
-	.blog_title a{
-		font-size:1.3em;
-		padding-left: 10px;
-		letter-spacing: 0.07em;
-		text-decoration: underline;
-	}
+.blog_title a {
+    font-size: 1.3em;
+    padding-left: 10px;
+    letter-spacing: 0.07em;
+    text-decoration: underline;
+}
 </style>
-
 <link rel="stylesheet" type="text/css" href="/static/new/css/markdown.css" />
 {% endblock %}
-
 {% block content %}
-
 <div id="markdown" class="container">
-   <div>
-   	{% for year, year_blogs in blogs.items() %}
-     <div class="blog_year"><h3>{{year}}</h3></div>
-     {%for blog in year_blogs%}
+    <div>
+        {% for year, year_blogs in blogs.items() %}
+        <div class="blog_year">
+            <h3>{{year}}</h3>
+        </div>
+        {%for blog in year_blogs%}
         <div>
-        <div class="blog_title">
-        	<ul>
-        		<li>
-        			<a href="{{ url_for('blogs_blueprint.display_blog',blog_path = blog.full_path)}}">{{blog['subtitle']}}</a>
-        		</li>
-        	</ul>
-        	
+            <div class="blog_title">
+                <ul>
+                    <li>
+                        <a href="{{ url_for('blogs_blueprint.display_blog',blog_path = blog.full_path)}}">{{blog['subtitle']}}</a>
+                    </li>
+                </ul>
+            </div>
         </div>
+        {% endfor %}
+        {%endfor%}
     </div>
-     {% endfor %}
-
-   	{%endfor%}
-   </div>
-   	
-
 </div>
-
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 5c474e24fa43cdffacd698cd3a1e9e5182a49016 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Fri, 7 May 2021 08:27:02 +0300
Subject: Add typing + autopep8 formatting

---
 wqflask/wqflask/markdown_routes.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/markdown_routes.py b/wqflask/wqflask/markdown_routes.py
index 28bd6e4b..b81bfb55 100644
--- a/wqflask/wqflask/markdown_routes.py
+++ b/wqflask/wqflask/markdown_routes.py
@@ -2,17 +2,21 @@
 
 Render pages from github, or if they are unavailable, look for it else where
 """
+
 import requests
 import markdown
 import os
 import sys
 
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup  # type: ignore
 
 from flask import send_from_directory
 from flask import Blueprint
 from flask import render_template
 
+from typing import Dict
+from typing import List
+
 glossary_blueprint = Blueprint('glossary_blueprint', __name__)
 references_blueprint = Blueprint("references_blueprint", __name__)
 environments_blueprint = Blueprint("environments_blueprint", __name__)
@@ -57,9 +61,10 @@ def get_file_from_python_search_path(pathname_suffix):
         return None
 
 
-def get_blogs(user="genenetwork", repo_name="gn-docs"):
+def get_blogs(user: str = "genenetwork",
+              repo_name: str = "gn-docs") -> dict:
 
-    blogs = {}
+    blogs: Dict[int, List] = {}
     github_url = f"https://api.github.com/repos/{user}/{repo_name}/git/trees/master?recursive=1"
 
     repo_tree = requests.get(github_url).json()["tree"]
-- 
cgit v1.2.3