diff --git a/.ember-cli.json b/.ember-cli.json index 6c2a175..2079f72 100644 --- a/.ember-cli.json +++ b/.ember-cli.json @@ -1,4 +1,3 @@ { - "disableAnalytics": false, - "output_path": "dist" + "disableAnalytics": false } \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index 16b268b..2533503 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { browser: true }, rules: { + 'no-console': 0 }, overrides: [ // node files diff --git a/.template-lintrc.js b/.template-lintrc.js new file mode 100644 index 0000000..b45e96f --- /dev/null +++ b/.template-lintrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + extends: 'recommended' +}; diff --git a/app/app.js b/app/app.js index b3b2bd6..6177023 100644 --- a/app/app.js +++ b/app/app.js @@ -3,12 +3,14 @@ import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; +// import EmbarkJS from 'Embark/EmbarkJS'; + const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver -}); +}) -loadInitializers(App, config.modulePrefix); +loadInitializers(App, config.modulePrefix) -export default App; +export default App \ No newline at end of file diff --git a/app/index.html b/app/index.html index 63539b6..9f501af 100644 --- a/app/index.html +++ b/app/index.html @@ -10,18 +10,18 @@ {{content-for "head"}} - + {{content-for "head-footer"}}

Welcome to Embark!

See the Embark's documentation to see what you can do with Embark!

-

Text

{{content-for "body"}} +
- + {{content-for "body-footer"}} diff --git a/app/routes/blockchain.js b/app/routes/blockchain.js index 6c74252..0f2b6bf 100644 --- a/app/routes/blockchain.js +++ b/app/routes/blockchain.js @@ -1,4 +1,12 @@ import Route from '@ember/routing/route'; export default Route.extend({ + model () { + return {} + }, + + init () { + this._super(...arguments) + console.log('Inited') + } }); diff --git a/app/styles/app.css b/app/styles/app.css new file mode 100644 index 0000000..44e084f --- /dev/null +++ b/app/styles/app.css @@ -0,0 +1 @@ +/* @import "ember-cli-bootstrap-4/bootstrap"; */ \ No newline at end of file diff --git a/app/styles/app.scss b/app/styles/app.scss deleted file mode 100644 index a2f3391..0000000 --- a/app/styles/app.scss +++ /dev/null @@ -1 +0,0 @@ -@import "ember-cli-bootstrap-4/bootstrap"; \ No newline at end of file diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 7fb1120..8c44bc5 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,3 @@ {{outlet}} -{{component ember-blockchain}} \ No newline at end of file +

Spiel

\ No newline at end of file diff --git a/app/templates/components/people-list.hbs b/app/templates/components/people-list.hbs new file mode 100644 index 0000000..e887fb7 --- /dev/null +++ b/app/templates/components/people-list.hbs @@ -0,0 +1,9 @@ +{{yield}} + +

{{title}}

+ + \ No newline at end of file diff --git a/package.json b/package.json index d920c2c..afdf02a 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "embark-emberjs-template", + "name": "embark-ember-template", "version": "0.0.1", "description": "", "scripts": {