Merge branch 'hotfix/search-box' into releases/v1

* hotfix/search-box:
  fix "Search Metadata" label so search does not break

Todo.md

@@ -1,27 +1,47 @@
 # todo
 
-ux improvements:
+Main task:
-- feedback tools
+- hashing and caching
-- integrating master list into single list
+    - <s>first, working out the logic of how we group items into sets
-- providing advanced search interfce
+        - needs to be deleted
+        - needs to be updated
+        - needs to be added
+        - for docs, issues, and comments</s>
+    - second, when we add or update an item, need to:
+        - go through the motions, download file, extract text
+        - check for existing indexed doc with that id
+        - check if existing indexed doc has same hash
+            - if so, skip
+            - otherwise, delete and re-index
 
-big picture improvements:
+Other bugs:
-- hypothesis API
+- Some github issues have no title (?)
-- folksonomy tagging with hypothesis
+- <s>Need to combine issues with comments</s>
-- tags, expanded schema
+- Not able to index markdown files _in a repo_
+- (Longer term) update main index vs update diff index
+
+Needs:
+- <s>control panel</s>
+
+Thursday product:
+- Everything re-indexed nightly
+- Search engine built on all documents in Google Drive, all issues, markdown files
+- Using pandoc to extract Google Drive document contents
+- BRIEF quickstart documentation
+
+Future:
+- Future plans to improve - plugins, improving matching
+- Subdomain plans
+- Folksonomy tagging and integration plans
 
 
 
 
-feedback form: where we are at
+config options for plugins
-- feedback button
+conditional blocks with import github inside
-- button triggers modal form
+complicated tho - better to have components split off
-- modal has emojis for feedback, text box, buttons
+
-
+
-feedback form: what we need to do
-- clicking emojis changes color, to select
-- clicking submit with filled out form submits to an endpoint
-- not sure how to use separate url, and then redirect back to same place
 
 
 

centillion.py

@@ -262,21 +262,15 @@ def list_docs(doctype):
         all_orgs = resp.json()
         for org in all_orgs:
             if org['login']=='dcppc':
-                # Business as usual
+                copper_team_id = '2700235'
-                search = Search(app.config["INDEX_DIR"])
+                mresp = github.get('/teams/%s/members/%s'%(copper_team_id,username))
-                return jsonify(search.get_list(doctype))
+                if mresp.status_code==204:
+                    # Business as usual
+                    search = Search(app.config["INDEX_DIR"])
+                    return jsonify(search.get_list(doctype))
 
     return render_template('403.html')
 
-
-@app.route('/feedback', methods=['POST'])
-def parse_request():
-    data = request.get_json()
-    flash("Thank you for your feedback!")
-    with open('dumdumdumdeedum.json','w') as f:
-        json.dumps(data,indent=4)
-
-
 @app.errorhandler(404)
 def oops(e):
     return render_template('404.html')

static/feedback.js

@@ -1,25 +0,0 @@
-// submitting form with modal:
-// https://stackoverflow.com/a/29068742
-//
-// closing a bootstrap modal with submit button:
-// https://stackoverflow.com/a/33478107
-//
-// flask post data as json:
-// https://stackoverflow.com/a/16664376
-
-/* make the smile green */
-function smile_click() {
-    $('#modal-feedback-smile-div').addClass('smile-active');
-    $('#modal-feedback-smile-icon').addClass('smile-active');
-    $('#modal-feedback-frown-div').removeClass('frown-active');
-    $('#modal-feedback-frown-icon').removeClass('frown-active');
-}
-
-/* make the frown red */
-function frown_click() {
-    $('#modal-feedback-smile-div').removeClass('smile-active');
-    $('#modal-feedback-smile-icon').removeClass('smile-active');
-    $('#modal-feedback-frown-div').addClass('frown-active');
-    $('#modal-feedback-frown-icon').addClass('frown-active');
-}
-

static/style.css

@@ -1,57 +1,3 @@
-/* feedback smileys */
-#modal-feedback-smile-icon,
-#modal-feedback-frown-icon {
-    padding-left: 100px;
-    padding-right: 100px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-div.smile-active {
-    background-color: #2b2;
-}
-i.smile-active {
-    color: #fff;
-}
-div.frown-active {
-    background-color: #b22;
-}
-i.frown-active {
-    color: #fff;
-}
-
-/* feedback text area */
-#modal-feedback-textarea {
-    width: 100%;
-}
-
-/* feedback buttons */
-button.close {
-    font-size: 35px;
-}
-button#submit-feedback-btn {
-    width: 250px;
-}
-
-button#feedback:hover {
-    opacity: 1.0;
-    filter: alpha(opacity=100); /* For IE8 and earlier */
-}
-
-button#feedback {
-    opacity: 0.5;
-    filter: alpha(opacity=50); /* For IE8 and earlier */
-
-    width: 180px;
-    height: 50px;
-    position: fixed; 
-    z-index: 999;
-    right: 120px;
-    bottom: 10px;
-}
-
-
-/* search results table */
 td#search-results-score-col,
 td#search-results-type-col {
     width: 100px;

templates/403.html

@@ -1,5 +1,4 @@
 {% extends "layout.html" %}
-{% set active_page = "403" %}
 {% block body %}
 
 <div class="container">

templates/404.html

@@ -1,5 +1,4 @@
 {% extends "layout.html" %}
-{% set active_page = "404" %}
 {% block body %}
 
 <div class="container">

templates/controlpanel.html

@@ -1,5 +1,4 @@
 {% extends "layout.html" %}
-{% set active_page = "control_panel" %}
 {% block body %}
 
 <hr />

templates/landing.html

@@ -1,5 +1,4 @@
 {% extends "layout.html" %}
-{% set active_page = "landing" %}
 {% block body %}
 <div class="container">
     <div class="row">

templates/layout.html

@@ -10,7 +10,6 @@
 <script src="{{ url_for('static', filename='bootstrap.min.js') }}"></script>
 <script src="{{ url_for('static', filename='master_list.js') }}"></script>
 <script src="{{ url_for('static', filename='search_list.js') }}"></script>
-<script src="{{ url_for('static', filename='feedback.js') }}"></script>
 
 
 {# ########## dataTables plugin ############ #}
@@ -24,11 +23,13 @@
 
 
 
-<div id="master-div">
+{# ########## github fork corner ############ #}
+
+<div>
 
     {% with messages = get_flashed_messages() %}
     {% if messages %}
-    <div class="container" id="flashed-messages-container">
+    <div class="container">
         <div class="alert alert-success alert-dismissible">
             <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
             <ul class=flashes>
@@ -41,56 +42,33 @@
     {% endif %}
     {% endwith %}
 
-    <div class="container" id="banner-container">
+    <div class="container">
     
         {#
         banner image
         #}
-        <div class="row" id="banner-row">
+        <div class="row">
-            <div class="col12sm" id="banner-col">
+            <div class="col12sm">
                 <center>
-                    <a id="banner-a" href="{{ url_for('search')}}?query=&fields=">
+                    <a href="{{ url_for('search')}}?query=&fields=">
-                        <img id="banner-img" src="{{ url_for('static', filename='centillion_white.png') }}">
+                    <img src="{{ url_for('static', filename='centillion_white.png') }}">
                     </a>
+                    {#
+                    need a tag line
+                    #}
+                    {% if config['TAGLINE'] %}
+                        <h2><a href="{{ url_for('search')}}?query=&fields=">
+                            {{config['TAGLINE']}}
+                        </a></h2>
+                    {% endif %}
                 </center>
             </div>
         </div>
-        {% if config['TAGLINE'] %}
-        <div class="row" id="tagline-row">
-            <div class="col12sm" id="tagline-col">
-                <center>
-                        <h2 id="tagline-tagline"> {{config['TAGLINE']}} </h2>
-                </center>
-            </div>
-        </div>
-        {% endif %}
     
     </div>
 
-    {#
-     feedback modal
-     #}
-    {% include "modal.html" %}
-
     {% block body %}{% endblock %}
 </div>
 
-{% if active_page=="search" or active_page=="master_list" %}
+<a href="https://github.com/dcppc/centillion" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
-
-    {# feedback button #}
-    <button id="feedback" type="button" 
-                          data-toggle="modal"
-                          data-target="#myModal"
-        class="btn btn-lg">Send Feedback</button>
-    
-    {# vertical spacing before the bottom, b/c of button #}
-    <div id="footer-whitespace" class="container">
-        <p>&nbsp;</p>
-        <p>&nbsp;</p>
-        <p>&nbsp;</p>
-    </div>
-
-{% endif %}
-
-<a id="github-corner" href="https://github.com/dcppc/centillion" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 

templates/masterlist.html

@@ -1,5 +1,4 @@
 {% extends "layout.html" %}
-{% set active_page = "master_list" %}
 {% block body %}
 
 <hr />

templates/modal.html

@@ -1,38 +0,0 @@
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
-        <h4 class="modal-title" id="myModalLabel">
-        Send us feedback!
-        </h4>
-      </div>
-      <div class="modal-body">
-        <div class="container-fluid">
-            <div id="modal-feedback-smile-div" class="col-xs-6 text-center" onClick="smile_click()">
-                <i id="modal-feedback-smile-icon" class="fa fa-smile-o fa-4x" aria-hidden="true"></i>
-            </div>
-            <div id="modal-feedback-frown-div" class="col-xs-6 text-center" onClick="frown_click()">
-                <i id="modal-feedback-frown-icon" class="fa fa-frown-o fa-4x" aria-hidden="true"></i>
-            </div>
-        </div>
-        <div class="container-fluid">
-            <p>&nbsp;</p>
-        </div>
-        <div class="container-fluid">
-            <textarea id="modal-feedback-textarea" rows="6"></textarea>
-        </div>
-      </div>
-      <div class="modal-footer">
-          <div class="text-center">
-            <button id="submit-feedback-btn" type="button" class="btn btn-lg btn-primary" data-dismiss="modal">
-                Send
-            </button>
-          </div>
-      </div>
-    </div>
-  </div>
-</div>        
-

templates/search.html

@@ -1,8 +1,7 @@
 {% extends "layout.html" %}
-{% set active_page = "search" %}
 {% block body %}
 
-<div id="search-bar-container" class="container">
+<div class="container">
     <div class="row">
 
         <div class="col-xs-12">
@@ -13,11 +12,7 @@
                     <p><button id="the-big-one" type="submit" style="font-size: 20px; padding: 10px; padding-left: 50px; padding-right: 50px;" 
                         value="search" class="btn btn-primary">Search</button>
                     </p>
-
+                    <p><a href="{{ url_for('search')}}?query=&fields=">[clear all results]</a>
-                    {% if parsed_query %}
-                        <p><a href="{{ url_for('search')}}?query=&fields=">[clear all results]</a>
-                    {% endif %}
-
                     </p>
                 </form>
             </center>
@@ -25,9 +20,18 @@
     </div>
 </div>
 
-<div id="info-bars-container" class="container">
+<div class="container">
     <div class="row">
 
+        {% if directories %}
+        <div class="col-xs-12 info directories-cloud">
+            <b>File directories:</b> 
+            {% for d in directories %}
+                <a href="{{url_for('search')}}?query={{d|trim}}&fields=filename">{{d|trim}}</a>
+            {% endfor %}
+        </div>
+        {% endif %}
+
         <ul class="list-group">
 
             {% if config['SHOW_PARSED_QUERY'] and parsed_query %}
@@ -42,9 +46,6 @@
                 </li>
             {% endif %}
 
-
-            {# use "if parsed_query" to check if this is 
-               a new search or search results #}
             {% if parsed_query %}
                 <li  class="list-group-item">
                     <div class="container-fluid">
@@ -58,7 +59,6 @@
                 </li>
             {% endif %}
 
-
             <li  class="list-group-item">
                     <div class="container-fluid">
                         <div class="row">
@@ -99,7 +99,7 @@
 </div>
 
 {% if parsed_query %}
-<div id="search-results-container" class="container">
+<div class="container">
     <div class="row">
         <table id="search-results" class="table">
             <thead id="search-results-header">
@@ -126,21 +126,44 @@
                             {% if e.kind=="gdoc" %}
                                 {% if e.mimetype=="document" %}
                                     <p><small>Drive Document</small</p>
+                                    <!--
+                                    <i class="fa fa-google fa-2x"></i>
+                                    <i class="fa fa-file-text fa-2x"></i>
+                                    -->
                                 {% else %}
                                     <p><small>Drive File</small</p>
+                                    <!--
+                                    <i class="fa fa-google fa-2x"></i>
+                                    <i class="fa fa-file-o fa-2x"></i>
+                                    -->
                                 {% endif %}
 
                             {% elif e.kind=="issue" %}
                                 <p><small>Issue</small</p>
+                                <!--
+                                <i class="fa fa-github fa-2x"></i>
+                                <i class="fa fa-question fa-2x"></i>
+                                -->
 
                             {% elif e.kind=="ghfile" %}
                                 <p><small>Github File</small</p>
+                                <!--
+                                <i class="fa fa-github fa-2x"></i>
+                                <i class="fa fa-file-o fa-2x"></i>
+                                -->
 
                             {% elif e.kind=="markdown" %}
                                 <p><small>Github Markdown</small</p>
+                                <!--
+                                <i class="fa fa-github fa-2x"></i>
+                                <i class="fa fa-file-text-o fa-2x"></i>
+                                -->
 
                             {% elif e.kind=="emailthread" %}
                                 <p><small>Email Thread</small</p>
+                                <!--
+                                <i class="fa fa-envelope-o fa-2x"></i>
+                                -->
 
                             {% else %}
                                 <p><small>Unknown</small</p>