From cd004ae1146eeedbf94a1a7d50511151a8982c76 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Tue, 29 Nov 2022 21:59:54 +0300
Subject: [PATCH 1/2] Updates jsPDF dependency url

---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 6457bfe0ed..e27b8b1e67 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "i18n-iso-countries": "^7.5.0",
     "intl": "1.2.5",
     "jquery": "^2.2.4",
-    "jspdf": "https://github.com/MrRio/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e",
+    "jspdf": "https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e",
     "kolibri-constants": "^0.1.41",
     "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#e9a2ff34716bb6412fe99f835ded5b17345bab94",
     "lodash": "^4.17.21",
diff --git a/yarn.lock b/yarn.lock
index 0c074104d7..b535884415 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7906,9 +7906,9 @@ jsonpointer@^5.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
   integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
 
-"jspdf@https://github.com/MrRio/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e":
+"jspdf@https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e":
   version "2.1.1"
-  resolved "https://github.com/MrRio/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e"
+  resolved "https://github.com/parallax/jsPDF.git#b7a1d8239c596292ce86dafa77f05987bcfa2e6e"
   dependencies:
     atob "^2.1.2"
     btoa "^1.2.1"
@@ -11112,7 +11112,7 @@ stackblur-canvas@2.2.0:
 stackblur-canvas@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz#849aa6f94b272ff26f6471fa4130ed1f7e47955b"
-  integrity sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs=
+  integrity sha512-TfbTympL5C1K+F/RizDkMBqH18EkUKU8V+4PphIXR+fWhZwwRi3bekP04gy2TOwOT3R6rJQJXAXFrbcZde7wow==
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -11858,7 +11858,7 @@ tr46@^2.1.0:
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 trim-newlines@^3.0.0:
   version "3.0.1"
@@ -12373,7 +12373,7 @@ web-streams-polyfill@^3.2.1:
 webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^4.0.2:
   version "4.0.2"
@@ -12533,7 +12533,7 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
 whatwg-url@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
-  integrity sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=
+  integrity sha512-sX+FT4N6iR0ZiqGqyDEKklyfMGR99zvxZD+LQ8IGae5uVGswQ7DOeLPB5KgJY8FzkwSzwqOXLQeVQvtOTSQU9Q==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -12874,7 +12874,7 @@ xhr@^2.0.1:
 "xml-name-validator@>= 2.0.1 < 3.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-  integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=
+  integrity sha512-jRKe/iQYMyVJpzPH+3HL97Lgu5HrCfii+qSo+TfjKHtOnvbnvdVfMYrn9Q34YV81M2e5sviJlI6Ko9y+nByzvA==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"

From 1a1cf8e6c1a39aaf8bae96f4addc2b681cd21137 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Tue, 29 Nov 2022 22:11:04 +0300
Subject: [PATCH 2/2] Removes misleading offline indicator on sign-in page

---
 .../frontend/accounts/pages/Main.vue          | 71 +++++++++++++------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
index c15a96fca1..dc05d5204c 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/Main.vue
@@ -6,12 +6,12 @@
       justify-center
       class="main pt-5"
     >
-      <h3 class="corner">
-        <OfflineText indicator />
-      </h3>
       <div>
         <!-- Sign in -->
-        <VCard class="pa-4" style="width: 300px;margin: 0 auto;">
+        <VCard
+          class="pa-4"
+          style="width: 300px;margin: 0 auto;"
+        >
           <VImg
             height="200"
             maxHeight="100"
@@ -22,30 +22,67 @@
           <h2 class="primary--text py-2 text-xs-center">
             {{ $tr('kolibriStudio') }}
           </h2>
-          <Banner :value="loginFailed" :text="$tr('loginFailed')" error />
-          <Banner :value="offline" :text="$tr('loginFailedOffline')" error />
+          <Banner
+            :value="loginFailed"
+            :text="$tr('loginFailed')"
+            error
+          />
+          <Banner
+            :value="offline"
+            :text="$tr('loginFailedOffline')"
+            error
+          />
           <Banner
             :value="Boolean(nextParam)"
             :text="$tr('loginToProceed')"
             class="pb-0 px-0"
             data-test="loginToProceed"
           />
-          <VForm ref="form" lazy-validation class="py-3" @submit.prevent="submit">
-            <EmailField v-model="username" autofocus />
-            <PasswordField v-model="password" :label="$tr('passwordLabel')" />
+          <VForm
+            ref="form"
+            lazy-validation
+            class="py-3"
+            @submit.prevent="submit"
+          >
+            <EmailField
+              v-model="username"
+              autofocus
+            />
+            <PasswordField
+              v-model="password"
+              :label="$tr('passwordLabel')"
+            />
             <p>
-              <ActionLink :to="{ name: 'ForgotPassword' }" :text="$tr('forgotPasswordLink')" />
+              <ActionLink
+                :to="{ name: 'ForgotPassword' }"
+                :text="$tr('forgotPasswordLink')"
+              />
             </p>
-            <VBtn block color="primary" large type="submit" :disabled="offline || busy">
+            <VBtn
+              block
+              color="primary"
+              large
+              type="submit"
+              :disabled="offline || busy"
+            >
               {{ $tr('signInButton') }}
             </VBtn>
-            <VBtn block flat color="primary" class="mt-2" :to="{ name: 'Create' }">
+            <VBtn
+              block
+              flat
+              color="primary"
+              class="mt-2"
+              :to="{ name: 'Create' }"
+            >
               {{ $tr('createAccountButton') }}
             </VBtn>
           </VForm>
           <VDivider />
           <p class="mt-4 text-xs-center">
-            <ActionLink href="/channels" :text="$tr('guestModeLink')" />
+            <ActionLink
+              href="/channels"
+              :text="$tr('guestModeLink')"
+            />
           </p>
         </VCard>
 
@@ -90,7 +127,6 @@
   import PolicyModals from 'shared/views/policies/PolicyModals';
   import { policies } from 'shared/constants';
   import LanguageSwitcherList from 'shared/languageSwitcher/LanguageSwitcherList';
-  import OfflineText from 'shared/views/OfflineText';
 
   export default {
     name: 'Main',
@@ -100,7 +136,6 @@
       LanguageSwitcherList,
       PasswordField,
       PolicyModals,
-      OfflineText,
     },
     data() {
       return {
@@ -191,10 +226,4 @@
     content: '•';
   }
 
-  .corner {
-    position: absolute;
-    top: 1em;
-    left: 1em;
-  }
-
 </style>