-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:softlayer/sl-ember-model into fi…
…x-generator-test
- Loading branch information
Showing
13 changed files
with
241 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| # sl-ember-store Changelog | ||
|
|
||
| ### 0.2.0 | ||
|
|
||
| * [#45](https://github.com/softlayer/sl-ember-store/pull/45) [DOCUMENTATION] Update installation instructions | ||
| * [INTERNAL] Modify package.json properties | ||
| * [#53](https://github.com/softlayer/sl-ember-store/pull/53) [BREAKING ENHANCEMENT] Upgrade to Ember CLI 0.1.4 | ||
|
|
||
| [View complete changeset](https://github.com/softlayer/sl-ember-store/compare/v0.1.0...v0.2.0) | ||
|
|
||
| ### 0.1.0 | ||
|
|
||
| * Initial release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # Repository Release Instructions | ||
|
|
||
| This document captures the steps a project maintainer should follow when releasing a new version of this Addon. | ||
|
|
||
| * Merge all desired pull requests into `develop` branch | ||
| * Merge `develop` branch into `master` branch | ||
| * If change is due to upgrading Ember CLI version | ||
| * Update Ember CLI version text in README.md file | ||
| * Update CHANGELOG.md | ||
| * Prefix the entries with one of the following tags inside brackets: | ||
| * BUGFIX | ||
| * A link to a bug and a link to a patch. | ||
| * FEATURE or ENHANCEMENT | ||
| * Are for things that users are interested in. Avoid super technical talk. Craft a concise description of the change. | ||
| * INTERNAL | ||
| * An internal log of changes. | ||
| * If a change requires a user to change their configuration, *bower.json*, *package.json*, or *Brocfile.js* also add a BREAKING tag within the brackets before any other tags (example [BREAKING BUGFIX]) | ||
| * Following the pattern of the existing entries for guidance | ||
| * Add appropriately linked "View complete changeset" link at bottom of entries | ||
| * After changes have been committed: | ||
| * `npm version x.x.x`, where *x.x.x* is the Semantic Version of the changeset | ||
| * `git push origin master` | ||
| * `git push origin --tags` | ||
| * `npm publish --registry http://registry.npmjs.org/` | ||
| * Note: `--registry` flag is workaround for occasional issues with default SSL url | ||
| * Merge `master` branch into `develop` | ||
|
|
||
| If any of these conditions are true: | ||
|
|
||
| * There have been modifications to the *tests/dummy/app* demo application | ||
| * There have been changes to the *bower.json*, *package.json*, or *Brocfile.js* files | ||
| * Ember CLI has been upgraded | ||
|
|
||
| Then follow these steps: | ||
|
|
||
| * Run `ember build` | ||
| * Copy the following files from */dist* folder outside of the working directory so they can be retained between switching branches: | ||
| * */dist/index.html* | ||
| * */dist/assets/dummy.css* | ||
| * */dist/assets/dummy.js* | ||
| * */dist/assets/vendor.css* | ||
| * */dist/assets/vendor.js* | ||
| * Switch to the `gh-pages` branch | ||
| * Replace the same files listed above with their copies | ||
| * Within the */dist/index.html* file, replace the following href values: | ||
| * `assets/vendor.css` with `sl-ember-store/dist/assets/vendor.css` | ||
| * `assets/dummy.css` with `sl-ember-store/dist/assets/dummy.css` | ||
| * `assets/vendor.js` with `sl-ember-store/dist/assets/vendor.js` | ||
| * `assets/dummy.js` with `sl-ember-store/dist/assets/dummy.js` | ||
| * Also within the */dist/index.html* file, in the `<meta name="dummy/config/environment"...` tag, replace the `locationType` value from `auto` to `hash` | ||
| * Commit and push the changes |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,49 @@ | ||
| <h1 id='title'>Welcome to {{#link-to "index"}}sl-ember-store{{/link-to}}!</h1> | ||
| <br> | ||
| <div class="container"> | ||
|
|
||
| {{outlet}} | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
| <div class="btn-group pull-right"> | ||
| <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> | ||
| <i class="fa fa-reorder"></i> <span class="caret"></span> | ||
| </button> | ||
|
|
||
| <ul class="dropdown-menu" role="menu"> | ||
| <li><a href="/sl-ember-store"><i class="fa fa-home"></i> Home</a></li> | ||
| <li><a href="https://github.com/softlayer/sl-ember-store/blob/master/README.md"><i class="fa fa-wrench"></i> Get Started</a></li> | ||
| <li><a href="https://github.com/softlayer/sl-ember-store/blob/master/CONTRIBUTING.md"><i class="fa fa-cog"></i> Contribution Guide</a></li> | ||
| <li><a href="https://github.com/softlayer/sl-ember-store/stargazers"><i class="fa fa-star"></i> Star Our Repo</a></li> | ||
| <li><a href="https://github.com/softlayer/sl-ember-store/fork"><i class="fa fa-code-fork"></i> Fork Our Repo</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-md-12 text-center"> | ||
| <h1>{{#link-to "index"}}Demo Application{{/link-to}}</h1> | ||
| <p class="lead">View the source code of the dummy application for syntax employed in this demo</p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-md-12 text-center"> | ||
| {{#link-to "singleModel" 1}}Single model example{{/link-to}} | ||
| | ||
| {{#link-to "arrayOfModels"}}Array of models example{{/link-to}} | ||
| </div> | ||
| </div> | ||
|
|
||
| {{outlet}} | ||
|
|
||
| <br><br> | ||
| <div class="row"> | ||
| <div class="col-md-12 text-center"> | ||
| <p>npm install sl-ember-store</p> | ||
| <p><a href="https://github.com/softlayer/sl-ember-store/blob/master/LICENSE.md">MIT Licensed</a></p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </body> | ||
| </html> |
83 changes: 63 additions & 20 deletions
83
tests/dummy/app/templates/array-of-models.hbs
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,63 @@ | ||
| <h2>Array of Models</h2> | ||
| <p>These records are loaded in our route's model hook with the following code:</p> | ||
| <code>this.store.find('foo');</code> | ||
| <p>These records are loaded by the store via the ajax adapter. The `/foo` | ||
| resource contains foo records with embedded `bar` records. These records are automatically | ||
| created as an instance of the `Bar` model.</p> | ||
|
|
||
| {{#each model in controller}} | ||
| <h3>Foo Model</h3> | ||
| <ul> | ||
| <li>ID: {{#link-to 'singleModel' model.id }}{{model.id}}{{/link-to}}</li> | ||
| <li>Text: {{model.text}}</li> | ||
| <ul> | ||
| <h3>Bar Model</h3> | ||
| <li>ID: {{model.bar.id}}</li> | ||
| <li>Text: {{model.bar.text}}</li> | ||
| </ul> | ||
| </ul> | ||
|
|
||
| {{/each}} | ||
| <div class="row"> | ||
| <div class="col-md-12"> | ||
|
|
||
| <h2>Array of Models</h2> | ||
|
|
||
| <p>These records are loaded in our route's model hook with the following code:</p> | ||
|
|
||
| <code>this.store.find('foo');</code> | ||
|
|
||
| <br><br> | ||
| <p>These records are loaded by the store via the ajax adapter. The "/foo" resource contains foo records with embedded "bar" records. These records are automatically created as an instance of the "Bar" model.</p> | ||
|
|
||
| <br> | ||
| {{#each model in controller}} | ||
| <h4>Foo Model</h4> | ||
|
|
||
| <ul> | ||
| <li>ID: {{#link-to 'singleModel' model.id }}{{model.id}}{{/link-to}}</li> | ||
| <li>Text: {{model.text}}</li> | ||
| <ul> | ||
| <h4>Bar Model</h4> | ||
| <li>ID: {{model.bar.id}}</li> | ||
| <li>Text: {{model.bar.text}}</li> | ||
| </ul> | ||
| </ul> | ||
| {{/each}} | ||
|
|
||
|
|
||
| <br> | ||
| <p>The original JSON for this resource:</p> | ||
|
|
||
| <pre> | ||
| { | ||
| id: 1, | ||
| text: 'This is foo record with id: 1', | ||
| bar: { | ||
| id: 1, | ||
| text: 'This is a bar record with id: 1' | ||
| } | ||
| }, | ||
| { | ||
| id: 2, | ||
| text: 'This is foo record #2', | ||
| bar: { | ||
| id: 2, | ||
| text: 'This is a bar record with id: 2' | ||
| } | ||
|
|
||
| }, | ||
| { | ||
| id: 3, | ||
| text: 'This is foo record #3', | ||
| bar: { | ||
| id: 3, | ||
| text: 'This is a bar record with id: 3' | ||
| } | ||
|
|
||
| } | ||
| </pre> | ||
|
|
||
|
|
||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +0,0 @@ | ||
| <p>sl-ember-store is a Simple, Low level, Model layer for <a href="http://emberjs.com">Ember.js</a>. </p> | ||
| <p>It's easy to install via <a href="http://ember-cli.com">ember-cli</a>.</p> | ||
|
|
||
| <p>Example of a single model {{#link-to "singleModel" 1}}route{{/link-to}}</p> | ||
| <p>Example of an array of models {{#link-to "arrayOfModels"}}route{{/link-to}}</p> | ||
Oops, something went wrong.