diff --git a/app/components/filter-collections.js b/app/components/filter-collections.js index 1ef4a00..16e66b5 100644 --- a/app/components/filter-collections.js +++ b/app/components/filter-collections.js @@ -1,5 +1,5 @@ import Ember from 'ember'; export default Ember.Component.extend({ - classNames: ['row'], + tagName: 'form', }); diff --git a/app/router.js b/app/router.js index 3234f26..75adc76 100644 --- a/app/router.js +++ b/app/router.js @@ -9,7 +9,9 @@ const Router = Ember.Router.extend({ Router.map(function() { this.route('login'); this.route('logout'); - this.route('collections'); + this.route('collections', function() { + this.route('1'); + }); }); export default Router; diff --git a/app/routes/collections/1.js b/app/routes/collections/1.js new file mode 100644 index 0000000..26d9f31 --- /dev/null +++ b/app/routes/collections/1.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/routes/collections.js b/app/routes/collections/index.js similarity index 100% rename from app/routes/collections.js rename to app/routes/collections/index.js diff --git a/app/styles/app.css b/app/styles/app.css index 1a8070d..b74ca4b 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1,3 +1,14 @@ +.content { + padding-left: 40px; + padding-right: 40px; + padding-top: 20px; + padding-bottom: 20px; +} + +.top-buffer { + padding-top: 20px; +} + .form-signin { max-width: 330px; padding: 15px; diff --git a/app/templates/collections/1.hbs b/app/templates/collections/1.hbs new file mode 100644 index 0000000..95a0f6f --- /dev/null +++ b/app/templates/collections/1.hbs @@ -0,0 +1,9 @@ +

Collection Detail

+ +
+
+
+ asf +
+
+
diff --git a/app/templates/collections.hbs b/app/templates/collections/index.hbs similarity index 100% rename from app/templates/collections.hbs rename to app/templates/collections/index.hbs diff --git a/app/templates/components/filter-collections.hbs b/app/templates/components/filter-collections.hbs index a60011d..f1f9fb8 100644 --- a/app/templates/components/filter-collections.hbs +++ b/app/templates/components/filter-collections.hbs @@ -1,10 +1,73 @@ -
+
+
- - + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+
+ + + +
+
diff --git a/ember-cli-build.js b/ember-cli-build.js index 2e0af58..3fb70dd 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -11,7 +11,6 @@ module.exports = function(defaults) { }); app.import('bower_components/bootstrap/dist/css/bootstrap.min.css'); - app.import('bower_components/bootstrap/dist/css/bootstrap-theme.min.css'); return app.toTree(); }; diff --git a/tests/unit/routes/collections/1-test.js b/tests/unit/routes/collections/1-test.js new file mode 100644 index 0000000..713679d --- /dev/null +++ b/tests/unit/routes/collections/1-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:collections/1', 'Unit | Route | collections/1', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +});