Merge branch 'develop' into feature/getVariableCategoryName

QuantiModo · May 30, 2020 · c1e056f · c1e056f · mikepsinn · May 30, 2020
2 parents 50b1e06 + e7a86c4
commit c1e056f
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 0 deletions.
diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js
@@ -63,6 +63,9 @@ var qm = {
             var result = qm.urlHelper.indexOfCurrentUrl("medimodo.heroku") !== -1;
             return result;
         },
+        isTestingOrDevelopment: function(){
+            return qm.appMode.isTesting() || qm.appMode.isDevelopment();
+        },
         isDevelopment: function(){
             if(qm.appMode.mode === 'development'){
                 return true;
@@ -3604,6 +3607,17 @@ var qm = {
             }else{
                 qm.apiHelper.getParameterDescription(parameterOrPropertyName, callback)
             }
+        },
+        goToHelpSite: function(){
+            qm.urlHelper.goToUrl("https://help.quantimo.do")
+        },
+        openDrift: function(){
+            if(typeof drift === "undefined"){
+                qm.qmLog.error("drift not defined!");
+                qm.help.goToHelpSite();
+            } else {
+                qm.chatButton.openDriftSidebar();
+            }
         }
     },
     imageHelper: {
@@ -8425,6 +8439,35 @@ var qm = {
         }
     },
     toast: {
+        errorAlert: function(errorMessage, callback){
+            var Toast = Swal.mixin({
+                toast: true,
+                icon: "error",
+                position: 'top-end',
+                confirmButtonText: "Need help?",
+                cancelButtonText: "OK",
+                showConfirmButton: true,
+                showCloseButton: true,
+                timer: 5000,
+                timerProgressBar: true,
+                onOpen: (toast) => {
+                    toast.addEventListener('mouseenter', Swal.stopTimer)
+                    toast.addEventListener('mouseleave', Swal.resumeTimer)
+                }
+            })
+            Toast.fire({
+                icon: 'error',
+                title: errorMessage
+            }).then(function(result){
+                if (result.value) {
+                    if(callback){
+                        callback(result);
+                    } else {
+                        qm.help.openDrift();
+                    }
+                }
+            })
+        },
         showQuestionToast: function(question, successMessage, callback){
             var Toast = Swal.mixin({
                 toast: true,
@@ -10173,6 +10216,9 @@ var qm = {
     qmLog: function(){
         return qm.qmLog;
     },
+    sweetAlert() {
+
+    }
 };
 if(typeof qmLog !== "undefined"){
     qm.qmLog = qmLog;

diff --git a/src/js/qmLogger.js b/src/js/qmLogger.js
@@ -288,6 +288,9 @@ var qmLog = {
         if(qmLog.color){
             consoleMessage = qmLog.color.red(consoleMessage);
         }
+        if(qm.appMode.isTestingOrDevelopment()){
+            qm.toast.errorAlert(consoleMessage);
+        }
         console.error(consoleMessage, errorSpecificMetaData);
         qmLog.globalMetaData = qmLog.addGlobalMetaDataAndLog(qmLog.name, qmLog.message, errorSpecificMetaData, qmLog.stackTrace);
         qmLog.bugsnagNotify(qmLog.name, qmLog.message, errorSpecificMetaData, "error", qmLog.stackTrace);

diff --git a/src/modals/index.html b/src/modals/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Modal Demos</title>
+    <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@sweetalert2/theme-borderless@3/borderless.css">
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@9/dist/sweetalert2.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" defer></script>
+    <script src="https://cdn.jsdelivr.net/gh/alpinejs/[email protected]/dist/alpine.min.js" defer></script>
+    <script src="../../lib/quantimodo/quantimodo-web.js"></script>
+    <script src="../js/ionIcons.js"></script>
+    <script src="../js/qmLogger.js"></script>
+    <script src="../js/qmHelpers.js"></script>
+    <script src="../data/qmStaticData.js"></script>
+    <!-- Must come after qmHelpers because we assign to qm.staticData -->
+    <script src="../js/qmChrome.js"></script>
+</head>
+<body>
+    <button id="popup-button">Popup</button>
+    <button id="full-inbox-button">Full Inbox</button>
+    <button id="compact-inbox-button">Compact Inbox</button>
+    <script src="modals.js" defer></script>
+</body>
+</html>
diff --git a/src/modals/modals.js b/src/modals/modals.js
@@ -0,0 +1,21 @@
+$(document).ready(function () {
+    function swalIframeOptions(path){
+        return {
+            showCancelButton: true,
+            showConfirmButton: false,
+            html: '<iframe width="100%" height="300" src="//web.quantimo.do/'+path+'" frameborder="0"></iframe>'
+        }
+    }
+    function fireIframe(path){
+        Swal.fire(swalIframeOptions(path));
+    }
+    $('#popup-button').click(() => {
+        fireIframe('android_popup.html')
+    });
+    $('#full-inbox-button').click(() => {
+        fireIframe('#/app/reminders-inbox')
+    });
+    $('#compact-inbox-button').click(() => {
+        fireIframe('#/app/reminders-inbox-compact')
+    });
+});