صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
akillibulut
/
porter
mirrorاز https://github.com/porter-dev/porter
2
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

Merge pull request #1919 from porter-dev/belanger/cleanup-html-files

Cleanup HTML files to more cleanly separate hosting targets
abelanger5 4 سال پیش
والد
c014eca51f 8b3c265642
کامیت
3fc37ff92a
12فایلهای تغییر یافته به همراه234 افزوده شده و 165 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 0 1
      .github/workflows/dev.yaml
  2. 5 0
      .github/workflows/production.yaml
  3. 5 0
      .github/workflows/staging.yaml
  4. 186 0
      dashboard/src/hosted.index.html
  5. 0 144
      dashboard/src/index.html
  6. 10 5
      dashboard/src/main/Main.tsx
  7. 5 5
      dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx
  8. 2 2
      dashboard/src/main/home/launch/launch-flow/LaunchFlow.tsx
  9. 1 1
      dashboard/src/main/home/provisioner/ProvisionerLogs.tsx
  10. 1 1
      dashboard/src/main/home/sidebar/ClusterSection.tsx
  11. 2 2
      dashboard/src/shared/hooks/useChart.ts
  12. 17 4
      dashboard/webpack.config.js

+ 0 - 1
.github/workflows/dev.yaml
مشاهده فایل 

@@ -33,7 +33,6 @@ jobs:
 
           DISCORD_KEY=${{secrets.DISCORD_KEY}}
 
           DISCORD_CID=${{secrets.DISCORD_CID}}
 
           FEEDBACK_ENDPOINT=${{secrets.FEEDBACK_ENDPOINT}}
 
-          SEGMENT_PUBLIC_KEY=${{secrets.SEGMENT_PUBLIC_KEY}}
 
           APPLICATION_CHART_REPO_URL=https://charts.dev.getporter.dev
 
           ADDON_CHART_REPO_URL=https://chart-addons.dev.getporter.dev
 
           ENABLE_SENTRY=true

+ 5 - 0
.github/workflows/production.yaml
مشاهده فایل 

@@ -34,6 +34,11 @@ jobs:
 
           DISCORD_KEY=${{secrets.DISCORD_KEY}}
 
           DISCORD_CID=${{secrets.DISCORD_CID}}
 
           FEEDBACK_ENDPOINT=${{secrets.FEEDBACK_ENDPOINT}}
 
+          IS_HOSTED=true
 
+          COHERE_KEY=${{secrets.COHERE_KEY}}
 
+          INTERCOM_APP_ID=${{secrets.INTERCOM_APP_ID}}
 
+          INTERCOM_SRC=${{secrets.INTERCOM_SRC}}
 
+          SEGMENT_WRITE_KEY=${{secrets.SEGMENT_WRITE_KEY}}
 
           SEGMENT_PUBLIC_KEY=${{secrets.SEGMENT_PUBLIC_KEY}}
 
           APPLICATION_CHART_REPO_URL=https://charts.getporter.dev
 
           ADDON_CHART_REPO_URL=https://chart-addons.getporter.dev

+ 5 - 0
.github/workflows/staging.yaml
مشاهده فایل 

@@ -33,6 +33,11 @@ jobs:
 
           DISCORD_KEY=${{secrets.DISCORD_KEY}}
 
           DISCORD_CID=${{secrets.DISCORD_CID}}
 
           FEEDBACK_ENDPOINT=${{secrets.FEEDBACK_ENDPOINT}}
 
+          IS_HOSTED=true
 
+          COHERE_KEY=${{secrets.COHERE_KEY}}
 
+          INTERCOM_APP_ID=${{secrets.INTERCOM_APP_ID}}
 
+          INTERCOM_SRC=${{secrets.INTERCOM_SRC}}
 
+          SEGMENT_WRITE_KEY=${{secrets.SEGMENT_WRITE_KEY}}
 
           SEGMENT_PUBLIC_KEY=${{secrets.SEGMENT_PUBLIC_KEY}}
 
           APPLICATION_CHART_REPO_URL=https://charts.staging.getporter.dev
 
           ADDON_CHART_REPO_URL=https://chart-addons.staging.getporter.dev

+ 186 - 0
dashboard/src/hosted.index.html
مشاهده فایل 

@@ -0,0 +1,186 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+  <head>
 
+    <title>Porter | Dashboard</title>
 
+
 
+    <script>
 
+      !(function () {
 
+        var e = (window.Cohere = window.Cohere || []);
 
+        if (e.invoked) console.error("Tried to load Cohere twice");
 
+        else {
 
+          (e.invoked = !0),
 
+            (e.snippet = "0.2"),
 
+            (e.methods = [
 
+              "init",
 
+              "identify",
 
+              "stop",
 
+              "showCode",
 
+              "getSessionUrl",
 
+              "makeCall",
 
+              "addCallStatusListener",
 
+              "removeCallStatusListener",
 
+              "widget",
 
+            ]),
 
+            e.methods.forEach(function (o) {
 
+              e[o] = function () {
 
+                var t = Array.prototype.slice.call(arguments);
 
+                t.unshift(o), e.push(t);
 
+              };
 
+            });
 
+          var o = document.createElement("script");
 
+          (o.type = "text/javascript"),
 
+            (o.async = !0),
 
+            (o.src = "https://static.cohere.so/main.js"),
 
+            (o.crossOrigin = "anonymous");
 
+          var t = document.getElementsByTagName("script")[0];
 
+          t.parentNode.insertBefore(o, t);
 
+        }
 
+      })();
 
+      window.Cohere.init("<%= htmlWebpackPlugin.options.cohereKey %>");
 
+    </script>
 
+
 
+    <script>
 
+      window.intercomSettings = {
 
+        app_id: "<%= htmlWebpackPlugin.options.intercomAppId %>",
 
+        custom_launcher_selector: "#intercom_help",
 
+      };
 
+    </script>
 
+
 
+    <script>
 
+      // We pre-filled your app ID in the widget URL: 'https://widget.intercom.io/widget/gq56g49i'
 
+      (function () {
 
+        var w = window;
 
+        var ic = w.Intercom;
 
+        if (typeof ic === "function") {
 
+          ic("reattach_activator");
 
+          ic("update", w.intercomSettings);
 
+        } else {
 
+          var d = document;
 
+          var i = function () {
 
+            i.c(arguments);
 
+          };
 
+          i.q = [];
 
+          i.c = function (args) {
 
+            i.q.push(args);
 
+          };
 
+          w.Intercom = i;
 
+          var l = function () {
 
+            var s = d.createElement("script");
 
+            s.type = "text/javascript";
 
+            s.async = true;
 
+            s.src = "<%= htmlWebpackPlugin.options.intercomSrc %>";
 
+            var x = d.getElementsByTagName("script")[0];
 
+            x.parentNode.insertBefore(s, x);
 
+          };
 
+          if (document.readyState === "complete") {
 
+            l();
 
+          } else if (w.attachEvent) {
 
+            w.attachEvent("onload", l);
 
+          } else {
 
+            w.addEventListener("load", l, false);
 
+          }
 
+        }
 
+      })();
 
+    </script>
 
+
 
+    <script>
 
+      !(function () {
 
+        var analytics = (window.analytics = window.analytics || []);
 
+        if (!analytics.initialize)
 
+          if (analytics.invoked)
 
+            window.console &&
 
+              console.error &&
 
+              console.error("Segment snippet included twice.");
 
+          else {
 
+            analytics.invoked = !0;
 
+            analytics.methods = [
 
+              "trackSubmit",
 
+              "trackClick",
 
+              "trackLink",
 
+              "trackForm",
 
+              "pageview",
 
+              "identify",
 
+              "reset",
 
+              "group",
 
+              "track",
 
+              "ready",
 
+              "alias",
 
+              "debug",
 
+              "page",
 
+              "once",
 
+              "off",
 
+              "on",
 
+              "addSourceMiddleware",
 
+              "addIntegrationMiddleware",
 
+              "setAnonymousId",
 
+              "addDestinationMiddleware",
 
+            ];
 
+            analytics.factory = function (e) {
 
+              return function () {
 
+                var t = Array.prototype.slice.call(arguments);
 
+                t.unshift(e);
 
+                analytics.push(t);
 
+                return analytics;
 
+              };
 
+            };
 
+            for (var e = 0; e < analytics.methods.length; e++) {
 
+              var key = analytics.methods[e];
 
+              analytics[key] = analytics.factory(key);
 
+            }
 
+            analytics.load = function (key, e) {
 
+              var t = document.createElement("script");
 
+              t.type = "text/javascript";
 
+              t.async = !0;
 
+              t.src =
 
+                "https://cdn.segment.com/analytics.js/v1/" +
 
+                key +
 
+                "/analytics.min.js";
 
+              var n = document.getElementsByTagName("script")[0];
 
+              n.parentNode.insertBefore(t, n);
 
+              analytics._loadOptions = e;
 
+            };
 
+            analytics._writeKey = "<%= htmlWebpackPlugin.options.segmentWriteKey %>";
 
+            analytics.SNIPPET_VERSION = "4.13.2";
 
+            analytics.load("<%= htmlWebpackPlugin.options.segmentKey %>");
 
+            analytics.page();
 
+          }
 
+      })();
 
+    </script>
 
+    <link rel="icon" href="https://i.ibb.co/HnSk02f/ptr.png" />
 
+    <meta
 
+      name="description"
 
+      content="Kubernetes powered PaaS that runs in your own cloud."
 
+    />
 
+    <meta property="og:title" content="Porter" />
 
+    <meta
 
+      property="og:image"
 
+      content="https://i.ibb.co/52g2g7C/porter-wide.png"
 
+    />
 
+    <meta
 
+      property="og:description"
 
+      content="Kubernetes powered PaaS that runs in your own cloud."
 
+    />
 
+    <meta property="og:url" content="https://porter.run" />
 
+    <link
 
+      href="https://fonts.googleapis.com/css?family=Work+Sans:400,500,600"
 
+      rel="stylesheet"
 
+    />
 
+    <link
 
+      href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.9.0/katex.min.css"
 
+      rel="stylesheet"
 
+    />
 
+    <link
 
+      href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Round"
 
+      rel="stylesheet"
 
+    />
 
+    <!-- Coding languages icons -->
 
+    <link
 
+      rel="stylesheet"
 
+      href="https://cdn.jsdelivr.net/gh/devicons/devicon@v2.14.0/devicon.min.css"
 
+    />
 
+  </head>
 
+  <body>
 
+    <div id="output"></div>
 
+    <div id="modal-root"></div>
 
+  </body>
 
+</html>

+ 0 - 144
dashboard/src/index.html
مشاهده فایل 

@@ -2,150 +2,6 @@
 
 <html lang="en">
 
   <head>
 
     <title>Porter | Dashboard</title>
 
-
 
-    <script>
 
-      !(function () {
 
-        var e = (window.Cohere = window.Cohere || []);
 
-        if (e.invoked) console.error("Tried to load Cohere twice");
 
-        else {
 
-          (e.invoked = !0),
 
-            (e.snippet = "0.2"),
 
-            (e.methods = [
 
-              "init",
 
-              "identify",
 
-              "stop",
 
-              "showCode",
 
-              "getSessionUrl",
 
-              "makeCall",
 
-              "addCallStatusListener",
 
-              "removeCallStatusListener",
 
-              "widget",
 
-            ]),
 
-            e.methods.forEach(function (o) {
 
-              e[o] = function () {
 
-                var t = Array.prototype.slice.call(arguments);
 
-                t.unshift(o), e.push(t);
 
-              };
 
-            });
 
-          var o = document.createElement("script");
 
-          (o.type = "text/javascript"),
 
-            (o.async = !0),
 
-            (o.src = "https://static.cohere.so/main.js"),
 
-            (o.crossOrigin = "anonymous");
 
-          var t = document.getElementsByTagName("script")[0];
 
-          t.parentNode.insertBefore(o, t);
 
-        }
 
-      })();
 
-      window.Cohere.init("_A-2HNgriISqaQq4yzTxM8V-");
 
-    </script>
 
-
 
-    <script>
 
-      window.intercomSettings = {
 
-        app_id: "gq56g49i",
 
-        custom_launcher_selector: "#intercom_help",
 
-      };
 
-    </script>
 
-
 
-    <script>
 
-      // We pre-filled your app ID in the widget URL: 'https://widget.intercom.io/widget/gq56g49i'
 
-      (function () {
 
-        var w = window;
 
-        var ic = w.Intercom;
 
-        if (typeof ic === "function") {
 
-          ic("reattach_activator");
 
-          ic("update", w.intercomSettings);
 
-        } else {
 
-          var d = document;
 
-          var i = function () {
 
-            i.c(arguments);
 
-          };
 
-          i.q = [];
 
-          i.c = function (args) {
 
-            i.q.push(args);
 
-          };
 
-          w.Intercom = i;
 
-          var l = function () {
 
-            var s = d.createElement("script");
 
-            s.type = "text/javascript";
 
-            s.async = true;
 
-            s.src = "https://widget.intercom.io/widget/gq56g49i";
 
-            var x = d.getElementsByTagName("script")[0];
 
-            x.parentNode.insertBefore(s, x);
 
-          };
 
-          if (document.readyState === "complete") {
 
-            l();
 
-          } else if (w.attachEvent) {
 
-            w.attachEvent("onload", l);
 
-          } else {
 
-            w.addEventListener("load", l, false);
 
-          }
 
-        }
 
-      })();
 
-    </script>
 
-
 
-    <script>
 
-      !(function () {
 
-        var analytics = (window.analytics = window.analytics || []);
 
-        if (!analytics.initialize)
 
-          if (analytics.invoked)
 
-            window.console &&
 
-              console.error &&
 
-              console.error("Segment snippet included twice.");
 
-          else {
 
-            analytics.invoked = !0;
 
-            analytics.methods = [
 
-              "trackSubmit",
 
-              "trackClick",
 
-              "trackLink",
 
-              "trackForm",
 
-              "pageview",
 
-              "identify",
 
-              "reset",
 
-              "group",
 
-              "track",
 
-              "ready",
 
-              "alias",
 
-              "debug",
 
-              "page",
 
-              "once",
 
-              "off",
 
-              "on",
 
-              "addSourceMiddleware",
 
-              "addIntegrationMiddleware",
 
-              "setAnonymousId",
 
-              "addDestinationMiddleware",
 
-            ];
 
-            analytics.factory = function (e) {
 
-              return function () {
 
-                var t = Array.prototype.slice.call(arguments);
 
-                t.unshift(e);
 
-                analytics.push(t);
 
-                return analytics;
 
-              };
 
-            };
 
-            for (var e = 0; e < analytics.methods.length; e++) {
 
-              var key = analytics.methods[e];
 
-              analytics[key] = analytics.factory(key);
 
-            }
 
-            analytics.load = function (key, e) {
 
-              var t = document.createElement("script");
 
-              t.type = "text/javascript";
 
-              t.async = !0;
 
-              t.src =
 
-                "https://cdn.segment.com/analytics.js/v1/" +
 
-                key +
 
-                "/analytics.min.js";
 
-              var n = document.getElementsByTagName("script")[0];
 
-              n.parentNode.insertBefore(t, n);
 
-              analytics._loadOptions = e;
 
-            };
 
-            analytics._writeKey = "J6sN7XaMPOGIkA1ZGYMBU4UX37aPZ1Yb";
 
-            analytics.SNIPPET_VERSION = "4.13.2";
 
-            analytics.load("<%= htmlWebpackPlugin.options.segmentKey %>");
 
-            analytics.page();
 
-          }
 
-      })();
 
-    </script>
 
     <link rel="icon" href="https://i.ibb.co/HnSk02f/ptr.png" />
 
     <meta
 
       name="description"

+ 10 - 5
dashboard/src/main/Main.tsx
مشاهده فایل 

@@ -5,7 +5,9 @@ import api from "shared/api";
 
 import { Context } from "shared/Context";
 
 import Cohere from "cohere-js";
 
 
-Cohere.init(process.env.COHERE_API_KEY);
 
+if (window.location.href.includes("dashboard.getporter.dev")) {
 
+  Cohere.init(process.env.COHERE_API_KEY);
 
+}
 
 
 import ResetPasswordInit from "./auth/ResetPasswordInit";
 
 import ResetPasswordFinalize from "./auth/ResetPasswordFinalize";
 
@@ -45,10 +47,13 @@ export default class Main extends Component<PropsType, StateType> {
 
       .checkAuth("", {}, {})
 
       .then((res) => {
 
         if (res && res?.data) {
 
-          Cohere.identify(res?.data?.id, {
 
-            displayName: res?.data?.email,
 
-            email: res?.data?.email,
 
-          });
 
+          if (window.location.href.includes("dashboard.getporter.dev")) {
 
+            Cohere.identify(res?.data?.id, {
 
+              displayName: res?.data?.email,
 
+              email: res?.data?.email,
 
+            });
 
+          }
 
+
 
           setUser(res?.data?.id, res?.data?.email);
 
           this.setState({
 
             isLoggedIn: true,

+ 5 - 5
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx
مشاهده فایل 

@@ -338,7 +338,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
 
       setSaveValueStatus("successful");
 
       setForceRefreshRevisions(true);
 
 
-      window.analytics.track("Chart Upgraded", {
 
+      window.analytics?.track("Chart Upgraded", {
 
         chart: currentChart.name,
 
         values: valuesYaml,
 
       });
 
@@ -353,7 +353,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
 
 
       setCurrentError(parsedErr);
 
 
-      window.analytics.track("Failed to Upgrade Chart", {
 
+      window.analytics?.track("Failed to Upgrade Chart", {
 
         chart: currentChart.name,
 
         values: valuesYaml,
 
         error: err,
 
@@ -392,7 +392,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
 
         setSaveValueStatus("successful");
 
         setForceRefreshRevisions(true);
 
 
-        window.analytics.track("Chart Upgraded", {
 
+        window.analytics?.track("Chart Upgraded", {
 
           chart: currentChart.name,
 
           values: valuesYaml,
 
         });
 
@@ -408,7 +408,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
 
         setSaveValueStatus(err);
 
         setCurrentError(parsedErr);
 
 
-        window.analytics.track("Failed to Upgrade Chart", {
 
+        window.analytics?.track("Failed to Upgrade Chart", {
 
           chart: currentChart.name,
 
           values: valuesYaml,
 
           error: err,
 
@@ -704,7 +704,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
 
   };
 
 
   useEffect(() => {
 
-    window.analytics.track("Opened Chart", {
 
+    window.analytics?.track("Opened Chart", {
 
       chart: currentChart.name,
 
     });

+ 2 - 2
dashboard/src/main/home/launch/launch-flow/LaunchFlow.tsx
مشاهده فایل 

@@ -118,7 +118,7 @@ const LaunchFlow: React.FC<PropsType> = (props) => {
 
         }
 
       )
 
       .then((_) => {
 
-        window.analytics.track("Deployed Add-on", {
 
+        window.analytics?.track("Deployed Add-on", {
 
           name: props.currentTemplate.name,
 
           namespace: selectedNamespace,
 
           values: values,
 
@@ -132,7 +132,7 @@ const LaunchFlow: React.FC<PropsType> = (props) => {
 
         setSaveValuesStatus(err);
 
 
         setCurrentError(err);
 
-        window.analytics.track("Failed to Deploy Add-on", {
 
+        window.analytics?.track("Failed to Deploy Add-on", {
 
           name: props.currentTemplate.name,
 
           namespace: selectedNamespace,
 
           values: values,

+ 1 - 1
dashboard/src/main/home/provisioner/ProvisionerLogs.tsx
مشاهده فایل 

@@ -137,7 +137,7 @@ class ProvisionerLogs extends Component<PropsType, StateType> {
 
       }
 
 
       if (err) {
 
-        window.analytics.track("Provisioning Error", {
 
+        window.analytics?.track("Provisioning Error", {
 
           error: err,
 
         });
 
         let e = ansiparse(err).map((el: any) => {

+ 1 - 1
dashboard/src/main/home/sidebar/ClusterSection.tsx
مشاهده فایل 

@@ -51,7 +51,7 @@ class ClusterSection extends Component<PropsType, StateType> {
 
     api
 
       .getClusters("<token>", {}, { id: currentProject.id })
 
       .then((res) => {
 
-        window.analytics.identify(user.userId, {
 
+        window.analytics?.identify(user.userId, {
 
           currentProject,
 
           clusters: res.data,
 
         });

+ 2 - 2
dashboard/src/shared/hooks/useChart.ts
مشاهده فایل 

@@ -76,7 +76,7 @@ export const useChart = (oldChart: ChartType, closeChart: () => void) => {
 
         }
 
       );
 
 
-      window.analytics.track("Chart Upgraded", {
 
+      window.analytics?.track("Chart Upgraded", {
 
         chart: chart.name,
 
         values: valuesYaml,
 
       });
 
@@ -88,7 +88,7 @@ export const useChart = (oldChart: ChartType, closeChart: () => void) => {
 
       }
 
       setCurrentError(parsedErr);
 
 
-      window.analytics.track("Failed to Upgrade Chart", {
 
+      window.analytics?.track("Failed to Upgrade Chart", {
 
         chart: chart.name,
 
         values: valuesYaml,
 
         error: err,

+ 17 - 4
dashboard/webpack.config.js
مشاهده فایل 

@@ -24,6 +24,22 @@ module.exports = () => {
 
   if (process.env.NODE_ENV !== env.NODE_ENV) {
 
     isDevelopment = process.env.NODE_ENV !== "production";
 
   }
 
+
 
+  let htmlPluginOpts = {
 
+    template: path.resolve(__dirname, "src", "index.html"),
 
+  };
 
+
 
+  if (env.IS_HOSTED) {
 
+    htmlPluginOpts = {
 
+      template: path.resolve(__dirname, "src", "hosted.index.html"),
 
+      cohereKey: `${env.COHERE_KEY}`,
 
+      intercomAppId: `${env.INTERCOM_APP_ID}`,
 
+      intercomSrc: `${process.env.INTERCOM_SRC}`,
 
+      segmentWriteKey: `${process.env.SEGMENT_WRITE_KEY}`,
 
+      segmentKey: `${process.env.SEGMENT_PUBLIC_KEY}`,
 
+    };
 
+  }
 
+
 
   /**
 
    * @type {webpack.Configuration}
 
    */
 
@@ -93,10 +109,7 @@ module.exports = () => {
 
       hot: true,
 
     },
 
     plugins: [
 
-      new HtmlWebpackPlugin({
 
-        template: path.resolve(__dirname, "src", "index.html"),
 
-        segmentKey: `${process.env.SEGMENT_PUBLIC_KEY}`,
 
-      }),
 
+      new HtmlWebpackPlugin(htmlPluginOpts),
 
       new webpack.DefinePlugin(envKeys),
 
       isDevelopment && new ReactRefreshWebpackPlugin(),
 
     ].filter(Boolean),