From 4364df3464c17adce8c05f47b690b6c0efe8be47 Mon Sep 17 00:00:00 2001 From: okfprojz Date: Fri, 8 Apr 2016 23:48:10 -0400 Subject: db stuff --- db.json | 316 +++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 195 insertions(+), 121 deletions(-) diff --git a/db.json b/db.json index 96a0c09..735da49 100644 --- a/db.json +++ b/db.json @@ -85,21 +85,23 @@ "uri": "", "width": "1920", "height": "1080", - "title": "background-color:white", + "title": "background:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, + } + ], + "press": [], + "mobileTitle": "", + "mobileMedia": [ { "uri": "https://ltho.s3.amazonaws.com/332543c6-fa00-4fcb-9c34-070764e5a692.png", "caption": "", "type": "image" } ], - "press": [], - "mobileTitle": "", - "mobileMedia": [], "linkText": "View in App Store", "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "marc-jacobs", @@ -115,23 +117,18 @@ "dateCreated": "Sun, 03 Apr 2016 18:56:57 GMT", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/874c2a97-493a-4fd6-973a-a1f400d84e55.png", - "caption": "", - "type": "image" - }, - { - "uri": "https://ltho.s3.amazonaws.com/12eaa8d4-328e-45e5-bd54-3ac2125d4956.png", + "uri": "https://ltho.s3.amazonaws.com/d985ec45-d5e5-4ab5-a60f-af42b18a0859.jpg", "caption": "", "type": "image" }, { "uri": "https://ltho.s3.amazonaws.com/5fd898ee-c83f-4b59-a013-4596e685af8e.png", - "caption": "", + "caption": "background-position:center", "type": "image" }, { - "uri": "https://ltho.s3.amazonaws.com/d985ec45-d5e5-4ab5-a60f-af42b18a0859.jpg", - "caption": "", + "uri": "https://ltho.s3.amazonaws.com/12eaa8d4-328e-45e5-bd54-3ac2125d4956.png", + "caption": "background-size:80%", "type": "image" } ], @@ -139,7 +136,7 @@ "mobileTitle": "", "linkText": "View Lookbook", "mobileMedia": [], - "whiteCursor": true, + "whiteCursor": false, "hideProject": false }, { @@ -156,11 +153,6 @@ "uri": "http://okfoc.us/300/reduced/good/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/7ea562b7-e45d-4c3f-8f07-691741f71fe9.png", - "caption": "background-position: bottom center;background-color:#f9f9f9;background-size: contain;", - "type": "image" } ], "containImage": "true", @@ -169,7 +161,13 @@ "press": [], "mobileTitle": "", "linkText": "good-music.com", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/7ea562b7-e45d-4c3f-8f07-691741f71fe9.png", + "caption": "background-position: bottom center;background-color:#f9f9f9;background-size: contain;", + "type": "image" + } + ], "whiteCursor": false, "hideProject": false }, @@ -187,11 +185,6 @@ "uri": "http://timesnewramen.com/typer", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/3337ba94-b25c-4374-8d63-e97ba833fb30.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -208,10 +201,17 @@ "__index": 4, "dateCreated": "Sun, 03 Apr 2016 19:05:52 GMT", "mobileTitle": "", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/3337ba94-b25c-4374-8d63-e97ba833fb30.png", + "caption": "", + "type": "image" + } + ], "linkText": "timesnewramen.com", - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "soylent-brand-development", @@ -277,16 +277,23 @@ "dateCreated": "Sun, 03 Apr 2016 19:23:53 GMT", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/b4eda603-4f51-4731-91e9-255672e0c2c6.png", + "uri": "http://okfoc.us/300/reduced/soylent/", "caption": "", - "type": "image" + "type": "link" } ], "mobileTitle": "", "linkText": "soylent.com", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/b4eda603-4f51-4731-91e9-255672e0c2c6.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "two-hustlers-", @@ -302,11 +309,6 @@ "uri": "http://twohustlers.com/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/b543dda4-d8bb-4978-9c1c-25872a949c3a.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -315,9 +317,16 @@ "dateCreated": "Sun, 03 Apr 2016 19:28:24 GMT", "mobileTitle": "", "linkText": "twohustlers.com", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/b543dda4-d8bb-4978-9c1c-25872a949c3a.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "alone-together", @@ -421,21 +430,23 @@ "uri": "", "width": "1280", "height": "902", - "title": "", + "title": "loop6.mp4", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, + } + ], + "press": [], + "mobileTitle": "", + "linkText": "", + "mobileMedia": [ { "uri": "https://ltho.s3.amazonaws.com/3ce5af16-c554-4aa8-b8d6-5bf43cd9ae67.png", "caption": "background-size:contain", "type": "image" } ], - "press": [], - "mobileTitle": "", - "linkText": "", - "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "boy-oh-boy", @@ -554,9 +565,9 @@ "brief": "Wolfsonian is a premiere museum\r\nin Miami that celebrates industry\r\nand design. We helped them create\r\na new annual event titled Power of\r\nDesign, creating the identity for the\r\nevent", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/adeb3ac1-c708-4c48-a25c-59cecb5286cb.png", - "caption": "background-size:99.8%", - "type": "image" + "uri": "http://okfoc.us/300/wolfsonian-complaints/", + "caption": "", + "type": "link" } ], "containImage": "true", @@ -566,8 +577,9 @@ "mobileTitle": "Power of Design", "mobileMedia": [], "linkText": "powerofdesign.wolfsonian.org", - "whiteCursor": false, - "hideProject": false + "whiteCursor": true, + "hideProject": false, + "disabled": false }, { "id": "no-fish-no-nothing", @@ -627,11 +639,6 @@ "uri": "http://okfoc.us/300/mike-will/reduced/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/f9a1d217-9120-437a-b9af-43ba7ac8dd1c.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -640,9 +647,16 @@ "dateCreated": "Sun, 03 Apr 2016 20:39:45 GMT", "mobileTitle": "", "linkText": "mikewillmade.it", - "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/f9a1d217-9120-437a-b9af-43ba7ac8dd1c.png", + "caption": "", + "type": "image" + } + ], + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "drake-shake-app", @@ -660,13 +674,8 @@ "uri": "", "width": "1920", "height": "1080", - "title": "background-color:black", + "title": "background:black", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "uri": "https://ltho.s3.amazonaws.com/ff8732a5-764b-4b14-8d66-3d66206d933f.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -683,10 +692,17 @@ "__index": 17, "dateCreated": "Sun, 03 Apr 2016 20:45:42 GMT", "mobileTitle": "", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/ff8732a5-764b-4b14-8d66-3d66206d933f.png", + "caption": "", + "type": "image" + } + ], "linkText": "View in App Store", - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "nike-hyperfeel", @@ -702,22 +718,24 @@ "dateCreated": "Sun, 03 Apr 2016 21:01:37 GMT", "media": [ { - "uri": "http://www.1948london.com/pano", + "uri": "http://1948london.com/pano/", "caption": "", "type": "link" - }, + } + ], + "press": [], + "mobileTitle": "", + "linkText": "1948london.com", + "mobileMedia": [ { "uri": "https://ltho.s3.amazonaws.com/c014af1f-4d79-4191-bda0-8150dd5a2ec1.png", "caption": "", "type": "image" } ], - "press": [], - "mobileTitle": "", - "linkText": "1948london.com", - "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "treasure-dance", @@ -772,16 +790,6 @@ "height": "1080", "title": "background-color:black", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "uri": "https://ltho.s3.amazonaws.com/118baf27-0eea-4713-b140-b32567ef91fa.png", - "caption": "", - "type": "image" - }, - { - "uri": "https://ltho.s3.amazonaws.com/fc9497c9-6f08-40cb-9f0d-d3c23004d449.png", - "caption": "", - "type": "image" } ], "containImage": "false", @@ -802,10 +810,22 @@ "__index": 20, "dateCreated": "Sun, 03 Apr 2016 21:10:21 GMT", "mobileTitle": "", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/118baf27-0eea-4713-b140-b32567ef91fa.png", + "caption": "", + "type": "image" + }, + { + "uri": "https://ltho.s3.amazonaws.com/fc9497c9-6f08-40cb-9f0d-d3c23004d449.png", + "caption": "", + "type": "image" + } + ], "linkText": "View in App Store", - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "been-trill", @@ -818,14 +838,9 @@ "brief": "We began working with infamous streetwear\r\ncompany, Been Trill, since their start.\r\nWe designed and built their e-commerce\r\nwebsite, which was like no other on the\r\ninternet. Products were displayed in 3D\r\nspace and the site featured an animated\r\nGIF social network where fans could\r\ncreate and share animations.", "media": [ { - "uri": "http://okfoc.us/300/beentrill", + "uri": "http://okfoc.us/300/beentrill/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/7f202909-b6e2-47c9-ab17-a35c9deb118a.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -839,9 +854,16 @@ "dateCreated": "Sun, 03 Apr 2016 21:11:32 GMT", "mobileTitle": "", "linkText": "beentrill.com", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/7f202909-b6e2-47c9-ab17-a35c9deb118a.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "paddles-on", @@ -889,6 +911,15 @@ "NatureOfWork": "Creative Direction\r\nWeb Development", "brief": "We were approached by Animation\r\nDomination High Definition, a block\r\nof animated content airing on FOX\r\nSaturday nights, to create a website\r\nto house their content in a way that\r\nwould be apropos to their young and\r\ninternet aware audience. For this\r\nwe invented a method to create GIF\r\nanimations directly from the shows,\r\na feature that has since been copied\r\nby several leading networks.", "media": [ + { + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/fox-adhd-iMac.mp4", + "uri": "", + "width": "1280", + "height": "720", + "title": "background-color:white", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" + }, { "uri": "https://ltho.s3.amazonaws.com/f1a8b089-a430-415e-be86-bdd1d06aa6ac.png", "caption": "", @@ -902,8 +933,9 @@ "mobileTitle": "", "linkText": "foxadhd.com", "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "crisis-response", @@ -978,9 +1010,13 @@ "brief": "Commissioned by Intel/The Creators\r\nProject we created an in-browser music\r\nvideo and in doing so pioneered Alpha\r\nChannel Video – a technique allowing\r\nfor layering HTML5 video elements. The\r\nwebsite allows users to deconstruct\r\nthe audio and video, creating their own\r\nversions. The site transposes the familiar\r\ninterface of Adobe Photoshop – as we\r\nbelieve even website’s with new functions\r\nshouldn’t come with manuals rather they\r\nshould naturally inspire play from the getgo.", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/aa76d72e-cdee-4f6a-8d34-2f57972a464f.png", - "caption": "", - "type": "image" + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/tanlines-iMac-video.mp4", + "uri": "", + "width": "1280", + "height": "720", + "title": "background-color:white", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } ], "containImage": "true", @@ -988,10 +1024,17 @@ "__index": 26, "dateCreated": "Sun, 03 Apr 2016 21:24:03 GMT", "mobileTitle": "Not The Same", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/aa76d72e-cdee-4f6a-8d34-2f57972a464f.png", + "caption": "", + "type": "image" + } + ], "linkText": "notthesa.me", "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "draw-with-your-face", @@ -1148,11 +1191,6 @@ "uri": "http://okfoc.us/300/landart/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/b9ae7c1f-5ec7-4a82-994d-92b7927a8d3b.png", - "caption": "", - "type": "image" } ], "containImage": "false", @@ -1169,10 +1207,17 @@ "__index": 31, "dateCreated": "Sun, 03 Apr 2016 21:30:57 GMT", "mobileTitle": "MOCA Land Art", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/b9ae7c1f-5ec7-4a82-994d-92b7927a8d3b.png", + "caption": "", + "type": "image" + } + ], "linkText": "moca.org/landart", - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "smirnoff-dance-exchange", @@ -1185,9 +1230,13 @@ "brief": "The Smirnoff Dance Exchange was\r\na day long global party happening in\r\n12 cities around the world. We built\r\na photo-booth that would capture\r\nGIF animations of party-goers\r\ndancing and post it to a website we\r\ncreated. The images also served as\r\nthe backdrop to the main event, a\r\nMadonna concert in New York City.", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/2b1ec406-a396-4cb6-8d1c-9f03911a854e.png", - "caption": "", - "type": "image" + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/smirnoff-iMac-video.mp4", + "uri": "", + "width": "1280", + "height": "720", + "title": "background-color:white", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } ], "containImage": "true", @@ -1195,10 +1244,17 @@ "__index": 32, "dateCreated": "Sun, 03 Apr 2016 21:31:59 GMT", "mobileTitle": "Smirnoff", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/2b1ec406-a396-4cb6-8d1c-9f03911a854e.png", + "caption": "", + "type": "image" + } + ], "linkText": "danceexchange.net", - "whiteCursor": true, - "hideProject": false + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "vfiles", @@ -1241,6 +1297,24 @@ "NatureOfWork": "Creative Director\r\nWeb Development\r\nPromotion", "brief": "Beginning in 2010, Ripps creative directed\r\nand designed many key assets for\r\nartist MIA’s album, /\\/\\/\\Y/\\ and the\r\nsubsequent mixtape, Vicki Leekx. One of\r\nthe sites released, facefacefacebook.com,\r\nused webcam face tracking technology\r\nto allow fans to create their own version\r\nof her album cover by overlaying YouTube\r\nbars onto their own face.", "media": [ + { + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/mia-2.mp4", + "uri": "", + "width": "1244", + "height": "820", + "title": "mia-2.mp4", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" + }, + { + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/mia.mp4", + "uri": "", + "width": "790", + "height": "482", + "title": "height:80%", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" + }, { "uri": "https://ltho.s3.amazonaws.com/b95bd68f-f0c9-46b2-a8ad-5484a7c59c25.png", "caption": "background-size:contain;\r\nbackground-color:black;", -- cgit v1.2.3-70-g09d2 From 2d235a4879719129139083308f39a0ed9fced20a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 8 Apr 2016 23:49:11 -0400 Subject: dont put iframes/videos in galleries if it isnt necessary --- public/assets/js/lib/ProjectView.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 7749908..a0e0055 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -27,6 +27,10 @@ var ProjectView = View.extend({ } } else { + // don't put iframes/videos in galleries if not necessary + if (this.$iframes.length || this.$videos.length) { + this.$images.remove() + } this.$(".mobile").remove() this.$(".desktop").removeClass("desktop") } -- cgit v1.2.3-70-g09d2 From fa29fe7d44bc7c52d4bccc2e397fefad4267659c Mon Sep 17 00:00:00 2001 From: okfprojz Date: Sat, 9 Apr 2016 02:39:21 -0400 Subject: db --- db.json | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/db.json b/db.json index 735da49..37298a3 100644 --- a/db.json +++ b/db.json @@ -31,9 +31,16 @@ "alternateTitle": "", "mobileTitle": "", "linkText": "internetarchaeology.org", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "http://internetarchaeology.org/digging.gif", + "caption": "background-size:cover; background-color:white;", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "annapurna-pictures", @@ -179,7 +186,7 @@ "client": "OKFocus", "link": "http://timesnewramen.com/", "NatureOfWork": "Type Design\r\nViral Media\r\nNoodle Consumption", - "brief": "In house font created to be the\r\nTimesNewRamen.com “most noodly serif font ever.”", + "brief": "In house font created to be the “most noodly serif font ever.”", "media": [ { "uri": "http://timesnewramen.com/typer", @@ -712,13 +719,13 @@ "client": "Nike", "link": "http://www.1948london.com/pano", "NatureOfWork": "Creative Direction\r\nGraphic Design\r\nBack-End Development", - "brief": "For the launch of Nike’s Hyperfeel\r\nshoe a gallery space in London was\r\ncreated complete with art which hosted\r\nworkshops showcasing the shoe’s\r\nlightness and agility. We created a\r\nwebsite featuring a custom back-end for\r\nthe workshop sign-ups as well as our own\r\nsignature 360˚ panoramic HTML5 solution\r\nwhere users from anywhere in the world\r\ncould experience the space with full 360˚\r\npanoramic views. In addition to the site,\r\nwe also facilitated the production the\r\npanoramic photography of the space.", + "brief": "For the launch of Nike’s Hyperfeel\r\nshoe a gallery space in London was\r\ncreated complete with art which hosted\r\nworkshops showcasing the shoe’s\r\nlightness and agility. We created a\r\nwebsite featuring a custom back-end for\r\nthe workshop sign-ups as well as our own\r\nsignature 360˚ panoramic HTML5 solution\r\nwhere users from anywhere in the world\r\ncould experience the space with full 360˚\r\npanoramic views. In addition to the site,\r\nwe also facilitated the production of\r\npanoramic photography of the space.", "containImage": "true", "__index": 18, "dateCreated": "Sun, 03 Apr 2016 21:01:37 GMT", "media": [ { - "uri": "http://1948london.com/pano/", + "uri": "http://okfoc.us/300/reduced/feellondon/", "caption": "", "type": "link" } @@ -838,7 +845,7 @@ "brief": "We began working with infamous streetwear\r\ncompany, Been Trill, since their start.\r\nWe designed and built their e-commerce\r\nwebsite, which was like no other on the\r\ninternet. Products were displayed in 3D\r\nspace and the site featured an animated\r\nGIF social network where fans could\r\ncreate and share animations.", "media": [ { - "uri": "http://okfoc.us/300/beentrill/", + "uri": "http://okfoc.us/300/reduced/beentrill/", "caption": "", "type": "link" } @@ -913,17 +920,12 @@ "media": [ { "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/fox-adhd-iMac.mp4", + "token": "http://okfocus.s3.amazonaws.com/video/fox-adhd-iMac-video.mp4", "uri": "", - "width": "1280", - "height": "720", - "title": "background-color:white", + "width": "1920", + "height": "1080", + "title": "background-color:white;", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "uri": "https://ltho.s3.amazonaws.com/f1a8b089-a430-415e-be86-bdd1d06aa6ac.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -932,7 +934,13 @@ "dateCreated": "Sun, 03 Apr 2016 21:17:55 GMT", "mobileTitle": "", "linkText": "foxadhd.com", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/f1a8b089-a430-415e-be86-bdd1d06aa6ac.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, "hideProject": false, "disabled": false -- cgit v1.2.3-70-g09d2 From 456f697e2c9d55ded0e6c51f4741e7dc8e8a5039 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 11 Apr 2016 14:44:46 -0400 Subject: bump okcms version --- index.js | 6 +++++- package.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index c826359..fe51393 100644 --- a/index.js +++ b/index.js @@ -62,7 +62,11 @@ var app = okcms.createApp({ key: process.env.S3_KEY, secret: process.env.S3_SECRET, bucket: process.env.S3_BUCKET, - maxbytes: 1024*1024*2, + dirname: "portfolio", + image: { allowed: true, preserveFilename: false, maxbytes: 2*1024*1024 }, + video: { allowed: true, preserveFilename: true, maxbytes: 200*1024*1024 }, + audio: { allowed: true, preserveFilename: true, maxbytes: 100*1024*1024 }, + }, } diff --git a/package.json b/package.json index 201d764..4c12dcf 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "dotenv": "^2.0.0", "object-assign": "^2.0.0", - "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.28" + "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.29" }, "devDependencies": { "grunt": "^0.4.5", -- cgit v1.2.3-70-g09d2 From 2b84b036311a2ab7a2e49132fa535b38444361ca Mon Sep 17 00:00:00 2001 From: okfprojz Date: Mon, 11 Apr 2016 14:45:11 -0400 Subject: db --- db.json | 145 +++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 48 deletions(-) diff --git a/db.json b/db.json index 37298a3..33e85ad 100644 --- a/db.json +++ b/db.json @@ -55,11 +55,6 @@ { "uri": "http://159.203.133.91/", "caption": "", - "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/4be1663d-4d42-447d-97fe-495282dec3f3.png", - "caption": "", "type": "image" } ], @@ -69,9 +64,16 @@ "press": [], "mobileTitle": "", "linkText": "annapurna.pictures", - "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/17499903-c9c6-4b68-82d1-b4f3089be90f.png", + "caption": "", + "type": "image" + } + ], + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "stone-island", @@ -87,20 +89,26 @@ "dateCreated": "Sun, 03 Apr 2016 18:40:41 GMT", "media": [ { - "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/stone-island-app.mp4", "uri": "", - "width": "1920", - "height": "1080", - "title": "background:white", - "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" + "caption": "", + "type": "image" + }, + { + "uri": "", + "caption": "", + "type": "image" } ], "press": [], "mobileTitle": "", "mobileMedia": [ { - "uri": "https://ltho.s3.amazonaws.com/332543c6-fa00-4fcb-9c34-070764e5a692.png", + "uri": "https://ltho.s3.amazonaws.com/0cf17cdc-ae65-478a-b2ab-e3a878d58e22.png", + "caption": "", + "type": "image" + }, + { + "uri": "https://ltho.s3.amazonaws.com/dcf5dcde-d683-4af4-acdd-c9637b2dbc57.png", "caption": "", "type": "image" } @@ -135,16 +143,33 @@ }, { "uri": "https://ltho.s3.amazonaws.com/12eaa8d4-328e-45e5-bd54-3ac2125d4956.png", - "caption": "background-size:80%", + "caption": "", "type": "image" } ], "press": [], "mobileTitle": "", "linkText": "View Lookbook", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/1f337646-49bc-45d0-92b6-ed8f3e017046.png", + "caption": "", + "type": "image" + }, + { + "uri": "https://ltho.s3.amazonaws.com/531b7c8d-4754-416e-8f3c-a2a19c5d820c.png", + "caption": "", + "type": "image" + }, + { + "uri": "https://ltho.s3.amazonaws.com/4440a524-db52-4c99-8a41-0f721dace097.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "g-o-o-d-music", @@ -157,9 +182,9 @@ "brief": "We have worked with Kanye West\r\nin various capacities since 2014. On\r\n2015 the Good Music website’s first\r\niteration was launched to premiere\r\na title track from the new Pusha-T\r\nalbum. We are always looking\r\nto create new ways for users to\r\nengage with content, in this case,\r\nthey must hold their mouse down\r\nto listen to the song and view some\r\nbeautiful animating birds.", "media": [ { - "uri": "http://okfoc.us/300/reduced/good/", + "uri": "http://good-music.com/", "caption": "", - "type": "link" + "type": "image" } ], "containImage": "true", @@ -170,13 +195,14 @@ "linkText": "good-music.com", "mobileMedia": [ { - "uri": "https://ltho.s3.amazonaws.com/7ea562b7-e45d-4c3f-8f07-691741f71fe9.png", - "caption": "background-position: bottom center;background-color:#f9f9f9;background-size: contain;", + "uri": "https://ltho.s3.amazonaws.com/884c74a4-27d0-4beb-87cd-802b1d7ae553.png", + "caption": "", "type": "image" } ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "times-new-ramen", @@ -191,7 +217,7 @@ { "uri": "http://timesnewramen.com/typer", "caption": "", - "type": "link" + "type": "image" } ], "containImage": "true", @@ -210,7 +236,7 @@ "mobileTitle": "", "mobileMedia": [ { - "uri": "https://ltho.s3.amazonaws.com/3337ba94-b25c-4374-8d63-e97ba833fb30.png", + "uri": "https://ltho.s3.amazonaws.com/ecaeba52-a2ab-4bb6-bbd4-548c83a6f847.png", "caption": "", "type": "image" } @@ -251,10 +277,16 @@ "dateCreated": "Sun, 03 Apr 2016 19:12:17 GMT", "press": [], "mobileTitle": "Soylent Branding", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/2014c07e-d573-4531-bcbb-577083bcce27.png", + "caption": "" + } + ], "linkText": "View Brand Book", "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "soylent-website", @@ -602,11 +634,6 @@ "uri": "http://okfoc.us/kenzo/", "caption": "", "type": "link" - }, - { - "uri": "https://ltho.s3.amazonaws.com/d2870d31-e417-49b4-8bb9-fe21e6e88d48.png", - "caption": "", - "type": "image" } ], "containImage": "true", @@ -628,9 +655,21 @@ "dateCreated": "Sun, 03 Apr 2016 20:36:13 GMT", "mobileTitle": "", "linkText": "kenzo.com/nofishnonothing", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/39fcc324-f4eb-458e-b21c-285ff0914c07.png", + "caption": "", + "type": "image" + }, + { + "uri": "https://ltho.s3.amazonaws.com/51022b2b-e903-4a71-a508-5468ea3aa824.png", + "caption": "", + "type": "image" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "mike-will-made-it", @@ -1055,18 +1094,16 @@ "brief": "We were challenged by Google to\r\nhelp them make Hangouts better. In\r\njust two weeks we created a game\r\nallowing players to “draw with their\r\nface” using while opponents try to\r\nguess the drawing’s subject. This\r\nproject was not just fun, it helped\r\nGoogle make a better API for\r\nHangouts. Its a good example of our\r\nabilities to innovate quickly.", "media": [ { - "type": "video", + "type": [ + "video", + "image" + ], "token": "http://okfocus.s3.amazonaws.com/nike/video/src/dwyf.mp4", "uri": "", "width": "1280", "height": "845", - "title": "", + "title": "dwyf.mp4", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "uri": "https://ltho.s3.amazonaws.com/b64d53ba-af07-4ef0-a16b-786eacafd979.png", - "caption": "background-size:70%", - "type": "image" } ], "containImage": "false", @@ -1075,9 +1112,15 @@ "dateCreated": "Sun, 03 Apr 2016 21:25:33 GMT", "mobileTitle": "", "linkText": "View in Hangouts", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/3875d5c9-8d7f-435f-ba90-953a9317a568.png", + "caption": "" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "tug-of-store", @@ -1090,9 +1133,9 @@ "brief": "An early experiment in real-time web\r\nexperience, this site for taste making\r\nsocial network, Svpply, allowed users to\r\ncollectively decide if a product was “cool”\r\nor “crap.” The sea of cursors updated\r\nreal-time as users would click on one side\r\nor another, effectively playing a massive\r\ngroup tug of war, choosing the fate of a\r\nproduct within Svpply’s database. Svpply\r\nsoon after was purchased by eBay.", "media": [ { - "uri": "https://ltho.s3.amazonaws.com/652f496b-6589-4377-bf53-9c772a0472d0.jpg", + "uri": "http://okfoc.us/300/reduced/tug/#standalone", "caption": "", - "type": "image" + "type": "link" } ], "containImage": "false", @@ -1110,9 +1153,15 @@ "dateCreated": "Sun, 03 Apr 2016 21:26:54 GMT", "mobileTitle": "", "linkText": "", - "mobileMedia": [], + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/652f496b-6589-4377-bf53-9c772a0472d0.jpg", + "caption": "" + } + ], "whiteCursor": false, - "hideProject": false + "hideProject": false, + "disabled": false }, { "id": "item-idem", @@ -1462,4 +1511,4 @@ ] } ] -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From 0a213a21b059cdc7eed826497a5c954fb9e26938 Mon Sep 17 00:00:00 2001 From: okfprojz Date: Mon, 11 Apr 2016 15:03:31 -0400 Subject: db --- db.json | 95 +++++++++++++++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 44 insertions(+), 53 deletions(-) diff --git a/db.json b/db.json index 33e85ad..93167fa 100644 --- a/db.json +++ b/db.json @@ -55,7 +55,7 @@ { "uri": "http://159.203.133.91/", "caption": "", - "type": "image" + "type": "link" } ], "containImage": "true", @@ -89,14 +89,13 @@ "dateCreated": "Sun, 03 Apr 2016 18:40:41 GMT", "media": [ { + "type": "video", + "token": "http://okfocus.s3.amazonaws.com/video/stone-island-app.mp4", "uri": "", - "caption": "", - "type": "image" - }, - { - "uri": "", - "caption": "", - "type": "image" + "width": "1920", + "height": "1080", + "title": "background-color:white", + "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } ], "press": [], @@ -182,9 +181,9 @@ "brief": "We have worked with Kanye West\r\nin various capacities since 2014. On\r\n2015 the Good Music website’s first\r\niteration was launched to premiere\r\na title track from the new Pusha-T\r\nalbum. We are always looking\r\nto create new ways for users to\r\nengage with content, in this case,\r\nthey must hold their mouse down\r\nto listen to the song and view some\r\nbeautiful animating birds.", "media": [ { - "uri": "http://good-music.com/", + "uri": "http://okfoc.us/300/reduced/good/", "caption": "", - "type": "image" + "type": "link" } ], "containImage": "true", @@ -217,7 +216,7 @@ { "uri": "http://timesnewramen.com/typer", "caption": "", - "type": "image" + "type": "link" } ], "containImage": "true", @@ -279,8 +278,9 @@ "mobileTitle": "Soylent Branding", "mobileMedia": [ { - "uri": "https://ltho.s3.amazonaws.com/2014c07e-d573-4531-bcbb-577083bcce27.png", - "caption": "" + "uri": "https://ltho.s3.amazonaws.com/portfolio/115eeba0-0017-11e6-8919-558e5e9bf555.png", + "caption": "", + "type": "image" } ], "linkText": "View Brand Book", @@ -959,11 +959,11 @@ "media": [ { "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/fox-adhd-iMac-video.mp4", + "token": "https://ltho.s3.amazonaws.com/portfolio/fox-adhd-iMac-video.mp4", "uri": "", "width": "1920", "height": "1080", - "title": "background-color:white;", + "title": "background-color:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } ], @@ -1058,10 +1058,10 @@ "media": [ { "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/tanlines-iMac-video.mp4", + "token": "https://ltho.s3.amazonaws.com/portfolio/tanlines-iMac-video.mp4", "uri": "", - "width": "1280", - "height": "720", + "width": "1920", + "height": "1080", "title": "background-color:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } @@ -1094,15 +1094,12 @@ "brief": "We were challenged by Google to\r\nhelp them make Hangouts better. In\r\njust two weeks we created a game\r\nallowing players to “draw with their\r\nface” using while opponents try to\r\nguess the drawing’s subject. This\r\nproject was not just fun, it helped\r\nGoogle make a better API for\r\nHangouts. Its a good example of our\r\nabilities to innovate quickly.", "media": [ { - "type": [ - "video", - "image" - ], - "token": "http://okfocus.s3.amazonaws.com/nike/video/src/dwyf.mp4", + "type": "video", + "token": "https://ltho.s3.amazonaws.com/portfolio/draw-with-your-face-iMac-video.mp4", "uri": "", - "width": "1280", - "height": "845", - "title": "dwyf.mp4", + "width": "1920", + "height": "1080", + "title": "background-color:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } ], @@ -1115,7 +1112,8 @@ "mobileMedia": [ { "uri": "https://ltho.s3.amazonaws.com/3875d5c9-8d7f-435f-ba90-953a9317a568.png", - "caption": "" + "caption": "", + "type": "image" } ], "whiteCursor": false, @@ -1288,10 +1286,10 @@ "media": [ { "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/smirnoff-iMac-video.mp4", + "token": "https://ltho.s3.amazonaws.com/portfolio/smirnoff-iMac-video.mp4", "uri": "", - "width": "1280", - "height": "720", + "width": "1920", + "height": "1080", "title": "background-color:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" } @@ -1356,26 +1354,12 @@ "media": [ { "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/mia-2.mp4", - "uri": "", - "width": "1244", - "height": "820", - "title": "mia-2.mp4", - "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "type": "video", - "token": "http://okfocus.s3.amazonaws.com/video/mia.mp4", + "token": "https://ltho.s3.amazonaws.com/portfolio/mia-facebook-iMac-video.mp4", "uri": "", - "width": "790", - "height": "482", - "title": "height:80%", + "width": "1920", + "height": "1080", + "title": "background-color:white", "thumb": "http://okfocus.s3.amazonaws.com/misc/okcms/video.png" - }, - { - "uri": "https://ltho.s3.amazonaws.com/b95bd68f-f0c9-46b2-a8ad-5484a7c59c25.png", - "caption": "background-size:contain;\r\nbackground-color:black;", - "type": "image" } ], "containImage": "false", @@ -1389,9 +1373,16 @@ "dateCreated": "Sun, 03 Apr 2016 21:35:41 GMT", "mobileTitle": "", "linkText": "facefacefacebook.com", - "mobileMedia": [], - "whiteCursor": true, - "hideProject": false + "mobileMedia": [ + { + "uri": "https://ltho.s3.amazonaws.com/b95bd68f-f0c9-46b2-a8ad-5484a7c59c25.png", + "caption": "background-size:contain;\r\nbackground-color:black;", + "type": "image" + } + ], + "whiteCursor": false, + "hideProject": false, + "disabled": false }, { "id": "album-covers", @@ -1511,4 +1502,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/package.json b/package.json index 4c12dcf..06443fd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "dotenv": "^2.0.0", "object-assign": "^2.0.0", - "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.29" + "okcms": "git+ssh://git@github.com:okfocus/okcms.git#v0.1.30" }, "devDependencies": { "grunt": "^0.4.5", -- cgit v1.2.3-70-g09d2