p3x-robot sunday release 2018-5-11 14:37:31

patrikx3 · May 11, 2018 · f77129c · f77129c
1 parent 9d999c7
commit f77129c
Show file tree

Hide file tree

Showing 45 changed files with 3,341 additions and 14,996 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,59 +1,64 @@
 const utils = require('corifeus-utils');
-const mz = require('mz');
+const fs = require('fs');
+const fsExtra = require('fs-extra');
 
 module.exports = function (grunt) {
 
     const themeDir = './themes/default/less/theme';
 
     const filesLess = {
-        'themes/default/css/bootstrap-default.css': 'themes/default/less/style.less',
+        'themes/default/css/style.css': 'themes/default/less/style.less',
         'themes/default/css/fontawesome.css': 'themes/default/less/fontawesome.less',
     }
 
+    const root = './node_modules/bootswatch';
+    const watches = fs.readdirSync(root);
+    const themes = ['default'];
+    const excluded = ['fonts'];
+    const themeCss = {
+        'bootstrap-default': '/themes/default/css/bootstrap-default.css',
+    }
 
-    grunt.registerTask('build', async function() {
-        const done = this.async();
-
-        const root = './node_modules/bootswatch';
-        const watches = await mz.fs.readdir(root);
-        const themes = [];
-        const excluded = ['fonts'];
-        const themeCss = {
-            'bootstrap-default': '/themes/default/css/bootstrap-default.css',
+    for(let path of watches) {
+        const stat = fs.statSync(`${root}/${path}`);
+        if (stat.isDirectory() && !excluded.includes(path)) {
+            themes.push(path);
+            themeCss[`bootstrap-${path}`] = `/themes/default/css/bootstrap-${path}.css`;
         }
+    }
+    fsExtra.ensureDirSync(themeDir);
 
-        await watches.forEachAsync(async(path) => {
-            const stat = await mz.fs.stat(`${root}/${path}`);
-            if (stat.isDirectory() && !excluded.includes(path)) {
-                themes.push(path);
-                themeCss[`bootstrap-${path}`] = `/themes/default/css/bootstrap-${path}.css`;
-           }
-        })
-        await utils.fs.ensureDir(themeDir);
+    for(let theme of themes) {
+        const less = `${themeDir}/${theme}.less`;
 
+        if (theme === 'default') {
+            fs.writeFileSync(less, `
+@import "../../../../node_modules/bootstrap/less/bootstrap";
+@import "../default";
+`)
 
-        await themes.forEachAsync(async (theme) => {
-            const less = `${themeDir}/${theme}.less`;
-            await mz.fs.writeFile(less, `
+        } else {
+            fs.writeFileSync(less, `
 @import "../../../../node_modules/bootstrap/less/bootstrap";
 @import "../../../../node_modules/bootswatch/${theme}/variables";
 @import "../../../../node_modules/bootswatch/${theme}/bootswatch";
 @import "../default";
 `)
-            filesLess[`themes/default/css/bootstrap-${theme}.css`] = less;
-        })
-        await mz.fs.writeFile(`./themes/default/js/themes.js`, `
+
+        }
+//        console.log(less)
+        filesLess[`themes/default/css/bootstrap-${theme}.css`] = less;
+
+    }
+
+
+    fs.writeFileSync(`./themes/default/js/themes.js`, `
 var themes = ${JSON.stringify(themeCss, null, 4)}
 `);
-        grunt.log.write(themes);
-        done();
-    })
 
-    require('time-grunt')(grunt);
+//    grunt.log.writeln(JSON.stringify(filesLess, null, 2))
+
     grunt.loadNpmTasks('grunt-contrib-less');
-    grunt.loadNpmTasks('grunt-contrib-copy');
-    grunt.loadNpmTasks('grunt-contrib-clean')
-    grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-wiredep');
 
     const builder = require(`corifeus-builder`);
@@ -67,12 +72,14 @@ var themes = ${JSON.stringify(themeCss, null, 4)}
         config:
             {
                 clean: {
+                    /*
                     themes: [
                         themeDir
                     ],
                     fonts: [
                         'themes/default/fonts'
                     ]
+                    */
                 },
                 copy: {
                     bootstrap: {
@@ -121,17 +128,17 @@ var themes = ${JSON.stringify(themeCss, null, 4)}
                         files: ['themes/default/**/*.*'],
                         tasks: ['less'],
                         options: {
+                            atBegin: true,
                             spawn: false,
                         },
                     },
                 }
             }
     });
 
+    grunt.registerTask('default', ['clean','copy', 'less', 'wiredep', 'cory-replace']);
+    grunt.registerTask('build', ['default']);
+    grunt.registerTask('run', ['watch:scripts']);
 
-    grunt.registerTask('default', ['clean','copy', 'build', 'less', 'wiredep', 'cory-replace']);
-    grunt.registerTask('run', ['default', 'watch']);
-
-
+};
 
-};
diff --git a/INSTALL.md b/INSTALL.md
@@ -106,7 +106,7 @@ UrlToolkit {
 
 ---
 
-[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.0.4-rc.3 
+[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.0 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 
 
-# 🤖 P3X Gitlist  v1.0.4-rc.3    
+# 🤖 P3X Gitlist  v1.1.0    
 
 # Description  
 
@@ -24,21 +24,15 @@ This is Klaus Silveira's fork, with multiple themes, sub-modules and updated to
 Done, just put on your server, nothing to build:   
 https://github.com/patrikx3/gitlist/releases
 
-### v1.0.4 - unreleased / in progress
-* Format size was missing space (ugly)
-* Graph time was not using the ```config.ini```
-* Fixed images to not show a html block span text and use now real image alt and title attributes in html
-* In progress
-  * Graph is not using Bootstrap
-  * Network is not using Bootstrap
-  * Browse tags
-  * In submodules, if the "submodule" and "path" is not the same, it chokes (it should work the submodule name and path are not the same)
-    * Works
-      * submodule "path/name"
-      * path path/name
-    * Not working
-      * submodule "name"
-      * path path/name 
+### v1.1.1 - unreleased / in progress
+* In submodules, if the "submodule" and "path" is not the same, it chokes (it should work the submodule name and path are not the same)
+  * Works
+    * submodule "path/name"
+    * path path/name
+  * Not working
+    * submodule "name"
+    * path path/name 
+
 
 Further [change log](changelog.md) ...
 
@@ -82,7 +76,7 @@ If you have Composer in your path, things get easier. But you know the drill.
 
 ---
 
-[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.0.4-rc.3 
+[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.0 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md
@@ -19,7 +19,7 @@ sudo apt upgrade -y
 
 ---
 
-[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.0.4-rc.3 
+[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.0 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

diff --git a/bower.json b/bower.json
@@ -18,6 +18,9 @@
     "marked": "^0.3.12",
     "jquery": "^3.3.1",
     "bootstrap": "^3.3.7",
-    "js-htmlencode": "^0.3.0"
+    "js-htmlencode": "^0.3.0",
+    "lodash": "^4.17.10",
+    "codemirror": "^5.37.0",
+    "raphael": "^2.2.7"
   }
 }
diff --git a/changelog.md b/changelog.md
@@ -5,6 +5,13 @@
                         
 [//]: #@corifeus-header:end
 
+### v1.1.0
+* Format size was missing space (ugly)
+* Graph time was not using the ```config.ini```
+* Fixed images to not show a html block span text and use now real image alt and title attributes in html
+* Graph is not using Bootstrap
+* Network is not using Bootstrap
+
 ### v1.0.3
 * Total bytes was not working with Twig 2
 
@@ -53,7 +60,7 @@
 
 ---
 
-[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.0.4-rc.3 
+[**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.0 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "opencollective": false
   },
   "description": "🤖 P3X Gitlist",
-  "version": "1.0.4-rc.4",
+  "version": "1.1.1-rc.0",
   "main": "index.js",
   "repository": "https://github.com/patrikx3/gitlist",
   "author": "patrikx3 <[email protected]>",
@@ -21,11 +21,12 @@
     "grunt-contrib-less": "^1.4.1",
     "grunt-contrib-watch": "^1.0.1",
     "grunt-wiredep": "^3.0.1",
-    "time-grunt": "^1.4.0",
+    "fs-extra": "^6.0.1",
     "corifeus-builder": "^1.7.1375-396"
   },
   "engines": {
     "node": ">=8.9.0"
   },
-  "homepage": "https://github.com/patrikx3/gitlist"
+  "homepage": "https://github.com/patrikx3/gitlist",
+  "dependencies": {}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ UrlToolkit { @@
     ---
-    [**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.0.4-rc.3
+    [**GITLIST**](https://pages.corifeus.com/gitlist) Build v1.1.0
     [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact)
@@ Expand Down @@