Merge pull request #32 from atlas-bi/dev

Dev

Author: sur.la.route

gulpfile.js

@@ -0,0 +1,55 @@
+const gulp = require('gulp');
+const autoprefexer = require('gulp-autoprefixer');
+const sass = require('gulp-sass')(require('sass'));
+const replace = require('gulp-replace');
+const { fontawesomeSubset } = require('fontawesome-subset')
+//const del = require('del');
+const purgecss = require('gulp-purgecss');
+const cssnano = require('gulp-cssnano');
+// const concat = require('gulp-concat');
+// const rename = require('gulp-rename');
+// const uglify = require('gulp-uglify');
+
+
+gulp.task('font:inter', function() {
+  return gulp.src('node_modules/@fontsource/inter/**/*').pipe(replace(/\.\/files\//g, '/font/inter/files/')).pipe(gulp.dest('web/wwwroot/font/inter'))
+});
+
+gulp.task('font:rasa', function() {
+  return gulp.src('node_modules/@fontsource/rasa/**/*').pipe(replace(/\.\/files\//g, '/font/rasa/files/')).pipe(gulp.dest('web/wwwroot/font/rasa'))
+});
+
+
+gulp.task('font:fontawesome', function(done) {
+    //del.sync('web/wwwroot/font/fontawesome/webfonts', {force:true});
+    fontawesomeSubset({
+      regular:['envelope', 'thumbs-up', 'play-circle', 'star'],
+      solid: ['code','quote-left', 'reply', 'reply-all', 'paper-plane','heading', 'times', 'folder', 'check', 'play', 'star','folder-plus', 'file-upload', 'save','angle-down','sort', 'folder-open','link','grip-lines', 'sliders-h', 'wrench','italic',  'user', 'list-ol', 'list-ul', 'chevron-left', 'chevron-right','bold', 'search', 'edit', 'trash', 'star', 'share', 'plus', 'chart-bar', 'universal-access', 'trash-alt']
+          }, 'web/wwwroot/font/fontawesome/webfonts');
+    done();
+});
+
+gulp.task('sass', function() {
+  return gulp.src("web/wwwroot/scss/**/*.scss")
+    .pipe(sass().on('error', sass.logError))
+    .pipe(
+      purgecss({
+        content: ['web/Pages/**/*.cshtml', 'web/wwwroot/js/**/*.js', 'web/wwwroot/lib/**/*.js'],
+        safelist: ['breadcrumb'],
+        whitelist: ['breadcrumb']
+      })
+    )
+    .pipe(autoprefexer())
+    .pipe(cssnano())
+    .pipe(gulp.dest('web/wwwroot/css/'))
+});
+
+
+
+gulp.task('build', gulp.parallel('font:inter','font:rasa', gulp.series('font:fontawesome','sass')));
+
+gulp.task('watch', gulp.series('build', function (cb) {
+    gulp.watch('web/wwwroot/**/*.scss', gulp.series('sass'));
+    gulp.watch('web/font/fontawesome/**/*.scss', gulp.series('font:fontawesome','sass'));
+    cb();
+}));

gulpfile.js/index.js

@@ -10,36 +10,24 @@
     "last 2 Safari versions"
   ],
   "dependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@fortawesome/fontawesome-free": "^5.15.4",
     "bulma": "^0.9.3",
-    "fontawesome-subset": "^2.0.0",
-    "gulp": "^4.0.2",
-    "handlebars": "^4.7.7"
+    "gulp": "^4.0.2"
   },
   "description": "Atlas BI Library",
   "devDependencies": {
-    "@creativebulma/bulma-badge": "github:christopherpickering/bulma-badge#patch-1",
+    "@creativebulma/bulma-badge": "^1.0.1",
     "@creativebulma/bulma-tooltip": "^1.2.0",
-    "@csstools/postcss-sass": "github:sinankeskin/postcss-sass",
-    "@fontsource/inter": "^4.5.0",
-    "@fontsource/rasa": "^4.5.2",
-    "@fullhuman/postcss-purgecss": "^4.0.3",
-    "autoprefixer": "^10.3.3",
-    "bulma-switch": "github:christopherpickering/bulma-switch#patch-1",
-    "cssnano": "^5.0.8",
-    "del": "^6.0.0",
-    "fonteditor-core": "^2.1.8",
-    "gulp-postcss": "^9.0.0",
-    "gulp-purgecss": "^4.0.3",
+    "@fontsource/inter": "^4.5.1",
+    "@fontsource/rasa": "^4.5.3",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "bulma-switch": "^2.0.0",
+    "fontawesome-subset": "^3.0.0",
+    "gulp-autoprefixer": "^8.0.0",
+    "gulp-cssnano": "^2.1.3",
+    "gulp-purgecss": "^4.1.3",
     "gulp-replace": "^1.1.3",
-    "gulp-sass": "^5.0.0",
-    "postcss": "^8.3.6",
-    "postcss-cli": "^8.3.1",
-    "postcss-sort-media-queries": "^3.11.12",
-    "sass": "^1.38.1"
+    "gulp-sass": "^5.1.0",
+    "sass": "^1.45.2"
   },
   "homepage": "https://demo.atlas.bi",
   "license": "AGPL-3.0-or-later",

gulpfile.js/tasks/build.js

@@ -195,7 +195,7 @@ public static Boolean CheckHrxPermissions(Atlas_WebContext _context, int ReportO
                               where ug.User.Username == username
                               select ug.GroupId).Contains(g.GroupId)
                        select g.GroupId).ToList().Count();
-            if (hrx > 1)
+            if (hrx >= 1)
             {
                 return true;
             }
@@ -206,7 +206,7 @@ join h in _context.ReportObjectHierarchies.Where(x => x.ChildReportObjectId == R
                               where ug.User.Username == username
                               select ug.GroupId).Contains(g.GroupId)
                        select g.GroupId).ToList().Count();
-            if (hrg > 1)
+            if (hrg >= 1)
             {
                 return true;
             }

gulpfile.js/tasks/packages.js

@@ -25,9 +25,6 @@
 ViewData["Title"] = "Access Control";
 }
 
-@section css {
-    <link rel="stylesheet" href="/css/access.min.css" inline />
-}
 
 @section js {
     <script async src="/js/access.min.js" inline></script>

gulpfile.js/tasks/style.js

@@ -75,7 +75,7 @@
                         else
                         {
 <div style="position: relative;">
-    <span class="tt-top" style="color:grey;position: relative;white-space: nowrap;cursor:default" data-tooltip="Login to Hyperspace to run report.">Run</span>
+    <span class="tt-top" style="color:grey;position: relative;white-space: nowrap;cursor:default" data-tooltip="Run from the Hyperspace report library.">Run</span>
 </div>}
                     }
     @if (t.EditReportUrl != null && t.EditReportUrl != "" && @Model.Permissions.Contains(38))