From a164bfbb16bde80089ed272294dc5be2042e48c8 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Thu, 9 Apr 2015 05:39:58 -0400 Subject: images --- site/index.js | 43 +++++++--- site/public/css/main.css | 18 ----- site/public/images/2H_LOGOMARK.png | Bin 0 -> 2466 bytes site/public/images/2H_WORDMARK.png | Bin 0 -> 4738 bytes site/public/images/brown046.jpg | Bin 5108 -> 0 bytes site/public/images/dither.gif | Bin 0 -> 52 bytes site/public/images/favicon.ico | Bin 0 -> 1406 bytes site/public/images/fb.png | Bin 0 -> 3203 bytes site/public/images/fb2.png | Bin 0 -> 3203 bytes site/public/images/full.png | Bin 0 -> 2969 bytes site/public/images/next.png | Bin 0 -> 563 bytes site/public/images/noise.png | Bin 0 -> 28981 bytes site/public/images/play-button.png | Bin 0 -> 17932 bytes site/public/images/play-button2.png | Bin 0 -> 11901 bytes site/public/images/tw.png | Bin 0 -> 3298 bytes site/public/images/tw2.png | Bin 0 -> 3121 bytes site/templates/bread.liquid | 14 ---- site/templates/index.liquid | 155 ++++++++++++++++++++++++++++++++++++ site/templates/page.liquid | 21 ++--- 19 files changed, 194 insertions(+), 57 deletions(-) delete mode 100644 site/public/css/main.css create mode 100644 site/public/images/2H_LOGOMARK.png create mode 100644 site/public/images/2H_WORDMARK.png delete mode 100644 site/public/images/brown046.jpg create mode 100644 site/public/images/dither.gif create mode 100644 site/public/images/favicon.ico create mode 100755 site/public/images/fb.png create mode 100755 site/public/images/fb2.png create mode 100755 site/public/images/full.png create mode 100644 site/public/images/next.png create mode 100644 site/public/images/noise.png create mode 100644 site/public/images/play-button.png create mode 100644 site/public/images/play-button2.png create mode 100755 site/public/images/tw.png create mode 100755 site/public/images/tw2.png delete mode 100644 site/templates/bread.liquid diff --git a/site/index.js b/site/index.js index 95d2bcf..9be7cd5 100644 --- a/site/index.js +++ b/site/index.js @@ -1,5 +1,13 @@ var okcms = require('..'); +var projectSchema = { + id: {type: 'string', id: true}, + title: {type: 'string'}, + description: {type: 'text'}, + video: {type: 'video'}, + images: {type: 'captioned-image-list'} +} + var app = okcms.createApp({ root: 'public', @@ -10,20 +18,19 @@ var app = okcms.createApp({ title: {type: 'string'}, body: {type: 'text'} }, - bread: { - type: {type: 'string', id: true}, - title: {type: 'string'}, - description: {type: 'text'}, - color: {type: 'enum', options: ["red","blue","green"]}, - video: {type: 'video'}, - images: {type: 'captioned-image-list'} - } + retail: projectSchema, + advertising: projectSchema, + experiential: projectSchema, + content: projectSchema, }, resources: [ { type: 'page', static: {id: 'about'}}, { type: 'page', static: {id: 'contact'}}, - { type: 'bread' }, + { type: 'retail' }, + { type: 'advertising' }, + { type: 'experiential' }, + { type: 'content' }, ], services: { @@ -37,7 +44,10 @@ var app = okcms.createApp({ views: { '/': { data: [ - {type: 'bread', query: '*'}, + {type: 'retail', query: '*'}, + {type: 'advertising', query: '*'}, + {type: 'experiental', query: '*'}, + {type: 'content', query: '*'}, {type: 'page', query: '*'} ] }, @@ -47,8 +57,17 @@ var app = okcms.createApp({ '/contact': { data: {type: 'page', query: 'contact'} }, - '/:id': { - data: {type: 'bread', query: ':id'} + '/retail/:id': { + data: {type: 'retail', query: ':id'} + } + '/advertising/:id': { + data: {type: 'advertising', query: ':id'} + } + '/experiental/:id': { + data: {type: 'experiental', query: ':id'} + } + '/content/:id': { + data: {type: 'content', query: ':id'} } } diff --git a/site/public/css/main.css b/site/public/css/main.css deleted file mode 100644 index 92b2ee7..0000000 --- a/site/public/css/main.css +++ /dev/null @@ -1,18 +0,0 @@ -html, body { - margin: 0; - passing: 0; - font-family: "Georgia", sans-serif; -} - -body { - background-image: url(../images/brown046.jpg); -} - -h1, h2, h3 { - color: rgb(12, 145, 14); -} - -.container { - padding: 2em; - background-color: rgba(255, 255, 255, 0.5); -} diff --git a/site/public/images/2H_LOGOMARK.png b/site/public/images/2H_LOGOMARK.png new file mode 100644 index 0000000..0ecbe64 Binary files /dev/null and b/site/public/images/2H_LOGOMARK.png differ diff --git a/site/public/images/2H_WORDMARK.png b/site/public/images/2H_WORDMARK.png new file mode 100644 index 0000000..63ed42e Binary files /dev/null and b/site/public/images/2H_WORDMARK.png differ diff --git a/site/public/images/brown046.jpg b/site/public/images/brown046.jpg deleted file mode 100644 index 4b86003..0000000 Binary files a/site/public/images/brown046.jpg and /dev/null differ diff --git a/site/public/images/dither.gif b/site/public/images/dither.gif new file mode 100644 index 0000000..670df08 Binary files /dev/null and b/site/public/images/dither.gif differ diff --git a/site/public/images/favicon.ico b/site/public/images/favicon.ico new file mode 100644 index 0000000..8cd6850 Binary files /dev/null and b/site/public/images/favicon.ico differ diff --git a/site/public/images/fb.png b/site/public/images/fb.png new file mode 100755 index 0000000..713d588 Binary files /dev/null and b/site/public/images/fb.png differ diff --git a/site/public/images/fb2.png b/site/public/images/fb2.png new file mode 100755 index 0000000..713d588 Binary files /dev/null and b/site/public/images/fb2.png differ diff --git a/site/public/images/full.png b/site/public/images/full.png new file mode 100755 index 0000000..dc24646 Binary files /dev/null and b/site/public/images/full.png differ diff --git a/site/public/images/next.png b/site/public/images/next.png new file mode 100644 index 0000000..7997259 Binary files /dev/null and b/site/public/images/next.png differ diff --git a/site/public/images/noise.png b/site/public/images/noise.png new file mode 100644 index 0000000..585ef73 Binary files /dev/null and b/site/public/images/noise.png differ diff --git a/site/public/images/play-button.png b/site/public/images/play-button.png new file mode 100644 index 0000000..e642874 Binary files /dev/null and b/site/public/images/play-button.png differ diff --git a/site/public/images/play-button2.png b/site/public/images/play-button2.png new file mode 100644 index 0000000..dfce7b0 Binary files /dev/null and b/site/public/images/play-button2.png differ diff --git a/site/public/images/tw.png b/site/public/images/tw.png new file mode 100755 index 0000000..d51cf9f Binary files /dev/null and b/site/public/images/tw.png differ diff --git a/site/public/images/tw2.png b/site/public/images/tw2.png new file mode 100755 index 0000000..4fd4b90 Binary files /dev/null and b/site/public/images/tw2.png differ diff --git a/site/templates/bread.liquid b/site/templates/bread.liquid deleted file mode 100644 index da36cce..0000000 --- a/site/templates/bread.liquid +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - -
-

{{bread.type | capitalize}}

-

- {{bread.description}} -

-
- - diff --git a/site/templates/index.liquid b/site/templates/index.liquid index 7c12a86..ba0b78d 100644 --- a/site/templates/index.liquid +++ b/site/templates/index.liquid @@ -28,3 +28,158 @@ + + + + + + + +TWOHUSTLERS + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + diff --git a/site/templates/page.liquid b/site/templates/page.liquid index e90f7ce..f752cb9 100644 --- a/site/templates/page.liquid +++ b/site/templates/page.liquid @@ -1,14 +1,9 @@ - - - - - - -
-

{{page.title | capitalize}}

-

- {{page.body}} -

+
+ + {{page.title}} + +
+ {{page.body}}
- - +
+
-- cgit v1.2.3-70-g09d2