diff --git a/src/vue-poc/components/core.js b/src/vue-poc/components/core.js index acdbe58..0b15bab 100644 --- a/src/vue-poc/components/core.js +++ b/src/vue-poc/components/core.js @@ -71,14 +71,16 @@ const router = new VueRouter({ routes: [ { path: '/', component: Home,meta:{title:"Home"} }, { path: '/session', component: Session ,meta:{title:"Session"}}, - { path: '/images', component: Images,meta:{title:"Images"} }, - { path: '/images/:id', name:"image",component: Image, props: true,meta:{title:"Image details"}}, - { path: '/select', component: Select,meta:{title:"Select"} }, - { path: '/search', component: Search,meta:{title:"Search"} }, + { path: '/images/item', component: Images, meta:{title:"Images"} }, + { path: '/images/report', name:"image-reports",component: Report, props: true, meta:{title: "Image report"}}, + { path: '/images/item/:id', name:"image",component: Image, props: true, meta:{title: "Image details"}}, + { path: '/images/thumbnail', component: Thumbnail, meta:{title:"Thumbnail generator"} }, + { path: '/select', component: Select, meta:{title:"Select"} }, + { path: '/search', component: Search, meta:{title:"Search"} }, { path: '/tabs', component: Tabs,meta:{title:"tab test",requiresAuth: true} }, { path: '/login', component: Login,meta:{title:"login"} }, { path: '/edit', component: Edit,meta:{title:"Ace editor"} }, - { path: '/thumbnail', component: Thumbnail,meta:{title:"Thumbnail generator"} }, + { path: '/files', component: Files,meta:{title:"File system"},props:{protocol:"webfile"} }, { path: '/database', component: Files,meta:{title:"Databases"},props:{protocol:"basexdb"} }, { path: '/ping', component: Ping,meta:{title:"Ping"} }, @@ -161,8 +163,9 @@ const app = new Vue({ text: 'Images' , model: false, children: [ - {href: '/images',text: 'Collection',icon: 'photo_camera'}, - {href: '/thumbnail',text: 'Thumbnail',icon: 'touch_app'} + {href: '/images/item',text: 'Collection',icon: 'photo_camera'}, + {href: '/thumbnail',text: 'Thumbnail',icon: 'touch_app'}, + {href: '/images/report',text: 'Image reports',icon: 'report'} ]}, { icon: 'more_horiz', diff --git a/src/vue-poc/features/images/image.vue b/src/vue-poc/features/images/image.vue index 582a928..aa77d74 100644 --- a/src/vue-poc/features/images/image.vue +++ b/src/vue-poc/features/images/image.vue @@ -9,9 +9,11 @@ arrow_back - Image: {{ id }} + {{ image.name }} + {{ image.path }} + Image: {{ id }} file_download diff --git a/src/vue-poc/features/images/images.vue b/src/vue-poc/features/images/images.vue index 482fa3a..1beac59 100644 --- a/src/vue-poc/features/images/images.vue +++ b/src/vue-poc/features/images/images.vue @@ -17,7 +17,7 @@ {{ total }} - + Page:{{ query.page+1 }} arrow_back @@ -26,8 +26,8 @@ arrow_forward - - + + + + + + diff --git a/src/vue-poc/static/app-gen.js b/src/vue-poc/static/app-gen.js index af264af..722dc79 100644 --- a/src/vue-poc/static/app-gen.js +++ b/src/vue-poc/static/app-gen.js @@ -1,4 +1,4 @@ -// generated 2017-08-17T16:08:17.382+01:00 +// generated 2017-08-17T23:58:25.476+01:00 Vue.component('qd-link',{template:` {{href}}link `, @@ -903,9 +903,11 @@ v0.0.2 arrow_back - Image: {{ id }} + {{ image.name }} + {{ image.path }} + Image: {{ id }} file_download @@ -957,7 +959,7 @@ v0.0.2 {{ total }} - + Page:{{ query.page+1 }} arrow_back @@ -966,8 +968,8 @@ v0.0.2 arrow_forward - - + + @@ -1082,8 +1084,8 @@ v0.0.2 this.busy=false this.total=r.data.total this.images=r.data.items - var t0 = performance.now()-t0; - console.log("Time: ",t0) + var t1 = performance.now(); + console.log("Time: ",t1 - t0) }) }, clear(){ @@ -1144,6 +1146,29 @@ v0.0.2 console.log("images mount") } + } + + ); + const Report=Vue.extend({template:` + + + + arrow_back + + todo + + + + + + +body + + + + `, + + } ); @@ -2219,14 +2244,16 @@ const router = new VueRouter({ routes: [ { path: '/', component: Home,meta:{title:"Home"} }, { path: '/session', component: Session ,meta:{title:"Session"}}, - { path: '/images', component: Images,meta:{title:"Images"} }, - { path: '/images/:id', name:"image",component: Image, props: true,meta:{title:"Image details"}}, - { path: '/select', component: Select,meta:{title:"Select"} }, - { path: '/search', component: Search,meta:{title:"Search"} }, + { path: '/images/item', component: Images, meta:{title:"Images"} }, + { path: '/images/report', name:"image-reports",component: Report, props: true, meta:{title: "Image report"}}, + { path: '/images/item/:id', name:"image",component: Image, props: true, meta:{title: "Image details"}}, + { path: '/images/thumbnail', component: Thumbnail, meta:{title:"Thumbnail generator"} }, + { path: '/select', component: Select, meta:{title:"Select"} }, + { path: '/search', component: Search, meta:{title:"Search"} }, { path: '/tabs', component: Tabs,meta:{title:"tab test",requiresAuth: true} }, { path: '/login', component: Login,meta:{title:"login"} }, { path: '/edit', component: Edit,meta:{title:"Ace editor"} }, - { path: '/thumbnail', component: Thumbnail,meta:{title:"Thumbnail generator"} }, + { path: '/files', component: Files,meta:{title:"File system"},props:{protocol:"webfile"} }, { path: '/database', component: Files,meta:{title:"Databases"},props:{protocol:"basexdb"} }, { path: '/ping', component: Ping,meta:{title:"Ping"} }, @@ -2309,8 +2336,9 @@ const app = new Vue({ text: 'Images' , model: false, children: [ - {href: '/images',text: 'Collection',icon: 'photo_camera'}, - {href: '/thumbnail',text: 'Thumbnail',icon: 'touch_app'} + {href: '/images/item',text: 'Collection',icon: 'photo_camera'}, + {href: '/thumbnail',text: 'Thumbnail',icon: 'touch_app'}, + {href: '/images/report',text: 'Image reports',icon: 'report'} ]}, { icon: 'more_horiz',