refactor(mysec): yeoman layout

group by filetype first
duncdrum · Feb 10, 2021 · 8a53b6e · 8a53b6e
1 parent d3fbbcd
commit 8a53b6e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 5 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -601,7 +601,7 @@ module.exports = class extends Generator {
       switch (this.props.apptype[0]) {
         case 'exist-design':
           this.fs.copyTpl(
-            this.templatePath('exist-design/page.html'),
+            this.templatePath('pages/exist-design/page.html'),
             this.destinationPath('templates/page.html'), {
               title: this.props.title,
               mysec: this.props.mysec
@@ -617,7 +617,7 @@ module.exports = class extends Generator {
           break
         case 'plain':
           this.fs.copyTpl(
-            this.templatePath('exist-plain/page.html'),
+            this.templatePath('pages/plain/page.html'),
             this.destinationPath('templates/page.html'), {
               title: this.props.title,
               mysec: this.props.mysec
@@ -688,8 +688,16 @@ module.exports = class extends Generator {
     // Secure area (mysec)
     if (this.props.mysec) {
       this.fs.copy(
-        this.templatePath('mysec/**'),
-        this.destinationPath('')
+        this.templatePath('pages/mysec/admin/*.html'),
+        this.destinationPath('admin/')
+      )
+      this.fs.copy(
+        this.templatePath('xq/admin/**'),
+        this.destinationPath('admin/')
+      )
+      this.fs.copy(
+        this.templatePath('pages/mysec/templates/*.html'),
+        this.destinationPath('templates/')
       )
       this.fs.copyTpl(
         this.templatePath('tests/integration/login-*_spec.js'),

diff --git a/...tors/app/templates/exist-design/page.html → ...pp/templates/pages/exist-design/page.html b/...tors/app/templates/exist-design/page.html → ...pp/templates/pages/exist-design/page.html
diff --git a/...tors/app/templates/mysec/admin/index.html → ...pp/templates/pages/mysec/admin/index.html b/...tors/app/templates/mysec/admin/index.html → ...pp/templates/pages/mysec/admin/index.html
diff --git a/...s/app/templates/mysec/admin/security.html → ...templates/pages/mysec/admin/security.html b/...s/app/templates/mysec/admin/security.html → ...templates/pages/mysec/admin/security.html
diff --git a/...emplates/mysec/templates/login-panel.html → ...es/pages/mysec/templates/login-panel.html b/...emplates/mysec/templates/login-panel.html → ...es/pages/mysec/templates/login-panel.html
diff --git a/...ators/app/templates/exist-plain/page.html → ...ators/app/templates/pages/plain/page.html b/...ators/app/templates/exist-plain/page.html → ...ators/app/templates/pages/plain/page.html
diff --git a/.../app/templates/mysec/admin/controller.xql → ...ors/app/templates/xq/admin/controller.xql b/.../app/templates/mysec/admin/controller.xql → ...ors/app/templates/xq/admin/controller.xql
diff --git a/test/generated-pkg/app-mysec.js b/test/generated-pkg/app-mysec.js
@@ -26,7 +26,7 @@ describe('eXide style …', function () {
 
   describe('secure exist design has …', function () {
     it('default files and restricted area', function (done) {
-      assert.file(['admin/controller.xql', 'templates/login-panel.html', 'pre-install.xql', 'test/cypress/integration/login-ok_spec.js'])
+      assert.file(['admin/controller.xql', 'admin/index.html','templates/login-panel.html', 'pre-install.xql', 'test/cypress/integration/login-ok_spec.js'])
       done()
     })