Skip to content

Commit 269a966

Browse files
gustavotoyotagustavotoyota
committed
Merge branch 'dev' into main
2 parents c0ac651 + 90aecc6 commit 269a966

File tree

5 files changed

+127
-158
lines changed

5 files changed

+127
-158
lines changed

‎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.0",
5+
"version": "1.0.1",
66
"author": "Gustavo Toyota <[email protected]>",
77
"dependencies": {
88
"@_ueberdosis/prosemirror-tables": "1.1.3",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
361361
PRODUCT_NAME = "$(TARGET_NAME)";
362362
PROVISIONING_PROFILE_SPECIFIER = "";
363-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store Profile";
363+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iOS App Store Profile";
364364
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
365365
SWIFT_VERSION = 5.0;
366366
TARGETED_DEVICE_FAMILY = "1,2";
@@ -386,7 +386,7 @@
386386
PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
387387
PRODUCT_NAME = "$(TARGET_NAME)";
388388
PROVISIONING_PROFILE_SPECIFIER = "";
389-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store Profile";
389+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "iOS App Store Profile";
390390
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
391391
SWIFT_VERSION = 5.0;
392392
TARGETED_DEVICE_FAMILY = "1,2";

‎apps/client/src/layouts/PagesLayout/MainContent/DisplayUI/DisplayTopBtns.vue‎

Lines changed: 38 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -91,82 +91,43 @@
9191
tooltip="Menu"
9292
style="position: absolute; right: 60px; top: 8px"
9393
>
94-
<q-menu
95-
anchor="bottom right"
96-
self="top right"
97-
>
98-
<q-list>
99-
<q-item>
100-
<q-item-section style="font-weight: bold">
101-
<q-item-label>
102-
{{ selfUserName().get() }}
103-
</q-item-label>
104-
</q-item-section>
105-
</q-item>
106-
107-
<q-separator />
108-
109-
<q-item
110-
v-if="isIncluded(quasarMode, ['ssr', 'spa'])"
111-
clickable
112-
v-close-popup
113-
:href="multiModePath('/')"
114-
>
115-
<q-item-section avatar>
116-
<q-icon name="mdi-home" />
117-
</q-item-section>
118-
<q-item-section>Home</q-item-section>
119-
</q-item>
120-
121-
<q-item clickable>
122-
<q-item-section avatar>
123-
<q-icon name="mdi-bell">
124-
<NotificationsBadge />
125-
</q-icon>
126-
</q-item-section>
127-
128-
<q-item-section>Notifications</q-item-section>
129-
130-
<NotificationsPopup />
131-
</q-item>
132-
133-
<q-item
134-
clickable
135-
v-close-popup
136-
@click="$q.dialog({ component: PagesSettingsDialog })"
137-
>
138-
<q-item-section avatar>
139-
<q-icon name="mdi-cog" />
140-
</q-item-section>
141-
142-
<q-item-section>Pages settings</q-item-section>
143-
</q-item>
144-
145-
<q-item
146-
clickable
147-
v-close-popup
148-
:href="multiModePath('/account/general')"
149-
>
150-
<q-item-section avatar>
151-
<q-icon name="mdi-account" />
152-
</q-item-section>
153-
154-
<q-item-section>Account settings</q-item-section>
155-
</q-item>
156-
157-
<q-item
158-
clickable
159-
v-close-popup
160-
@click="logout()"
161-
>
162-
<q-item-section avatar>
163-
<q-icon name="mdi-logout" />
164-
</q-item-section>
165-
166-
<q-item-section>Logout</q-item-section>
167-
</q-item>
168-
</q-list>
169-
</q-menu>
94+
<AccountPopup>
95+
<q-item
96+
v-if="isIncluded(quasarMode, ['ssr', 'spa'])"
97+
clickable
98+
v-close-popup
99+
:href="multiModePath('/')"
100+
>
101+
<q-item-section avatar>
102+
<q-icon name="mdi-home" />
103+
</q-item-section>
104+
<q-item-section>Home</q-item-section>
105+
</q-item>
106+
107+
<q-item clickable>
108+
<q-item-section avatar>
109+
<q-icon name="mdi-bell">
110+
<NotificationsBadge />
111+
</q-icon>
112+
</q-item-section>
113+
114+
<q-item-section>Notifications</q-item-section>
115+
116+
<NotificationsPopup />
117+
</q-item>
118+
119+
<q-item
120+
clickable
121+
v-close-popup
122+
@click="$q.dialog({ component: PagesSettingsDialog })"
123+
>
124+
<q-item-section avatar>
125+
<q-icon name="mdi-cog" />
126+
</q-item-section>
127+
128+
<q-item-section>Pages settings</q-item-section>
129+
</q-item>
130+
</AccountPopup>
170131
</DisplayBtn>
171132
</template>
172133

@@ -227,10 +188,9 @@
227188

228189
<script setup lang="ts">
229190
import { isIncluded } from '@stdlib/misc';
230-
import { logout } from 'src/code/auth/logout';
231-
import { selfUserName } from 'src/code/self-user-name';
232191
import { multiModePath } from 'src/code/utils/misc';
233192
193+
import AccountPopup from '../../MainToolbar/AccountPopup.vue';
234194
import AlignmentBtns from '../../MainToolbar/AlignmentBtns.vue';
235195
import BasicBtns from '../../MainToolbar/BasicBtns.vue';
236196
import FormattingBtns from '../../MainToolbar/FormattingBtns.vue';

‎apps/client/src/layouts/PagesLayout/MainToolbar/AccountPopup.vue‎

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,108 @@
11
<template>
2-
<ToolbarBtn
3-
tooltip="Account"
4-
icon="mdi-account"
5-
icon-size="30px"
6-
round
2+
<q-menu
3+
anchor="bottom right"
4+
self="top right"
75
>
8-
<q-menu
9-
anchor="bottom right"
10-
self="top right"
11-
auto-close
12-
>
13-
<q-list>
14-
<template v-if="uiStore().loggedIn">
15-
<q-item>
16-
<q-item-section style="font-weight: bold">
17-
<q-item-label>
18-
{{ selfUserName().get() }}
19-
</q-item-label>
20-
</q-item-section>
21-
</q-item>
22-
23-
<q-separator />
24-
25-
<q-item
26-
clickable
27-
:href="multiModePath('/account/general')"
28-
>
29-
<q-item-section avatar>
30-
<q-icon name="mdi-account" />
31-
</q-item-section>
32-
<q-item-section>Account settings</q-item-section>
33-
</q-item>
34-
</template>
6+
<q-list>
7+
<template v-if="uiStore().loggedIn">
8+
<q-item>
9+
<q-item-section style="font-weight: bold">
10+
<q-item-label>
11+
{{ selfUserName().get() }}
12+
</q-item-label>
13+
</q-item-section>
14+
</q-item>
3515

36-
<template v-else>
37-
<q-item
38-
clickable
39-
:href="multiModePath('/login')"
40-
>
41-
<q-item-section avatar>
42-
<q-icon name="mdi-login" />
43-
</q-item-section>
44-
<q-item-section>Login</q-item-section>
45-
</q-item>
16+
<q-separator />
4617

47-
<q-item
48-
clickable
49-
:href="multiModePath('/register')"
50-
>
51-
<q-item-section avatar>
52-
<q-icon name="mdi-account-plus" />
53-
</q-item-section>
54-
<q-item-section>Register</q-item-section>
55-
</q-item>
56-
</template>
18+
<slot></slot>
5719

5820
<q-item
59-
v-if="!($q.platform.is.capacitor && $q.platform.is.ios)"
6021
clickable
61-
:href="multiModePath('/pricing')"
22+
v-close-popup
23+
:href="multiModePath('/account/general')"
6224
>
6325
<q-item-section avatar>
64-
<q-icon name="mdi-currency-usd" />
26+
<q-icon name="mdi-account" />
6527
</q-item-section>
66-
<q-item-section>Pricing</q-item-section>
28+
<q-item-section>Account settings</q-item-section>
6729
</q-item>
30+
</template>
6831

32+
<template v-else>
6933
<q-item
70-
v-if="isIncluded(quasarMode, ['ssr', 'spa'])"
7134
clickable
72-
:href="multiModePath('/download')"
35+
v-close-popup
36+
:href="multiModePath('/login')"
7337
>
7438
<q-item-section avatar>
75-
<q-icon name="mdi-download" />
39+
<q-icon name="mdi-login" />
7640
</q-item-section>
77-
<q-item-section>Download</q-item-section>
41+
<q-item-section>Login</q-item-section>
7842
</q-item>
7943

8044
<q-item
8145
clickable
82-
:href="multiModePath('/whitepaper')"
46+
v-close-popup
47+
:href="multiModePath('/register')"
8348
>
8449
<q-item-section avatar>
85-
<q-icon name="mdi-file-document" />
50+
<q-icon name="mdi-account-plus" />
8651
</q-item-section>
87-
<q-item-section>Whitepaper</q-item-section>
52+
<q-item-section>Register</q-item-section>
8853
</q-item>
89-
</q-list>
9054

91-
<template v-if="uiStore().loggedIn">
92-
<q-item
93-
clickable
94-
@click="logout()"
95-
>
96-
<q-item-section avatar>
97-
<q-icon name="mdi-logout" />
98-
</q-item-section>
99-
<q-item-section>Logout</q-item-section>
100-
</q-item>
55+
<slot></slot>
10156
</template>
102-
</q-menu>
103-
</ToolbarBtn>
57+
58+
<q-item
59+
v-if="!($q.platform.is.capacitor && $q.platform.is.ios)"
60+
clickable
61+
v-close-popup
62+
:href="multiModePath('/pricing')"
63+
>
64+
<q-item-section avatar>
65+
<q-icon name="mdi-currency-usd" />
66+
</q-item-section>
67+
<q-item-section>Pricing</q-item-section>
68+
</q-item>
69+
70+
<q-item
71+
v-if="isIncluded(quasarMode, ['ssr', 'spa'])"
72+
clickable
73+
v-close-popup
74+
:href="multiModePath('/download')"
75+
>
76+
<q-item-section avatar>
77+
<q-icon name="mdi-download" />
78+
</q-item-section>
79+
<q-item-section>Download</q-item-section>
80+
</q-item>
81+
82+
<q-item
83+
clickable
84+
v-close-popup
85+
:href="multiModePath('/whitepaper')"
86+
>
87+
<q-item-section avatar>
88+
<q-icon name="mdi-file-document" />
89+
</q-item-section>
90+
<q-item-section>Whitepaper</q-item-section>
91+
</q-item>
92+
93+
<q-item
94+
v-if="uiStore().loggedIn"
95+
clickable
96+
v-close-popup
97+
@click="logout()"
98+
>
99+
<q-item-section avatar>
100+
<q-icon name="mdi-logout" />
101+
</q-item-section>
102+
<q-item-section>Logout</q-item-section>
103+
</q-item>
104+
</q-list>
105+
</q-menu>
104106
</template>
105107

106108
<script setup lang="ts">

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,14 @@
125125

126126
<Gap style="width: 2px" />
127127

128-
<AccountPopup />
128+
<ToolbarBtn
129+
tooltip="Account"
130+
icon="mdi-account"
131+
icon-size="30px"
132+
round
133+
>
134+
<AccountPopup />
135+
</ToolbarBtn>
129136

130137
<Gap style="width: 10px" />
131138
</div>

0 commit comments

Comments
 (0)