From 2886d60e1d5853dc7d4c8d4e7992f417a4ffe390 Mon Sep 17 00:00:00 2001
From: mbjacobs <39781011+mbjacobs@users.noreply.github.com>
Date: Sun, 21 Feb 2021 12:58:02 -0500
Subject: [PATCH] Update images to display on deployed site; add Chetah fix.
 (#69)

* Add cluster filtering, full summary view, fix vanishing query

* Updates to home page and Chetah.

* Image updates and Cheetah fix
---
 web/templates/web/_nav.html                   |  2 +-
 web/templates/web/home.html                   | 10 ++++----
 web/templates/web/organization.html           |  5 +---
 .../web/project_digitalidentification.html    | 23 +++++++++++++++++++
 web/templates/web/project_pdfparsing.html     |  4 ++--
 web/templates/web/project_refugees.html       | 19 +++++++++++++++
 6 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 web/templates/web/project_digitalidentification.html
 create mode 100644 web/templates/web/project_refugees.html

diff --git a/web/templates/web/_nav.html b/web/templates/web/_nav.html
index dbe5aa5f..bdb9e0c9 100644
--- a/web/templates/web/_nav.html
+++ b/web/templates/web/_nav.html
@@ -2,7 +2,7 @@
 <div class="ui container">
   <div class="ui large secondary pointing menu">
     <a href="/" class="item">
-        <img class="logo" src="{% static 'web/logo.png' %}" alt="Data4Good logo">
+        <img class="logo" src="/static/images/logo.png" alt="Data4Good logo">
     </a>
     <a href="#about"  class="item">
         About
diff --git a/web/templates/web/home.html b/web/templates/web/home.html
index ffd2967d..d7b347d7 100644
--- a/web/templates/web/home.html
+++ b/web/templates/web/home.html
@@ -48,7 +48,7 @@
         <h1 class="ui header" id="site-title">
           Data4Good
         </h1>
-        <h2>Make data, training, and implementation connect to make nonprofit organizations stronger.</h2>
+        <h2>Connecting data, training and implementation to help create stronger nonprofit organizations.</h2>
       </div>
     </div>
   </div>
@@ -59,7 +59,7 @@ <h2 class="ui header horizontal divider">Projects</h2>
         <div class="ui divided items projects-container">
           <div class="item">
             <div class="image">
-              <img src="https://wtwp.com/wp-content/uploads/2015/06/placeholder-image.png">
+              <img src="/static/images/cio4good_thumb.png" alt="Screenshot of Tabelau benchmarking dashboard">
             </div>
             <div class="content">
               <a class="header" href="{% url 'web:cio4good'%}">Trends in the IT Sector of Non-Profit Organizations</a>
@@ -82,7 +82,7 @@ <h2 class="ui header horizontal divider">Projects</h2>
           </div>
           <div class="item">
             <div class="image">
-              <img src="https://wtwp.com/wp-content/uploads/2015/06/placeholder-image.png">
+              <img src="/static/images/chetah_thumb.png" alt="Screenshot from Chetah search engine in use">
             </div>
             <div class="content">
               <a class="header" href="{% url 'web:pdfparsing'%}">Chetah Search Engine</a>
@@ -103,7 +103,7 @@ <h2 class="ui header horizontal divider">Projects</h2>
           </div>
           <div class="item">
             <div class="image">
-              <img src="https://wtwp.com/wp-content/uploads/2015/06/placeholder-image.png">
+              <img src="/static/images/digital_identification_thumb.png" alt="Research poster for IFRC S2030 Think Paper on Digital Identification">
             </div>
             <div class="content">
               <a class="header" href="https://drive.google.com/file/d/17sz0ih_1RQ91IcyMTRn3Tmb4LUgw65wt/view">Think Paper on Digital Identification</a>
@@ -124,7 +124,7 @@ <h2 class="ui header horizontal divider">Projects</h2>
           </div>
           <div class="item">
             <div class="image">
-              <img src="https://wtwp.com/wp-content/uploads/2015/06/placeholder-image.png">
+              <img src="/static/images/refugee_thumb.png" alt="Research poster for Refugee Demographic & Connectivity Trends in Greece and Serbia">
             </div>
             <div class="content">
               <a class="header" href="https://drive.google.com/file/d/1k5KTfw5x5wjicFecdyaE0qWkXwsbbNgY/view">Refugee Demographic & Connectitivity Trends in Greece and Serbia</a>
diff --git a/web/templates/web/organization.html b/web/templates/web/organization.html
index 0ac68277..2ea0e56a 100644
--- a/web/templates/web/organization.html
+++ b/web/templates/web/organization.html
@@ -49,10 +49,7 @@ <h4>Project Manager</h4>
                       <div class="content">
                         <!-- <img src="{% static 'web/team/Mariah-Headshot.jpg' %}" alt="Headshot of Mariah Jacobs" width=100%> -->
                         <h3><a href="https://www.linkedin.com/in/mariah-jacobs/">Mariah Jacobs</a></h3>
-                        <h4>UX Designer & Software Engineer</h4>
-                        <!-- <p>Mariah Jacobs is a graduate student at UMSI focusing in User Experience (UX) research, design, and development. 
-                          Prior to UMSI, she received her B.S. in Computer Science and has completed past internships at Intel as a software engineer. 
-                          After graduation, she hopes to work as a UX Engineer, where she can blend her passion for design and code.</p> -->
+                        <h4>Web Developer</h4>
                       </div>
                     </div>
                   </div>
diff --git a/web/templates/web/project_digitalidentification.html b/web/templates/web/project_digitalidentification.html
new file mode 100644
index 00000000..b6263c71
--- /dev/null
+++ b/web/templates/web/project_digitalidentification.html
@@ -0,0 +1,23 @@
+{% extends "base_uikit.html" %}
+
+{% block content %}
+
+{% load static %}
+{% load sass_tags %}
+<script type='text/javascript' src='https://tableau.dsc.umich.edu/javascripts/api/viz_v1.js'></script>
+
+<div>
+    {% include 'web/_nav.html' %}
+    <div class="ui main text container">
+        <h1 class="ui header">Think Paper on Digital Identification</h1>
+        <p>Digital identification and biometric data have become increasingly popular in the private sector and have slowly been introduced and piloted in governmental and non-governmental organizations in the emerging world.</p>
+        <p>The IFRC S2030 Think Piece on Digital Identification summarizes research into how biometric data, digital identification, and blockchain technology have and will take part in the lives of vulnerable populations in refugee camps.</p>
+   
+        <a href="https://drive.google.com/file/d/17sz0ih_1RQ91IcyMTRn3Tmb4LUgw65wt/view">
+            <img alt="Research Poster">
+        </a>
+    </div>
+</div>
+
+
+{% endblock %}
diff --git a/web/templates/web/project_pdfparsing.html b/web/templates/web/project_pdfparsing.html
index dc9ddf83..b128869e 100644
--- a/web/templates/web/project_pdfparsing.html
+++ b/web/templates/web/project_pdfparsing.html
@@ -162,7 +162,7 @@ <h2 id="search-results-header">Search Results</h2>
                 <div id="orderResultsForm" class="ui form search-results-order-container">
                   <form action = "" method="get">
                     {% csrf_token %}
-                    <div class="inline fields">
+                    <!-- <div class="inline fields">
                       <label for="results">Order By:</label>
                       <div class="field">
                         <div class="ui radio checkbox">
@@ -176,7 +176,7 @@ <h2 id="search-results-header">Search Results</h2>
                           <label>Date</label>
                         </div>
                       </div>
-                    </div>
+                    </div> -->
                   </form>
                 </div>
             </header>
diff --git a/web/templates/web/project_refugees.html b/web/templates/web/project_refugees.html
new file mode 100644
index 00000000..a2d71178
--- /dev/null
+++ b/web/templates/web/project_refugees.html
@@ -0,0 +1,19 @@
+{% extends "base_uikit.html" %}
+
+{% block content %}
+
+{% load static %}
+{% load sass_tags %}
+
+<div>
+    {% include 'web/_nav.html' %}
+    <div class="ui main text container">
+        <h1 class="ui header">Refugee Demographic & Connectivity Trends in Greece and Serbia</h1>
+        <p>What can we learn about refugees' access to the internet and mobile device ownership from a high level perspective?</p>   
+        <a href="https://drive.google.com/file/d/1k5KTfw5x5wjicFecdyaE0qWkXwsbbNgY/view">
+            <img alt="Research Poster">
+        </a>
+    </div>
+</div>
+
+{% endblock %}