Merge pull request #2 from jacobmichels/fix-dropdown-colour

Fix dropdown colour
jacobmichels · Apr 27, 2020 · d69a1cf · d69a1cf
2 parents 2893c41 + 577fb08
commit d69a1cf
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/electron/src/config.html b/electron/src/config.html
@@ -30,6 +30,7 @@
                 <div class="bg-color card z-depth-4" >
                   <div class="card-content white-text">
                     <span id="title" class="card-title">&#127959; Configuration</span>
+                    <p id="message"></p>
                   </div>
                   <div class="card-action">
                     <div class="input-field">
@@ -47,6 +48,7 @@
                         <option value="wait">Wait until last second to accept</option>
                       </select>
                     </div>
+                    <a onclick="test()" class="waves-effect red waves-light btn">test pushed id</a>
                     <a onclick="cancel()" class="waves-effect red waves-light btn">cancel</a>
                     <a onclick="save()" class="waves-effect red waves-light btn">save and exit</a>
                   </div>

diff --git a/electron/src/config.js b/electron/src/config.js
@@ -64,9 +64,17 @@ save = () => {       //save id to file
     // BrowserWindow.getFocusedWindow().setSize(500, 265);
 }
 
-function adjust_textarea(h) {
-    h.style.height = "20px";
-    h.style.height = (h.scrollHeight)+"px";
-}
-
-// $($)
+test = () =>{
+    let tempID = $('#pushed-id-field').val();
+    $.ajax({
+        type: 'POST',
+        data: { "id": tempID, "event": "test" },
+        url: 'https://us-central1-lol-boosted.cloudfunctions.net/sendNotification',
+        success: function (data) {
+            $('#message').html('Sent test notification to Pushed ID "'+tempID+'"');
+        },
+        error: function (data) {
+            $('#message').html("error in http request to firebase");
+        }
+    })
+}
diff --git a/electron/src/index.css b/electron/src/index.css
@@ -75,6 +75,6 @@ html,body {
 }
 
 input{
-  color: #9e9e9e;
+  color: #ffffff;
   font-size:1rem !important;
 }
diff --git a/firebase/functions/index.js b/firebase/functions/index.js
@@ -15,12 +15,25 @@ exports.sendNotification = functions.https.onRequest((request, response) => {
     // console.log(request.query);
     // response.send("good");
 
-    const formdata = {
-        "app_key": process.env.app_key,
-        "app_secret": process.env.app_secret,
-        "target_type": "pushed_id",
-        "content": "Your league game is ready!",
-        "pushed_id":request.body.id,
+    let formdata;
+
+    if(request.body.event==='test'){
+        formdata = {
+            "app_key": process.env.app_key,
+            "app_secret": process.env.app_secret,
+            "target_type": "pushed_id",
+            "content": "This is a test notification from boosted. If you got this, everything should be working!",
+            "pushed_id":request.body.id,
+        }
+    }
+    else{
+        formdata = {
+            "app_key": process.env.app_key,
+            "app_secret": process.env.app_secret,
+            "target_type": "pushed_id",
+            "content": "Your league game is ready!",
+            "pushed_id":request.body.id,
+        }
     }
 
     https.post({