diff --git a/app/adapters/node.js b/app/adapters/node.js index 01326e26a7878cf0155b324eb28dcc175c6a9293..0464c21a72685c16e02cdb32f0549f07ffc80c8e 100644 --- a/app/adapters/node.js +++ b/app/adapters/node.js @@ -1,13 +1,18 @@ import ApplicationAdapter from './application'; export default class NodeAdapter extends ApplicationAdapter { + findNode(node_id) { - let url, ret; + let url, ret, json; url = this.buildURL('nodes', node_id); - ret = this.ajax(url, 'GET'); - return ret; - } + return this.ajax(url, 'GET').then((node) => { + this.store.pushPayload('folder', node); + ret = this.store.peekRecord('folder', node.data.id); + console.log(node.data); + return ret; + }); + } } diff --git a/app/components/folder.hbs b/app/components/folder.hbs index ce089eec5f2af19c9d86ec1f25526af874fb85e5..d711d74110c93dcdf61ffcef0a7983e1f09c9276 100644 --- a/app/components/folder.hbs +++ b/app/components/folder.hbs @@ -1,8 +1,6 @@ <div class="node folder"> <div class="icon folder"></div> <div class="title"> - <LinkTo @route="node" @model={{@model.id}}> - {{@model.title}} - </LinkTo> + {{@model.title}} </div> </div> \ No newline at end of file diff --git a/app/components/panel.hbs b/app/components/panel.hbs new file mode 100644 index 0000000000000000000000000000000000000000..3c2b87f52fd924dd712815efeac326468ae69aec --- /dev/null +++ b/app/components/panel.hbs @@ -0,0 +1,4 @@ + +{{#each @nodes as |node|}} + <Folder @model={{node}} /> +{{/each}} \ No newline at end of file diff --git a/app/models/node.js b/app/models/node.js index c8dc0446216ef66c37a1ad765f4f3dc44f6c4f69..f964bc8e14855ffadf2cd7041f12856db5e2b2c6 100644 --- a/app/models/node.js +++ b/app/models/node.js @@ -3,8 +3,8 @@ import Model, { attr, hasMany, belongsTo } from '@ember-data/model'; export default class NodeModel extends Model { @attr title; @attr model; - @belongsTo('node', { inverse: 'descendants', polymorphic: true }) parent; - @hasMany('node', { polymorphic: true }) descendants; + @belongsTo('node', { inverse: 'children', polymorphic: true }) parent; + @hasMany('node', { polymorphic: true, inverse: 'parent' }) children; get is_folder() { return this.type === 'folder' || this.model === 'folder'; diff --git a/app/templates/authenticated/index.hbs b/app/templates/authenticated/index.hbs index 96cffdf229dfcdc6c942e62cc91de9a6d5e3d493..81ad92b79d0b3f866a715a45237e177ca1b8cc61 100644 --- a/app/templates/authenticated/index.hbs +++ b/app/templates/authenticated/index.hbs @@ -12,9 +12,13 @@ </button> </div> -Documents and Folders will be displayed here! <Modal::NewFolder id="new-folder" @onClose={{this.closeNewFolderModal}} - {{show-when this.show_new_folder_modal}} /> \ No newline at end of file + {{show-when this.show_new_folder_modal}} /> + +{{@model.title}} + + +<Panel @nodes={{model.children}} /> \ No newline at end of file