Merge branch 'master' of github.com:adamhrv/megapixels_dev

11 files changed, 75 insertions, 15 deletions

diff --git a/site/content/pages/about/assets/adam-harvey-3d.jpg b/site/content/pages/about/assets/adam-harvey-3d.jpg
new file mode 100644
index 00000000..2d7cbd80
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.jpg
diff --git a/site/content/pages/about/assets/adam-harvey-3d.png b/site/content/pages/about/assets/adam-harvey-3d.png
new file mode 100644
index 00000000..3616e851
--- /dev/null
+++ b/site/content/pages/about/assets/adam-harvey-3d.png
diff --git a/site/content/pages/about/assets/adam-harvey.jpg b/site/content/pages/about/assets/adam-harvey.jpg
index e0ab893a..38a484d1 100644
--- a/site/content/pages/about/assets/adam-harvey.jpg
+++ b/site/content/pages/about/assets/adam-harvey.jpg
diff --git a/site/content/pages/about/assets/jules-laplace-3d.jpg b/site/content/pages/about/assets/jules-laplace-3d.jpg
new file mode 100644
index 00000000..d51e0933
--- /dev/null
+++ b/site/content/pages/about/assets/jules-laplace-3d.jpg
diff --git a/site/content/pages/about/assets/jules-laplace.jpg b/site/content/pages/about/assets/jules-laplace.jpg
index 310b2783..18fc1170 100644
--- a/site/content/pages/about/assets/jules-laplace.jpg
+++ b/site/content/pages/about/assets/jules-laplace.jpg
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
new file mode 100644
index 00000000..3ad962df
--- /dev/null
+++ b/site/content/pages/about/credits.md
@@ -0,0 +1,43 @@
+------------
+
+status: published
+title: MegaPixels Press and News
+desc: MegaPixels Press and News
+slug: press
+cssclass: about
+published: 2018-12-04
+updated: 2018-12-04
+authors: Adam Harvey
+ 
+------------
+ 
+# Credits
+
+<section class="about-menu">
+<ul>
+    <li><a href="/about/">About</a></li>
+    <li><a href="/about/press/">Press</a></li>
+    <li><a class="current" href="/about/credits/">Credits</a></li>
+    <li><a href="/about/disclaimer/">Disclaimer</a></li>
+    <li><a href="/about/terms/">Terms and Conditions</a></li>
+    <li><a href="/about/privacy/">Privacy Policy</a></li>
+</ul>
+</section>
+
+
+#### Team
+
+- Research, concept: Adam Harvey
+- Site development, visualizations: Jules LaPlace
+- Assistant researcher: Berit Gilma
+- Produced in Partnership with Mozilla
+
+#### Code
+
+- This site uses D3 and C2 for visuzations. 
+- Add more here
+
+#### Data
+
+- link to github
+- how it was gathered
\ No newline at end of file
diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md
index 97edc461..f82a09a0 100644
--- a/site/content/pages/about/disclaimer.md
+++ b/site/content/pages/about/disclaimer.md
@@ -17,15 +17,14 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a class="current" href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-### Sidebar
-
-## End Sidebar
+(TEMPORARY PAGE)
 
 Last updated: December 04, 2018
 
diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md
index dbf4e1bb..b1b7a80f 100644
--- a/site/content/pages/about/index.md
+++ b/site/content/pages/about/index.md
@@ -17,23 +17,34 @@ authors: Adam Harvey
 <ul>
 <li><a class="current" href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-<p><div style="font-size:20px;line-height:36px">Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">videos on YouTube</a>. </div></p>
+(PAGE UNDER DEVELOPMENT)
 
-While these datasets include many public figures, politicans, athletes, and actors, they also include many non-public figures including digital activists, students, and pedestrians. Some images are used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global supply chain of biometric data.
+<p><div style="font-size:20px;line-height:36px">MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about facial recognition datasets that aims to unravel their histories, futures, geographies, and meanings. Throughout 2019 this site, coded by Jules LaPlace, will publish research reports, visualizations, raw data, and interactive tools to explore how publicly available facial recognition datasets contribute to a global supply chain of biometric data that powers the global facial recognition industry.</div></p>
 
-MegaPixels is art and research by <a href="https://ahprojects.com">Adam Harvey</a> about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. During 2019 this site, coded by Jules LaPlace, will publish research reports, visualizations, downloadable statisticds, and interactive tools for searching the datasets.
+The MegaPixels website is produced in partnership with [Mozilla](https://mozilla.org).
 
-This project is produced in partnership with [Mozilla](https://mozilla.org) who has provided the funding to research the datasets, build the site, and develop tools to help you understand the role these datasets have played in creating biometric surveillance technologies. 
-
-
-## Team
-
-![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and a researcher in residence at Karlsruhe HfG.
-
-![sideimage:Jules LaPlace](assets/jule s-laplace.jpg)**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+<div class="flex-container">
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey-3d.jpg" />
+        <h3>Adam Harvey</h3>
+        <p>is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund grants, and is a researcher in residence at Karlsruhe HfG. 
+        <br>
+        ahprojects.com
+        </p>
+    </div>
+    <div class="team-member">
+        <img src="https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace-3d.jpg" />
+        <h3>Jules LaPlace</h3>
+        <p>is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.
+        <br>
+        https://asdf.us
+        </p>
+    </div>
+</div>
diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md
index 2e6d3423..47e1af52 100644
--- a/site/content/pages/about/press.md
+++ b/site/content/pages/about/press.md
@@ -17,12 +17,13 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a class="current" href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
-(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?)
+(TEMPORARY PAGE)
 
 - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset>
\ No newline at end of file
diff --git a/site/content/pages/about/privacy.md b/site/content/pages/about/privacy.md
index 0d908559..e36daf2a 100644
--- a/site/content/pages/about/privacy.md
+++ b/site/content/pages/about/privacy.md
@@ -17,12 +17,15 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a class="current" href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
+(TEMPORARY PAGE)
+
 A summary of our privacy policy is as follows:
 
 The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.
diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md
index 3217e366..7ae6dac7 100644
--- a/site/content/pages/about/terms.md
+++ b/site/content/pages/about/terms.md
@@ -18,12 +18,15 @@ authors: Adam Harvey
 <ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
+<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a class="current" href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
 </section>
 
+(TEMPORARY PAGE)
+
 (FPO: this is only example text)
 
 Last updated: December 04, 2018