diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 00000000..3144cd93 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +generators/app/templates/specs/integration/landing_spec.js +generators/app/templates/specs/mocha/rest_spec.js +generators/app/templates/specs/xqs/xqSuite.js + +node_modules/ \ No newline at end of file diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 07882fb2..342aaf47 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 14 - name: Install dependencies run: npm ci - name: Release diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 00000000..ee85d9b1 --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "stylelint-config-standard" +} \ No newline at end of file diff --git a/generators/app/index.js b/generators/app/index.js index a61aa28b..ecaaeb2c 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -539,7 +539,7 @@ module.exports = class extends Generator { apptype: this.props.apptype[0] }) this.fs.copyTpl( - this.templatePath('style.css'), + this.templatePath('styles/style.css'), this.destinationPath('resources/css/style.css'), { apptype: this.props.apptype[0] }) @@ -595,6 +595,18 @@ module.exports = class extends Generator { odd: this.props.odd }) + // #36 shared-resources + this.fs.copy( + this.templatePath('img/exist_icon_16x16.ico'), + this.destinationPath('resources/images/exist_icon_16x16.ico') + ) + this.fs.copy( + this.templatePath('img/powered-by.svg'), + this.destinationPath('resources/images/powered-by.svg') + ) + + this.npmInstall(['bootstrap@5']) + // distinct contents (flexible) // see #28 switch (this.props.apptype[0]) { @@ -606,9 +618,14 @@ module.exports = class extends Generator { mysec: this.props.mysec }) this.fs.copy( - this.templatePath('exist-design/images/**'), + this.templatePath('img/exist-design/**'), this.destinationPath('resources/images/') ) + // #36 + this.fs.copy( + this.templatePath('styles/exist-2.2.css'), + this.destinationPath('resources/css/exist-2.2.css') + ) break case 'plain': this.fs.copyTpl( diff --git a/generators/app/templates/build.xml b/generators/app/templates/build.xml index 1defd2a1..26351430 100644 --- a/generators/app/templates/build.xml +++ b/generators/app/templates/build.xml @@ -1,28 +1,32 @@ - <%- desc %> - - - - + <%- desc %> + + + + - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + diff --git a/generators/app/templates/exist-design/images/bold.gif b/generators/app/templates/exist-design/images/bold.gif deleted file mode 100755 index d6a9cc2c..00000000 Binary files a/generators/app/templates/exist-design/images/bold.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/code.gif b/generators/app/templates/exist-design/images/code.gif deleted file mode 100755 index 7acf6e46..00000000 Binary files a/generators/app/templates/exist-design/images/code.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/delete-icon.png b/generators/app/templates/exist-design/images/delete-icon.png deleted file mode 100755 index aa1a746c..00000000 Binary files a/generators/app/templates/exist-design/images/delete-icon.png and /dev/null differ diff --git a/generators/app/templates/exist-design/images/glyphicons-halflings.png b/generators/app/templates/exist-design/images/glyphicons-halflings.png deleted file mode 100755 index 92d4445d..00000000 Binary files a/generators/app/templates/exist-design/images/glyphicons-halflings.png and /dev/null differ diff --git a/generators/app/templates/exist-design/images/grey-box-bot.gif b/generators/app/templates/exist-design/images/grey-box-bot.gif deleted file mode 100755 index 995a544f..00000000 Binary files a/generators/app/templates/exist-design/images/grey-box-bot.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/grey-box-rpt.gif b/generators/app/templates/exist-design/images/grey-box-rpt.gif deleted file mode 100755 index 4e17cedc..00000000 Binary files a/generators/app/templates/exist-design/images/grey-box-rpt.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/grey-box-top.gif b/generators/app/templates/exist-design/images/grey-box-top.gif deleted file mode 100755 index 20bc464f..00000000 Binary files a/generators/app/templates/exist-design/images/grey-box-top.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/italic.gif b/generators/app/templates/exist-design/images/italic.gif deleted file mode 100755 index 8bb330bd..00000000 Binary files a/generators/app/templates/exist-design/images/italic.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/nav-dropdown.gif b/generators/app/templates/exist-design/images/nav-dropdown.gif deleted file mode 100755 index 0244f134..00000000 Binary files a/generators/app/templates/exist-design/images/nav-dropdown.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/nav-dropdown.png b/generators/app/templates/exist-design/images/nav-dropdown.png deleted file mode 100755 index fd1e4433..00000000 Binary files a/generators/app/templates/exist-design/images/nav-dropdown.png and /dev/null differ diff --git a/generators/app/templates/exist-design/images/nav.gif b/generators/app/templates/exist-design/images/nav.gif deleted file mode 100755 index 2f756cf4..00000000 Binary files a/generators/app/templates/exist-design/images/nav.gif and /dev/null differ diff --git a/generators/app/templates/exist-design/images/page-edit-icon.png b/generators/app/templates/exist-design/images/page-edit-icon.png deleted file mode 100755 index 7d6a3fb1..00000000 Binary files a/generators/app/templates/exist-design/images/page-edit-icon.png and /dev/null differ diff --git a/generators/app/templates/expath-pkg.xml b/generators/app/templates/expath-pkg.xml index d2a88d9e..a316dcd1 100644 --- a/generators/app/templates/expath-pkg.xml +++ b/generators/app/templates/expath-pkg.xml @@ -3,5 +3,5 @@ abbrev="<%- short %>" version="<%- version %>" spec="1.0"> <%- desc %> - <%_ if (apptype !== 'empty') { %><% } -%> + <%_ if (apptype !== 'empty') { %><% } -%> diff --git a/generators/app/templates/github/readme.md b/generators/app/templates/github/readme.md index 9bcb831a..70c4f634 100644 --- a/generators/app/templates/github/readme.md +++ b/generators/app/templates/github/readme.md @@ -7,7 +7,6 @@ <%_ } else { _%> ![exist-db CI](https://github.com/<%- ghuser %>/<%- title %>/workflows/exist-db%20CI/badge.svg) <% } -%> -[![Coverage percentage][coveralls-image]][coveralls-url] @@ -107,6 +106,4 @@ You can take a look at the [Contribution guidelines for this project](.github/CO <%_ if (ci == 'travis') { %> [travis-image]: https://travis-ci.com/<%- ghuser %>/<%- title %>.svg?branch=master [travis-url]: https://travis-ci.com/<%- ghuser %>/<%- title %> -<% } -%> -[coveralls-image]: https://coveralls.io/repos/<%- ghuser %>/<%- title %>/badge.svg -[coveralls-url]: https://coveralls.io/r/<%- ghuser %>/<%- title %> +<% } -%> \ No newline at end of file diff --git a/generators/app/templates/exist-design/images/bgmenu.gif b/generators/app/templates/img/exist-design/bgmenu.gif similarity index 100% rename from generators/app/templates/exist-design/images/bgmenu.gif rename to generators/app/templates/img/exist-design/bgmenu.gif diff --git a/generators/app/templates/exist-design/images/bgmenuhi.gif b/generators/app/templates/img/exist-design/bgmenuhi.gif similarity index 100% rename from generators/app/templates/exist-design/images/bgmenuhi.gif rename to generators/app/templates/img/exist-design/bgmenuhi.gif diff --git a/generators/app/templates/exist-design/images/body-base.gif b/generators/app/templates/img/exist-design/body-base.gif similarity index 100% rename from generators/app/templates/exist-design/images/body-base.gif rename to generators/app/templates/img/exist-design/body-base.gif diff --git a/generators/app/templates/exist-design/images/body.gif b/generators/app/templates/img/exist-design/body.gif similarity index 100% rename from generators/app/templates/exist-design/images/body.gif rename to generators/app/templates/img/exist-design/body.gif diff --git a/generators/app/templates/exist-design/images/existdb.png b/generators/app/templates/img/exist-design/existdb.png similarity index 100% rename from generators/app/templates/exist-design/images/existdb.png rename to generators/app/templates/img/exist-design/existdb.png diff --git a/generators/app/templates/exist-design/images/header.gif b/generators/app/templates/img/exist-design/header.gif similarity index 100% rename from generators/app/templates/exist-design/images/header.gif rename to generators/app/templates/img/exist-design/header.gif diff --git a/generators/app/templates/exist-design/images/horizontal.gif b/generators/app/templates/img/exist-design/horizontal.gif similarity index 100% rename from generators/app/templates/exist-design/images/horizontal.gif rename to generators/app/templates/img/exist-design/horizontal.gif diff --git a/generators/app/templates/img/exist-design/noise.png b/generators/app/templates/img/exist-design/noise.png new file mode 100644 index 00000000..210e5e38 Binary files /dev/null and b/generators/app/templates/img/exist-design/noise.png differ diff --git a/generators/app/templates/img/exist_icon_16x16.ico b/generators/app/templates/img/exist_icon_16x16.ico new file mode 100644 index 00000000..369b350f Binary files /dev/null and b/generators/app/templates/img/exist_icon_16x16.ico differ diff --git a/generators/app/templates/img/existdb-web.svg b/generators/app/templates/img/existdb-web.svg new file mode 100644 index 00000000..3ae5fc8d --- /dev/null +++ b/generators/app/templates/img/existdb-web.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/generators/app/templates/img/powered-by.svg b/generators/app/templates/img/powered-by.svg new file mode 100644 index 00000000..75e4f325 --- /dev/null +++ b/generators/app/templates/img/powered-by.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + powered by + + + \ No newline at end of file diff --git a/generators/app/templates/pages/error-page.html b/generators/app/templates/pages/error-page.html index 3a64f182..0d901bc2 100755 --- a/generators/app/templates/pages/error-page.html +++ b/generators/app/templates/pages/error-page.html @@ -3,7 +3,4 @@

An error has occurred

An error has been generated by the application.

-    
 
diff --git a/generators/app/templates/pages/exist-design/page.html b/generators/app/templates/pages/exist-design/page.html
index 90560958..e6dfa05a 100755
--- a/generators/app/templates/pages/exist-design/page.html
+++ b/generators/app/templates/pages/exist-design/page.html
@@ -4,12 +4,10 @@
         <%- title %>
         
         
-        
-        
+        
+        
         
-