diff --git a/app.js b/app.js index 394ce05..ce89c65 100644 --- a/app.js +++ b/app.js @@ -2,10 +2,13 @@ 'use strict'; var app = angular.module('grimoire', [ - 'ngRoute', + //'ngRoute', + 'ui.bootstrap', + 'ui.slimscroll', 'grimoire.controller', ]); +/* app.config(['$routeProvider', function($routeProvider) { $routeProvider.when('/grimoire', { templateUrl: 'grimoire.html', @@ -14,6 +17,10 @@ }).otherwise({ redirectTo: '/grimoire' }); + }]).config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.useXDomain = true; + delete $httpProvider.defaults.headers.common['X-Requested-With']; }]); +*/ }(window.angular)); \ No newline at end of file diff --git a/bower.json b/bower.json index fd9bc52..7cf46ed 100644 --- a/bower.json +++ b/bower.json @@ -23,6 +23,8 @@ "angular-bootstrap": "~0.12.0", "bootstrap": "~3.3.2", "lodash": "~3.0.0", - "angular-route": "~1.3.10" + "angular-route": "~1.3.10", + "slimscroll": "~1.3.3", + "angular-slimscroll": "~1.1.2" } } diff --git a/grimoire-controller.js b/grimoire-controller.js index 28e308e..86ac998 100644 --- a/grimoire-controller.js +++ b/grimoire-controller.js @@ -6,7 +6,67 @@ function GrimoireController() { /*jshint validthis: true */ this.welcome = 'Welcome to the Grimoire App!'; - console.log("LOADED CONTROLLER"); + this.sources = [ + { + 'name': 'Core Rule Book', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + { + 'name': 'Advanced Player\'s Guide', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + { + 'name': 'Core Rule Book', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + { + 'name': 'Advanced Player\'s Guide', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + { + 'name': 'Core Rule Book', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + { + 'name': 'Advanced Player\'s Guide', + 'sources': ['Armor', 'Weapons', 'Wondrous Items'], + }, + ]; + this.itemLists = [ + { + 'timestamp': new Date() - 100000, + 'items': [ + { + 'name': '+2 super cool sword', + 'worth': 5000, + 'url': 'http://www.google.com' + }, + { + 'name': 'nifty hat', + 'worth': 2000, + 'url': '' + } + ], + }, + { + 'timestamp': new Date(), + 'items': [ + { + 'name': '+3 super cool sword', + 'worth': 5000, + 'url': 'http://www.google.com' + }, + { + 'name': 'nifty boots', + 'worth': 2000, + 'url': '' + } + ], + }]; + + this.copyToClipboard = function(list) { + console.log(list); + } } angular diff --git a/grimoire.css b/grimoire.css index 7d0d6a7..a0638e1 100644 --- a/grimoire.css +++ b/grimoire.css @@ -1,3 +1,22 @@ -.body { - ; -}; \ No newline at end of file +.menu { + border: 2px solid; +} + +.super { + vertical-align: super; + font-size: smaller; +} + +.item-list { + border: 1px dotted; + padding: 1em; + margin: 1em; +} + +.copy { + font-size: smaller; +} + +.big { + font-size: 200%; +} \ No newline at end of file diff --git a/index.html b/index.html index 9bbd4f1..8dfc9e2 100644 --- a/index.html +++ b/index.html @@ -10,9 +10,37 @@ -
-