From 9ef9b13bd9419edd9243e49e3a001189bf840305 Mon Sep 17 00:00:00 2001
From: Seth Herr <seth.william.herr@gmail.com>
Date: Wed, 13 Sep 2023 11:56:04 -0700
Subject: [PATCH 1/4] Add agreement back in to safari

---
 apple/Config.xcconfig |  4 ++--
 dist/index.html       | 14 +++++++-------
 dist/popup.js         |  8 ++++----
 esbuild.config.mjs    |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/apple/Config.xcconfig b/apple/Config.xcconfig
index b3d8940..db4b4d4 100644
--- a/apple/Config.xcconfig
+++ b/apple/Config.xcconfig
@@ -8,8 +8,8 @@
 //  2. Run the Archive process in XCODE
 //  ... Someday use https://fastlane.tools to automate things
 //
-CURRENT_PROJECT_VERSION = 17
-MARKETING_VERSION = 0.11.0
+CURRENT_PROJECT_VERSION = 18
+MARKETING_VERSION = 0.11.1
 //
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
diff --git a/dist/index.html b/dist/index.html
index e4f466c..f4991aa 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -9,12 +9,12 @@
   <title>Convus</title>
 </head>
 
-<body id="body-popup" class="target-chrome">
+<body id="body-popup" class="target-safari">
   <div id="whitespace-preserver" style="height: 3rem"></div>
   <div id="sign_in_message" class="hidden">
     <h2 class="my-4">Convus browser extension</h2>
     <p class="mt-4 mb-4">
-      <a href="http://localhost:3009/browser_extension_auth" target="_blank" class="btn btn-success" id="signInBtn">Sign in to the
+      <a href="https://www.convus.org/browser_extension_auth" target="_blank" class="btn btn-success" id="signInBtn">Sign in to the
         browser extension</a>
     </p>
   </div>
@@ -32,7 +32,7 @@ <h2 class="my-4">Logged out from browser extension</h2>
     <p class="mt-4 mb-4">You can close this popup, or it will close automatically in <span id="out_countdown">5</span>
       seconds.</p>
   </div>
-  <form class="hidden pb-2" id="new_user" action="http://localhost:3009/api/v1/auth" accept-charset="UTF-8" method="post">
+  <form class="hidden pb-2" id="new_user" action="https://www.convus.org/api/v1/auth" accept-charset="UTF-8" method="post">
     <h2 class="mb-2 mt-3">Log in</h2>
     <div class="form-row">
       <label for="email">Email</label>
@@ -47,11 +47,11 @@ <h2 class="mb-2 mt-3">Log in</h2>
       <input type="submit" name="commit" value="Log in" id="loginBtn" class="btn btn-success"
         data-disable-with="Log in" />
     </div>
-    <p class="mt-2"><a href="http://localhost:3009/users/password/new" target="_blank">Forgot your password?</a></p>
-    <p class="mt-2"><a href="http://localhost:3009/users/sign_up" target="_blank">Sign up</a></p>
+    <p class="mt-2"><a href="https://www.convus.org/users/password/new" target="_blank">Forgot your password?</a></p>
+    <p class="mt-2"><a href="https://www.convus.org/users/sign_up" target="_blank">Sign up</a></p>
   </form>
-  <form id="new_rating" action="http://localhost:3009/api/v1/ratings" accept-charset="UTF-8" method="post" class="pb-2 hidden">
-    <input autocomplete="off" type="hidden" value="chrome_extension-0.11.1" name="source" id="source" />
+  <form id="new_rating" action="https://www.convus.org/api/v1/ratings" accept-charset="UTF-8" method="post" class="pb-2 hidden">
+    <input autocomplete="off" type="hidden" value="safari_extension-0.11.1" name="source" id="source" />
     <input class="hiddenFieldTimezone" autocomplete="off" type="hidden" name="timezone" id="timezone" />
     <div class="row grid-cols-2 divide-x border-b">
       <div class="col pb-1 pt-2">
diff --git a/dist/popup.js b/dist/popup.js
index 17265e1..dd5d7ae 100644
--- a/dist/popup.js
+++ b/dist/popup.js
@@ -367,7 +367,7 @@
       return true;
     }
   };
-  var baseUrl = "http://localhost:3009";
+  var baseUrl = "https://www.convus.org";
   var renderLocalAlert = () => {
     if (document.getElementById("local-alert")) {
       return;
@@ -581,7 +581,7 @@
   };
 
   // login.js
-  var baseUrl2 = "http://localhost:3009";
+  var baseUrl2 = "https://www.convus.org";
   var formAuthUrl = baseUrl2 + "/api/v1/auth";
   var authUrl = baseUrl2 + "/browser_extension_auth";
   var storeAuthData = (authToken, currentName) => {
@@ -713,7 +713,7 @@
 
   // injected_script.js
   function injectedScript() {
-    const authUrl2 = "http://localhost:3009/browser_extension_auth";
+    const authUrl2 = "https://www.convus.org/browser_extension_auth";
     console.log("Convus extension is getting the page metadata!");
     if (authUrl2 === window.location.href) {
       const authData = {
@@ -748,7 +748,7 @@
   }
 
   // popup.js
-  var browserTarget = "chrome";
+  var browserTarget = "safari";
   var safariType = !!browserTarget.match("safari");
   if (browserTarget == "chrome") {
     browser = chrome;
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index 43231d7..f474eeb 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -5,9 +5,9 @@ import * as esbuild from 'esbuild'
 const watch = process.argv.includes('--watch') || process.env.WATCH === 'true'
 
 // Current options: chrome, firefox, safari, safari_ios
-const target = 'chrome'
+const target = 'safari'
 
-process.env.NODE_ENV ||= 'development'
+process.env.NODE_ENV ||= 'production'
 const baseUrl = process.env.NODE_ENV === 'production' ? 'https://www.convus.org' : 'http://localhost:3009'
 const version = process.env.npm_package_version
 
@@ -28,7 +28,7 @@ writeFileSync('dist/manifest.json', replaceEnvValues(manifestContent))
 // esbuild, go to town
 const errorFilePath = 'esbuild_error'
 const watchOptions = {
-  onRebuild (error, result) {
+  onRebuild(error, result) {
     if (error) {
       console.error('watch build failed:', error)
       writeFileSync(errorFilePath, error.toString())

From 00716722c9982d3282f591971c76b34d7c1fdd48 Mon Sep 17 00:00:00 2001
From: Seth Herr <seth.william.herr@gmail.com>
Date: Wed, 13 Sep 2023 11:59:59 -0700
Subject: [PATCH 2/4] safari ios

---
 dist/index.html    | 4 ++--
 dist/popup.js      | 2 +-
 esbuild.config.mjs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index f4991aa..2260bc8 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -9,7 +9,7 @@
   <title>Convus</title>
 </head>
 
-<body id="body-popup" class="target-safari">
+<body id="body-popup" class="target-safari_ios">
   <div id="whitespace-preserver" style="height: 3rem"></div>
   <div id="sign_in_message" class="hidden">
     <h2 class="my-4">Convus browser extension</h2>
@@ -51,7 +51,7 @@ <h2 class="mb-2 mt-3">Log in</h2>
     <p class="mt-2"><a href="https://www.convus.org/users/sign_up" target="_blank">Sign up</a></p>
   </form>
   <form id="new_rating" action="https://www.convus.org/api/v1/ratings" accept-charset="UTF-8" method="post" class="pb-2 hidden">
-    <input autocomplete="off" type="hidden" value="safari_extension-0.11.1" name="source" id="source" />
+    <input autocomplete="off" type="hidden" value="safari_ios_extension-0.11.1" name="source" id="source" />
     <input class="hiddenFieldTimezone" autocomplete="off" type="hidden" name="timezone" id="timezone" />
     <div class="row grid-cols-2 divide-x border-b">
       <div class="col pb-1 pt-2">
diff --git a/dist/popup.js b/dist/popup.js
index dd5d7ae..eae091c 100644
--- a/dist/popup.js
+++ b/dist/popup.js
@@ -748,7 +748,7 @@
   }
 
   // popup.js
-  var browserTarget = "safari";
+  var browserTarget = "safari_ios";
   var safariType = !!browserTarget.match("safari");
   if (browserTarget == "chrome") {
     browser = chrome;
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index f474eeb..fc152db 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -5,7 +5,7 @@ import * as esbuild from 'esbuild'
 const watch = process.argv.includes('--watch') || process.env.WATCH === 'true'
 
 // Current options: chrome, firefox, safari, safari_ios
-const target = 'safari'
+const target = 'safari_ios'
 
 process.env.NODE_ENV ||= 'production'
 const baseUrl = process.env.NODE_ENV === 'production' ? 'https://www.convus.org' : 'http://localhost:3009'

From 422a03ed684f73d70cf01c97dc2e38db7343876f Mon Sep 17 00:00:00 2001
From: Seth Herr <seth.william.herr@gmail.com>
Date: Wed, 13 Sep 2023 12:12:39 -0700
Subject: [PATCH 3/4] back default (chrome, dev)

---
 dist/index.html    | 14 +++++++-------
 dist/popup.js      |  8 ++++----
 esbuild.config.mjs |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dist/index.html b/dist/index.html
index 2260bc8..e4f466c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -9,12 +9,12 @@
   <title>Convus</title>
 </head>
 
-<body id="body-popup" class="target-safari_ios">
+<body id="body-popup" class="target-chrome">
   <div id="whitespace-preserver" style="height: 3rem"></div>
   <div id="sign_in_message" class="hidden">
     <h2 class="my-4">Convus browser extension</h2>
     <p class="mt-4 mb-4">
-      <a href="https://www.convus.org/browser_extension_auth" target="_blank" class="btn btn-success" id="signInBtn">Sign in to the
+      <a href="http://localhost:3009/browser_extension_auth" target="_blank" class="btn btn-success" id="signInBtn">Sign in to the
         browser extension</a>
     </p>
   </div>
@@ -32,7 +32,7 @@ <h2 class="my-4">Logged out from browser extension</h2>
     <p class="mt-4 mb-4">You can close this popup, or it will close automatically in <span id="out_countdown">5</span>
       seconds.</p>
   </div>
-  <form class="hidden pb-2" id="new_user" action="https://www.convus.org/api/v1/auth" accept-charset="UTF-8" method="post">
+  <form class="hidden pb-2" id="new_user" action="http://localhost:3009/api/v1/auth" accept-charset="UTF-8" method="post">
     <h2 class="mb-2 mt-3">Log in</h2>
     <div class="form-row">
       <label for="email">Email</label>
@@ -47,11 +47,11 @@ <h2 class="mb-2 mt-3">Log in</h2>
       <input type="submit" name="commit" value="Log in" id="loginBtn" class="btn btn-success"
         data-disable-with="Log in" />
     </div>
-    <p class="mt-2"><a href="https://www.convus.org/users/password/new" target="_blank">Forgot your password?</a></p>
-    <p class="mt-2"><a href="https://www.convus.org/users/sign_up" target="_blank">Sign up</a></p>
+    <p class="mt-2"><a href="http://localhost:3009/users/password/new" target="_blank">Forgot your password?</a></p>
+    <p class="mt-2"><a href="http://localhost:3009/users/sign_up" target="_blank">Sign up</a></p>
   </form>
-  <form id="new_rating" action="https://www.convus.org/api/v1/ratings" accept-charset="UTF-8" method="post" class="pb-2 hidden">
-    <input autocomplete="off" type="hidden" value="safari_ios_extension-0.11.1" name="source" id="source" />
+  <form id="new_rating" action="http://localhost:3009/api/v1/ratings" accept-charset="UTF-8" method="post" class="pb-2 hidden">
+    <input autocomplete="off" type="hidden" value="chrome_extension-0.11.1" name="source" id="source" />
     <input class="hiddenFieldTimezone" autocomplete="off" type="hidden" name="timezone" id="timezone" />
     <div class="row grid-cols-2 divide-x border-b">
       <div class="col pb-1 pt-2">
diff --git a/dist/popup.js b/dist/popup.js
index eae091c..17265e1 100644
--- a/dist/popup.js
+++ b/dist/popup.js
@@ -367,7 +367,7 @@
       return true;
     }
   };
-  var baseUrl = "https://www.convus.org";
+  var baseUrl = "http://localhost:3009";
   var renderLocalAlert = () => {
     if (document.getElementById("local-alert")) {
       return;
@@ -581,7 +581,7 @@
   };
 
   // login.js
-  var baseUrl2 = "https://www.convus.org";
+  var baseUrl2 = "http://localhost:3009";
   var formAuthUrl = baseUrl2 + "/api/v1/auth";
   var authUrl = baseUrl2 + "/browser_extension_auth";
   var storeAuthData = (authToken, currentName) => {
@@ -713,7 +713,7 @@
 
   // injected_script.js
   function injectedScript() {
-    const authUrl2 = "https://www.convus.org/browser_extension_auth";
+    const authUrl2 = "http://localhost:3009/browser_extension_auth";
     console.log("Convus extension is getting the page metadata!");
     if (authUrl2 === window.location.href) {
       const authData = {
@@ -748,7 +748,7 @@
   }
 
   // popup.js
-  var browserTarget = "safari_ios";
+  var browserTarget = "chrome";
   var safariType = !!browserTarget.match("safari");
   if (browserTarget == "chrome") {
     browser = chrome;
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index fc152db..8738e1b 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -5,9 +5,9 @@ import * as esbuild from 'esbuild'
 const watch = process.argv.includes('--watch') || process.env.WATCH === 'true'
 
 // Current options: chrome, firefox, safari, safari_ios
-const target = 'safari_ios'
+const target = 'chrome'
 
-process.env.NODE_ENV ||= 'production'
+process.env.NODE_ENV ||= 'development'
 const baseUrl = process.env.NODE_ENV === 'production' ? 'https://www.convus.org' : 'http://localhost:3009'
 const version = process.env.npm_package_version
 

From 220610aa30d11ff106a7262d219a0264fef1782f Mon Sep 17 00:00:00 2001
From: Seth Herr <seth.william.herr@gmail.com>
Date: Wed, 13 Sep 2023 12:13:30 -0700
Subject: [PATCH 4/4] minimal

---
 esbuild.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index 8738e1b..43231d7 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -28,7 +28,7 @@ writeFileSync('dist/manifest.json', replaceEnvValues(manifestContent))
 // esbuild, go to town
 const errorFilePath = 'esbuild_error'
 const watchOptions = {
-  onRebuild(error, result) {
+  onRebuild (error, result) {
     if (error) {
       console.error('watch build failed:', error)
       writeFileSync(errorFilePath, error.toString())
