From e9a38d1e829fb4dd307336bb48f0c647467c669c Mon Sep 17 00:00:00 2001 From: studiokaiji Date: Tue, 10 Oct 2023 21:09:12 +0900 Subject: [PATCH 01/20] =?UTF-8?q?hover=E3=81=97=E3=81=A6=E3=82=82opacity?= =?UTF-8?q?=E3=81=8C=E5=A4=89=E3=82=8F=E3=82=89=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/routes/+layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte index 7b8f50597..b92e1c21a 100644 --- a/web/src/routes/+layout.svelte +++ b/web/src/routes/+layout.svelte @@ -209,7 +209,7 @@ } :global(button:disabled) { - opacity: 0.5; + opacity: 0.5 !important; } :global( From 4d48939b60ea5327a15a14a38f59a409a3e78c37 Mon Sep 17 00:00:00 2001 From: studiokaiji Date: Tue, 10 Oct 2023 23:43:39 +0900 Subject: [PATCH 02/20] =?UTF-8?q?border-radius=E3=81=AB=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=80=81margin=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/lib/components/ModalDialog.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/src/lib/components/ModalDialog.svelte b/web/src/lib/components/ModalDialog.svelte index e6686623a..96d2fdc33 100644 --- a/web/src/lib/components/ModalDialog.svelte +++ b/web/src/lib/components/ModalDialog.svelte @@ -28,6 +28,7 @@ dialog { border: var(--default-border); - border-radius: 10px; + border-radius: var(--radius); + } + + .dialog-content { + margin: 0.5rem; } From 4917fd773b98545cd0acc09e25b5f20e05fac330 Mon Sep 17 00:00:00 2001 From: studiokaiji Date: Tue, 10 Oct 2023 23:49:20 +0900 Subject: [PATCH 03/20] =?UTF-8?q?=E3=83=AA=E3=83=80=E3=82=A4=E3=83=AC?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=81=AE=E3=81=9F=E3=82=81=E3=81=ABauthor?= =?UTF-8?q?=E3=81=AE=E7=8A=B6=E6=85=8B=E3=82=92=E5=95=8F=E3=82=8F=E3=81=9A?= =?UTF-8?q?Login=E3=82=92=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/routes/+page.svelte | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte index 0679b636c..21a2457d8 100644 --- a/web/src/routes/+page.svelte +++ b/web/src/routes/+page.svelte @@ -1,5 +1,4 @@ @@ -7,9 +6,4 @@ nostter -
-

nostter

- {#if $author === undefined} - - {/if} -
+ From 9ac19697b4128c9f03640da6a2ccebd0cad514dc Mon Sep 17 00:00:00 2001 From: studiokaiji Date: Tue, 10 Oct 2023 23:50:20 +0900 Subject: [PATCH 04/20] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AEUI=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/lib/i18n/locales/en.json | 9 +- web/src/lib/i18n/locales/ja.json | 8 +- web/src/routes/Login.svelte | 346 ++++++++++++++++++++++--------- 3 files changed, 262 insertions(+), 101 deletions(-) diff --git a/web/src/lib/i18n/locales/en.json b/web/src/lib/i18n/locales/en.json index e2e433436..3f9b1100c 100644 --- a/web/src/lib/i18n/locales/en.json +++ b/web/src/lib/i18n/locales/en.json @@ -15,11 +15,16 @@ "recommended": "Recommended", "key": "Login with key", "create_account": "Create account", + "create": "Create", "name": "name", "try_demo": "Try demo", - "login": "Login" + "login": "Login", + "hero-message": "A Liberating Social Network for All.", + "hero-message-sub": "No sudden post restrictions, no disappearing accounts. All you need is just one KEY." }, "post": "Post", "follow": "Follow", - "following": "Following" + "following": "Following", + "cancel": "Cancel", + "or": "OR" } diff --git a/web/src/lib/i18n/locales/ja.json b/web/src/lib/i18n/locales/ja.json index b91f42d0f..18c47923c 100644 --- a/web/src/lib/i18n/locales/ja.json +++ b/web/src/lib/i18n/locales/ja.json @@ -15,11 +15,15 @@ "recommended": "推奨", "key": "鍵でログイン", "create_account": "アカウントを作成", + "create": "作成", "name": "名前", "try_demo": "デモを試す", - "login": "ログイン" + "login": "ログイン", + "hero-message": "みんなのための、自由なSNS。", + "hero-message-sub": "突然投稿ができなくなることも、アカウントが消えることもない。必要なのは「鍵」ひとつだけ。" }, "post": "投稿", "follow": "フォロー", - "following": "フォロー中" + "following": "フォロー中", + "or": "または" } diff --git a/web/src/routes/Login.svelte b/web/src/routes/Login.svelte index 8ebeddf04..79d57408d 100644 --- a/web/src/routes/Login.svelte +++ b/web/src/routes/Login.svelte @@ -6,7 +6,7 @@ import { Login } from '$lib/Login'; import { loginType } from '../stores/Author'; import { page } from '$app/stores'; - import { afterNavigate, goto } from '$app/navigation'; + import { afterNavigate } from '$app/navigation'; import { authorProfile } from '../stores/Author'; import { WebStorage } from '$lib/WebStorage'; import ModalDialog from '$lib/components/ModalDialog.svelte'; @@ -35,7 +35,7 @@ } async function loginWithDemo() { - await goto('/home'); + location.pathname = '/home'; } function createAccount(): void { @@ -66,6 +66,10 @@ const { waitNostr } = await import('nip07-awaiter'); waitNostr(10000).then((n) => (nostr = n)); } + + if ($authorProfile) { + gotoHome(); + } }); async function gotoHome() { @@ -77,7 +81,7 @@ const url = '/home'; console.log(`Redirect to ${url}`); - await goto(url); + location.pathname = url; } afterNavigate(async () => { @@ -93,118 +97,266 @@ }); -
- - -
-
-
- -
- -
- -
-
-
- -
- -
- - -
-
-
{$_('login.recommended')}
- {#if nostr === undefined} -

- Please install - Browser Extension - -

- {/if} -
- + +
+

{$_('login.create_account')}

+
+
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+ +
+ +
+
+

{$_('or')}

+
-
- -
-
-
- console.debug()} - /> -
-
- -
-
-
- - - - -
- -
+ +
+ + + + +
+ + + + + + From b9b5168329a27287c7c946e02bfd578c37e1c0f4 Mon Sep 17 00:00:00 2001 From: kaiji <31398458+studiokaiji@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:00:50 +0900 Subject: [PATCH 06/20] Update web/src/routes/Login.svelte MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 雪猫 --- web/src/routes/Login.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/routes/Login.svelte b/web/src/routes/Login.svelte index 712a89a35..9d4fb70cb 100644 --- a/web/src/routes/Login.svelte +++ b/web/src/routes/Login.svelte @@ -218,7 +218,7 @@ From 3563a09debd9a3b1b703ba5bc488db9148f26429 Mon Sep 17 00:00:00 2001 From: SnowCait Date: Sat, 21 Oct 2023 19:48:10 +0900 Subject: [PATCH 12/20] Extract splash screen --- web/src/routes/+page.svelte | 22 ++-------------------- web/src/routes/SplashScreen.svelte | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 web/src/routes/SplashScreen.svelte diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte index 5a7074487..f4ca968c8 100644 --- a/web/src/routes/+page.svelte +++ b/web/src/routes/+page.svelte @@ -1,6 +1,7 @@