GeezerVison is showing github.com — Merge branch 'dev' into main · DeepNotesApp/DeepNotes@42b9510
File treeExpand file treeCollapse file tree Open diff view settings src-capacitor/ios/App/App.xcodeproj MainToolbar/PagesSettingsDialog
Some content is hiddenLarge Commits have some content hidden by default. Use the searchbox below for content that may be hidden. Dismiss bannerExpand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: apps/app-server/tsconfig.json +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | { | 2 | 2 | "$schema": "https://json.schemastore.org/tsconfig", | 3 | 3 |
| 4 | | - "extends": "tsconfig/base.json", | | 4 | + "extends": "@deeplib/tsconfig/base.json", | 5 | 5 |
| 6 | 6 | // Necessary for ts-node-dev to work | 7 | 7 | "ts-node": { | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/package.json +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 2 | 2 | "name": "@deepnotes/client", | 3 | 3 | "description": "DeepNotes", | 4 | 4 | "homepage": "https://deepnotes.app", | 5 | | - "version": "1.0.20", | | 5 | + "version": "1.0.21", | 6 | 6 | | 7 | 7 | "dependencies": { | 8 | 8 | "@_ueberdosis/prosemirror-tables": "~1.1.3", | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/quasar.config.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -84,7 +84,7 @@ module.exports = configure(function (ctx) { | 84 | 84 | // https://github.com/quasarframework/quasar/tree/dev/extras | 85 | 85 | extras: [ | 86 | 86 | // 'ionicons-v4', | 87 | | - 'mdi-v5', | | 87 | + 'mdi-v7', | 88 | 88 | // 'fontawesome-v6', | 89 | 89 | // 'eva-icons', | 90 | 90 | // 'themify', | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 359 | 359 | INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; | 360 | 360 | IPHONEOS_DEPLOYMENT_TARGET = 13.0; | 361 | 361 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; | 362 | | - MARKETING_VERSION = 1.0.20; | | 362 | + MARKETING_VERSION = 1.0.21; | 363 | 363 | OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; | 364 | 364 | PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes; | 365 | 365 | PRODUCT_NAME = "$(TARGET_NAME)"; | | 386 | 386 | INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; | 387 | 387 | IPHONEOS_DEPLOYMENT_TARGET = 13.0; | 388 | 388 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; | 389 | | - MARKETING_VERSION = 1.0.20; | | 389 | + MARKETING_VERSION = 1.0.21; | 390 | 390 | PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes; | 391 | 391 | PRODUCT_NAME = "$(TARGET_NAME)"; | 392 | 392 | PROVISIONING_PROFILE_SPECIFIER = ""; | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/boot/ui.client.ts +2Lines changed: 2 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -25,4 +25,6 @@ export default boot(({ store }) => { | 25 | 25 | internals.localStorage.getItem('currentPathExpanded') !== 'false'; | 26 | 26 | uiStore(store).recentPagesExpanded = | 27 | 27 | internals.localStorage.getItem('recentPagesExpanded') !== 'false'; | | 28 | + uiStore(store).selectedPagesExpanded = | | 29 | + internals.localStorage.getItem('selectedPagesExpanded') === 'true'; | 28 | 30 | }); |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/code/stores.ts +3-1Lines changed: 3 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -4,7 +4,9 @@ import { useAuthStore } from 'src/stores/auth'; | 4 | 4 | import { usePagesStore } from 'src/stores/pages'; | 5 | 5 | import { useUIStore } from 'src/stores/ui'; | 6 | 6 |
| 7 | | -function makeStoreFunc<T extends (...args: any[]) => any>(storeDefinition: T) { | | 7 | +export function makeStoreFunc<T extends (...args: any[]) => any>( | | 8 | + storeDefinition: T, | | 9 | +) { | 8 | 10 | let _store: ReturnType<T>; | 9 | 11 |
| 10 | 12 | return (pinia?: Pinia): ReturnType<T> => { | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/components/MiniSidebarBtn.vue +55-4Lines changed: 55 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 5 | 5 | :active="active" | 6 | 6 | v-ripple | 7 | 7 | :disable="disable" | | 8 | + v-bind="{ | | 9 | + ...$attrs, | | 10 | +
| | 11 | + onClick: (...args) => onClick(args, $attrs), | | 12 | + }" | 8 | 13 | > | 9 | 14 | <q-item-section avatar> | 10 | | - <q-icon :name="icon" /> | | 15 | + <q-circular-progress | | 16 | + v-if="loading" | | 17 | + indeterminate | | 18 | + size="20px" | | 19 | + style="margin-left: 2px" | | 20 | + /> | | 21 | + | | 22 | + <q-icon | | 23 | + v-else | | 24 | + :name="icon" | | 25 | + /> | 11 | 26 | </q-item-section> | 12 | 27 |
| 13 | 28 | <q-tooltip | | 25 | 40 | </q-item> | 26 | 41 | </template> | 27 | 42 |
| 28 | | -<script setup lang="ts"> | 29 | | -defineProps<{ | | 43 | +<script lang="ts"> | | 44 | +export default { | | 45 | + inheritAttrs: false, | | 46 | +}; | | 47 | +
| | 48 | +export interface MiniSidebarBtnProps extends QItemProps { | | 49 | + delay?: boolean; | 30 | 50 | active?: boolean; | 31 | 51 | icon: string; | 32 | 52 | tooltip: string; | 33 | 53 | disable?: boolean; | 34 | | -}>(); | | 54 | +} | | 55 | +</script> | | 56 | + | | 57 | +<script setup lang="ts"> | | 58 | +import { sleep } from '@stdlib/misc'; | | 59 | +import type { QItemProps } from 'quasar'; | | 60 | +
| | 61 | +const props = defineProps<MiniSidebarBtnProps>(); | | 62 | +
| | 63 | +const loading = ref(false); | | 64 | +
| | 65 | +async function onClick(args: any[], attrs: any) { | | 66 | + if (attrs.onClick == null) { | | 67 | + return; | | 68 | + } | | 69 | +
| | 70 | + args[0].preventDefault(); | | 71 | +
| | 72 | + loading.value = true; | | 73 | +
| | 74 | + if (props.delay) { | | 75 | + await sleep(500); | | 76 | + } | | 77 | +
| | 78 | + try { | | 79 | + await attrs.onClick(...args); | | 80 | + } catch (error) { | | 81 | + mainLogger.error(error); | | 82 | + } | | 83 | +
| | 84 | + loading.value = false; | | 85 | +} | 35 | 86 | </script> |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/layouts/PagesLayout/LeftSidebar/CurrentPath.vue +13-20Lines changed: 13 additions & 20 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | <template> | 2 | | - <q-toolbar style="padding: 0; background-color: #141414; min-height: 50px"> | | 2 | + <q-toolbar | | 3 | + style=" | | 4 | + padding: 0; | | 5 | + background-color: #141414; | | 6 | + min-height: 0; | | 7 | + overflow: hidden; | | 8 | + " | | 9 | + > | 3 | 10 | <DeepBtn | 4 | 11 | flat | 5 | | - style="width: 100%; height: 50px; border-radius: 0" | | 12 | + style="width: 100%; height: 32px; min-height: 0; border-radius: 0" | 6 | 13 | no-caps | 7 | 14 | @click="negateProp(uiStore(), 'currentPathExpanded')" | 8 | 15 | > | 9 | | - <div style="width: 100%; display: flex; align-items: center"> | 10 | | - <q-avatar style="margin-left: -8px"> | | 16 | + <div style="width: 100%; height: 0; display: flex; align-items: center"> | | 17 | + <q-avatar style="margin-top: -1px; margin-left: -8px"> | 11 | 18 | <q-icon | 12 | 19 | name="mdi-map-marker-radius" | 13 | | - size="26px" | | 20 | + size="20px" | 14 | 21 | /> | 15 | 22 | </q-avatar> | 16 | 23 |
| | 19 | 26 | margin-left: -2px; | 20 | 27 | text-align: left; | 21 | 28 | color: rgba(255, 255, 255, 0.85); | 22 | | - font-size: 15.2px; | | 29 | + font-size: 13.5px; | 23 | 30 | " | 24 | 31 | > | 25 | 32 | Current path | 26 | 33 | </q-toolbar-title> | 27 | 34 | </div> | 28 | | - | 29 | | - <q-tooltip | 30 | | - v-if="!uiStore().leftSidebarExpanded" | 31 | | - anchor="center right" | 32 | | - self="center left" | 33 | | - max-width="200px" | 34 | | - transition-show="jump-right" | 35 | | - transition-hide="jump-left" | 36 | | - > | 37 | | - <div style="font-weight: bold; font-size: 14px">Current path</div> | 38 | | - </q-tooltip> | 39 | 35 | </DeepBtn> | 40 | 36 | </q-toolbar> | 41 | 37 |
| 42 | 38 | <q-list | 43 | | - :class="{ | 44 | | - mini: !uiStore().leftSidebarExpanded, | 45 | | - }" | 46 | 39 | style=" | 47 | 40 | height: 0; | 48 | 41 | overflow-x: hidden; | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/layouts/PagesLayout/LeftSidebar/LeftSidebar.vue +8-1Lines changed: 8 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 31 | 31 | /> | 32 | 32 |
| 33 | 33 | <RecentPages /> | | 34 | + | | 35 | + <q-separator | | 36 | + style="background-color: rgba(255, 255, 255, 0.15) !important" | | 37 | + /> | | 38 | + | | 39 | + <SelectedPages /> | 34 | 40 | </q-drawer> | 35 | 41 | </template> | 36 | 42 |
| 37 | 43 | <script setup lang="ts"> | 38 | 44 | import { listenPointerEvents } from '@stdlib/misc'; | 39 | | -import CurrentPath from 'src/layouts/PagesLayout/LeftSidebar/CurrentPath.vue'; | 40 | 45 |
| | 46 | +import CurrentPath from './CurrentPath.vue'; | 41 | 47 | import RecentPages from './RecentPages.vue'; | | 48 | +import SelectedPages from './SelectedPages.vue'; | 42 | 49 |
| 43 | 50 | function resizeLeftSidebar(event: PointerEvent) { | 44 | 51 | listenPointerEvents(event, { | |
Collapse file Copy file name to clipboardExpand all lines: apps/client/src/layouts/PagesLayout/LeftSidebar/RecentPages.vue +13-17Lines changed: 13 additions & 17 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 1 | 1 | <template> | 2 | | - <q-toolbar style="padding: 0; background-color: #141414"> | | 2 | + <q-toolbar | | 3 | + style=" | | 4 | + padding: 0; | | 5 | + background-color: #141414; | | 6 | + min-height: 0; | | 7 | + overflow: hidden; | | 8 | + " | | 9 | + > | 3 | 10 | <DeepBtn | 4 | 11 | flat | 5 | | - style="width: 100%; height: 50px; border-radius: 0" | | 12 | + style="width: 100%; height: 32px; min-height: 0; border-radius: 0" | 6 | 13 | no-caps | 7 | 14 | @click="negateProp(uiStore(), 'recentPagesExpanded')" | 8 | 15 | > | 9 | | - <div style="width: 100%; display: flex; align-items: center"> | 10 | | - <q-avatar style="margin-left: -8px"> | | 16 | + <div style="width: 100%; height: 0; display: flex; align-items: center"> | | 17 | + <q-avatar style="margin-top: -1px; margin-left: -8px"> | 11 | 18 | <q-icon | 12 | 19 | name="mdi-history" | 13 | | - size="26px" | | 20 | + size="20px" | 14 | 21 | /> | 15 | 22 | </q-avatar> | 16 | 23 |
| | 19 | 26 | margin-left: -2px; | 20 | 27 | text-align: left; | 21 | 28 | color: rgba(255, 255, 255, 0.85); | 22 | | - font-size: 15.2px; | | 29 | + font-size: 13.5px; | 23 | 30 | " | 24 | 31 | > | 25 | 32 | Recent pages | 26 | 33 | </q-toolbar-title> | 27 | 34 | </div> | 28 | | - | 29 | | - <q-tooltip | 30 | | - v-if="!uiStore().leftSidebarExpanded" | 31 | | - anchor="center right" | 32 | | - self="center left" | 33 | | - max-width="200px" | 34 | | - transition-show="jump-right" | 35 | | - transition-hide="jump-left" | 36 | | - > | 37 | | - <div style="font-weight: bold; font-size: 14px">Recent pages</div> | 38 | | - </q-tooltip> | 39 | 35 | </DeepBtn> | 40 | 36 | </q-toolbar> | 41 | 37 |
| |
|