From 8170885236b7a89e1922e874f4866d04cd937286 Mon Sep 17 00:00:00 2001
From: Hunter Long <info@socialeck.com>
Date: Mon, 16 Mar 2020 20:13:07 -0700
Subject: [PATCH] additional

---
 frontend/src/API.js                           |  2 +-
 frontend/src/components/Index/Group.vue       |  1 +
 .../components/Service/ServiceFailures.vue    | 34 ++++++++++++-------
 .../src/components/Service/ServiceInfo.vue    | 15 +++++---
 handlers/notifications.go                     |  2 +-
 notifiers/command.go                          |  5 +--
 notifiers/discord.go                          |  1 +
 notifiers/email.go                            |  1 +
 notifiers/line_notify.go                      |  1 +
 notifiers/mobile.go                           |  1 +
 notifiers/slack.go                            |  5 +--
 notifiers/telegram.go                         |  1 +
 notifiers/twilio.go                           |  1 +
 notifiers/webhook.go                          |  1 +
 types/notifications/methods.go                | 16 +++++++++
 15 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/frontend/src/API.js b/frontend/src/API.js
index b1c9c3ba..138ffdc7 100644
--- a/frontend/src/API.js
+++ b/frontend/src/API.js
@@ -53,7 +53,7 @@ class Api {
   }
 
   async service_failures(id, start, end, limit = 999, offset = 0) {
-    return axios.get('/api/services/' + id + '/failures?start=' + start + '&end=' + end + '&limit=' + limit).then(response => (response.data))
+    return axios.get('/api/services/' + id + '/failures?start=' + start + '&end=' + end + '&limit=' + limit+ '&offset=' + offset).then(response => (response.data))
   }
 
   async service_delete(id) {
diff --git a/frontend/src/components/Index/Group.vue b/frontend/src/components/Index/Group.vue
index 483fce3c..4d03a804 100644
--- a/frontend/src/components/Index/Group.vue
+++ b/frontend/src/components/Index/Group.vue
@@ -8,6 +8,7 @@
                 <span class="badge float-right" :class="{'bg-success': service.online, 'bg-danger': !service.online }">{{service.online ? "ONLINE" : "OFFLINE"}}</span>
 
                 <GroupServiceFailures :service="service"/>
+
             </a>
 
         </div>
diff --git a/frontend/src/components/Service/ServiceFailures.vue b/frontend/src/components/Service/ServiceFailures.vue
index 964934f4..53ee9434 100644
--- a/frontend/src/components/Service/ServiceFailures.vue
+++ b/frontend/src/components/Service/ServiceFailures.vue
@@ -9,19 +9,19 @@
             <p class="mb-1">{{failure.issue}}</p>
         </div>
 
-        <nav aria-label="page navigation example">
-            <ul class="pagination">
-                <li class="page-item">
-                    <a class="page-link" href="#" aria-label="Previous">
+        <nav v-if="total > 4" aria-label="page navigation example">
+            <ul class="pagination justify-content-center">
+                <li class="page-item" :class="{'disabled': page===1}">
+                    <a @click.prevent="gotoPage(page-1)" :disabled="page===1" class="page-link" href="#" aria-label="Previous">
                         <span aria-hidden="true">&laquo;</span>
                         <span class="sr-only">Previous</span>
                     </a>
                 </li>
-                <li class="page-item"><a class="page-link" href="#">1</a></li>
-                <li class="page-item"><a class="page-link" href="#">2</a></li>
-                <li class="page-item"><a class="page-link" href="#">3</a></li>
-                <li class="page-item">
-                    <a class="page-link" href="#" aria-label="Next">
+                <li v-for="n in Math.floor(total / limit)" class="page-item" :class="{'active': page === n}">
+                    <a @click.prevent="gotoPage(n)" class="page-link" href="#">{{n}}</a>
+                </li>
+                <li class="page-item" :class="{'disabled': page===Math.floor(total / limit)}">
+                    <a @click.prevent="gotoPage(page+1)" :disabled="page===Math.floor(total / limit)" class="page-link" href="#" aria-label="Next">
                         <span aria-hidden="true">&raquo;</span>
                         <span class="sr-only">Next</span>
                     </a>
@@ -47,15 +47,25 @@ export default {
     data () {
         return {
             failures: [],
-            limit: 15,
+            limit: 4,
             offset: 0,
-            total: this.service.stats.failures
+            total: this.service.stats.failures,
+            page: 1
         }
     },
     async mounted () {
-      this.failures = await Api.service_failures(this.service.id, this.now(), this.now(), this.limit, this.offset)
+        await this.gotoPage(1)
     },
     methods: {
+        async gotoPage(page) {
+            this.page = page;
+
+            this.offset = (page-1) * this.limit;
+
+            window.console.log('page', this.page, this.limit, this.offset);
+
+            this.failures = await Api.service_failures(this.service.id, 0, 9999999999, this.limit, this.offset)
+        },
         smallText(s) {
             if (s.online) {
                 return `Online, last checked ${this.ago(s.last_success)}`
diff --git a/frontend/src/components/Service/ServiceInfo.vue b/frontend/src/components/Service/ServiceInfo.vue
index d9d9b9aa..e4bdc16b 100644
--- a/frontend/src/components/Service/ServiceInfo.vue
+++ b/frontend/src/components/Service/ServiceInfo.vue
@@ -1,5 +1,5 @@
 <template v-if="service">
-    <div class="col-12 card mb-4" style="min-height: 280px" :class="{'offline-card': !service.online}">
+    <div class="col-12 card mb-4" style="min-height: 280px;" :class="{'offline-card': !service.online}">
         <div class="card-body p-3 p-md-1 pt-md-3 pb-md-1">
             <h4 class="card-title mb-4"><router-link :to="serviceLink(service)">{{service.name}}</router-link>
                 <span class="badge float-right" :class="{'badge-success': service.online, 'badge-danger': !service.online}">
@@ -44,13 +44,13 @@
                 </div>
 
                     <div class="col-4">
-                        <button @click.prevent="openTab='incident'" class="btn btn-block btn-outline-secondary">Create Incident</button>
+                        <button @click.prevent="Tab('incident')" class="btn btn-block btn-outline-secondary" :class="{'text-white btn-secondary': openTab==='incident'}" >Create Incident</button>
                     </div>
                     <div class="col-4">
-                        <button @click.prevent="openTab='message'" class="btn btn-block btn-outline-secondary">Create Announcement</button>
+                        <button @click.prevent="Tab('message')" class="btn btn-block btn-outline-secondary" :class="{'text-white btn-secondary': openTab==='message'}">Create Announcement</button>
                     </div>
                     <div class="col-4">
-                        <button @click.prevent="openTab='failures'" class="btn btn-block btn-outline-secondary" :disabled="!service.failures">
+                        <button @click.prevent="Tab('failures')" class="btn btn-block btn-outline-secondary" :disabled="service.stats.failures === 0" :class="{'text-white btn-secondary': openTab==='failures'}">
                             Failures <span class="badge badge-danger float-right mt-1">{{service.stats.failures}}</span></button>
                     </div>
 
@@ -121,6 +121,13 @@
           this.loaded = true
       },
       methods: {
+          Tab(name) {
+              if (this.openTab === name) {
+                  this.openTab = ''
+                  return
+              }
+              this.openTab=name;
+          },
         sinceYesterday(data) {
             window.console.log(data)
           let total = 0
diff --git a/handlers/notifications.go b/handlers/notifications.go
index b3b44cc3..ca96b9f6 100644
--- a/handlers/notifications.go
+++ b/handlers/notifications.go
@@ -30,7 +30,7 @@ func apiNotifiersHandler(w http.ResponseWriter, r *http.Request) {
 	notifiers := services.AllNotifiers()
 	var notifs []*notifications.Notification
 	for _, n := range notifiers {
-		notifs = append(notifs, n.Select())
+		notifs = append(notifs, notifications.SelectNotifier(n.Select()))
 	}
 	returnJson(notifs, w, r)
 }
diff --git a/notifiers/command.go b/notifiers/command.go
index 31384be4..bc2470c6 100644
--- a/notifiers/command.go
+++ b/notifiers/command.go
@@ -44,6 +44,7 @@ var Command = &commandLine{&notifications.Notification{
 	Delay:       time.Duration(1 * time.Second),
 	Icon:        "fas fa-terminal",
 	Host:        "/bin/bash",
+	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Shell or Bash",
@@ -72,14 +73,14 @@ func runCommand(app string, cmd ...string) (string, string, error) {
 
 // OnFailure for commandLine will trigger failing service
 func (u *commandLine) OnFailure(s *services.Service, f *failures.Failure) error {
-	msg := u.GetValue("host")
+	msg := u.GetValue("var2")
 	_, _, err := runCommand(u.Host, msg)
 	return err
 }
 
 // OnSuccess for commandLine will trigger successful service
 func (u *commandLine) OnSuccess(s *services.Service) error {
-	msg := u.GetValue("host")
+	msg := u.GetValue("var1")
 	_, _, err := runCommand(u.Host, msg)
 	return err
 }
diff --git a/notifiers/discord.go b/notifiers/discord.go
index 1ec101a2..89b0f459 100644
--- a/notifiers/discord.go
+++ b/notifiers/discord.go
@@ -44,6 +44,7 @@ var Discorder = &discord{&notifications.Notification{
 	Delay:       time.Duration(5 * time.Second),
 	Host:        "https://discordapp.com/api/webhooks/****/*****",
 	Icon:        "fab fa-discord",
+	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "discord webhooker URL",
diff --git a/notifiers/email.go b/notifiers/email.go
index 520e8af2..32eace2b 100644
--- a/notifiers/email.go
+++ b/notifiers/email.go
@@ -127,6 +127,7 @@ var email = &emailer{&notifications.Notification{
 	Author:      "Hunter Long",
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "far fa-envelope",
+	Limits:      30,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "SMTP Host",
diff --git a/notifiers/line_notify.go b/notifiers/line_notify.go
index 51f06787..95f4d3e8 100644
--- a/notifiers/line_notify.go
+++ b/notifiers/line_notify.go
@@ -48,6 +48,7 @@ var LineNotify = &lineNotifier{&notifications.Notification{
 	Author:      "Kanin Peanviriyakulkit",
 	AuthorUrl:   "https://github.com/dogrocker",
 	Icon:        "far fa-bell",
+	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Access Token",
diff --git a/notifiers/mobile.go b/notifiers/mobile.go
index 66469eea..f5c561e4 100644
--- a/notifiers/mobile.go
+++ b/notifiers/mobile.go
@@ -48,6 +48,7 @@ var Mobile = &mobilePush{&notifications.Notification{
 	AuthorUrl: "https://github.com/hunterlong",
 	Delay:     time.Duration(5 * time.Second),
 	Icon:      "fas fa-mobile-alt",
+	Limits:    30,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Device Identifiers",
diff --git a/notifiers/slack.go b/notifiers/slack.go
index abd30da8..768d7bd7 100644
--- a/notifiers/slack.go
+++ b/notifiers/slack.go
@@ -55,6 +55,7 @@ var slacker = &slack{&notifications.Notification{
 	Delay:       time.Duration(10 * time.Second),
 	Host:        "https://webhooksurl.slack.com/***",
 	Icon:        "fab fa-slack",
+	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Incoming webhooker Url",
@@ -118,9 +119,5 @@ func (u *slack) OnSuccess(s *services.Service) error {
 		Time:     utils.Now().Unix(),
 	}
 	msg := parseSlackMessage(s.Id, successTemplate, message)
-
-	fmt.Println("Sending OnSuccess message!")
-	fmt.Println(msg)
-	fmt.Printf("%s\n", u.Host)
 	return u.sendSlack(msg)
 }
diff --git a/notifiers/telegram.go b/notifiers/telegram.go
index 857e5243..a59110d7 100644
--- a/notifiers/telegram.go
+++ b/notifiers/telegram.go
@@ -47,6 +47,7 @@ var Telegram = &telegram{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "fab fa-telegram-plane",
 	Delay:       time.Duration(5 * time.Second),
+	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Telegram API Token",
diff --git a/notifiers/twilio.go b/notifiers/twilio.go
index 39645fbe..68e20c33 100644
--- a/notifiers/twilio.go
+++ b/notifiers/twilio.go
@@ -47,6 +47,7 @@ var Twilio = &twilio{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "far fa-comment-alt",
 	Delay:       time.Duration(10 * time.Second),
+	Limits:      15,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Account SID",
diff --git a/notifiers/webhook.go b/notifiers/webhook.go
index 93296b50..68a94629 100644
--- a/notifiers/webhook.go
+++ b/notifiers/webhook.go
@@ -47,6 +47,7 @@ var Webhook = &webhooker{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "fas fa-code-branch",
 	Delay:       time.Duration(1 * time.Second),
+	Limits:      180,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "HTTP Endpoint",
diff --git a/types/notifications/methods.go b/types/notifications/methods.go
index 07b9362f..886f1390 100644
--- a/types/notifications/methods.go
+++ b/types/notifications/methods.go
@@ -38,6 +38,22 @@ func (n *Notification) LastSent() time.Duration {
 	return since
 }
 
+func SelectNotifier(n *Notification) *Notification {
+	notif, err := Find(n.Method)
+	if err != nil {
+		log.Errorln(err)
+		return n
+	}
+	n.Host = notif.Host
+	n.Username = notif.Username
+	n.Password = notif.Password
+	n.ApiSecret = notif.ApiSecret
+	n.ApiKey = notif.ApiKey
+	n.Var1 = notif.Var1
+	n.Host = notif.Var2
+	return n
+}
+
 func (n *Notification) CanSend() bool {
 	if !n.Enabled.Bool {
 		return false