Merge pull request #42 from IITC-CE/iitc-beta-channel

IITC-CE · Dec 18, 2020 · 649571b · 649571b
2 parents cbd2aed + d482bfe
commit 649571b
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iitc-button",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "repository": "https://github.com/IITC-CE/IITC-Button.git",
   "license": "GPLv3",
   "private": true,

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
@@ -49,6 +49,9 @@
     "release": {
         "message": "Release"
     },
+    "beta": {
+        "message": "Beta"
+    },
     "testBuilds": {
         "message": "Test builds"
     },

diff --git a/src/background/intel.js b/src/background/intel.js
@@ -60,15 +60,19 @@ async function initialize() {
     "IITC_is_enabled",
     "channel",
     "release_iitc_code",
+    "beta_iitc_code",
     "test_iitc_code",
     "local_iitc_code",
     "release_plugins_flat",
+    "beta_plugins_flat",
     "test_plugins_flat",
     "local_plugins_flat",
     "release_plugins_local",
+    "beta_plugins_local",
     "test_plugins_local",
     "local_plugins_local",
     "release_plugins_user",
+    "beta_plugins_user",
     "test_plugins_user",
     "local_plugins_user"
   ]);

diff --git a/src/background/manager.js b/src/background/manager.js
@@ -11,6 +11,7 @@ let external_update_timeout_id = null;
 let channel = "release";
 const network_host = {
   release: "https://iitc.app/build/release",
+  beta: "https://iitc.app/build/beta",
   test: "https://iitc.app/build/test",
   local: "http://localhost:8000"
 };
@@ -101,21 +102,27 @@ export async function checkUpdates(force) {
     "last_check_update",
     "local_server_host",
     "release_update_check_interval",
+    "beta_update_check_interval",
     "test_update_check_interval",
     "local_update_check_interval",
     "release_last_modified",
+    "beta_last_modified",
     "test_last_modified",
     "local_last_modified",
     "release_categories",
+    "beta_categories",
     "test_categories",
     "local_categories",
     "release_plugins_flat",
+    "beta_plugins_flat",
     "test_plugins_flat",
     "local_plugins_flat",
     "release_plugins_local",
+    "beta_plugins_local",
     "test_plugins_local",
     "local_plugins_local",
     "release_plugins_user",
+    "beta_plugins_user",
     "test_plugins_user",
     "local_plugins_user"
   ]);
@@ -250,6 +257,7 @@ export async function checkExternalUpdates(force) {
     "last_check_external_update",
     "external_update_check_interval",
     "release_plugins_user",
+    "beta_plugins_user",
     "test_plugins_user",
     "local_plugins_user"
   ]);

diff --git a/src/popup/components/ElementPlugin.vue b/src/popup/components/ElementPlugin.vue
@@ -124,6 +124,7 @@ export default {
       const data = await browser.storage.local.get([
         "channel",
         "release_plugins_user",
+        "beta_plugins_user",
         "test_plugins_user",
         "local_plugins_user"
       ]);

diff --git a/src/popup/components/SectionOptions.vue b/src/popup/components/SectionOptions.vue
@@ -8,20 +8,22 @@
     ></Header>
     <div class="settings-section">
       <h2>{{ _("choosingUpdateChannel") }}</h2>
-      <p
-        v-for="(item, index) in updateChannels"
-        v-bind:key="index"
-        class="input-field"
-      >
-        <input
-          type="radio"
-          v-bind:id="index"
-          name="update-channel"
-          v-bind:value="index"
-          v-model="channelSelect"
-        />
-        <label v-bind:for="index">{{ item.name }}</label>
-      </p>
+      <div class="channels-row">
+        <p
+          v-for="(item, index) in updateChannels"
+          v-bind:key="index"
+          class="input-field"
+        >
+          <input
+            type="radio"
+            v-bind:id="index"
+            name="update-channel"
+            v-bind:value="index"
+            v-model="channelSelect"
+          />
+          <label v-bind:for="index">{{ item.name }}</label>
+        </p>
+      </div>
     </div>
     <Hr />
     <div class="settings-section">
@@ -31,6 +33,9 @@
           <UpdateCheckIntervalSelector
             v-bind:channel="'release'"
           ></UpdateCheckIntervalSelector>
+          <UpdateCheckIntervalSelector
+            v-bind:channel="'beta'"
+          ></UpdateCheckIntervalSelector>
           <UpdateCheckIntervalSelector
             v-bind:channel="'test'"
           ></UpdateCheckIntervalSelector>
@@ -99,9 +104,11 @@ export default {
 
         const data = await browser.storage.local.get([
           "release_categories",
+          "beta_categories",
           "test_categories",
           "local_categories",
           "release_plugins_flat",
+          "beta_plugins_flat",
           "test_plugins_flat",
           "local_plugins_flat"
         ]);
@@ -186,4 +193,8 @@ h2:first-letter {
 .local-server__input__err {
   color: var(--state-off);
 }
+
+.channels-row {
+  column-count: 2;
+}
 </style>
diff --git a/src/popup/components/mixins.js b/src/popup/components/mixins.js
@@ -6,11 +6,13 @@ export const mixin = {
     return {
       updateChannels: {
         release: { name: _("release") },
+        beta: { name: _("beta") },
         test: { name: _("testBuilds") },
         local: { name: _("localServer") }
       },
       updateChannelsIntervals: {
         release: { name: _("release") },
+        beta: { name: _("beta") },
         test: { name: _("testBuilds") },
         external: { name: _("anyChannel") }
       },

diff --git a/src/popup/data.js b/src/popup/data.js
@@ -4,9 +4,11 @@ export async function init(self) {
   const data = await browser.storage.local.get([
     "channel",
     "release_categories",
+    "beta_categories",
     "test_categories",
     "local_categories",
     "release_plugins_flat",
+    "beta_plugins_flat",
     "test_plugins_flat",
     "local_plugins_flat"
   ]);