From 5619fc13188bcf9b3d6cf9d115387704ecdeac6f Mon Sep 17 00:00:00 2001 From: PijusSerapinasMipsas Date: Fri, 14 Jul 2023 16:25:32 +0300 Subject: [PATCH 1/5] bug: login view with hive porfile changes --- src/main/index.ts | 1 + src/renderer/views/LoginView.tsx | 60 ++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index 6896ff8..6f483d6 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -66,6 +66,7 @@ if (!gotTheLock) { contextIsolation: false, }, }) + window.openDevTools(); const theUrl = process.argv[process.argv.length - 1] if (theUrl.includes('speak://')) { const UrlWoo = new URL(theUrl) diff --git a/src/renderer/views/LoginView.tsx b/src/renderer/views/LoginView.tsx index 11812d6..e5ba66c 100644 --- a/src/renderer/views/LoginView.tsx +++ b/src/renderer/views/LoginView.tsx @@ -61,11 +61,11 @@ export function LoginView() { event.preventDefault() const login = { - username: username, - key: key, - profile: profile, - accountType: accountType, - symKey: symKey, + username, + key, + profile, + accountType, + symKey, isEncrypted: encryption, } @@ -170,24 +170,38 @@ export function LoginView() { ) : ( <> - Profile name - - - - Username - + HIVE Username +
+
+ @ +
+ +
)} From 1caae14eb251880b885c8a257565b810fe7e3491 Mon Sep 17 00:00:00 2001 From: PijusSerapinasMipsas Date: Fri, 14 Jul 2023 17:09:29 +0300 Subject: [PATCH 2/5] bug: fixed login.ts --- src/main/index.ts | 1 - src/renderer/components/SideNavbar.tsx | 2 +- src/renderer/services/accountServices/login.ts | 2 +- src/renderer/views/LoginView.tsx | 12 ------------ 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index 6f483d6..6896ff8 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -66,7 +66,6 @@ if (!gotTheLock) { contextIsolation: false, }, }) - window.openDevTools(); const theUrl = process.argv[process.argv.length - 1] if (theUrl.includes('speak://')) { const UrlWoo = new URL(theUrl) diff --git a/src/renderer/components/SideNavbar.tsx b/src/renderer/components/SideNavbar.tsx index 3752e2b..793770a 100644 --- a/src/renderer/components/SideNavbar.tsx +++ b/src/renderer/components/SideNavbar.tsx @@ -27,7 +27,7 @@ export function SideNavbar(props: any) { if (login) { const user = (await AccountService.getAccount(login)) as any console.log('login debug 2', user) - + console.log(user) const ringItem = user.keyring[0] setLogin(user.nickname) setMyChannelLink(`${ringItem.type}:${ringItem.username}`) diff --git a/src/renderer/services/accountServices/login.ts b/src/renderer/services/accountServices/login.ts index bcd1889..9fbdef5 100644 --- a/src/renderer/services/accountServices/login.ts +++ b/src/renderer/services/accountServices/login.ts @@ -16,7 +16,7 @@ export async function login(data) { if (Valid) { const profile = { _id: userAccounts[0].id.toString(), - nickname: data.profile, + nickname: data.username, keyring: [ { type: 'hive', diff --git a/src/renderer/views/LoginView.tsx b/src/renderer/views/LoginView.tsx index e5ba66c..4973811 100644 --- a/src/renderer/views/LoginView.tsx +++ b/src/renderer/views/LoginView.tsx @@ -63,7 +63,6 @@ export function LoginView() { const login = { username, key, - profile, accountType, symKey, isEncrypted: encryption, @@ -143,17 +142,6 @@ export function LoginView() { overlay={Disabled (Coming Soon!)} >
- - Profile name - - Username Date: Fri, 14 Jul 2023 21:23:10 +0300 Subject: [PATCH 3/5] log --- src/renderer/components/SideNavbar.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/SideNavbar.tsx b/src/renderer/components/SideNavbar.tsx index 793770a..4e8fb4d 100644 --- a/src/renderer/components/SideNavbar.tsx +++ b/src/renderer/components/SideNavbar.tsx @@ -16,7 +16,7 @@ import iconTrend from '../assets/img/icon_trend.svg' import shakeHands from '../assets/img/shake-hands.svg' import { AccountService } from '../services/account.service' -export function SideNavbar(props: any) { +export function SideNavbar() { const [login, setLogin] = useState('') const [myChannelLink, setMyChannelLink] = useState('') @@ -27,7 +27,6 @@ export function SideNavbar(props: any) { if (login) { const user = (await AccountService.getAccount(login)) as any console.log('login debug 2', user) - console.log(user) const ringItem = user.keyring[0] setLogin(user.nickname) setMyChannelLink(`${ringItem.type}:${ringItem.username}`) @@ -53,7 +52,13 @@ export function SideNavbar(props: any) { } return ( - + From 594661352563f31b011433cbb27695b5a3fd5d39 Mon Sep 17 00:00:00 2001 From: PijusSerapinasMipsas Date: Fri, 14 Jul 2023 21:23:51 +0300 Subject: [PATCH 4/5] arrow => --- src/renderer/components/SideNavbar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/components/SideNavbar.tsx b/src/renderer/components/SideNavbar.tsx index 4e8fb4d..4d2a382 100644 --- a/src/renderer/components/SideNavbar.tsx +++ b/src/renderer/components/SideNavbar.tsx @@ -16,7 +16,7 @@ import iconTrend from '../assets/img/icon_trend.svg' import shakeHands from '../assets/img/shake-hands.svg' import { AccountService } from '../services/account.service' -export function SideNavbar() { +export const SideNavbar = () => { const [login, setLogin] = useState('') const [myChannelLink, setMyChannelLink] = useState('') From 863476d6d5e00234777ae632cc5b408e27b9f64c Mon Sep 17 00:00:00 2001 From: PijusSerapinasMipsas Date: Fri, 14 Jul 2023 21:24:42 +0300 Subject: [PATCH 5/5] logs --- src/renderer/components/SideNavbar.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/renderer/components/SideNavbar.tsx b/src/renderer/components/SideNavbar.tsx index 4d2a382..606ae89 100644 --- a/src/renderer/components/SideNavbar.tsx +++ b/src/renderer/components/SideNavbar.tsx @@ -23,10 +23,8 @@ export const SideNavbar = () => { useEffect(() => { const load = async () => { const login = localStorage.getItem('SNProfileID') - console.log('login debug', login) if (login) { const user = (await AccountService.getAccount(login)) as any - console.log('login debug 2', user) const ringItem = user.keyring[0] setLogin(user.nickname) setMyChannelLink(`${ringItem.type}:${ringItem.username}`) @@ -44,7 +42,6 @@ export const SideNavbar = () => { const user = await AccountService.logout(profileID) const accountsInit = (await AccountService.getAccounts()) as any localStorage.removeItem('SNProfileID') - console.log(accountsInit) if (accountsInit.length > 0) { localStorage.setItem('SNProfileID', accountsInit[0]._id) }