Merge pull request #133 from leonhartX/icon

log improve

Author: leonhartX

content/alert.html

@@ -4,7 +4,7 @@
   <div class="qGW0q" jsname="x0irnb">
     <div>
       <div class="gwHZe" aria-label="Logs" jsname="ikTLpc" tabindex="0" role="list">
-        <div tabindex="0" role="listitem" class="fHhrY ptNZqd" jsname="HYltEe">
+        <div tabindex="0" role="listitem" class="fHhrY _COLOR_CLASS_" jsname="HYltEe">
           <div class="Akkarb lNXgjb" id="alerttime">_TIMESTAMP_</div>
           <div class="ACpDpe lNXgjb" id="alertLevel">_LEVEL_</div>
           <div class="BjuRcd lNXgjb">[github assistant] _MESSAGE_</div>

content/modal.html

@@ -130,7 +130,7 @@ <h2 class="VfPpkd-k2Wrsb">Config sync options</h2>
                     placeholder="Ignore patterns"></label>
                 <div class="VfPpkd-fmcmS-yrriRe-W0vJo-RWgCYc">
                   <p class="VfPpkd-fmcmS-yrriRe-W0vJo-fmcmS VfPpkd-fmcmS-yrriRe-W0vJo-fmcmS-OWXEXe-zvnfze">Use regex
-                    separated by ';'/p>
+                    separated by ';'</p>
                 </div>
               </div>
             </div>

icon/icon.png

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.0",
+  "version": "5.0.1",
   "manifest_version": 2,
   "default_locale": "en",
   "name": "__MSG_appName__",
@@ -54,7 +54,6 @@
   ],
   "permissions": [
     "https://script.google.com/*",
-    "https://www.googleapis.com/oauth2/v4/token",
     "https://gitlab.com/*",
     "identity",
     "storage",

manifest.json

@@ -5,8 +5,8 @@ let currentUrl;
 let gas;
 let scm;
 let context = {};
-const LEVEL_ERROR = 'Warning';
-const LEVEL_WARN = 'Info';
+const LEVEL_ERROR = 'Error';
+const LEVEL_WARN = 'Warn';
 const LEVEL_INFO = 'Notice';
 const observer = new MutationObserver((e) => {
   let url = window.location.href;
@@ -57,10 +57,6 @@ function load() {
           break;
         case 'nothing':
           break;
-        case 'need relogin':
-          initLoginContent();
-          showLog('Extension has been updated, please relogin', LEVEL_WARN);
-          break;
         default:
           showLog(err, LEVEL_ERROR);
           break;
@@ -351,14 +347,19 @@ function auth() {
         context.gapiToken = token;
         chrome.storage.sync.set({
           "gapiToken": token
-        }); 
+        });
         resolve(token);
       }
     });
   });
 }
 
 function prepareCode() {
+  if (!getRepo()) {
+    return new Promise((resolve, reject) => {
+      reject(new Error("Repository is not set"));
+    })
+  }
   return Promise.all([gas.getGasCode(), scm.getCode()])
     .then((data) => {
       return {
@@ -370,7 +371,7 @@ function prepareCode() {
 
 function showDiff(code, type) {
   if (Object.keys(code.scm).length === 0 && type === 'pull') {
-    showLog('There is nothing to pull', LEVEL_WARN);
+    showLog('There is nothing to pull', LEVEL_INFO);
     return;
   }
   //setting the diff model
@@ -417,7 +418,7 @@ function showDiff(code, type) {
     }, '');
 
   if (diff === '') {
-    showLog('Everything already up-to-date', LEVEL_WARN);
+    showLog('Everything already up-to-date', LEVEL_INFO);
     return;
   }
 
@@ -529,7 +530,7 @@ function updateBranch() {
       if (branches.length === 0) {
         branch = '';
         if (scm.name === 'github') {
-          showLog('This repository is empty, try to create a new branch such as [master] in Github', LEVEL_WARN);
+          showLog('This repository is empty, try to create a new branch such as [main] in Github', LEVEL_WARN);
         } else {
           showLog('This repository is empty, first create a new branch', LEVEL_WARN);
         }
@@ -621,9 +622,16 @@ function showLog(message, level = LEVEL_INFO) {
 
   $.get(chrome.runtime.getURL('content/alert.html'))
     .then((content) => {
+      const colorClass = level == LEVEL_ERROR ? "nN3Fac" : "ptNZqd";
       $("[jsname=cFQkCb]").removeClass("LcqFFc");
-      $("[jsname=cFQkCb] > [jsname=NR4lfb]").css("flex-basis", "150px")
-      $('.Vod31b').html(content.replace(/_TIMESTAMP_/g, new Date().toLocaleTimeString()).replace(/_LEVEL_/g, level).replace(/_MESSAGE_/, message));
+      const currentOffset = $("[jsname=cFQkCb] > [jsname=NR4lfb]").css("flex-basis");
+      const offset = (currentOffset === "0px" || currentOffset === "auto") ? "150px" : currentOffset;
+      $("[jsname=cFQkCb] > [jsname=NR4lfb]").css("flex-basis", offset);
+      $('.Vod31b').html(content
+        .replace(/_COLOR_CLASS_/, colorClass)
+        .replace(/_TIMESTAMP_/g, new Date().toLocaleTimeString())
+        .replace(/_LEVEL_/g, level)
+        .replace(/_MESSAGE_/, message));
     })
 }
 

src/gas-hub.js

@@ -48,7 +48,7 @@ class Github {
         })
     });
     if (changed.length === 0) {
-      showLog('Nothing to do', LEVEL_WARN);
+      showLog('Nothing to do', LEVEL_INFO);
       return;
     }
 
@@ -151,7 +151,7 @@ class Github {
   pushToGist(code) {
     const files = $('.diff-file:checked').toArray().map((elem) => elem.value);
     if (files.length === 0) {
-      showLog('Nothing to do', LEVEL_WARN);
+      showLog('Nothing to do', LEVEL_INFO);
       return;
     }
     const payload = {