Skip to content

Commit 42b9510

Browse files
gustavotoyotagustavotoyota
committed
Merge branch 'dev' into main
2 parents d5a70d1 + 3da7ec5 commit 42b9510

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+2037
-856
lines changed

‎apps/app-server/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/tsconfig",
33

4-
"extends": "tsconfig/base.json",
4+
"extends": "@deeplib/tsconfig/base.json",
55

66
// Necessary for ts-node-dev to work
77
"ts-node": {

‎apps/client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@deepnotes/client",
33
"description": "DeepNotes",
44
"homepage": "https://deepnotes.app",
5-
"version": "1.0.20",
5+
"version": "1.0.21",
66
"author": "Gustavo Toyota <[email protected]>",
77
"dependencies": {
88
"@_ueberdosis/prosemirror-tables": "~1.1.3",

‎apps/client/quasar.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module.exports = configure(function (ctx) {
8484
// https://github.com/quasarframework/quasar/tree/dev/extras
8585
extras: [
8686
// 'ionicons-v4',
87-
'mdi-v5',
87+
'mdi-v7',
8888
// 'fontawesome-v6',
8989
// 'eva-icons',
9090
// 'themify',

‎apps/client/src-capacitor/ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
360360
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
361361
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
362-
MARKETING_VERSION = 1.0.20;
362+
MARKETING_VERSION = 1.0.21;
363363
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
364364
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
365365
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -386,7 +386,7 @@
386386
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
387387
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
388388
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
389-
MARKETING_VERSION = 1.0.20;
389+
MARKETING_VERSION = 1.0.21;
390390
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
391391
PRODUCT_NAME = "$(TARGET_NAME)";
392392
PROVISIONING_PROFILE_SPECIFIER = "";

‎apps/client/src/boot/ui.client.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ export default boot(({ store }) => {
2525
internals.localStorage.getItem('currentPathExpanded') !== 'false';
2626
uiStore(store).recentPagesExpanded =
2727
internals.localStorage.getItem('recentPagesExpanded') !== 'false';
28+
uiStore(store).selectedPagesExpanded =
29+
internals.localStorage.getItem('selectedPagesExpanded') === 'true';
2830
});

‎apps/client/src/code/stores.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { useAuthStore } from 'src/stores/auth';
44
import { usePagesStore } from 'src/stores/pages';
55
import { useUIStore } from 'src/stores/ui';
66

7-
function makeStoreFunc<T extends (...args: any[]) => any>(storeDefinition: T) {
7+
export function makeStoreFunc<T extends (...args: any[]) => any>(
8+
storeDefinition: T,
9+
) {
810
let _store: ReturnType<T>;
911

1012
return (pinia?: Pinia): ReturnType<T> => {

‎apps/client/src/components/MiniSidebarBtn.vue‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,24 @@
55
:active="active"
66
v-ripple
77
:disable="disable"
8+
v-bind="{
9+
...$attrs,
10+
11+
onClick: (...args) => onClick(args, $attrs),
12+
}"
813
>
914
<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+
/>
1126
</q-item-section>
1227

1328
<q-tooltip
@@ -25,11 +40,47 @@
2540
</q-item>
2641
</template>
2742

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;
3050
active?: boolean;
3151
icon: string;
3252
tooltip: string;
3353
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+
}
3586
</script>

‎apps/client/src/layouts/PagesLayout/LeftSidebar/CurrentPath.vue‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<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+
>
310
<DeepBtn
411
flat
5-
style="width: 100%; height: 50px; border-radius: 0"
12+
style="width: 100%; height: 32px; min-height: 0; border-radius: 0"
613
no-caps
714
@click="negateProp(uiStore(), 'currentPathExpanded')"
815
>
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">
1118
<q-icon
1219
name="mdi-map-marker-radius"
13-
size="26px"
20+
size="20px"
1421
/>
1522
</q-avatar>
1623

@@ -19,30 +26,16 @@
1926
margin-left: -2px;
2027
text-align: left;
2128
color: rgba(255, 255, 255, 0.85);
22-
font-size: 15.2px;
29+
font-size: 13.5px;
2330
"
2431
>
2532
Current path
2633
</q-toolbar-title>
2734
</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>
3935
</DeepBtn>
4036
</q-toolbar>
4137

4238
<q-list
43-
:class="{
44-
mini: !uiStore().leftSidebarExpanded,
45-
}"
4639
style="
4740
height: 0;
4841
overflow-x: hidden;

‎apps/client/src/layouts/PagesLayout/LeftSidebar/LeftSidebar.vue‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,21 @@
3131
/>
3232

3333
<RecentPages />
34+
35+
<q-separator
36+
style="background-color: rgba(255, 255, 255, 0.15) !important"
37+
/>
38+
39+
<SelectedPages />
3440
</q-drawer>
3541
</template>
3642

3743
<script setup lang="ts">
3844
import { listenPointerEvents } from '@stdlib/misc';
39-
import CurrentPath from 'src/layouts/PagesLayout/LeftSidebar/CurrentPath.vue';
4045
46+
import CurrentPath from './CurrentPath.vue';
4147
import RecentPages from './RecentPages.vue';
48+
import SelectedPages from './SelectedPages.vue';
4249
4350
function resizeLeftSidebar(event: PointerEvent) {
4451
listenPointerEvents(event, {

‎apps/client/src/layouts/PagesLayout/LeftSidebar/RecentPages.vue‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<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+
>
310
<DeepBtn
411
flat
5-
style="width: 100%; height: 50px; border-radius: 0"
12+
style="width: 100%; height: 32px; min-height: 0; border-radius: 0"
613
no-caps
714
@click="negateProp(uiStore(), 'recentPagesExpanded')"
815
>
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">
1118
<q-icon
1219
name="mdi-history"
13-
size="26px"
20+
size="20px"
1421
/>
1522
</q-avatar>
1623

@@ -19,23 +26,12 @@
1926
margin-left: -2px;
2027
text-align: left;
2128
color: rgba(255, 255, 255, 0.85);
22-
font-size: 15.2px;
29+
font-size: 13.5px;
2330
"
2431
>
2532
Recent pages
2633
</q-toolbar-title>
2734
</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>
3935
</DeepBtn>
4036
</q-toolbar>
4137

0 commit comments

Comments
 (0)