diff --git a/src/config/middleware.js b/src/config/middleware.js index b7fa71c..0d0ed80 100644 --- a/src/config/middleware.js +++ b/src/config/middleware.js @@ -13,8 +13,8 @@ module.exports = [ handle: 'resource', enable: true, options: { - root: path.join(think.ROOT_PATH, 'www'), - publicPath: /^\/(scripts|css|views|images|favicon\.ico)/ + root: path.join(think.ROOT_PATH, 'view'), + publicPath: /^\/(scripts|css|views|images|admin\.jpg|favicon\.ico)/ } }, { diff --git a/src/controller/index.js b/src/controller/index.js index 530193a..58f1d8e 100644 --- a/src/controller/index.js +++ b/src/controller/index.js @@ -1,7 +1,7 @@ -const Base = require('./base.js'); - -module.exports = class extends Base { - indexAction() { - return this.display(); - } -}; +const Base = require('./base.js'); + +module.exports = class extends Base { + async indexAction() { + await this.display("index.html"); + } +}; diff --git a/www/404.html b/view/404.html similarity index 100% rename from www/404.html rename to view/404.html diff --git a/www/admin.jpg b/view/admin.jpg similarity index 100% rename from www/admin.jpg rename to view/admin.jpg diff --git a/www/css/externe/calendar.min.css b/view/css/externe/calendar.min.css similarity index 100% rename from www/css/externe/calendar.min.css rename to view/css/externe/calendar.min.css diff --git a/www/css/externe/ngDialog-theme-default.css b/view/css/externe/ngDialog-theme-default.css similarity index 100% rename from www/css/externe/ngDialog-theme-default.css rename to view/css/externe/ngDialog-theme-default.css diff --git a/www/css/externe/ngDialog-theme-plain.css b/view/css/externe/ngDialog-theme-plain.css similarity index 100% rename from www/css/externe/ngDialog-theme-plain.css rename to view/css/externe/ngDialog-theme-plain.css diff --git a/www/css/externe/ngDialog.css b/view/css/externe/ngDialog.css similarity index 100% rename from www/css/externe/ngDialog.css rename to view/css/externe/ngDialog.css diff --git a/www/css/externe/semantic.min.css b/view/css/externe/semantic.min.css similarity index 100% rename from www/css/externe/semantic.min.css rename to view/css/externe/semantic.min.css diff --git a/www/css/externe/themes/default/assets/fonts/brand-icons.eot b/view/css/externe/themes/default/assets/fonts/brand-icons.eot similarity index 100% rename from www/css/externe/themes/default/assets/fonts/brand-icons.eot rename to view/css/externe/themes/default/assets/fonts/brand-icons.eot diff --git a/www/css/externe/themes/default/assets/fonts/brand-icons.svg b/view/css/externe/themes/default/assets/fonts/brand-icons.svg similarity index 100% rename from www/css/externe/themes/default/assets/fonts/brand-icons.svg rename to view/css/externe/themes/default/assets/fonts/brand-icons.svg diff --git a/www/css/externe/themes/default/assets/fonts/brand-icons.ttf b/view/css/externe/themes/default/assets/fonts/brand-icons.ttf similarity index 100% rename from www/css/externe/themes/default/assets/fonts/brand-icons.ttf rename to view/css/externe/themes/default/assets/fonts/brand-icons.ttf diff --git a/www/css/externe/themes/default/assets/fonts/brand-icons.woff b/view/css/externe/themes/default/assets/fonts/brand-icons.woff similarity index 100% rename from www/css/externe/themes/default/assets/fonts/brand-icons.woff rename to view/css/externe/themes/default/assets/fonts/brand-icons.woff diff --git a/www/css/externe/themes/default/assets/fonts/brand-icons.woff2 b/view/css/externe/themes/default/assets/fonts/brand-icons.woff2 similarity index 100% rename from www/css/externe/themes/default/assets/fonts/brand-icons.woff2 rename to view/css/externe/themes/default/assets/fonts/brand-icons.woff2 diff --git a/www/css/externe/themes/default/assets/fonts/icons.eot b/view/css/externe/themes/default/assets/fonts/icons.eot similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.eot rename to view/css/externe/themes/default/assets/fonts/icons.eot diff --git a/www/css/externe/themes/default/assets/fonts/icons.otf b/view/css/externe/themes/default/assets/fonts/icons.otf similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.otf rename to view/css/externe/themes/default/assets/fonts/icons.otf diff --git a/www/css/externe/themes/default/assets/fonts/icons.svg b/view/css/externe/themes/default/assets/fonts/icons.svg similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.svg rename to view/css/externe/themes/default/assets/fonts/icons.svg diff --git a/www/css/externe/themes/default/assets/fonts/icons.ttf b/view/css/externe/themes/default/assets/fonts/icons.ttf similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.ttf rename to view/css/externe/themes/default/assets/fonts/icons.ttf diff --git a/www/css/externe/themes/default/assets/fonts/icons.woff b/view/css/externe/themes/default/assets/fonts/icons.woff similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.woff rename to view/css/externe/themes/default/assets/fonts/icons.woff diff --git a/www/css/externe/themes/default/assets/fonts/icons.woff2 b/view/css/externe/themes/default/assets/fonts/icons.woff2 similarity index 100% rename from www/css/externe/themes/default/assets/fonts/icons.woff2 rename to view/css/externe/themes/default/assets/fonts/icons.woff2 diff --git a/www/css/externe/themes/default/assets/fonts/outline-icons.eot b/view/css/externe/themes/default/assets/fonts/outline-icons.eot similarity index 100% rename from www/css/externe/themes/default/assets/fonts/outline-icons.eot rename to view/css/externe/themes/default/assets/fonts/outline-icons.eot diff --git a/www/css/externe/themes/default/assets/fonts/outline-icons.svg b/view/css/externe/themes/default/assets/fonts/outline-icons.svg similarity index 100% rename from www/css/externe/themes/default/assets/fonts/outline-icons.svg rename to view/css/externe/themes/default/assets/fonts/outline-icons.svg diff --git a/www/css/externe/themes/default/assets/fonts/outline-icons.ttf b/view/css/externe/themes/default/assets/fonts/outline-icons.ttf similarity index 100% rename from www/css/externe/themes/default/assets/fonts/outline-icons.ttf rename to view/css/externe/themes/default/assets/fonts/outline-icons.ttf diff --git a/www/css/externe/themes/default/assets/fonts/outline-icons.woff b/view/css/externe/themes/default/assets/fonts/outline-icons.woff similarity index 100% rename from www/css/externe/themes/default/assets/fonts/outline-icons.woff rename to view/css/externe/themes/default/assets/fonts/outline-icons.woff diff --git a/www/css/externe/themes/default/assets/fonts/outline-icons.woff2 b/view/css/externe/themes/default/assets/fonts/outline-icons.woff2 similarity index 100% rename from www/css/externe/themes/default/assets/fonts/outline-icons.woff2 rename to view/css/externe/themes/default/assets/fonts/outline-icons.woff2 diff --git a/www/css/externe/themes/default/assets/images/flags.png b/view/css/externe/themes/default/assets/images/flags.png similarity index 100% rename from www/css/externe/themes/default/assets/images/flags.png rename to view/css/externe/themes/default/assets/images/flags.png diff --git a/www/css/externe/toastr.min.css b/view/css/externe/toastr.min.css similarity index 100% rename from www/css/externe/toastr.min.css rename to view/css/externe/toastr.min.css diff --git a/www/css/externe/uploadfile.css b/view/css/externe/uploadfile.css similarity index 100% rename from www/css/externe/uploadfile.css rename to view/css/externe/uploadfile.css diff --git a/www/css/style.css b/view/css/style.css similarity index 100% rename from www/css/style.css rename to view/css/style.css diff --git a/www/favicon.ico b/view/favicon.ico similarity index 100% rename from www/favicon.ico rename to view/favicon.ico diff --git a/www/images/404.png b/view/images/404.png similarity index 100% rename from www/images/404.png rename to view/images/404.png diff --git a/www/images/add-note.png b/view/images/add-note.png similarity index 100% rename from www/images/add-note.png rename to view/images/add-note.png diff --git a/www/images/add-tag.png b/view/images/add-tag.png similarity index 100% rename from www/images/add-tag.png rename to view/images/add-tag.png diff --git a/www/images/add.png b/view/images/add.png similarity index 100% rename from www/images/add.png rename to view/images/add.png diff --git a/www/images/admin.jpg b/view/images/admin.jpg similarity index 100% rename from www/images/admin.jpg rename to view/images/admin.jpg diff --git a/www/images/back-tag.png b/view/images/back-tag.png similarity index 100% rename from www/images/back-tag.png rename to view/images/back-tag.png diff --git a/www/images/back.png b/view/images/back.png similarity index 100% rename from www/images/back.png rename to view/images/back.png diff --git a/www/images/bg.png b/view/images/bg.png similarity index 100% rename from www/images/bg.png rename to view/images/bg.png diff --git a/www/images/cocktail.png b/view/images/cocktail.png similarity index 100% rename from www/images/cocktail.png rename to view/images/cocktail.png diff --git a/www/images/copy-hover.png b/view/images/copy-hover.png similarity index 100% rename from www/images/copy-hover.png rename to view/images/copy-hover.png diff --git a/www/images/copy.ico b/view/images/copy.ico similarity index 100% rename from www/images/copy.ico rename to view/images/copy.ico diff --git a/www/images/copy.png b/view/images/copy.png similarity index 100% rename from www/images/copy.png rename to view/images/copy.png diff --git a/www/images/default.ico b/view/images/default.ico similarity index 100% rename from www/images/default.ico rename to view/images/default.ico diff --git a/www/images/default.jpg b/view/images/default.jpg similarity index 100% rename from www/images/default.jpg rename to view/images/default.jpg diff --git a/www/images/delete-hover.png b/view/images/delete-hover.png similarity index 100% rename from www/images/delete-hover.png rename to view/images/delete-hover.png diff --git a/www/images/delete.png b/view/images/delete.png similarity index 100% rename from www/images/delete.png rename to view/images/delete.png diff --git a/www/images/detail-hover.png b/view/images/detail-hover.png similarity index 100% rename from www/images/detail-hover.png rename to view/images/detail-hover.png diff --git a/www/images/detail.ico b/view/images/detail.ico similarity index 100% rename from www/images/detail.ico rename to view/images/detail.ico diff --git a/www/images/detail.png b/view/images/detail.png similarity index 100% rename from www/images/detail.png rename to view/images/detail.png diff --git a/www/images/developing.png b/view/images/developing.png similarity index 100% rename from www/images/developing.png rename to view/images/developing.png diff --git a/www/images/edit-bookmark-hover.png b/view/images/edit-bookmark-hover.png similarity index 100% rename from www/images/edit-bookmark-hover.png rename to view/images/edit-bookmark-hover.png diff --git a/www/images/edit-bookmark.png b/view/images/edit-bookmark.png similarity index 100% rename from www/images/edit-bookmark.png rename to view/images/edit-bookmark.png diff --git a/www/images/edit.png b/view/images/edit.png similarity index 100% rename from www/images/edit.png rename to view/images/edit.png diff --git a/www/images/favicon.ico b/view/images/favicon.ico similarity index 100% rename from www/images/favicon.ico rename to view/images/favicon.ico diff --git a/www/images/favorite-hover.png b/view/images/favorite-hover.png similarity index 100% rename from www/images/favorite-hover.png rename to view/images/favorite-hover.png diff --git a/www/images/favorite.png b/view/images/favorite.png similarity index 100% rename from www/images/favorite.png rename to view/images/favorite.png diff --git a/www/images/hide.png b/view/images/hide.png similarity index 100% rename from www/images/hide.png rename to view/images/hide.png diff --git a/www/images/loading.gif b/view/images/loading.gif similarity index 100% rename from www/images/loading.gif rename to view/images/loading.gif diff --git a/www/images/logo.png b/view/images/logo.png similarity index 100% rename from www/images/logo.png rename to view/images/logo.png diff --git a/www/images/logout.png b/view/images/logout.png similarity index 100% rename from www/images/logout.png rename to view/images/logout.png diff --git a/www/images/more.png b/view/images/more.png similarity index 100% rename from www/images/more.png rename to view/images/more.png diff --git a/www/images/random-hover.png b/view/images/random-hover.png similarity index 100% rename from www/images/random-hover.png rename to view/images/random-hover.png diff --git a/www/images/random.png b/view/images/random.png similarity index 100% rename from www/images/random.png rename to view/images/random.png diff --git a/www/images/screenshot.gif b/view/images/screenshot.gif similarity index 100% rename from www/images/screenshot.gif rename to view/images/screenshot.gif diff --git a/www/images/screenshot.png b/view/images/screenshot.png similarity index 100% rename from www/images/screenshot.png rename to view/images/screenshot.png diff --git a/www/images/store-bookmark-hover.png b/view/images/store-bookmark-hover.png similarity index 100% rename from www/images/store-bookmark-hover.png rename to view/images/store-bookmark-hover.png diff --git a/www/images/store-bookmark.png b/view/images/store-bookmark.png similarity index 100% rename from www/images/store-bookmark.png rename to view/images/store-bookmark.png diff --git a/www/images/weixin.ico b/view/images/weixin.ico similarity index 100% rename from www/images/weixin.ico rename to view/images/weixin.ico diff --git a/www/images/wx.jpg b/view/images/wx.jpg similarity index 100% rename from www/images/wx.jpg rename to view/images/wx.jpg diff --git a/www/images/wx.png b/view/images/wx.png similarity index 100% rename from www/images/wx.png rename to view/images/wx.png diff --git a/www/images/zfb.jpg b/view/images/zfb.jpg similarity index 100% rename from www/images/zfb.jpg rename to view/images/zfb.jpg diff --git a/www/images/zfb.png b/view/images/zfb.png similarity index 100% rename from www/images/zfb.png rename to view/images/zfb.png diff --git a/view/index_index.html b/view/index.html similarity index 100% rename from view/index_index.html rename to view/index.html diff --git a/www/scripts/app-angular.js b/view/scripts/app-angular.js similarity index 100% rename from www/scripts/app-angular.js rename to view/scripts/app-angular.js diff --git a/www/scripts/controllers/advice-controller.js b/view/scripts/controllers/advice-controller.js similarity index 100% rename from www/scripts/controllers/advice-controller.js rename to view/scripts/controllers/advice-controller.js diff --git a/www/scripts/controllers/bookmark-info-controller.js b/view/scripts/controllers/bookmark-info-controller.js similarity index 100% rename from www/scripts/controllers/bookmark-info-controller.js rename to view/scripts/controllers/bookmark-info-controller.js diff --git a/www/scripts/controllers/bookmarks-controller.js b/view/scripts/controllers/bookmarks-controller.js similarity index 100% rename from www/scripts/controllers/bookmarks-controller.js rename to view/scripts/controllers/bookmarks-controller.js diff --git a/www/scripts/controllers/edit-controller.js b/view/scripts/controllers/edit-controller.js similarity index 100% rename from www/scripts/controllers/edit-controller.js rename to view/scripts/controllers/edit-controller.js diff --git a/www/scripts/controllers/home-controller.js b/view/scripts/controllers/home-controller.js similarity index 100% rename from www/scripts/controllers/home-controller.js rename to view/scripts/controllers/home-controller.js diff --git a/www/scripts/controllers/hot-controller.js b/view/scripts/controllers/hot-controller.js similarity index 100% rename from www/scripts/controllers/hot-controller.js rename to view/scripts/controllers/hot-controller.js diff --git a/www/scripts/controllers/login-controller.js b/view/scripts/controllers/login-controller.js similarity index 100% rename from www/scripts/controllers/login-controller.js rename to view/scripts/controllers/login-controller.js diff --git a/www/scripts/controllers/menus-controller.js b/view/scripts/controllers/menus-controller.js similarity index 100% rename from www/scripts/controllers/menus-controller.js rename to view/scripts/controllers/menus-controller.js diff --git a/www/scripts/controllers/note-controller.js b/view/scripts/controllers/note-controller.js similarity index 100% rename from www/scripts/controllers/note-controller.js rename to view/scripts/controllers/note-controller.js diff --git a/www/scripts/controllers/search-controller.js b/view/scripts/controllers/search-controller.js similarity index 100% rename from www/scripts/controllers/search-controller.js rename to view/scripts/controllers/search-controller.js diff --git a/www/scripts/controllers/settings-controller.js b/view/scripts/controllers/settings-controller.js similarity index 100% rename from www/scripts/controllers/settings-controller.js rename to view/scripts/controllers/settings-controller.js diff --git a/www/scripts/controllers/tags-controller.js b/view/scripts/controllers/tags-controller.js similarity index 100% rename from www/scripts/controllers/tags-controller.js rename to view/scripts/controllers/tags-controller.js diff --git a/www/scripts/directives/js-init-directive.js b/view/scripts/directives/js-init-directive.js similarity index 100% rename from www/scripts/directives/js-init-directive.js rename to view/scripts/directives/js-init-directive.js diff --git a/www/scripts/directives/module-directive.js b/view/scripts/directives/module-directive.js similarity index 100% rename from www/scripts/directives/module-directive.js rename to view/scripts/directives/module-directive.js diff --git a/www/scripts/externe/angular-cookies.min.js b/view/scripts/externe/angular-cookies.min.js similarity index 100% rename from www/scripts/externe/angular-cookies.min.js rename to view/scripts/externe/angular-cookies.min.js diff --git a/www/scripts/externe/angular-sortable-view.min.js b/view/scripts/externe/angular-sortable-view.min.js similarity index 100% rename from www/scripts/externe/angular-sortable-view.min.js rename to view/scripts/externe/angular-sortable-view.min.js diff --git a/www/scripts/externe/angular-ui-router.min.js b/view/scripts/externe/angular-ui-router.min.js similarity index 100% rename from www/scripts/externe/angular-ui-router.min.js rename to view/scripts/externe/angular-ui-router.min.js diff --git a/www/scripts/externe/angular.min.js b/view/scripts/externe/angular.min.js similarity index 100% rename from www/scripts/externe/angular.min.js rename to view/scripts/externe/angular.min.js diff --git a/www/scripts/externe/axios.min.js b/view/scripts/externe/axios.min.js similarity index 100% rename from www/scripts/externe/axios.min.js rename to view/scripts/externe/axios.min.js diff --git a/www/scripts/externe/calendar.min.js b/view/scripts/externe/calendar.min.js similarity index 100% rename from www/scripts/externe/calendar.min.js rename to view/scripts/externe/calendar.min.js diff --git a/www/scripts/externe/clipboard.min.js b/view/scripts/externe/clipboard.min.js similarity index 100% rename from www/scripts/externe/clipboard.min.js rename to view/scripts/externe/clipboard.min.js diff --git a/www/scripts/externe/dayjs.min.js b/view/scripts/externe/dayjs.min.js similarity index 100% rename from www/scripts/externe/dayjs.min.js rename to view/scripts/externe/dayjs.min.js diff --git a/www/scripts/externe/identicon.js b/view/scripts/externe/identicon.js similarity index 100% rename from www/scripts/externe/identicon.js rename to view/scripts/externe/identicon.js diff --git a/www/scripts/externe/jquery-3.1.1.min.js b/view/scripts/externe/jquery-3.1.1.min.js similarity index 100% rename from www/scripts/externe/jquery-3.1.1.min.js rename to view/scripts/externe/jquery-3.1.1.min.js diff --git a/www/scripts/externe/jquery.form.js b/view/scripts/externe/jquery.form.js similarity index 100% rename from www/scripts/externe/jquery.form.js rename to view/scripts/externe/jquery.form.js diff --git a/www/scripts/externe/jquery.uploadfile.min.js b/view/scripts/externe/jquery.uploadfile.min.js similarity index 100% rename from www/scripts/externe/jquery.uploadfile.min.js rename to view/scripts/externe/jquery.uploadfile.min.js diff --git a/www/scripts/externe/md5.js b/view/scripts/externe/md5.js similarity index 100% rename from www/scripts/externe/md5.js rename to view/scripts/externe/md5.js diff --git a/www/scripts/externe/ng-infinite-scroll.min.js b/view/scripts/externe/ng-infinite-scroll.min.js similarity index 100% rename from www/scripts/externe/ng-infinite-scroll.min.js rename to view/scripts/externe/ng-infinite-scroll.min.js diff --git a/www/scripts/externe/ngDialog.min.js b/view/scripts/externe/ngDialog.min.js similarity index 100% rename from www/scripts/externe/ngDialog.min.js rename to view/scripts/externe/ngDialog.min.js diff --git a/www/scripts/externe/pnglib.js b/view/scripts/externe/pnglib.js similarity index 100% rename from www/scripts/externe/pnglib.js rename to view/scripts/externe/pnglib.js diff --git a/www/scripts/externe/semantic.min.js b/view/scripts/externe/semantic.min.js similarity index 100% rename from www/scripts/externe/semantic.min.js rename to view/scripts/externe/semantic.min.js diff --git a/www/scripts/externe/timeago.min.js b/view/scripts/externe/timeago.min.js similarity index 100% rename from www/scripts/externe/timeago.min.js rename to view/scripts/externe/timeago.min.js diff --git a/www/scripts/externe/toastr.min.js b/view/scripts/externe/toastr.min.js similarity index 100% rename from www/scripts/externe/toastr.min.js rename to view/scripts/externe/toastr.min.js diff --git a/www/scripts/services/data-service.js b/view/scripts/services/data-service.js similarity index 100% rename from www/scripts/services/data-service.js rename to view/scripts/services/data-service.js diff --git a/www/scripts/services/pub-sub-service.js b/view/scripts/services/pub-sub-service.js similarity index 100% rename from www/scripts/services/pub-sub-service.js rename to view/scripts/services/pub-sub-service.js diff --git a/www/views/advice.html b/view/views/advice.html similarity index 100% rename from www/views/advice.html rename to view/views/advice.html diff --git a/www/views/bookmark-info.html b/view/views/bookmark-info.html similarity index 100% rename from www/views/bookmark-info.html rename to view/views/bookmark-info.html diff --git a/www/views/bookmarks.html b/view/views/bookmarks.html similarity index 100% rename from www/views/bookmarks.html rename to view/views/bookmarks.html diff --git a/www/views/dialog-add-tag.html b/view/views/dialog-add-tag.html similarity index 100% rename from www/views/dialog-add-tag.html rename to view/views/dialog-add-tag.html diff --git a/www/views/dialog-del-bookmark.html b/view/views/dialog-del-bookmark.html similarity index 100% rename from www/views/dialog-del-bookmark.html rename to view/views/dialog-del-bookmark.html diff --git a/www/views/dialog-del-note.html b/view/views/dialog-del-note.html similarity index 100% rename from www/views/dialog-del-note.html rename to view/views/dialog-del-note.html diff --git a/www/views/dialog-del-tag.html b/view/views/dialog-del-tag.html similarity index 100% rename from www/views/dialog-del-tag.html rename to view/views/dialog-del-tag.html diff --git a/www/views/edit.html b/view/views/edit.html similarity index 100% rename from www/views/edit.html rename to view/views/edit.html diff --git a/www/views/home.html b/view/views/home.html similarity index 100% rename from www/views/home.html rename to view/views/home.html diff --git a/www/views/hot.html b/view/views/hot.html similarity index 100% rename from www/views/hot.html rename to view/views/hot.html diff --git a/www/views/login.html b/view/views/login.html similarity index 100% rename from www/views/login.html rename to view/views/login.html diff --git a/www/views/menus.html b/view/views/menus.html similarity index 100% rename from www/views/menus.html rename to view/views/menus.html diff --git a/www/views/note.html b/view/views/note.html similarity index 100% rename from www/views/note.html rename to view/views/note.html diff --git a/www/views/pagination.html b/view/views/pagination.html similarity index 100% rename from www/views/pagination.html rename to view/views/pagination.html diff --git a/www/views/search.html b/view/views/search.html similarity index 100% rename from www/views/search.html rename to view/views/search.html diff --git a/www/views/settings.html b/view/views/settings.html similarity index 100% rename from www/views/settings.html rename to view/views/settings.html diff --git a/www/views/tags.html b/view/views/tags.html similarity index 100% rename from www/views/tags.html rename to view/views/tags.html