From 158aaa8ff7a9698b8a9f90739a1fe48ff2a6807b Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 19 May 2015 01:42:56 +0200
Subject: merge retail section into experiental

---
 site/db.json                |  6 ++----
 site/index.js               | 26 ++++++++++++--------------
 site/templates/all.liquid   |  6 ------
 site/templates/index.liquid |  6 ------
 4 files changed, 14 insertions(+), 30 deletions(-)

(limited to 'site')

diff --git a/site/db.json b/site/db.json
index 4bb50e4..010ad37 100644
--- a/site/db.json
+++ b/site/db.json
@@ -1,6 +1,6 @@
 {
   "meta": [],
-  "retail": [
+  "experiential": [
     {
       "id": "nicola-s-new-york",
       "title": "NICOLA’S NEW YORK",
@@ -109,9 +109,7 @@
         "caption": ""
       },
       "__index": "2"
-    }
-  ],
-  "experiential": [
+    },
     {
       "id": "gaga-s-workshop-barneys-new-york",
       "title": "GAGA'S WORKSHOP + BARNEYS NEW YORK",
diff --git a/site/index.js b/site/index.js
index 04d2455..9e1f568 100644
--- a/site/index.js
+++ b/site/index.js
@@ -30,7 +30,6 @@ var app  = okcms.createApp({
     advertising: projectSchema,
     content: projectSchema,
     experiential: projectSchema,
-    retail: projectSchema,
     shape: {
       id: {type: 'string', id: true, hidden: true},
       title: {type: 'string'},    
@@ -46,7 +45,6 @@ var app  = okcms.createApp({
     { type: 'advertising' },
     { type: 'content' },
     { type: 'experiential' },
-    { type: 'retail' },
   ],
 
   services: {
@@ -65,7 +63,7 @@ var app  = okcms.createApp({
         {type: 'page', query: 'contact'},
 //         {type: 'shape', query: 'about-images'},
         {type: 'shape', query: 'shape-images'},
-        {type: 'retail', query: '*'},
+//         {type: 'retail', query: '*'},
         {type: 'advertising', query: '*'},
         {type: 'experiential', query: '*'},
         {type: 'content', query: '*'},
@@ -83,23 +81,23 @@ var app  = okcms.createApp({
     },
     '/all': {
       data: [
-        {type: 'retail', query: '*'},
+//         {type: 'retail', query: '*'},
         {type: 'advertising', query: '*'},
         {type: 'experiential', query: '*'},
         {type: 'content', query: '*'},
       ],
       template: 'all'
     },
-    '/retail/:id': {
-      data: {
-        type: 'retail',
-        as: 'project',
-        query: {
-          id: ':id'
-        }
-      },
-      template: 'project'
-    },
+//     '/retail/:id': {
+//       data: {
+//         type: 'retail',
+//         as: 'project',
+//         query: {
+//           id: ':id'
+//         }
+//       },
+//       template: 'project'
+//     },
     '/advertising/:id': {
       data: {
         type: 'advertising',
diff --git a/site/templates/all.liquid b/site/templates/all.liquid
index 97528c2..ca4b83f 100644
--- a/site/templates/all.liquid
+++ b/site/templates/all.liquid
@@ -17,10 +17,4 @@
       <span>{{ project.menu }}</span>
     </div>
   {% endfor %}
-  {% for project in retails %}
-    <div class="project" data-id="{{ project.id }}" data-type="retail">
-      <img src="{{ project.thumbnail.uri }}">
-      <span>{{ project.menu }}</span>
-    </div>
-  {% endfor %}
 </div>
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index 573cfc0..41d64e6 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -101,12 +101,6 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 		<div class="sub" data-type="experiential">
 		  {% for project in experientials %}
         <a href="#" data-type="experiential" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.thumbnail.uri }}">{{ project.menu }}</a>
-      {% endfor %}
-		</div>
-		<div class="cat" data-type="retail">retail</div>
-		<div class="sub" data-type="retail">
-		  {% for project in retails %}
-        <a href="#" data-type="retail" data-id="{{ project.id }}" data-name="{{ project.menu }}" data-image="{{ project.thumbnail.uri }}">{{ project.menu }}</a>
       {% endfor %}
 		</div>
 	</div>
-- 
cgit v1.2.3-70-g09d2