diff options
| -rw-r--r-- | db.json | 16 | ||||
| -rw-r--r-- | index.js | 16 | ||||
| -rw-r--r-- | public/assets/js/app.js | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/NavView.js | 2 | ||||
| -rw-r--r-- | templates/index.liquid | 1 |
5 files changed, 27 insertions, 10 deletions
@@ -45,5 +45,21 @@ "iframe": "http://okfoc.us", "video": "" } + ], + "page": [ + { + "id": "introduction", + "title": "Introduction", + "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum quam tortor, tempor eget eleifend ullamcorper, tristique et nibh. Donec posuere tellus orci, et feugiat mi lacinia sit amet. Aliquam lorem dui, auctor auctor pharetra ut, elementum sed ligula. Nam et mi et metus maximus auctor. Praesent dapibus sodales vestibulum. Vestibulum efficitur lorem at felis dignissim ornare. Phasellus vitae varius augue, eu pharetra turpis. Ut eleifend est at blandit vulputate. Proin vitae nisi eu mi semper volutpat. Nullam pharetra, velit eu rhoncus fringilla, dolor elit tincidunt odio, a molestie est risus sit amet purus. Etiam dui orci, lacinia quis pharetra id, tincidunt id eros. In nisl nibh, tempor ac tempus ut, porttitor et felis. Proin turpis justo, facilisis ac metus vel, porttitor iaculis sapien.", + "__index": 0, + "dateCreated": "Mon, 28 Mar 2016 22:13:55 GMT" + }, + { + "id": "services-overview", + "title": "Services Overview", + "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum quam tortor, tempor eget eleifend ullamcorper, tristique et nibh. Donec posuere tellus orci, et feugiat mi lacinia sit amet. Aliquam lorem dui, auctor auctor pharetra ut, elementum sed ligula. Nam et mi et metus maximus auctor. Praesent dapibus sodales vestibulum. Vestibulum efficitur lorem at felis dignissim ornare. Phasellus vitae varius augue, eu pharetra turpis. Ut eleifend est at blandit vulputate. Proin vitae nisi eu mi semper volutpat. Nullam pharetra, velit eu rhoncus fringilla, dolor elit tincidunt odio, a molestie est risus sit amet purus. Etiam dui orci, lacinia quis pharetra id, tincidunt id eros. In nisl nibh, tempor ac tempus ut, porttitor et felis. Proin turpis justo, facilisis ac metus vel, porttitor iaculis sapien.", + "__index": 1, + "dateCreated": "Mon, 28 Mar 2016 22:14:01 GMT" + } ] }
\ No newline at end of file @@ -2,13 +2,6 @@ var okcms = require('okcms') var isProduction = process.env.OK_PRODUCTION === 'true' -var viewConfig = { - template: 'index', - data: [ - {type: 'project', query: '*'}, - ] -} - var app = okcms.createApp({ project: 'OKFocus Portfolio', @@ -38,10 +31,17 @@ var app = okcms.createApp({ resources: [ { type: 'project' }, + { type: 'page' }, ], views: { - '/': viewConfig, + '/': { + template: 'index', + data: [ + {type: 'project', query: '*'}, + {type: 'page', query: '*'}, + ] + }, }, services: { diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 89c1869..fb01ff1 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -32,8 +32,6 @@ var app = (function() { $("body").removeClass("loading") }, 20) app.view = null - app.router = new SiteRouter() - app.router.launch() console.log("launched") } diff --git a/public/assets/js/lib/NavView.js b/public/assets/js/lib/NavView.js new file mode 100644 index 0000000..110e1fb --- /dev/null +++ b/public/assets/js/lib/NavView.js @@ -0,0 +1,2 @@ +var NavView = View.extend({ +})
\ No newline at end of file diff --git a/templates/index.liquid b/templates/index.liquid index a3ce509..69f3b3a 100644 --- a/templates/index.liquid +++ b/templates/index.liquid @@ -125,6 +125,7 @@ INDEX</div> <script src="/assets/js/vendor/util.js"></script> <script src="/assets/js/vendor/View.js"></script> <script src="/assets/js/lib/GalleryView.js"></script> +<script src="/assets/js/lib/NavView.js"></script> <script src="/assets/js/lib/ProjectView.js"></script> <script src="/assets/js/app.js"></script> {% endif %} |