From b0819659baf18853fd0ef6616f44ed0afe20f558 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Tue, 16 Oct 2018 23:34:18 -0400 Subject: [PATCH 01/40] fix(assets): security fix --- src/middleware/index.js | 5 ++--- src/webserver.js | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index d7164798d..6bba96588 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -98,9 +98,8 @@ module.exports = function(app, db, callback) { //Mobile app.use('/mobile', express.static(path.join(__dirname, '../../', 'mobile'))); - app.use('/uploads/tickets', middleware.redirectToLogin, express.static(path.resolve(__dirname, '/public/uploads/tickets'))); - app.use('/uploads/users', middleware.redirectToLogin, express.static(path.resolve(__dirname, '/public/uploads/users'))); - + app.use('/uploads', middleware.redirectToLogin, express.static(path.resolve(__dirname, '/public/uploads'))); + app.use(express.static(path.join(__dirname, '../../', 'public'))); //Remove to enable plugins diff --git a/src/webserver.js b/src/webserver.js index ac491b400..36f203b52 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -96,6 +96,9 @@ var async = require('async'), app.set('view engine', 'hbs'); hbsHelpers.register(hbs.handlebars); + // Prevent unauth from uploads + app.use('/uploads', middleware.redirectToLogin, express.static(path.resolve(__dirname, '/public/uploads'))); + app.use(express.static(path.join(__dirname, '../', 'public'))); app.use(favicon(path.join(__dirname, '../', 'public/img/favicon.ico'))); app.use(bodyParser.urlencoded({ extended: false })); From 93c138743171089e76e607ad1db192436d2b3fbe Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 17 Oct 2018 00:12:49 -0400 Subject: [PATCH 02/40] style(logo): logo to image --- public/img/defaultLogoDark.png | Bin 0 -> 12688 bytes public/img/defaultLogoLight.png | Bin 0 -> 12695 bytes public/uploads/assets/.gitkeep | 0 src/middleware/index.js | 16 ++--- src/sass/partials/common.sass | 5 ++ src/views/login.hbs | 109 ++++++++++++++++---------------- src/views/partials/topbar.hbs | 21 +++--- src/webserver.js | 9 +-- 8 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 public/img/defaultLogoDark.png create mode 100644 public/img/defaultLogoLight.png create mode 100644 public/uploads/assets/.gitkeep diff --git a/public/img/defaultLogoDark.png b/public/img/defaultLogoDark.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7541d65e86edbea0c625809d758594a1c56b9d GIT binary patch literal 12688 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 Pj|5CnL!nmAH2nVnmI#2k literal 0 HcmV?d00001 diff --git a/public/img/defaultLogoLight.png b/public/img/defaultLogoLight.png new file mode 100644 index 0000000000000000000000000000000000000000..4faf93d4367c5d952ae0be93749a7c1be1c14ef0 GIT binary patch literal 12695 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 A>i_@% literal 0 HcmV?d00001 diff --git a/public/uploads/assets/.gitkeep b/public/uploads/assets/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/src/middleware/index.js b/src/middleware/index.js index 6bba96588..e70e3e478 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -27,7 +27,8 @@ var _ = require('lodash'), favicon = require('serve-favicon'), session = require('express-session'), MongoStore = require('connect-mongo')(session), - passportConfig = require('../passport')(); + passportConfig = require('../passport')(), + nconf = require('nconf'); var middleware = {}; @@ -85,22 +86,15 @@ module.exports = function(app, db, callback) { app.use(passportConfig.session()); app.use(flash()); - //Load after Passport!! - app.use('/uploads/tickets', function(req, res, next) { - if (!req.user) - return res.redirect('/'); - - return next(); - }); - //CORS app.use(allowCrossDomain); //Mobile app.use('/mobile', express.static(path.join(__dirname, '../../', 'mobile'))); - app.use('/uploads', middleware.redirectToLogin, express.static(path.resolve(__dirname, '/public/uploads'))); + app.use('/assets', express.static(nconf.get('base_dir') + '/public/uploads/assets')); + app.use('/uploads', middleware.redirectToLogin, express.static(nconf.get('base_dir') + '/public/uploads')); - app.use(express.static(path.join(__dirname, '../../', 'public'))); + app.use(express.static(nconf.get('base_dir') + '/public')); //Remove to enable plugins //next(null, store); diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index a7bd7f15c..81f566ba0 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -1,3 +1,8 @@ +.site-logo + width: 140px !important +.site-logo-login + width: 400px !important + .accent-text color: $accent_color !important diff --git a/src/views/login.hbs b/src/views/login.hbs index c5166135d..afeedc47f 100644 --- a/src/views/login.hbs +++ b/src/views/login.hbs @@ -24,7 +24,7 @@ } img { - margin-bottom: 55px; + margin-bottom: 50px; } label { @@ -160,60 +160,59 @@

{{#if flash.message}} {{{flash.message}}} {{else}} {{{flash}}}{{/if}}

').appendTo("body")),this.on({focus:function(e){$this.show()},blur:function(e){$this.hide()},mouseenter:function(e){$this.show()},mouseleave:function(e){$this.hide()}})},show:function(){if(this.tip="function"==typeof this.options.src?this.options.src(this.element):this.options.src,tooltipdelay&&clearTimeout(tooltipdelay),checkdelay&&clearTimeout(checkdelay),"string"==typeof this.tip&&this.tip.length){$tooltip.stop().css({top:-2e3,visibility:"hidden"}).removeClass(this.options.activeClass).show(),$tooltip.html('
'+this.tip+"
");var $this=this,pos=UI.$.extend({},this.element.offset(),{width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}),width=$tooltip[0].offsetWidth,height=$tooltip[0].offsetHeight,offset="function"==typeof this.options.offset?this.options.offset.call(this.element):this.options.offset,position="function"==typeof this.options.pos?this.options.pos.call(this.element):this.options.pos,tmppos=position.split("-"),tcss={display:"none",visibility:"visible",top:pos.top+pos.height+height,left:pos.left};if("fixed"==UI.$html.css("position")||"fixed"==UI.$body.css("position")){var bodyoffset=UI.$("body").offset(),htmloffset=UI.$("html").offset(),docoffset_top=htmloffset.top+bodyoffset.top,docoffset_left=htmloffset.left+bodyoffset.left;pos.left-=docoffset_left,pos.top-=docoffset_top}"left"!=tmppos[0]&&"right"!=tmppos[0]||"right"!=UI.langdirection||(tmppos[0]="left"==tmppos[0]?"right":"left");var variants={bottom:{top:pos.top+pos.height+offset,left:pos.left+pos.width/2-width/2},top:{top:pos.top-height-offset,left:pos.left+pos.width/2-width/2},left:{top:pos.top+pos.height/2-height/2,left:pos.left-width-offset},right:{top:pos.top+pos.height/2-height/2,left:pos.left+pos.width+offset}};UI.$.extend(tcss,variants[tmppos[0]]),2==tmppos.length&&(tcss.left="left"==tmppos[1]?pos.left:pos.left+pos.width-width);var boundary=this.checkBoundary(tcss.left,tcss.top,width,height);if(boundary){switch(boundary){case"x":position=2==tmppos.length?tmppos[0]+"-"+(tcss.left<0?"left":"right"):tcss.left<0?"right":"left";break;case"y":position=2==tmppos.length?(tcss.top<0?"bottom":"top")+"-"+tmppos[1]:tcss.top<0?"bottom":"top";break;case"xy":position=2==tmppos.length?(tcss.top<0?"bottom":"top")+"-"+(tcss.left<0?"left":"right"):tcss.left<0?"right":"left"}tmppos=position.split("-"),UI.$.extend(tcss,variants[tmppos[0]]),2==tmppos.length&&(tcss.left="left"==tmppos[1]?pos.left:pos.left+pos.width-width)}tcss.left-=UI.$body.position().left,tooltipdelay=setTimeout(function(){$tooltip.css(tcss).attr("class",["uk-tooltip","uk-tooltip-"+position,$this.options.cls].join(" ")),$this.options.animation?$tooltip.css({opacity:0,display:"block"}).addClass($this.options.activeClass).animate({opacity:1},parseInt($this.options.animation,10)||400):$tooltip.show().addClass($this.options.activeClass),tooltipdelay=!1,checkdelay=setInterval(function(){$this.element.is(":visible")||$this.hide()},150)},parseInt(this.options.delay,10)||0)}},hide:function(){if(!this.element.is("input")||this.element[0]!==document.activeElement)if(tooltipdelay&&clearTimeout(tooltipdelay),checkdelay&&clearTimeout(checkdelay),$tooltip.stop(),this.options.animation){var $this=this;$tooltip.fadeOut(parseInt(this.options.animation,10)||400,function(){$tooltip.removeClass($this.options.activeClass)})}else $tooltip.hide().removeClass(this.options.activeClass)},content:function(){return this.tip},checkBoundary:function(left,top,width,height){var axis="";return(left<0||left-UI.$win.scrollLeft()+width>window.innerWidth)&&(axis+="x"),(top<0||top-UI.$win.scrollTop()+height>window.innerHeight)&&(axis+="y"),axis}}),UI.tooltip}),function(addon){var component;window.UIkit&&(component=addon(UIkit)),"function"==typeof define&&define.amd&&define("uikit-upload",["uikit"],function(){return component||addon(UIkit)})}(function(UI){"use strict";var xhr,fi;function xhrupload(files,settings){if(!UI.support.ajaxupload)return this;if(settings=UI.$.extend({},xhrupload.defaults,settings),files.length){if("*.*"!==settings.allow)for(var file,i=0;file=files[i];i++)if(!matchName(settings.allow,file.name))return void("string"==typeof settings.notallowed?alert(settings.notallowed):settings.notallowed(file,settings));var complete=settings.complete;if(settings.single){var count=files.length,uploaded=0,allow=!0;settings.beforeAll(files),settings.complete=function(response,xhr){uploaded+=1,complete(response,xhr),settings.filelimit&&uploaded>=settings.filelimit&&(allow=!1),allow&&uploaded
',$body.on("show.uk.modal",".uk-modal-dialog-replace",function(){setTimeout(function(){var dialogReplace=$(".uk-modal-dialog-replace");if(dialogReplace.find(".uk-button-primary").length){var actionBtn=dialogReplace.find(".uk-button-primary").toggleClass("uk-button-primary md-btn-flat-primary");actionBtn.next("button")&&actionBtn.next("button").after(actionBtn)}dialogReplace.find(".uk-button").length&&dialogReplace.find(".uk-button").toggleClass("uk-button md-btn md-btn-flat"),dialogReplace.find(".uk-margin-small-top").length&&dialogReplace.find(".uk-margin-small-top").toggleClass("uk-margin-small-top uk-margin-top"),dialogReplace.find("input.uk-width-1-1").length&&dialogReplace.find("input.uk-width-1-1").toggleClass("uk-width-1-1 md-input"),dialogReplace.find(".uk-form").length&&dialogReplace.find(".uk-form").removeClass("uk-form")},50)})}void 0!==UIkit.components.tooltip&&$.extend(UIkit.components.tooltip.prototype.defaults,{animation:280,offset:8}),void 0!==UIkit.components.sortable&&Modernizr.touch&&$("[data-uk-sortable]").children().addClass("needsclick")}); \ No newline at end of file diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index 845b8de50..7a5cdf8c9 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -344,7 +344,7 @@ a.button font-size: 24px font-weight: 500 line-height: 30px - color: #444 + color: automatic-text-color(lighten($page_content_right_bg, 10%)) .action-link background: transparent @@ -379,20 +379,20 @@ a.button li float: none !important width: 100% !important - background: #f5f5f5 !important - color: #444 + background: $page_content_button_color !important + color: $page_content_button_text_color !important line-height: 1.4em !important height: auto !important a display: block width: 100% - background: #f5f5f5 !important + background: $page_content_button_color !important line-height: 1.4em !important padding: 5px 15px !important - color: #212121 !important + color: $page_content_button_text_color !important &:hover background: rgba(0,0,0, 0.085) !important - color: #212121 !important + color: $page_content_button_text_color !important .disconnected z-index: 10000 @@ -676,6 +676,15 @@ div.hoverAction background: lighten($page_content_title_bg, 10%) border-top: $page_content_border_top +.search-box input.ticket-top-search + background: $page_content_button_color + height: 30px + border: 1px solid $page_content_button_color + border-radius: 5px + color: $page_content_button_text_color + &::placeholder + color: automatic-text-color($page_content_button_color, 'muted') + .pagination margin-right: 8px diff --git a/src/sass/partials/messages.sass b/src/sass/partials/messages.sass index b052cce31..8e37a957e 100644 --- a/src/sass/partials/messages.sass +++ b/src/sass/partials/messages.sass @@ -23,11 +23,11 @@ text-overflow: '...' &:hover - background: white + background: lighten($page_content_left_bg, 5%) cursor: pointer &.message-folder:hover - background: $page_content_left_bg + background: lighten($page_content_left_bg, 5%) cursor: default //&:last-child diff --git a/src/sass/partials/mg.sass b/src/sass/partials/mg.sass index 0d14e3992..b28120339 100644 --- a/src/sass/partials/mg.sass +++ b/src/sass/partials/mg.sass @@ -2,8 +2,10 @@ .mGraph .mg-x-axis text, .mGraph .mg-y-axis text font-size: 11px + fill: $text_color .mGraph .mg-active-datapoint + fill: $text_color font-size: 13px .mGraph-panel diff --git a/src/sass/partials/selectize.sass b/src/sass/partials/selectize.sass index 8609e44e2..4f390d7b8 100644 --- a/src/sass/partials/selectize.sass +++ b/src/sass/partials/selectize.sass @@ -297,7 +297,7 @@ margin: 0 4px 0 -2px !important .selectize-input.disabled opacity: 0.5 - background-color: #fafafa + background-color: darken($page_content_right_bg, 5%) .selectize-input border-color: rgba(0, 0, 0, 0.12) diff --git a/src/sass/partials/topnav.sass b/src/sass/partials/topnav.sass index 76afe79b2..21f4cd382 100644 --- a/src/sass/partials/topnav.sass +++ b/src/sass/partials/topnav.sass @@ -152,8 +152,8 @@ visibility: hidden opacity: 0 z-index: 99999 - background: #ffffff - border: 1px solid rgba(100,100,100,0.4) + background: lighten($page_content_right_bg, 10%) + border: 1px solid rgba(0,0,0,0.2) //padding: 10px position: relative +boxShadow(0px 3px 8px 0px rgba(0,0,0,0.247059)) @@ -172,7 +172,7 @@ &:after border-color: rgba(255, 255, 255, 0) - border-bottom-color: #fff + border-bottom-color: lighten($page_content_right_bg, 10%) border-width: 8px margin-left: -8px @@ -204,10 +204,10 @@ .actions width: 100% height: auto - border-bottom: 1px solid rgba(100,100,100,0.4) + border-bottom: 1px solid rgba(0,0,0,0.2) line-height: 24px font-size: 12px - color: #000 + color: $text_color font-family: "Roboto", sans-serif a width: 100% @@ -239,13 +239,13 @@ li width: 100% - background: #ffffff !important - border-bottom: 1px solid rgba(100,100,100,0.4) + background: lighten($page_content_right_bg, 10%) !important + border-bottom: 1px solid rgba(0,0,0,0.2) height: 72px max-height: 80px line-height: normal &:hover - background: darken(#fff, 4%) !important + background: darken(lighten($page_content_right_bg, 10%), 4%) !important &:last-child border-bottom: none @@ -254,22 +254,21 @@ width: 100% height: 71px padding: 10px !important - background: #ffffff !important + background: lighten($page_content_right_bg, 10%) !important line-height: normal !important font-size: 12px - color: black !important + color: $text_color !important position: relative &:hover background: transparent !important - color: #000 !important .messageUnread width: 16px height: 16px font-size: 12px font-family: "FontAwesome" - color: #646464 + color: automatic-text-color(lighten($page_content_right_bg, 10%), 'muted') position: absolute top: 8px right: 3px @@ -286,7 +285,7 @@ margin-bottom: 3px div.messageDate - color: #646464 !important + color: automatic-text-color(lighten($page_content_right_bg, 10%), 'muted') !important div.messageSnippet width: 218px @@ -300,7 +299,7 @@ font-size: 25px line-height: 59px text-align: center - color: black + color: automatic-text-color(lighten($page_content_right_bg, 10%)) background: transparent !important &.warn color: #e7a13c diff --git a/src/sass/partials/ui.sass b/src/sass/partials/ui.sass index 49a026d74..0852e9f15 100644 --- a/src/sass/partials/ui.sass +++ b/src/sass/partials/ui.sass @@ -336,7 +336,7 @@ label.md-label &.uk-badge-danger background: #e53935 &.uk-badge-grey - background: #ccc + background: darken($page_content_right_bg, 5%) &.uk-badge-small font-size: 10px padding: 2px 4px @@ -362,7 +362,9 @@ label.md-label padding-right: 12px !important .uk-dropdown - background: #f5f5f5 + background: $page_content_button_color + & >ul > li > a + color: $page_content_button_text_color .uk-dropdown.uk-datepicker opacity: 1 @@ -575,13 +577,19 @@ textarea.review-list .no-data-available-text font-size: 2em - color: grey + color: automatic-text-color(lighten($page_content_right_bg, 10%), 'muted') font-weight: 300 position: absolute top: 50% left: 50% transform: translate(-50%, -50%) +.c3 text, .c3-text.c3-empty + fill: $text_color !important + +.uk-table thead th + color: automatic-text-color(lighten($page_content_right_bg, 10%), 'muted') + .danger-zone, .zone border: 1px solid rgba(0,0,0,0.175) diff --git a/src/views/dashboard.hbs b/src/views/dashboard.hbs index 113b8e38d..c4ebca068 100644 --- a/src/views/dashboard.hbs +++ b/src/views/dashboard.hbs @@ -15,8 +15,10 @@ -
Last - Updated: Cache Still Loading...
+
+ Last Updated: + Cache Still Loading... +
diff --git a/src/views/partials/topbar/notifications.hbs b/src/views/partials/topbar/notifications.hbs index 65c537333..7436ad2a4 100644 --- a/src/views/partials/topbar/notifications.hbs +++ b/src/views/partials/topbar/notifications.hbs @@ -31,7 +31,7 @@ {{/each}}
-
+
View All Notifications
diff --git a/src/views/settings.hbs b/src/views/settings.hbs index 1221420e9..1363f80c2 100644 --- a/src/views/settings.hbs +++ b/src/views/settings.hbs @@ -281,7 +281,7 @@
Header Background

Background color of the header

-
+
@@ -298,7 +298,7 @@
Header Primary

Text and icon color within the header

-
+
@@ -315,7 +315,7 @@
Primary

Most text and icons. Choose a darker color.

-
+
@@ -332,7 +332,7 @@
Secondary

The main background color

-
+
@@ -349,7 +349,7 @@
Tertiary

Accent color, used for links, some buttons, and notifications

-
+
@@ -366,7 +366,7 @@
Quaternary

Sidebar background color

-
+
@@ -810,7 +810,7 @@
-
+
@@ -829,7 +829,7 @@
-
+
diff --git a/src/views/tickets.hbs b/src/views/tickets.hbs index 6271e3bf5..9a8c669ac 100644 --- a/src/views/tickets.hbs +++ b/src/views/tickets.hbs @@ -87,8 +87,8 @@
-
- +
From 5edfb0f68e92c3509db538353579d6d134c8880f Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Mon, 5 Nov 2018 03:06:22 -0500 Subject: [PATCH 15/40] fix(style): incorrect border style --- src/sass/partials/selectize.sass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sass/partials/selectize.sass b/src/sass/partials/selectize.sass index 4f390d7b8..2e0388597 100644 --- a/src/sass/partials/selectize.sass +++ b/src/sass/partials/selectize.sass @@ -127,7 +127,8 @@ display: inline-block .selectize-input - border: 1px solid darken($selectize_bg, 10%) + border: 0 solid darken($selectize_bg, 10%) + border-bottom-width: 1px padding: 8px 8px display: inline-block width: 100% From a76747d889eced77c0d34b3f98fd54880a3ef523 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Mon, 5 Nov 2018 19:24:14 -0500 Subject: [PATCH 16/40] style(sass): updates for darker colors --- .../js/angularjs/controllers/settings.js | 2 +- src/sass/partials/common.sass | 2 +- src/sass/partials/messages.sass | 16 ++++++--- src/sass/partials/tLoader.sass | 24 +++++++++++-- src/sass/partials/ui.sass | 19 ++++++++++ src/views/layout/main.hbs | 36 ++++++++++++++----- src/views/partials/createGroupWindow.hbs | 4 +-- src/views/partials/deletePriorityWindow.hbs | 2 +- src/views/partials/deleteTicketTypeWindow.hbs | 2 +- src/views/partials/newMessageWindow.hbs | 2 +- src/views/partials/ticketFilterWindow.hbs | 10 +++--- .../report_TicketsByGroup.hbs | 2 +- .../report_TicketsByPriorities.hbs | 4 +-- .../report_TicketsByStatus.hbs | 4 +-- .../report_TicketsByTags.hbs | 4 +-- .../report_TicketsByTypes.hbs | 4 +-- .../report_TicketsByUsers.hbs | 4 +-- 17 files changed, 102 insertions(+), 39 deletions(-) diff --git a/src/public/js/angularjs/controllers/settings.js b/src/public/js/angularjs/controllers/settings.js index 13c6e2952..8f66f84d0 100644 --- a/src/public/js/angularjs/controllers/settings.js +++ b/src/public/js/angularjs/controllers/settings.js @@ -1467,7 +1467,7 @@ define([ '
\n' + '
\n' + ' \n' + - ' \n'; priorities.forEach(function(p) { if (p._id.toString() !== savedPriority._id) diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index 7a5cdf8c9..b7bcccf70 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -621,7 +621,7 @@ div.hoverAction span font-size: 0.875rem - color: #4d4d4d + color: automatic-text-color(lighten($page_content_right_bg, 10%), 'muted') font-weight: normal line-height: 1.5 margin-bottom: 0 diff --git a/src/sass/partials/messages.sass b/src/sass/partials/messages.sass index 8e37a957e..3cf67abde 100644 --- a/src/sass/partials/messages.sass +++ b/src/sass/partials/messages.sass @@ -34,7 +34,7 @@ // border-bottom: none &.active - background: white + background: $page_content_right_bg &.active:before, &.message-tag:before @@ -152,8 +152,8 @@ right: 0 height: 40px border: none - border-top: 1px solid #ddd - background: #fff + border-top: 1px solid $page_content_border_color + background: darken($page_content_right_bg, 5%) button border: none margin: 0 @@ -175,6 +175,10 @@ height: 40px font-size: 14px font-family: "Source Sans Pro", sans-serif + background: darken($page_content_right_bg, 5%) + color: automatic-text-color(darken($page_content_right_bg, 5%)) + &::placeholder + color: automatic-text-color(darken($page_content_right_bg, 5%)) a display: block float: right @@ -259,7 +263,7 @@ input[type="checkbox"]:checked.poloCheckbox + label display: block padding: 10px 5px 5px 5px font-size: 11px - color: #989898 + color: automatic-text-color($page_content_right_bg, 'muted') font-family: "Roboto", sans-serif .conversation-deleted font-weight: 700 @@ -351,10 +355,12 @@ input[type="checkbox"]:checked.poloCheckbox + label border: 1px solid $page_content_border_color background: lighten($page_bg_color, 20%) padding: 5px 15px - color: #222 + color: automatic-text-color(lighten($page_bg_color, 20%)) font-size: 13px font-weight: 300 +borderRadius(15px) + &::placeholder + color: automatic-text-color(lighten($page_bg_color, 20%), 'muted') &.withSeperator padding-left: 33px &::before diff --git a/src/sass/partials/tLoader.sass b/src/sass/partials/tLoader.sass index 63d1abcdd..9fffe6fc0 100644 --- a/src/sass/partials/tLoader.sass +++ b/src/sass/partials/tLoader.sass @@ -1,4 +1,5 @@ -#loader-wrapper +#loader-wrapper, +#dot-loader background: $page_content_bg position: absolute top: 0 @@ -9,6 +10,14 @@ height: 100% z-index: 999999 +@keyframes bigdotbounce + 0% + -webkit-transform: translateY(0%) + 50% + -webkit-transform: translateY(-150%) + 100% + -webkit-transform: translateY(0%) + @keyframes bounceC 0% -webkit-transform: translateY(0%) @@ -38,6 +47,10 @@ .t circle -webkit-animation: bounceC .7s infinite alternate ease-in-out +.bigdot circle + animation: bigdotbounce .7s infinite alternate ease-in-out + -webkit-animation: bigdotbounce .7s infinite alternate ease-in-out + //p // font-family: $fontFamily // font-size: 22px @@ -52,10 +65,12 @@ left: 50% transform: translate(-50%, -50%) -.loader-wrapper +.loader-wrapper, +.dot-loader-wrapper width: 100% height: 100% - svg.t + svg.t, + svg.bigdot position: absolute top: 0 left: 30% @@ -76,6 +91,9 @@ path fill: #323232 +svg.bigdot circle + fill: $accent_color !important + .shadow animation: expand .35s infinite alternate ease-in-out -webkit-animation: expand .35s infinite alternate ease-in-out diff --git a/src/sass/partials/ui.sass b/src/sass/partials/ui.sass index 0852e9f15..5d262dd2a 100644 --- a/src/sass/partials/ui.sass +++ b/src/sass/partials/ui.sass @@ -361,6 +361,25 @@ label.md-label padding-left: 12px !important padding-right: 12px !important +.uk-datepicker-table th + color: automatic-text-color($page_content_right_bg, 'muted') +.uk-datepicker-table a + color: $text_color + &:hover, &:active, &:focus + color: $text_color +a.uk-datepicker-table-muted + color: darken(automatic-text-color($page_content_right_bg, 'muted'), 5%) + &:hover, &:active, &:focus + color: darken(automatic-text-color($page_content_right_bg, 'muted'), 5%) + +.uk-tooltip + background: mix(black, $page_content_bg, 65%) + color: automatic-text-color(mix(black, $page_content_bg, 65%)) +.uk-tooltip-top-left:after, +.uk-tooltip-top-right:after, +.uk-tooltip-top:after + border-top-color: mix(black, $page_content_bg, 65%) !important + .uk-dropdown background: $page_content_button_color & >ul > li > a diff --git a/src/views/layout/main.hbs b/src/views/layout/main.hbs index 2267405df..5dd40d331 100644 --- a/src/views/layout/main.hbs +++ b/src/views/layout/main.hbs @@ -25,23 +25,43 @@ -
+ + + + + + + + + + + + + + + + + + + + + +
- - - + + + - +
- + - - +
diff --git a/src/views/partials/createGroupWindow.hbs b/src/views/partials/createGroupWindow.hbs index 8db6cac16..099d4051f 100644 --- a/src/views/partials/createGroupWindow.hbs +++ b/src/views/partials/createGroupWindow.hbs @@ -7,7 +7,7 @@
- {{#each data.users}} {{/each}} @@ -15,7 +15,7 @@
- {{#each data.users}} {{/each}} diff --git a/src/views/partials/deletePriorityWindow.hbs b/src/views/partials/deletePriorityWindow.hbs index a01a335c0..26454da55 100644 --- a/src/views/partials/deletePriorityWindow.hbs +++ b/src/views/partials/deletePriorityWindow.hbs @@ -10,7 +10,7 @@
- {{#each @root.data.common.priorities}} {{#isnot name ../name}} diff --git a/src/views/partials/deleteTicketTypeWindow.hbs b/src/views/partials/deleteTicketTypeWindow.hbs index 8933f9c49..f5b755473 100644 --- a/src/views/partials/deleteTicketTypeWindow.hbs +++ b/src/views/partials/deleteTicketTypeWindow.hbs @@ -10,7 +10,7 @@
- {{#each @root.data.common.ticketTypes}} {{#isnot name ../name}} diff --git a/src/views/partials/newMessageWindow.hbs b/src/views/partials/newMessageWindow.hbs index e63d52e83..9cb202b3f 100644 --- a/src/views/partials/newMessageWindow.hbs +++ b/src/views/partials/newMessageWindow.hbs @@ -7,7 +7,7 @@
- + + + + + diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs index 1f4f59e76..904132f44 100644 --- a/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs +++ b/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs @@ -38,7 +38,7 @@
- diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs index 8a01e7157..adb9ccd99 100644 --- a/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs +++ b/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs @@ -38,7 +38,7 @@
- + @@ -50,7 +50,7 @@
- @@ -50,7 +50,7 @@
- @@ -50,7 +50,7 @@
- +
    {{#each data.common.users}} From 08904cf2c22b2b42c4102bdaf1897fa4bb4f78fa Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Mon, 5 Nov 2018 19:39:44 -0500 Subject: [PATCH 18/40] style(sass): issue where colors were rending incorrectly --- src/sass/partials/ui.sass | 2 +- src/views/dashboard.hbs | 4 ++-- src/views/layout/main.hbs | 21 --------------------- src/views/partials/nav.hbs | 2 +- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/src/sass/partials/ui.sass b/src/sass/partials/ui.sass index 5d262dd2a..9ba8907ff 100644 --- a/src/sass/partials/ui.sass +++ b/src/sass/partials/ui.sass @@ -603,7 +603,7 @@ textarea.review-list left: 50% transform: translate(-50%, -50%) -.c3 text, .c3-text.c3-empty +.c3-legend-item text, .c3-text.c3-empty fill: $text_color !important .uk-table thead th diff --git a/src/views/dashboard.hbs b/src/views/dashboard.hbs index c4ebca068..e1357bf28 100644 --- a/src/views/dashboard.hbs +++ b/src/views/dashboard.hbs @@ -100,7 +100,7 @@
    -
    +
    Top 5 Groups
    -
    +
    Top 10 Tags
    diff --git a/src/views/layout/main.hbs b/src/views/layout/main.hbs index 5dd40d331..ee9c7d363 100644 --- a/src/views/layout/main.hbs +++ b/src/views/layout/main.hbs @@ -25,27 +25,6 @@ - - - - - - - - - - - - - - - - - - - - -
    diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs index 58e4ed364..01b603ca9 100644 --- a/src/views/partials/nav.hbs +++ b/src/views/partials/nav.hbs @@ -99,7 +99,7 @@ {{#canUser data.user "notices:view"}} -
  • Notices
    • +
  • warningNotices
    • {{/canUser}}
    From d02b1ecccf27811a6a18873ee923adb049a0054e Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Mon, 5 Nov 2018 20:07:47 -0500 Subject: [PATCH 19/40] style(sass): more dark theme fixes --- src/sass/partials/common.sass | 2 +- src/sass/partials/ui.sass | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index b7bcccf70..4b7a40d59 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -151,7 +151,7 @@ font-size: 14px line-height: 18px display: block - color: #727272 + color: automatic-text-color($page_content_right_bg, 'muted') .cursor-pointer cursor: default !important diff --git a/src/sass/partials/ui.sass b/src/sass/partials/ui.sass index 9ba8907ff..0233c353d 100644 --- a/src/sass/partials/ui.sass +++ b/src/sass/partials/ui.sass @@ -288,6 +288,8 @@ label.md-label .uk-modal-dialog background: $page_content_right_bg +.uk-file-upload + background: lighten($page_content_right_bg, 2%) .uk-accordion-title-small font-size: 13px From d22e91461ae7414d0104417335fc48445de9a548 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 7 Nov 2018 01:07:19 -0500 Subject: [PATCH 20/40] chore(code): cleanup --- src/sass/functions.sass | 2 +- src/sass/partials/common.sass | 2 +- src/views/partials/nav.hbs | 27 +-------------------------- src/views/pub_createTicket.hbs | 1 + src/views/pub_signup.hbs | 1 + 5 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/sass/functions.sass b/src/sass/functions.sass index 96bb95070..88870932a 100644 --- a/src/sass/functions.sass +++ b/src/sass/functions.sass @@ -17,7 +17,7 @@ @if (lightness($bgColor) > 50 and lightness($accent_color) > 75) @return darken($accent_color, 40%) @else - @return $accent_color + @return lighten($accent_color, 10%) @function pace-color() @if ($topbar_bg == #42464d) diff --git a/src/sass/partials/common.sass b/src/sass/partials/common.sass index 4b7a40d59..7d8bf5ae7 100644 --- a/src/sass/partials/common.sass +++ b/src/sass/partials/common.sass @@ -169,7 +169,7 @@ margin: 0 a.blackLink - color: #222 !important + color: automatic-link-color($page_content_right_bg) !important a.hoverUnderline &:hover diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs index 01b603ca9..f7f81e9b3 100644 --- a/src/views/partials/nav.hbs +++ b/src/views/partials/nav.hbs @@ -30,19 +30,8 @@
  • chatMessages
    • - - - - - - - - - {{#canUser data.user "accounts:view"}}
  • Accounts
    • {{/canUser}} {{#canUser data.user "groups:view"}}
  • supervisor_accountGroups
    • {{/canUser}} - - {{#canUser data.user "reports:view"}}
  • @@ -53,15 +42,10 @@
    • {{/canUser}} @@ -144,15 +128,10 @@
  • Closed
\ No newline at end of file diff --git a/src/views/pub_createTicket.hbs b/src/views/pub_createTicket.hbs index d9c7ce492..600092e74 100644 --- a/src/views/pub_createTicket.hbs +++ b/src/views/pub_createTicket.hbs @@ -40,6 +40,7 @@ height: 500px; background: #f6f6f6; border: 1px solid #ccc; + color: #222; padding: 15px; overflow: auto; } diff --git a/src/views/pub_signup.hbs b/src/views/pub_signup.hbs index c04716ee9..8f4f46f45 100644 --- a/src/views/pub_signup.hbs +++ b/src/views/pub_signup.hbs @@ -42,6 +42,7 @@ border: 1px solid #ccc; padding: 15px; overflow: auto; + color: #222; } p { From f01cf82e0f67c5326e9aa76aa9c1a6b00d3f5400 Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 7 Nov 2018 01:21:43 -0500 Subject: [PATCH 21/40] chore(sass): building of dynamic sass --- app.js | 4 + src/controllers/api/v1/settings.js | 9 ++ src/helpers/viewdata/index.js | 66 +-------------- .../js/angularjs/controllers/settings.js | 9 +- src/routes/index.js | 1 + src/sass/buildsass.js | 82 +++++++++++++++++++ 6 files changed, 104 insertions(+), 67 deletions(-) create mode 100644 src/sass/buildsass.js diff --git a/app.js b/app.js index a79fec1f0..6fcb6549d 100644 --- a/app.js +++ b/app.js @@ -178,6 +178,10 @@ function dbCallback(err, db) { function(next) { require('./src/settings/defaults').init(next); }, + function(next) { + winston.debug('Building dynamic sass...'); + require('./src/sass/buildsass').build(next); + }, function(next) { //Start Task Runners require('./src/taskrunner'); diff --git a/src/controllers/api/v1/settings.js b/src/controllers/api/v1/settings.js index 559b48399..d0ea49646 100644 --- a/src/controllers/api/v1/settings.js +++ b/src/controllers/api/v1/settings.js @@ -99,5 +99,14 @@ apiSettings.testMailer = function(req, res) { }); }; +apiSettings.buildsass = function(req, res) { + var buildsass = require('../../../sass/buildsass'); + buildsass.build(function(err) { + if (err) return res.status(400).json({success: false, error: err}); + + return res.json({success: true}); + }); +}; + module.exports = apiSettings; \ No newline at end of file diff --git a/src/helpers/viewdata/index.js b/src/helpers/viewdata/index.js index d14db12b1..5b07cc18a 100644 --- a/src/helpers/viewdata/index.js +++ b/src/helpers/viewdata/index.js @@ -17,79 +17,15 @@ var async = require('async'), winston = require('winston'), moment = require('moment'), permissions = require('../../permissions'), - settingSchema = require('../../models/setting'), - settingUtil = require('../../settings/settingsUtil'), - - sass = require('node-sass'); - + settingSchema = require('../../models/setting'); var viewController = {}; var viewdata = {}; viewdata.notifications = {}; viewdata.users = {}; -var nconf = require('nconf'); -var sassOptionsDefaults = { - indentedSyntax: true, - includePaths: [ - nconf.get('base_dir') + '/src/sass' - ], - outputStyle: 'compressed' -}; - -function sassVariable(name, value) { - return '$' + name + ': ' + value + '\n'; -} - -function sassVariables(variablesObj) { - return Object.keys(variablesObj).map(function (name) { - return sassVariable(name, variablesObj[name]); - }).join('\n'); -} - -function sassImport(path) { - return '@import \'' + path + '\'\n'; -} - -function dynamicSass(entry, vars, success, error) { - var dataString = - sassVariables(vars) + - sassImport(entry); - var sassOptions = _.assign({}, sassOptionsDefaults, { - data: dataString - }); - - sass.render(sassOptions, function (err, result) { - return (err) - ? error(err) - : success(result.css.toString()); - }); -} - viewController.getData = function(request, cb) { async.parallel([ - function(callback) { - settingUtil.getSettings(function(err, s) { - if (!err && s) { - var settings = s.data.settings; - - dynamicSass('app.sass', { - header_background: settings.colorHeaderBG.value, - header_primary: settings.colorHeaderPrimary.value, - primary: settings.colorPrimary.value, - secondary: settings.colorSecondary.value, - tertiary: settings.colorTertiary.value, - quaternary: settings.colorQuaternary.value - }, function(result) { - var fs = require('fs'); - var themeCss = nconf.get('base_dir') + '/public/css/app.min.css'; - fs.writeFileSync(themeCss, result); - return callback(); - }, callback); - } else - return callback(); - }); - }, function(callback) { settingSchema.getSetting('gen:sitetitle', function(err, setting) { if (!err && setting && setting.value) diff --git a/src/public/js/angularjs/controllers/settings.js b/src/public/js/angularjs/controllers/settings.js index 8f66f84d0..5ae1da151 100644 --- a/src/public/js/angularjs/controllers/settings.js +++ b/src/public/js/angularjs/controllers/settings.js @@ -1616,9 +1616,14 @@ define([ 'Content-Type': 'application/json' } }).then(function successCallback() { - helpers.UI.showSnackbar('Color Scheme Saved. Reloading...', false); // Call rebuild of app.min.css - $timeout(function() { $window.location.reload(); }, 1000); + $http.get('/api/v1/settings/buildsass') + .then(function successCallback() { + helpers.UI.showSnackbar('Color Scheme Saved. Reloading...', false); + $timeout(function() { $window.location.reload(); }, 1000); + }, function errorCallback(err) { + helpers.UI.showSnackbar(err, true); + }); }, function errorCallback(err) { helpers.UI.showSnackbar(err, true); }); diff --git a/src/routes/index.js b/src/routes/index.js index 9269291e5..f51f26142 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -231,6 +231,7 @@ function mainRoutes(router, middleware, controllers) { router.put('/api/v1/settings', middleware.api, controllers.api.settings.updateSetting); router.post('/api/v1/settings/testmailer', middleware.api, controllers.api.settings.testMailer); + router.get('/api/v1/settings/buildsass', middleware.api, controllers.api.settings.buildsass); router.get('/api/v1/plugins/list/installed', middleware.api, function(req, res) { return res.json({success: true, loadedPlugins: global.plugins}); }); router.get('/api/v1/plugins/install/:packageid', middleware.api, middleware.isAdmin, controllers.api.plugins.installPlugin); diff --git a/src/sass/buildsass.js b/src/sass/buildsass.js new file mode 100644 index 000000000..58a69f181 --- /dev/null +++ b/src/sass/buildsass.js @@ -0,0 +1,82 @@ +/* + . .o8 oooo + .o8 "888 `888 + .o888oo oooo d8b oooo oooo .oooo888 .ooooo. .oooo.o 888 oooo + 888 `888""8P `888 `888 d88' `888 d88' `88b d88( "8 888 .8P' + 888 888 888 888 888 888 888ooo888 `"Y88b. 888888. + 888 . 888 888 888 888 888 888 .o o. )88b 888 `88b. + "888" d888b `V88V"V8P' `Y8bod88P" `Y8bod8P' 8""888P' o888o o888o + ======================================================================== + Created: 11/7/2018 + Author: Chris Brame + + */ + +var _ = require('lodash'); +var sass = require('node-sass'); +var nconf = require('nconf'); +var settingUtil = require('../settings/settingsUtil'); + +var buildsass = {}; + +var sassOptionsDefaults = { + indentedSyntax: true, + includePaths: [ + nconf.get('base_dir') + '/src/sass' + ], + outputStyle: 'compressed' +}; + +function sassVariable(name, value) { + return '$' + name + ': ' + value + '\n'; +} + +function sassVariables(variablesObj) { + return Object.keys(variablesObj).map(function (name) { + return sassVariable(name, variablesObj[name]); + }).join('\n'); +} + +function sassImport(path) { + return '@import \'' + path + '\'\n'; +} + +function dynamicSass(entry, vars, success, error) { + var dataString = + sassVariables(vars) + + sassImport(entry); + var sassOptions = _.assign({}, sassOptionsDefaults, { + data: dataString + }); + + sass.render(sassOptions, function (err, result) { + return (err) + ? error(err) + : success(result.css.toString()); + }); +} + +buildsass.build = function(callback) { + settingUtil.getSettings(function(err, s) { + if (!err && s) { + var settings = s.data.settings; + + dynamicSass('app.sass', { + header_background: settings.colorHeaderBG.value, + header_primary: settings.colorHeaderPrimary.value, + primary: settings.colorPrimary.value, + secondary: settings.colorSecondary.value, + tertiary: settings.colorTertiary.value, + quaternary: settings.colorQuaternary.value + }, function(result) { + var fs = require('fs'); + var themeCss = nconf.get('base_dir') + '/public/css/app.min.css'; + fs.writeFileSync(themeCss, result); + return callback(); + }, callback); + } else + return callback(); + }); +}; + +module.exports = buildsass; \ No newline at end of file From 88367d9a8f743ca79f77beca5a225be8a8060f2d Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 7 Nov 2018 01:34:20 -0500 Subject: [PATCH 22/40] fix(install): server crash due to invalid middleware --- src/views/install.hbs | 4 ++++ src/webserver.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/install.hbs b/src/views/install.hbs index 52efab804..174c97f13 100644 --- a/src/views/install.hbs +++ b/src/views/install.hbs @@ -29,6 +29,10 @@ padding: 15px 0; } + h2 { + color: #444 !important; + } + p { font-family: "Roboto", Arial, sans-serif; font-weight: 300; diff --git a/src/webserver.js b/src/webserver.js index 3625ee53a..eb15c0f2a 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -97,11 +97,11 @@ var async = require('async'), app.set('view engine', 'hbs'); hbsHelpers.register(hbs.handlebars); - app.use('/assets', express.static(nconf.get('base_dir') + '/public/uploads/assets')); - app.use('/uploads', middleware.redirectToLogin, express.static(nconf.get('base_dir') + '/public/uploads')); + app.use('/assets', express.static(path.join(__dirname, '../public/uploads/assets'))); + app.use('/uploads', routeMiddleware.redirectToLogin, express.static(path.join(__dirname, '../public/uploads'))); - app.use(express.static(nconf.get('base_dir') + '/public')); - app.use(favicon(nconf.get('base_dir') + '/public/img/favicon.ico')); + app.use(express.static(path.join(__dirname, '../public'))); + app.use(favicon(path.join(__dirname, '../public/img/favicon.ico'))); app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.json()); From 20c06d80af7cbb0b23861d7f3a2c3f3f4be95b1e Mon Sep 17 00:00:00 2001 From: Chris Brame Date: Wed, 7 Nov 2018 01:36:45 -0500 Subject: [PATCH 23/40] style(sass): invalid spinner background --- src/views/partials/createTicketWindow.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/createTicketWindow.hbs b/src/views/partials/createTicketWindow.hbs index ea0849586..a7b529a0d 100644 --- a/src/views/partials/createTicketWindow.hbs +++ b/src/views/partials/createTicketWindow.hbs @@ -52,7 +52,7 @@