From ebd884e654c45373dc56a03730a4ce670887ce8b Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 17:27:26 +0200 Subject: Fixed lint errors --- client/components/rules/rulesActions.js | 8 ++++---- client/components/rules/rulesMain.js | 2 +- client/components/rules/rulesTriggers.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js index ecba857b..64a5c70e 100644 --- a/client/components/rules/rulesActions.js +++ b/client/components/rules/rulesActions.js @@ -41,16 +41,16 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-actions' (event) { + 'click .js-set-board-actions'(){ this.setBoardActions(); }, - 'click .js-set-card-actions' (event) { + 'click .js-set-card-actions'() { this.setCardActions(); }, - 'click .js-set-mail-actions' (event) { + 'click .js-set-mail-actions'() { this.setMailActions(); }, - 'click .js-set-checklist-actions' (event) { + 'click .js-set-checklist-actions'() { this.setChecklistActions(); }, }]; diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 65cc3d98..e0171b56 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -24,7 +24,7 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-delete-rule' (event) { + 'click .js-delete-rule' () { const rule = this.currentData(); Rules.remove(rule._id); Actions.remove(rule.actionId); diff --git a/client/components/rules/rulesTriggers.js b/client/components/rules/rulesTriggers.js index 506e63b2..e3c16221 100644 --- a/client/components/rules/rulesTriggers.js +++ b/client/components/rules/rulesTriggers.js @@ -39,13 +39,13 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-triggers' (event) { + 'click .js-set-board-triggers' () { this.setBoardTriggers(); }, - 'click .js-set-card-triggers' (event) { + 'click .js-set-card-triggers' () { this.setCardTriggers(); }, - 'click .js-set-checklist-triggers' (event) { + 'click .js-set-checklist-triggers' () { this.setChecklistTriggers(); }, }]; -- cgit v1.2.3-1-g7c22 From f19948f9936af6656d70ba629d56cbf40de77b2a Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 17:47:01 +0200 Subject: Added back button --- client/components/rules/ruleDetails.jade | 4 ++++ client/components/rules/rules.styl | 11 +++++++++++ client/components/rules/rulesActions.jade | 6 +++++- client/components/rules/rulesMain.js | 9 +++++++++ client/components/rules/rulesTriggers.jade | 6 +++++- 5 files changed, 34 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade index b9a1351c..1f351357 100644 --- a/client/components/rules/ruleDetails.jade +++ b/client/components/rules/ruleDetails.jade @@ -14,5 +14,9 @@ template(name="ruleDetails") div.trigger-content div.trigger-text = action + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 45ce4003..b52f84a7 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -32,6 +32,17 @@ display: inline-block float: right margin: auto +.rules-back + display: block + overflow: auto + margin-top: 15px + margin-bottom: 5px + button + display: inline-block + float: right + margin: auto + margin-right:14px + .flex display: -webkit-box display: -moz-box diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade index 8dfceeeb..4bcff769 100644 --- a/client/components/rules/rulesActions.jade +++ b/client/components/rules/rulesActions.jade @@ -22,4 +22,8 @@ template(name="rulesActions") else if ($eq currentActions.get 'checklist') +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar) else if ($eq currentActions.get 'mail') - +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) \ No newline at end of file + +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index e0171b56..feb46d74 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -46,6 +46,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade index 0ef5edfa..01c0cad5 100644 --- a/client/components/rules/rulesTriggers.jade +++ b/client/components/rules/rulesTriggers.jade @@ -18,4 +18,8 @@ template(name="rulesTriggers") else if showCardTrigger.get +cardTriggers else if showChecklistTrigger.get - +checklistTriggers \ No newline at end of file + +checklistTriggers + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 506b95107c9c124d07f36be295487b1454107a86 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 17:55:24 +0200 Subject: Fixed uppercase rules details --- client/components/rules/ruleDetails.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/ruleDetails.js b/client/components/rules/ruleDetails.js index 386b2b48..17c86dc3 100644 --- a/client/components/rules/ruleDetails.js +++ b/client/components/rules/ruleDetails.js @@ -14,7 +14,9 @@ BlazeComponent.extendComponent({ const trigger = Triggers.findOne({ _id: rule.triggerId, }); - return trigger.description(); + const desc = trigger.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, action() { const ruleId = this.data().ruleId; @@ -24,7 +26,9 @@ BlazeComponent.extendComponent({ const action = Actions.findOne({ _id: rule.actionId, }); - return action.description(); + const desc = action.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, events() { -- cgit v1.2.3-1-g7c22 From 6931b88e4013754a7b03205a9916b9e607224f48 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Sun, 7 Oct 2018 18:19:51 +0200 Subject: Prevent rules with no name --- client/components/rules/rulesMain.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'client/components') diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index feb46d74..3e871c69 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -34,9 +34,11 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - this.find('#ruleTitle').value = ''; - this.ruleName.set(ruleTitle); - this.setTrigger(); + if(ruleTitle != undefined && ruleTitle != ''){ + this.find('#ruleTitle').value = ''; + this.ruleName.set(ruleTitle); + this.setTrigger(); + } }, 'click .js-goto-action' (event) { event.preventDefault(); -- cgit v1.2.3-1-g7c22