Merge pull request #610 from liyasthomas/update-proxy-info

Update proxy information.

CHANGELOG.md

@@ -342,7 +342,7 @@
 - Serialize a request into JSON? [\#4](https://github.com/liyasthomas/postwoman/issues/4)
 - Add brand new logo to the project [\#244](https://github.com/liyasthomas/postwoman/pull/244) ([caneco](https://github.com/caneco))
 - Feature/pre request script [\#231](https://github.com/liyasthomas/postwoman/pull/231) ([nickpalenchar](https://github.com/nickpalenchar))
-- Add the ApolloTV proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX))
+- Add the Apollo Software proxy server [\#217](https://github.com/liyasthomas/postwoman/pull/217) ([NBTX](https://github.com/NBTX))
 - bug: keeping information on page change [\#211](https://github.com/liyasthomas/postwoman/pull/211) ([breno-pereira](https://github.com/breno-pereira))
 - Work in Progress: feature/allow-collections-importing [\#209](https://github.com/liyasthomas/postwoman/pull/209) ([vlad0337187](https://github.com/vlad0337187))
 - Feature/log errors [\#207](https://github.com/liyasthomas/postwoman/pull/207) ([nickpalenchar](https://github.com/nickpalenchar))

README.md

@@ -161,7 +161,7 @@ _Collections are synced with local session storage_
  - Access APIs served in non-HTTPS (`http://`)
  - Use custom Proxy URL
 
-_Official Postwoman Proxy is hosted by ApolloTV - **[Privacy policy](https://apollotv.xyz/legal)**_
+_Official Postwoman Proxy is hosted by Apollo Software - **[Privacy Policy](https://apollosoftware.xyz/legal/postwoman)**_
 
 📜 **Pre-Request Scripts β**: Snippets of code associated with a request that are executed before the request is sent.
 

functions/strategies/AxiosStrategy.js

@@ -2,7 +2,7 @@ import axios from "axios"
 
 const axiosWithProxy = async (req, { state }) => {
   const { data } = await axios.post(
-    state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
+    state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
     req
   )
   return data

functions/strategies/ChromeStrategy.js

@@ -35,10 +35,12 @@ const chromeWithProxy = (req, { state }) =>
         data: {
           config: {
             method: "post",
-            url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
+            url:
-            data: req,
+              state.postwoman.settings.PROXY_URL ||
-          },
+              "https://postwoman.apollosoftware.xyz/",
-        },
+            data: req
+          }
+        }
       },
       ({ data }) => {
         if (data.error) {

functions/strategies/ExtensionStrategy.js

@@ -4,11 +4,12 @@ export const hasExtensionInstalled = () =>
 const extensionWithProxy = async (req, { state }) => {
   const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
     method: "post",
-    url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
+    url:
-    data: req,
+      state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
-  })
+    data: req
-  return data
+  });
-}
+  return data;
+};
 
 const extensionWithoutProxy = async (req, _store) => {
   const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest(req)

functions/strategies/FirefoxStrategy.js

@@ -14,10 +14,11 @@ const firefoxWithProxy = (req, { state }) =>
 
     window.firefoxExtSendRequest({
       method: "post",
-      url: state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
+      url:
-      data: req,
+        state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
-    })
+      data: req
-  })
+    });
+  });
 
 const firefoxWithoutProxy = (req, _store) =>
   new Promise((resolve, reject) => {

lang/de-DE.js

@@ -79,9 +79,9 @@ export default {
   disabled: "Deaktiviert",
   proxy: "Proxy",
   postwoman_official_proxy_hosting:
-    "Postwomans offizieller Proxy wird durch ApolloTV bereitgestellt.",
+    "Postwomans offizieller Proxy wird durch Apollo Software bereitgestellt.",
   read_the: "Lies die",
-  apollotv_privacy_policy: "ApolloTV Datenschutzerklärung",
+  apollosw_privacy_policy: "Apollo Software Datenschutzerklärung",
   contact_us: "Kontaktiere uns",
   connect: "Verbinden",
   disconnect: "Trennen",

lang/en-US.js

@@ -85,9 +85,9 @@ export default {
   enabled: "Enabled",
   disabled: "Disabled",
   proxy: "Proxy",
-  postwoman_official_proxy_hosting: "Postwoman's Official Proxy is hosted by ApolloTV.",
+  postwoman_official_proxy_hosting: "Postwoman's Official Proxy is hosted by Apollo Software.",
   read_the: "Read the",
-  apollotv_privacy_policy: "ApolloTV privacy policy",
+  apollosw_privacy_policy: "Apollo Software privacy policy",
   contact_us: "Contact us",
   connect: "Connect",
   disconnect: "Disconnect",

lang/es-ES.js

@@ -78,9 +78,9 @@ export default {
   enabled: "Habilitado",
   disabled: "Deshabilitado",
   proxy: "Proxy",
-  postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en ApolloTV.",
+  postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en Apollo Software.",
   read_the: "Leer la",
-  apollotv_privacy_policy: "Política de Privacidad de ApolloTV",
+  apollosw_privacy_policy: "Política de Privacidad de Apollo Software",
   contact_us: "Contáctenos",
   connect: "Conectar",
   disconnect: "Desconectar",

lang/fa-IR.js

@@ -78,9 +78,9 @@ export default {
   enabled: "فعال",
   disabled: "غیر فعال",
   proxy: "پراکسی",
-  postwoman_official_proxy_hosting: "پراکسی Postwoman  برروی هاست ApolloTV قرار دارد.",
+  postwoman_official_proxy_hosting: "پراکسی Postwoman  برروی هاست Apollo Software قرار دارد.",
   read_the: "بخوانید",
-  apollotv_privacy_policy: "خط مشی رازداری ApolloTV",
+  apollosw_privacy_policy: "خط مشی رازداری Apollo Software",
   contact_us: "Contact us",
   connect: "Connect",
   disconnect: "Disconnect",

lang/fr-FR.js

@@ -78,9 +78,9 @@ export default {
   enabled: "Activé",
   disabled: "Désactivé",
   proxy: "Proxy",
-  postwoman_official_proxy_hosting: "Le proxy officiel de Postwoman est hébergé par ApolloTV.",
+  postwoman_official_proxy_hosting: "Le proxy officiel de Postwoman est hébergé par Apollo Software.",
   read_the: "Lire la",
-  apollotv_privacy_policy: "politique de confidentialité ApolloTV",
+  apollosw_privacy_policy: "politique de confidentialité Apollo Software",
   contact_us: "Contactez nous",
   connect: "Relier",
   disconnect: "Déconnecter",

lang/id-ID.js

@@ -78,9 +78,9 @@ export default {
   enabled: "diaktifkan",
   disabled: "dinonaktifkan",
   proxy: "Proksi",
-  postwoman_official_proxy_hosting: "Proksi Resmi Postwoman dalam penginangan ApolloTV.",
+  postwoman_official_proxy_hosting: "Proksi Resmi Postwoman dalam penginangan Apollo Software.",
   read_the: "Bacalah",
-  apollotv_privacy_policy: "kebijakan privasi ApolloTV",
+  apollosw_privacy_policy: "kebijakan privasi Apollo Software",
   contact_us: "Hubungi kami",
   connect: "Menghubungkan",
   disconnect: "Memutuskan",

lang/ja-JP.js

@@ -78,9 +78,9 @@ export default {
   enabled: "有効",
   disabled: "無効",
   proxy: "プロキシ",
-  postwoman_official_proxy_hosting: "Postwomanの公式プロキシは、Apollo TVがホストしています。",
+  postwoman_official_proxy_hosting: "Postwomanの公式プロキシは、Apollo Softwareがホストしています。",
   read_the: "プライバシーポリシー",
-  apollotv_privacy_policy: "を読む",
+  apollosw_privacy_policy: "を読む",
   contact_us: "お問い合わせ",
   connect: "接続",
   disconnect: "切断",
@@ -241,5 +241,5 @@ export default {
   go_home: "ホームに戻る",
   reload: "リロード",
   enter_curl: "cURLを入力",
-  empty: "空",
+  empty: "空"
-}
+};

lang/pt-BR.js

@@ -80,7 +80,7 @@ export default {
   proxy: "Proxy",
   postwoman_official_proxy_hosting: "Postwoman's alojamento proxy oficial",
   read_the: "Leia o",
-  apollotv_privacy_policy: "ApolloTV Política de Privacidade",
+  apollosw_privacy_policy: "Apollo Software Política de Privacidade",
   contact_us: "Contate-Nos",
   connect: "Conectar",
   disconnect: "Desconectar",

lang/tr-TR.js

@@ -78,9 +78,9 @@ export default {
   enabled: "Aktif",
   disabled: "Aktif değil",
   proxy: "Proxy",
-  postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en ApolloTV.",
+  postwoman_official_proxy_hosting: "Proxy Oficial de Postwoman está hospedado en Apollo Software.",
   read_the: "Leer la",
-  apollotv_privacy_policy: "ApolloTV gizlilik politikaları",
+  apollosw_privacy_policy: "Apollo Software gizlilik politikaları",
   contact_us: "Bizimle iletişime geçin",
   connect: "Bağlan",
   disconnect: "Kesmek",

lang/zh-CN.js

@@ -78,9 +78,9 @@ export default {
   enabled: "已启用",
   disabled: "已禁用",
   proxy: "代理",
-  postwoman_official_proxy_hosting: "Postwoman的官方代理由ApolloTV托管",
+  postwoman_official_proxy_hosting: "Postwoman的官方代理由Apollo Software托管",
   read_the: "阅读",
-  apollotv_privacy_policy: "ApolloTV隐私政策",
+  apollosw_privacy_policy: "Apollo Software隐私政策",
   contact_us: "联系我们",
   connect: "连接",
   disconnect: "断开",

pages/graphql.vue

@@ -591,8 +591,9 @@ export default {
           ? {
               method: "post",
               url:
-                this.$store.state.postwoman.settings.PROXY_URL || `https://postwoman.apollotv.xyz/`,
+                this.$store.state.postwoman.settings.PROXY_URL ||
-              data: reqOptions,
+                `https://postwoman.apollosoftware.xyz/`,
+              data: reqOptions
             }
           : reqOptions
 

pages/settings.vue

@@ -207,9 +207,12 @@
             {{ $t("postwoman_official_proxy_hosting") }}
             <br />
             {{ $t("read_the") }}
-            <a class="link" href="https://apollotv.xyz/legal" target="_blank" rel="noopener">
+            <a
-              {{ $t("apollotv_privacy_policy") }} </a
+              class="link"
-            >.
+              href="https://apollosoftware.xyz/legal/postwoman"
+              target="_blank"
+              rel="noopener">
+              {{ $t("apollosw_privacy_policy") }} </a>.
           </p>
         </li>
       </ul>
@@ -338,8 +341,7 @@ export default {
 
         FRAME_COLORS_ENABLED: this.$store.state.postwoman.settings.FRAME_COLORS_ENABLED || false,
         PROXY_ENABLED: this.$store.state.postwoman.settings.PROXY_ENABLED || false,
-        PROXY_URL:
+        PROXY_URL: this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollosoftware.xyz/",
-          this.$store.state.postwoman.settings.PROXY_URL || "https://postwoman.apollotv.xyz/",
         PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
 
         EXTENSIONS_ENABLED:
@@ -639,8 +641,8 @@ export default {
       fb.writeSettings("syncEnvironments", true)
     },
     resetProxy({ target }) {
-      this.settings.PROXY_URL = `https://postwoman.apollotv.xyz/`
+      this.settings.PROXY_URL = `https://postwoman.apollosoftware.xyz/`;
-      target.innerHTML = this.doneButton
+      target.innerHTML = this.doneButton;
       this.$toast.info(this.$t("cleared"), {
         icon: "clear_all",
       })