Skip to content

Commit 69875be

Browse files
committed
Merge branch 'dev' into main
2 parents 33a752b + 15e2641 commit 69875be

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

apps/client/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/>
5151
<meta
5252
property="og:title"
53-
content="DeepNotes - Dive into your note universe"
53+
content="DeepNotes - Infinite Canvas Note-taking"
5454
/>
5555
<meta
5656
property="og:description"
@@ -72,7 +72,7 @@
7272
/>
7373
<meta
7474
property="twitter:title"
75-
content="DeepNotes - Dive into your note universe"
75+
content="DeepNotes - Infinite Canvas Note-taking"
7676
/>
7777
<meta
7878
property="twitter:description"

apps/client/package.json

Lines changed: 2 additions & 2 deletions
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.2",
5+
"version": "1.0.3",
66
"author": "Gustavo Toyota <[email protected]>",
77
"dependencies": {
88
"@_ueberdosis/prosemirror-tables": "1.1.3",
@@ -125,7 +125,7 @@
125125
"scripts": {
126126
"build:android": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m capacitor -T android --ide",
127127
"build:electron": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m electron",
128-
"build:electron:publish": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m electron --publish onTagOrDraft",
128+
"build:electron:publish": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m electron --publish always",
129129
"build:ios": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m capacitor -T ios",
130130
"build:spa": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m spa",
131131
"build:ssr": "cross-env NODE_OPTIONS=--max_old_space_size=4096 quasar build -m ssr",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Tue Jul 11 16:57:40 AMT 2023
2-
VERSION_CODE=33
1+
#Mon Jul 17 11:07:10 AMT 2023
2+
VERSION_CODE=39

apps/client/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useEventListener } from '@vueuse/core';
1010
import { isCtrlDown } from './code/utils/misc';
1111
1212
useMeta(() => ({
13-
title: 'DeepNotes - Dive into your note universe',
13+
title: 'DeepNotes - Infinite Canvas Note-taking',
1414
}));
1515
1616
onMounted(() => {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
<Gap style="height: 24px" />
1515

1616
<DeepBtn
17-
label="Resend verification email"
17+
:label="`Resend verification email${
18+
secondsRemaining > 0 ? ` (${secondsRemaining}s)` : ''
19+
}`"
1820
color="primary"
1921
style="font-size: 16px; padding: 10px 22px"
2022
@click="resendVerificationEmail()"
23+
:disabled="secondsRemaining > 0"
2124
/>
2225

2326
<Gap style="height: 64px" />
@@ -34,22 +37,31 @@
3437
</template>
3538

3639
<script setup lang="ts">
40+
import { useIntervalFn } from '@vueuse/core';
3741
import { handleError } from 'src/code/utils/misc';
3842
3943
useMeta(() => ({
4044
title: 'Finish registration - DeepNotes',
4145
}));
4246
47+
const secondsRemaining = ref(60);
48+
49+
useIntervalFn(() => {
50+
secondsRemaining.value--;
51+
}, 1000);
52+
4353
async function resendVerificationEmail() {
4454
try {
4555
await trpcClient.users.account.resendVerificationEmail.mutate({
46-
email: internals.sessionStorage?.getItem('email'),
56+
email: internals.sessionStorage?.getItem('email')!,
4757
});
4858
4959
$quasar().notify({
5060
message: 'Verification email resent.',
5161
type: 'positive',
5262
});
63+
64+
secondsRemaining.value = 60;
5365
} catch (error) {
5466
handleError(error);
5567
}

0 commit comments

Comments
 (0)