Merge branch 'master' of https://github.com/SantiMA10/devops-streamdeck

SantiMA10 · May 10, 2020 · c41c42d · c41c42d
2 parents 6c3df01 + f522261
commit c41c42d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/dev.santiagomartin.devops.sdPlugin/pi/ts/main.tsx b/src/dev.santiagomartin.devops.sdPlugin/pi/ts/main.tsx
@@ -62,6 +62,12 @@ function connectElgatoStreamDeckSocket(
     );
   });
 
+  document.addEventListener("openUrl", (e) => {
+    const { detail } = e as CustomEvent;
+
+    openUrl(detail.url);
+  });
+
   document.addEventListener("removeAccount", (e) => {
     const { detail } = e as CustomEvent;
 
@@ -96,6 +102,7 @@ function connectElgatoStreamDeckSocket(
 
     websocket.send(JSON.stringify(json));
   };
+
   const openUrl = (url: string) => {
     websocket.send(
       JSON.stringify({

diff --git a/src/dev.santiagomartin.devops.sdPlugin/setup/ts/main.tsx b/src/dev.santiagomartin.devops.sdPlugin/setup/ts/main.tsx
@@ -16,6 +16,12 @@ const SetupForm: React.FC = () => {
     window.close();
   };
 
+  const openUrl = (url: String) => {
+    window.opener.document.dispatchEvent(
+      new CustomEvent("openUrl", { detail: { url } })
+    );
+  };
+
   return (
     <div
       style={{ display: "flex", flexDirection: "column", alignItems: "center" }}
@@ -26,6 +32,12 @@ const SetupForm: React.FC = () => {
         <a
           target="_blank"
           href="https://github.com/SantiMA10/devops-streamdeck#how-it-works"
+          onClick={(e) => {
+            e.preventDefault();
+            openUrl(
+              "https://github.com/SantiMA10/devops-streamdeck#how-it-works"
+            );
+          }}
         >
           instructions here
         </a>
@@ -38,7 +50,7 @@ const SetupForm: React.FC = () => {
           type="text"
           placeholder="Account name"
           value={name}
-          onChange={event => setName(event.target.value)}
+          onChange={(event) => setName(event.target.value)}
           required
         />
       </div>
@@ -49,7 +61,7 @@ const SetupForm: React.FC = () => {
           type="password"
           placeholder="Paste here your personal token"
           value={token}
-          onChange={event => setToken(event.target.value)}
+          onChange={(event) => setToken(event.target.value)}
           required
         />
       </div>
@@ -60,7 +72,7 @@ const SetupForm: React.FC = () => {
           type="text"
           placeholder="Add here your self-hosted domain"
           value={domain}
-          onChange={event => setDomain(event.target.value)}
+          onChange={(event) => setDomain(event.target.value)}
         />
       </div>
       <button style={{ marginTop: 10 }} onClick={onSave}>