Merge pull request #8 from mogproject/dev

Implement new features for v0.1.1
mogproject · Jan 8, 2021 · 37470d3 · 37470d3
2 parents 9c46273 + cf5cb76
commit 37470d3
Show file tree

Hide file tree

Showing 22 changed files with 7,316 additions and 305 deletions.
diff --git a/assets/_locales/en/messages.json b/assets/_locales/en/messages.json
@@ -8,6 +8,9 @@
     "enable_by_default": {
         "message": "Enable filter by default"
     },
+    "filter_replies": {
+        "message": "Filter replies"
+    },
     "languages": {
         "message": "Languages"
     },
@@ -23,6 +26,21 @@
     "remove_this_language": {
         "message": "Remove this language"
     },
+    "blocked_words": {
+        "message": "Blocked words"
+    },
+    "blocked_words_description": {
+        "message": "Place each word on a new line."
+    },
+    "clear": {
+        "message": "Clear"
+    },
+    "save": {
+        "message": "Save"
+    },
+    "save_blocked_words": {
+        "message": "Save blocked words"
+    },
     "reset_settings": {
         "message": "Reset settings"
     },

diff --git a/assets/_locales/ja/messages.json b/assets/_locales/ja/messages.json
@@ -8,6 +8,9 @@
     "enable_by_default": {
         "message": "デフォルトで有効"
     },
+    "filter_replies": {
+        "message": "返信もフィルターする"
+    },
     "languages": {
         "message": "言語"
     },
@@ -23,6 +26,21 @@
     "remove_this_language": {
         "message": "この言語を削除"
     },
+    "blocked_words": {
+        "message": "ブロックする単語"
+    },
+    "blocked_words_description": {
+        "message": "各行に 1つずつ\nキーワードを記入してください"
+    },
+    "clear": {
+        "message": "消去"
+    },
+    "save": {
+        "message": "保存"
+    },
+    "save_blocked_words": {
+        "message": "ブロックする単語を保存"
+    },
     "reset_settings": {
         "message": "初期設定に戻す"
     },

diff --git a/assets/_locales/ko/messages.json b/assets/_locales/ko/messages.json
@@ -8,6 +8,9 @@
     "enable_by_default": {
         "message": "기본으로 활성화"
     },
+    "filter_replies": {
+        "message": "회신 필터링"
+    },
     "languages": {
         "message": "언어"
     },
@@ -23,6 +26,21 @@
     "remove_this_language": {
         "message": "이 언어를 제거"
     },
+    "blocked_words": {
+        "message": "차단 된 단어"
+    },
+    "blocked_words_description": {
+        "message": "각 줄에 하나씩 키워드를 입력하십시오"
+    },
+    "clear": {
+        "message": "맑은"
+    },
+    "save": {
+        "message": "저장"
+    },
+    "save_blocked_words": {
+        "message": "차단 된 단어 저장"
+    },
     "reset_settings": {
         "message": "설정 초기화"
     },

diff --git a/assets/css/popup.css b/assets/css/popup.css
@@ -40,6 +40,7 @@ header .popup-title-version {
 footer {
     background-color: #dddddd;
     font-size: 12px;
+    margin-top: 12px;
     border-top: 1px;
     padding: 6px 6px;
     border: 0 solid #040404;
@@ -71,33 +72,76 @@ label {
     -khtml-user-select: none;
 }
 
-.popup-lang-container {
-    height: 24px;
-    margin: 2px 0;
+.popup-settings textarea {
+    font-size: 14px;
 }
 
-.popup-button-icon-remove {
+.popup-settings input[type='button'],
+input[type='submit'] {
+    color: #065fd4;
+    background-color: #f9f9f9;
+    border: 1px solid #065fd4;
     float: right;
     padding: 0;
-    color: #606060;
-    background-color: #ececec;
-    margin-left: 10px;
-    width: 24px;
     height: 24px;
-    border: 1px solid #909090;
     border-radius: 4px;
+    margin-left: 10px;
 }
 
-.popup-button-icon-add {
-    float: right;
-    padding: 0;
+.popup-settings input[type='button']:hover,
+input[type='submit']:hover {
+    color: #f9f9f9;
+    background-color: #0a8dff;
+}
+
+.popup-settings input[type='button']:disabled,
+input[type='submit']:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+.popup-settings input[type='button']:disabled:hover,
+input[type='submit']:disabled:hover {
     color: #065fd4;
     background-color: #f9f9f9;
-    margin-left: 10px;
-    width: 24px;
+}
+
+#popup-form-blocked-words div {
+    padding-left: 16px;
+}
+
+.popup-settings textarea {
+    font-size: 13px;
+    width: 100%;
+    box-sizing: border-box;
+    overflow-x: auto;
+    overflow-y: auto;
+}
+
+.popup-lang-container {
     height: 24px;
-    border: 1px solid #065fd4;
-    border-radius: 4px;
+    margin: 2px 0;
+}
+
+.popup-button-icon-remove {
+    color: #606060 !important;
+    background-color: #ececec !important;
+    border: 1px solid #909090 !important;
+    width: 24px;
+}
+
+.popup-button-icon-remove:hover {
+    color: #f9f9f9 !important;
+    background-color: #0a8dff !important;
+    border: 1px solid #065fd4 !important;
+}
+
+.popup-button-icon-add {
+    width: 24px;
+}
+
+.popup-button-save {
+    width: 72px;
 }
 
 .popup-lang-select-container {
@@ -109,3 +153,8 @@ label {
 .popup-lang-select {
     margin-left: 16px;
 }
+
+.popup-button-container {
+    margin: 6px 0 0 0;
+    height: 24px;
+}
diff --git a/assets/css/yay-filter.css b/assets/css/yay-filter.css
@@ -13,20 +13,17 @@
     -khtml-user-select: none;
 }
 
-#yay-filter-container div {
-    display: flex;
-}
-
 #yay-filter-container svg {
+    position: absolute;
     width: 24px;
     height: 24px;
     margin-top: -4px;
     margin-right: 4px;
     fill: var(--yt-spec-text-secondary);
 }
 
-#yay-filter-container span {
-    padding-top: 2px;
+#yay-filter-label {
+    margin-left: 28px;
 }
 
 #yay-filter-status {

diff --git a/jest.setup.js b/jest.setup.js
@@ -1,3 +1,5 @@
 // Add chrome object to global scope
-Object.assign(global, require('jest-chrome'))
+Object.assign(global, require('jest-chrome'));
 
+// set debug flag
+global.__DEBUG__ = false;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "devDependencies": {
         "@types/chrome": "0.0.127",
         "@types/jest": "^26.0.19",
+        "@types/jsdom": "^16.2.5",
         "@typescript-eslint/eslint-plugin": "^4.11.0",
         "@typescript-eslint/parser": "^4.11.0",
         "chrome": "^0.1.0",