From d6680a0bcc77cd716787368cea0c16fc59a98a57 Mon Sep 17 00:00:00 2001 From: STEVEN Date: Thu, 19 May 2022 22:29:27 +0800 Subject: [PATCH] feat: seed data only in dev mode (#61) --- store/seed/10001__user.sql | 10 ++++++---- store/sqlite.go | 7 +++++-- web/src/less/signin.less | 8 -------- web/src/pages/Signin.tsx | 30 ++++-------------------------- 4 files changed, 15 insertions(+), 40 deletions(-) diff --git a/store/seed/10001__user.sql b/store/seed/10001__user.sql index dd23f6b6..efd53675 100644 --- a/store/seed/10001__user.sql +++ b/store/seed/10001__user.sql @@ -1,17 +1,19 @@ INSERT INTO user ( `id`, - `name`, `email`, + `role`, + `name`, `open_id`, `password_hash` ) VALUES ( 101, - 'guest', - 'guest@example.com', - 'guest_open_id', + 'steven@memos.com', + 'OWNER', + 'Steven', + 'steven_open_id', -- raw password: secret '$2a$14$ajq8Q7fbtFRQvXpdCq7Jcuy.Rx1h/L4J60Otx.gyNLbAYctGMJ9tK' ); diff --git a/store/sqlite.go b/store/sqlite.go index f04c1263..81977df9 100644 --- a/store/sqlite.go +++ b/store/sqlite.go @@ -54,8 +54,11 @@ func (db *DB) Open() (err error) { if err := db.migrate(); err != nil { return fmt.Errorf("failed to migrate: %w", err) } - if err := db.seed(); err != nil { - return fmt.Errorf("failed to seed: %w", err) + // If mode is dev, then seed the database. + if db.mode == "dev" { + if err := db.seed(); err != nil { + return fmt.Errorf("failed to seed: %w", err) + } } } else { // If db file exists and mode is dev, we should migrate and seed the database. diff --git a/web/src/less/signin.less b/web/src/less/signin.less index 2808cf56..08ab0dc9 100644 --- a/web/src/less/signin.less +++ b/web/src/less/signin.less @@ -68,14 +68,6 @@ @apply cursor-wait opacity-80; } } - - > .btn-text { - @apply text-sm; - } - - > .split-text { - @apply text-gray-400 mx-2; - } } > .tip-text { diff --git a/web/src/pages/Signin.tsx b/web/src/pages/Signin.tsx index af777c81..8123c89a 100644 --- a/web/src/pages/Signin.tsx +++ b/web/src/pages/Signin.tsx @@ -25,6 +25,10 @@ const Signin: React.FC = () => { useEffect(() => { api.getSystemStatus().then((status) => { setSiteOwner(status.owner); + if (status.profile.mode === "dev") { + setEmail("steven@memos.com"); + setPassword("secret"); + } pageLoadingState.setFinish(); }); }, []); @@ -105,28 +109,6 @@ const Signin: React.FC = () => { actionBtnLoadingState.setFinish(); }; - const handleAutoSigninAsGuestBtnClick = async () => { - if (actionBtnLoadingState.isLoading) { - return; - } - - try { - actionBtnLoadingState.setLoading(); - await api.login("guest@example.com", "secret"); - - const user = await userService.doSignIn(); - if (user) { - locationService.replaceHistory("/"); - } else { - toastHelper.error("😟 Login failed"); - } - } catch (error: any) { - console.error(error); - toastHelper.error("😟 " + error.message); - } - actionBtnLoadingState.setFinish(); - }; - return (
@@ -149,10 +131,6 @@ const Signin: React.FC = () => {
- - / {siteOwner ? (