1014 #30 再來是作出Domain列表？嗎？不對，controller的部分還沒完成

pulipulichen · Oct 15, 2019 · 7e78ab6 · 7e78ab6
1 parent 8ea3f93
commit 7e78ab6
Show file tree

Hide file tree

Showing 19 changed files with 1,460 additions and 71 deletions.
diff --git a/public/spa/admin-components/domain.js b/public/spa/admin-components/domain.js
diff --git a/public/spa/admin-components/domain.js.map b/public/spa/admin-components/domain.js.map
diff --git a/public/spa/admin-components/material.js b/public/spa/admin-components/material.js
diff --git a/public/spa/admin-components/material.js.map b/public/spa/admin-components/material.js.map
diff --git a/public/spa/admin.js b/public/spa/admin.js
diff --git a/public/spa/admin.js.map b/public/spa/admin.js.map
diff --git a/public/spa/client.js b/public/spa/client.js
@@ -441,14 +441,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _helpers_AxiosHelper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./helpers/AxiosHelper */ "./webpack-app/helpers/AxiosHelper.js");
 /* harmony import */ var _helpers_DayJSHelper__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./helpers/DayJSHelper */ "./webpack-app/helpers/DayJSHelper.js");
 /* harmony import */ var _helpers_StringHelper__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./helpers/StringHelper */ "./webpack-app/helpers/StringHelper.js");
-/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! jquery */ "./node_modules/jquery/dist/jquery.js");
-/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _client_client_tpl__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./client/client.tpl */ "./webpack-app/client/client.tpl");
-/* harmony import */ var _client_client_tpl__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_client_client_tpl__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./config.js */ "./webpack-app/config.js");
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_config_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var _client_routes__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./client/routes */ "./webpack-app/client/routes.js");
-/* harmony import */ var _client_components__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./client/components */ "./webpack-app/client/components.js");
+/* harmony import */ var _helpers_ValidateHelper__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./helpers/ValidateHelper */ "./webpack-app/helpers/ValidateHelper.js");
+/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! jquery */ "./node_modules/jquery/dist/jquery.js");
+/* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _client_client_tpl__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./client/client.tpl */ "./webpack-app/client/client.tpl");
+/* harmony import */ var _client_client_tpl__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_client_client_tpl__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./config.js */ "./webpack-app/config.js");
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_config_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _client_routes__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./client/routes */ "./webpack-app/client/routes.js");
+/* harmony import */ var _client_components__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./client/components */ "./webpack-app/client/components.js");
 /* global __webpack_public_path__ */
 
 
@@ -465,6 +466,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 // ----------------------
 
 
@@ -482,9 +484,9 @@ __webpack_require__.r(__webpack_exports__);
 
 let baseURL = __webpack_require__.p
 baseURL = baseURL.split('/').slice(0, 3).join('/')
-_config_js__WEBPACK_IMPORTED_MODULE_9___default.a.baseURL = baseURL
+_config_js__WEBPACK_IMPORTED_MODULE_10___default.a.baseURL = baseURL
 
-let baseScript = jquery__WEBPACK_IMPORTED_MODULE_7___default()(document.currentScript)
+let baseScript = jquery__WEBPACK_IMPORTED_MODULE_8___default()(document.currentScript)
 if (baseScript.length === 1) {
   baseScript.before(`<div id="app"></div>`)
 }
@@ -493,7 +495,7 @@ if (baseScript.length === 1) {
 
 let VueController = {
   data: {
-    config: _config_js__WEBPACK_IMPORTED_MODULE_9___default.a,
+    config: _config_js__WEBPACK_IMPORTED_MODULE_10___default.a,
     status: {
       username: '',
     },
@@ -505,7 +507,8 @@ let VueController = {
     lib: {
       AxiosHelper: _helpers_AxiosHelper__WEBPACK_IMPORTED_MODULE_4__["default"].setBaseURL(baseURL),
       DayJSHelper: _helpers_DayJSHelper__WEBPACK_IMPORTED_MODULE_5__["default"],
-      StringHelper: _helpers_StringHelper__WEBPACK_IMPORTED_MODULE_6__["default"]
+      StringHelper: _helpers_StringHelper__WEBPACK_IMPORTED_MODULE_6__["default"],
+      ValidateHelper: _helpers_ValidateHelper__WEBPACK_IMPORTED_MODULE_7__["default"]
     },
     view: 'Loading',
     error: '',
@@ -569,9 +572,9 @@ let VueController = {
   el: '#app',
   i18n: _plugins_i18n__WEBPACK_IMPORTED_MODULE_3__["default"],
 
-  template: _client_client_tpl__WEBPACK_IMPORTED_MODULE_8___default.a,
-  router: _client_routes__WEBPACK_IMPORTED_MODULE_10__["default"],
-  components: _client_components__WEBPACK_IMPORTED_MODULE_11__["default"],
+  template: _client_client_tpl__WEBPACK_IMPORTED_MODULE_9___default.a,
+  router: _client_routes__WEBPACK_IMPORTED_MODULE_11__["default"],
+  components: _client_components__WEBPACK_IMPORTED_MODULE_12__["default"],
   errorCaptured(err, vm, info) {
     // https://medium.com/js-dojo/error-exception-handling-in-vue-js-application-6c26eeb6b3e4
     this.error = err.stack
@@ -584,10 +587,10 @@ let VueController = {
 }
 
 if (typeof(baseURL) === 'string') {
-  jquery__WEBPACK_IMPORTED_MODULE_7___default()(() => {
+  jquery__WEBPACK_IMPORTED_MODULE_8___default()(() => {
     new vue__WEBPACK_IMPORTED_MODULE_0__["default"](VueController)
 
-    jquery__WEBPACK_IMPORTED_MODULE_7___default()('body > #TestMessage').remove()
+    jquery__WEBPACK_IMPORTED_MODULE_8___default()('body > #TestMessage').remove()
   })
 }
 

diff --git a/public/spa/client.js.map b/public/spa/client.js.map
diff --git a/public/spa/commons.js b/public/spa/commons.js
diff --git a/public/spa/commons.js.map b/public/spa/commons.js.map
diff --git a/webpack-app/admin.js b/webpack-app/admin.js
@@ -18,6 +18,7 @@ import components from './admin/components'
 import AxiosHelper from './helpers/AxiosHelper'
 import DayJSHelper from './helpers/DayJSHelper'
 import StringHelper from './helpers/StringHelper'
+import ValidateHelper from './helpers/ValidateHelper'
 
 // --------------------
 // Components
@@ -61,7 +62,8 @@ let VueController = {
     lib: {
       AxiosHelper: AxiosHelper.setBaseURL(baseURL),
       DayJSHelper: DayJSHelper,
-      StringHelper: StringHelper
+      StringHelper: StringHelper,
+      ValidateHelper: ValidateHelper
     },
     //view: 'Loading',
     view: null,

diff --git a/webpack-app/admin/components/DomainAdd/DomainAdd.html b/webpack-app/admin/components/DomainAdd/DomainAdd.html
@@ -17,10 +17,10 @@ <h2>{{ $t('Add Domain') }}</h2>
     </div>
   </div>
 
-  <div class="unstackable three fields">
+  <div class="three fields">
     <div class="field">
       <label for="addInputDomain">
-        {{ $t('Domain') }}
+        {{ $t('Domain (include http:// or https:// or port)') }}
       </label>
       <input type="url"
              id="addInputDomain"
@@ -44,15 +44,15 @@ <h2>{{ $t('Add Domain') }}</h2>
       </label>
       <button type="button"
               class="ui fluid button"
-              v-bind:class="{disabled: !enableUpload}"
+              v-bind:class="{disabled: !enableAdd}"
               v-on:click="addSubmit">
         {{ $t('Submit') }}
       </button>
     </div>
 
 
   </div>
-  <div class="unstackable two fields">
+  <div class="two fields">
     <div class="field">
       <label for="addInputAdmins">
         {{ $t('Admins') }}

diff --git a/webpack-app/admin/components/DomainAdd/DomainAdd.js b/webpack-app/admin/components/DomainAdd/DomainAdd.js
@@ -1,23 +1,22 @@
-let DomainsAdd = {
+let DomainAdd = {
   props: ['lib', 'status', 'config', 'progress', 'error', 'view'],
   data() {    
     this.$i18n.locale = this.config.locale
     return {
-      createInput: {
+      addInput: {
         domain: '',
         title: '',
         admins: '',
         config: ''
-      },
-      pageConfig: {
-        page: 1,
-        maxPage: 0
       }
     }
   },
   components: {
   },
   computed: {
+    enableAdd: function () {
+      return this.lib.ValidateHelper.isURL(this.addInput.domain)
+    }
   },
   watch: {
   },
@@ -39,4 +38,4 @@ let DomainsAdd = {
   } // methods
 }
 
-export default DomainsAdd
+export default DomainAdd
diff --git a/webpack-app/admin/components/DomainList/DomainList.js b/webpack-app/admin/components/DomainList/DomainList.js
@@ -1,4 +1,4 @@
-let DomainsList = {
+let DomainList = {
   props: ['lib', 'status', 'config', 'progress', 'error', 'view'],
   data() {    
     this.$i18n.locale = this.config.locale
@@ -39,4 +39,4 @@ let DomainsList = {
   } // methods
 }
 
-export default DomainsList
+export default DomainList
diff --git a/webpack-app/admin/components/Material/Material.js b/webpack-app/admin/components/Material/Material.js
@@ -1,4 +1,4 @@
-let Materials = {
+let Material = {
   props: ['lib', 'status', 'config', 'progress', 'error', 'view'],
   data() {    
     this.$i18n.locale = this.config.locale
@@ -192,4 +192,4 @@ let Materials = {
   } // methods
 }
 
-export default Materials
+export default Material
diff --git a/webpack-app/admin/components/Navigation/Items/Items.html b/webpack-app/admin/components/Navigation/Items/Items.html
@@ -15,14 +15,14 @@
 
     <a class="item"
        v-bind:class="{active: $route.path.startsWith('/domains')}"
-       v-on:click="$router.push('/domains')">
-     {{ $t('Domains') }}
+       href="#/domain/list">
+     {{ $t('Domain') }}
     </a>
 
     <a class="item"
        v-bind:class="{active: $route.path.startsWith('/materials')}"
-       v-on:click="$router.push('/materials')">
-     {{ $t('Materials') }}
+       href="#/material">
+     {{ $t('Material') }}
     </a>
 
     <a class="item"