Merge branch 'dev' into main

Author: gustavotoyota

apps/app-server/src/env.d.ts

@@ -52,7 +52,6 @@ declare namespace NodeJS {
     ZOHO_USER: string;
     ZOHO_PASSWORD: string;
 
-    STRIPE_PUBLISHABLE_KEY: string;
     STRIPE_SECRET_KEY: string;
     STRIPE_WEBHOOK_SECRET: string;
     STRIPE_MONTHLY_PRICE_ID: string;

apps/client/package.json

@@ -2,7 +2,7 @@
   "name": "@deepnotes/client",
   "description": "DeepNotes",
   "homepage": "https://deepnotes.app",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Gustavo Toyota <[email protected]>",
   "dependencies": {
     "@_ueberdosis/prosemirror-tables": "1.1.3",

apps/client/quasar.config.js

@@ -346,7 +346,7 @@ module.exports = configure(function (ctx) {
           target: 'AppImage',
         },
 
-        ...(true // true for NSIS, false for AppX
+        ...(false // true for NSIS, false for AppX
           ? {
               win: {
                 target: 'nsis',

apps/client/src-capacitor/android/app/version.properties

@@ -1,2 +1,2 @@
-#Mon Jul 17 11:07:10 AMT 2023
-VERSION_CODE=39
+#Mon Jul 24 09:09:25 AMT 2023
+VERSION_CODE=41

apps/client/src/code/pages/page/notes/note-collab.ts

@@ -58,6 +58,8 @@ export const INoteCollab = once(() =>
 
           wrapChildren: z.boolean().default(false),
           stretchChildren: z.boolean().default(true),
+
+          forceColorInheritance: z.boolean().default(false),
         })
         .default({}),
 

apps/client/src/code/pages/page/notes/note.ts

@@ -468,7 +468,9 @@ export class PageNote extends PageElem() implements IPageRegion {
       }),
 
       color: computed(() =>
-        this.react.collab.color.inherit && this.react.region.type === 'note'
+        this.react.region.type === 'note' &&
+        (this.react.region.react.collab.container.forceColorInheritance ||
+          this.react.collab.color.inherit)
           ? this.react.region.react.color
           : colorNameToColorHex('notes', this.react.collab.color.value),
       ),

apps/client/src/env.d.ts

@@ -64,7 +64,6 @@ declare namespace NodeJS {
     ZOHO_USER: string;
     ZOHO_PASSWORD: string;
 
-    STRIPE_PUBLISHABLE_KEY: string;
     STRIPE_SECRET_KEY: string;
     STRIPE_WEBHOOK_SECRET: string;
     STRIPE_MONTHLY_PRICE_ID: string;

apps/client/src/layouts/PagesLayout/RightSidebar/NoteProperties/NoteProperties.vue

@@ -635,6 +635,19 @@
         "
       />
 
+      <Gap style="height: 16px" />
+
+      <Checkbox
+        label="Force color inheritance"
+        :model-value="note.react.collab.container.forceColorInheritance"
+        @update:model-value="
+          changeProp($event, (selectedNote, value) => {
+            selectedNote.react.collab.container.forceColorInheritance = value;
+          })
+        "
+        :disable="page.react.readOnly || !note.react.collab.container.enabled"
+      />
+
       <Gap style="height: 24px" />
 
       <DeepBtn

apps/client/src/pages/home/Download/Download.vue

@@ -51,10 +51,11 @@
               padding: 18px 28px;
               line-height: normal;
             "
-            :href="`https://github.com/DeepNotesApp/DeepNotes/releases/download/v${version}/DeepNotes-Setup-${version}.exe`"
+            href="https://apps.microsoft.com/store/detail/deepnotes/9PH76W3HPQZJ"
+            target="_blank"
           >
             <div>
-              <div>Download for Windows (NSIS)</div>
+              <div>Go to Microsoft Store</div>
 
               <Gap style="height: 7px" />
 
@@ -93,6 +94,7 @@
               line-height: normal;
             "
             href="https://play.google.com/store/apps/details?id=app.deepnotes"
+            target="_blank"
           />
 
           <DeepBtn
@@ -106,6 +108,7 @@
               line-height: normal;
             "
             href="https://apps.apple.com/us/app/deepnotes-visual-note-taking/id6450611344"
+            target="_blank"
           />
         </div>
 
@@ -123,7 +126,7 @@
         style="justify-content: center"
       >
         <PlatformCard
-          :url="`https://github.com/DeepNotesApp/DeepNotes/releases/download/v${version}/DeepNotes-Setup-${version}.exe`"
+          url="https://apps.microsoft.com/store/detail/deepnotes/9PH76W3HPQZJ"
         >
           <img
             src="~assets/platforms/windows.webp"

apps/client/src/pages/home/Index/Index.vue

@@ -157,7 +157,7 @@
           <BillingFrequencyToggle v-model="billingFrequency" />
         </div>
 
-        <Gap style="height: 34px" />
+        <Gap style="height: 48px" />
 
         <PricingSection :billing-frequency="billingFrequency" />
       </template>