Skip to content

Commit 4a0c08e

Browse files
committed
fix: Code reviews.
1 parent 827f2cf commit 4a0c08e

6 files changed

Lines changed: 57 additions & 57 deletions

File tree

src/App.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useEffect, useLayoutEffect, useState } from 'react'
22
import { DNDLayout } from 'src/components/Layout'
3-
import { AuthModal, useAuth } from 'src/features/auth'
43
import { setupAnalytics, setupIdentification, trackPageView } from 'src/lib/analytics'
54
import { useUserPreferences } from 'src/stores/preferences'
65
import { AppContentLayout } from './components/Layout'
@@ -22,7 +21,6 @@ export const App = () => {
2221
const [showOnboarding, setShowOnboarding] = useState(true)
2322
const { onboardingCompleted, maxVisibleCards, isDNDModeActive, DNDDuration, setDNDDuration } =
2423
useUserPreferences()
25-
const { isAuthModalOpen, closeAuthModal } = useAuth()
2624

2725
useLayoutEffect(() => {
2826
document.documentElement.style.setProperty('--max-visible-cards', maxVisibleCards.toString())
@@ -64,8 +62,6 @@ export const App = () => {
6462
<OnboardingModal showOnboarding={showOnboarding} setShowOnboarding={setShowOnboarding} />
6563
)}
6664

67-
{<AuthModal showAuth={isAuthModalOpen} closeModal={closeAuthModal} />}
68-
6965
<div className="layoutLayers hideScrollBar">
7066
{isDNDModeActive() && <DNDLayout />}
7167
<AppContentLayout />

src/components/Layout/AppLayout.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ import 'react-contexify/dist/ReactContexify.css'
33
import { Outlet } from 'react-router-dom'
44
import { BeatLoader } from 'react-spinners'
55
import 'src/assets/App.css'
6+
import { AuthModal, useAuth } from 'src/features/auth'
67
import { MarketingBanner } from 'src/features/MarketingBanner'
78
import { Header } from './Header'
89

910
export const AppLayout = () => {
11+
const { isAuthModalOpen, closeAuthModal } = useAuth()
12+
1013
return (
1114
<>
1215
<MarketingBanner />
1316

1417
<div className="App">
1518
<Header />
19+
<AuthModal showAuth={isAuthModalOpen} closeModal={closeAuthModal} />
1620
<React.Suspense
1721
fallback={
1822
<div className="appLoading">

src/features/settings/components/BookmarkSettings/bookmarkSettings.css

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -81,52 +81,3 @@
8181
.btn:hover {
8282
filter: brightness(85%);
8383
}
84-
85-
.container {
86-
width: auto;
87-
display: flex;
88-
flex-direction: column;
89-
gap: 10px;
90-
}
91-
92-
.userCard {
93-
width: auto;
94-
background-color: var(--placeholder-background-color);
95-
padding: 10px;
96-
margin: 10px;
97-
border-radius: 20px;
98-
display: flex;
99-
align-items: center;
100-
}
101-
.userImage {
102-
width: 60px;
103-
height: 60px;
104-
border-radius: 20%;
105-
}
106-
.userInfos {
107-
width: auto;
108-
margin-left: 10px;
109-
}
110-
.userName {
111-
font-size: larger;
112-
font-weight: 600;
113-
}
114-
.userEmail {
115-
font-size: medium;
116-
margin-top: 6px;
117-
}
118-
.actions {
119-
margin-left: auto;
120-
}
121-
.logoutBtn {
122-
font-size: medium;
123-
padding: 8px 20px;
124-
background-color: #e57373;
125-
color: var(--button-text-color);
126-
border: 0;
127-
border-radius: 20px;
128-
font-weight: bold;
129-
font-size: 16px;
130-
text-align: center;
131-
margin-left: 8px;
132-
}

src/features/settings/components/ProfileSettings.tsx renamed to src/features/settings/components/Profile/ProfileSettings.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { SettingsContentLayout } from 'src/components/Layout/SettingsContentLayo
55
import { useAuth, User } from 'src/features/auth'
66
import { BookmarkedPost } from 'src/features/bookmarks'
77
import { useBookmarks } from 'src/stores/bookmarks'
8-
import { BookmarkItem } from './BookmarkSettings'
9-
import './bookmarkSettings/bookmarkSettings.css'
8+
import { BookmarkItem } from '../BookmarkSettings'
9+
import './profileSettings.css'
1010

1111
interface UserInfoProps {
1212
user: User
@@ -84,7 +84,7 @@ export const ProfileSettings = () => {
8484
}
8585

8686
return (
87-
<div className="container">
87+
<div className="profile">
8888
{user != null && <UserInfo user={user} />}
8989
<SettingsContentLayout
9090
title="Bookmarks"
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
.profile {
2+
width: auto;
3+
display: flex;
4+
flex-direction: column;
5+
gap: 10px;
6+
}
7+
8+
.profile .userCard {
9+
width: auto;
10+
background-color: var(--placeholder-background-color);
11+
padding: 10px;
12+
margin: 10px;
13+
border-radius: 20px;
14+
display: flex;
15+
align-items: center;
16+
}
17+
.profile .userImage {
18+
width: 60px;
19+
height: 60px;
20+
border-radius: 20%;
21+
}
22+
.profile .userInfos {
23+
width: auto;
24+
margin-left: 10px;
25+
}
26+
.profile .userName {
27+
font-size: larger;
28+
font-weight: 600;
29+
}
30+
.profile .userEmail {
31+
font-size: medium;
32+
margin-top: 6px;
33+
}
34+
.profile .actions {
35+
margin-left: auto;
36+
}
37+
38+
.profile .logoutBtn {
39+
font-size: medium;
40+
padding: 8px 20px;
41+
background-color: #e57373;
42+
color: var(--button-text-color);
43+
border: 0;
44+
border-radius: 20px;
45+
font-weight: bold;
46+
font-size: 16px;
47+
text-align: center;
48+
margin-left: 8px;
49+
}

src/features/settings/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export * from './components/BookmarkSettings'
22
export * from './components/GeneralSettings'
3-
export * from './components/ProfileSettings'
3+
export * from './components/Profile/ProfileSettings'
44
export * from './components/SearchEngineSettings'
55
export * from './components/SourceSettings'
66
export * from './components/TopicSettings'

0 commit comments

Comments
 (0)