Skip to content

Commit d131993

Browse files
committed
rename pause to DND
1 parent 4dd8dfa commit d131993

6 files changed

Lines changed: 36 additions & 42 deletions

File tree

src/App.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ function App() {
2828
firstSeenDate,
2929
markOnboardingAsCompleted,
3030
maxVisibleCards,
31-
isPauseModeActive,
32-
pauseTo,
31+
isDNDModeActive,
32+
DNDDurarion,
3333
} = useUserPreferences()
3434

3535
useLayoutEffect(() => {
@@ -63,7 +63,7 @@ function App() {
6363
}
6464

6565
useLayoutEffect(() => {
66-
let dndLayoutDiv = document.getElementsByClassName('pauseContentWrapper')[0]
66+
let dndLayoutDiv = document.getElementsByClassName('DNDContent')[0]
6767
let observer = new IntersectionObserver(callback, intersectionOptions)
6868

6969
if (dndLayoutDiv) {
@@ -75,7 +75,7 @@ function App() {
7575
return () => {
7676
observer.disconnect()
7777
}
78-
}, [pauseTo])
78+
}, [DNDDurarion])
7979

8080
return (
8181
<>
@@ -98,7 +98,7 @@ function App() {
9898
/>
9999

100100
<div className="layoutLayers hideScrollBar">
101-
{isPauseModeActive() && <DNDLayout />}
101+
{isDNDModeActive() && <DNDLayout />}
102102
<AppContentLayout setShowSettings={setShowSettings} />
103103
</div>
104104
<BookmarksSidebar showSidebar={showSideBar} onClose={() => setShowSideBar(false)} />

src/components/Layout/DNDLayout/DNDLayout.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
transition: all 0.4s ease-out;
1111
}
1212

13-
.pauseContentWrapper {
13+
.DNDContent {
1414
min-height: 100%;
1515
display: flex;
1616
flex-direction: column;

src/components/Layout/DNDLayout/DNDLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const DNDLayout = () => {
1818
}
1919

2020
return (
21-
<section className="pauseContentWrapper">
21+
<section className="DNDContent">
2222
<div className="searchWidget">
2323
<SearchBarWithLogo />
2424
</div>

src/components/Layout/Header.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const Header = ({
2727
}: HeaderProps) => {
2828
const [themeIcon, setThemeIcon] = useState(<BsMoon />)
2929
const isFirstRun = useRef(true)
30-
const { theme, setTheme, setPauseTo, isPauseModeActive } = useUserPreferences()
30+
const { theme, setTheme, setDNDDuration, isDNDModeActive } = useUserPreferences()
3131
const { userBookmarks } = useBookmarks()
3232

3333
useEffect(() => {
@@ -75,9 +75,7 @@ export const Header = ({
7575
}
7676

7777
const onUnpauseClicked = () => {
78-
setTimeout(() => {
79-
setPauseTo(0)
80-
}, 200)
78+
setDNDDuration(0)
8179
}
8280

8381
return (
@@ -94,7 +92,7 @@ export const Header = ({
9492
</span>
9593
<SearchBar />
9694
<div className="extras">
97-
{isPauseModeActive() && (
95+
{isDNDModeActive() && (
9896
<button className="extraBtn extraTextBtn" onClick={() => onUnpauseClicked()}>
9997
<MdDoDisturbOff />
10098
&nbsp;Unpause

src/features/settings/components/DNDSettings.tsx

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ type DNDSettingsProps = {
2121
export const DNDSettings = ({ setShowSettings }: DNDSettingsProps) => {
2222
const [selectedDNDDuration, setSelectedDNDDuration] = useState<DndOption['value']>()
2323

24-
const { pauseTo, setPauseTo } = useUserPreferences()
24+
const { DNDDurarion, setDNDDuration } = useUserPreferences()
2525

2626
const onApplyClicked = () => {
2727
if (!selectedDNDDuration) {
2828
return
2929
}
3030

3131
if (typeof selectedDNDDuration === 'string') {
32-
setPauseTo('always')
32+
setDNDDuration('always')
3333
} else {
3434
const value = selectedDNDDuration as number
3535
const futureDate = new Date(new Date().getTime() + value * 60000)
36-
setPauseTo(futureDate.getTime())
36+
setDNDDuration(futureDate.getTime())
3737
}
3838

3939
setShowSettings(false)
@@ -55,25 +55,21 @@ export const DNDSettings = ({ setShowSettings }: DNDSettingsProps) => {
5555
<span className="settingHint">(Pause Hackertab for some moment)</span>
5656
</p>
5757
<div className="settingContent">
58-
<div className="pauseFormWrapper">
59-
<div className="form">
60-
<div style={{ flex: 1 }}>
61-
<Select
62-
options={DNDDurations}
63-
placeholder="For x minutes"
64-
isMulti={false}
65-
isClearable={false}
66-
isSearchable={false}
67-
value={DNDDurations.find((e) => e.value === pauseTo)}
68-
classNamePrefix={'hackertab'}
69-
onChange={onPeriodSelect}
70-
/>
71-
</div>
72-
73-
<button className="pauseButton" onClick={onApplyClicked}>
74-
Apply
75-
</button>
58+
<div className="form">
59+
<div style={{ flex: 1 }}>
60+
<Select
61+
options={DNDDurations}
62+
placeholder="For x minutes"
63+
isMulti={false}
64+
isClearable={false}
65+
isSearchable={false}
66+
value={DNDDurations.find((e) => e.value === DNDDurarion)}
67+
classNamePrefix={'hackertab'}
68+
onChange={onPeriodSelect}
69+
/>
7670
</div>
71+
72+
<button onClick={onApplyClicked}>Apply</button>
7773
</div>
7874
</div>
7975
</div>

src/stores/preferences.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export type UserPreferencesState = {
1919
cardsSettings: Record<string, CardSettingsType>
2020
firstSeenDate: number
2121
userCustomCards: SupportedCardType[]
22-
pauseTo: number | "always"
22+
DNDDurarion: number | "always"
2323
}
2424

2525
type UserPreferencesStoreActions = {
@@ -35,8 +35,8 @@ type UserPreferencesStoreActions = {
3535
markOnboardingAsCompleted: (occupation: Omit<Occupation, 'icon'> | null) => void
3636
setUserCustomCards: (cards: SupportedCardType[]) => void
3737
updateCardOrder: (prevIndex: number, newIndex: number) => void
38-
setPauseTo: (value: number | "always") => void
39-
isPauseModeActive: () => boolean;
38+
setDNDDuration: (value: number | "always") => void
39+
isDNDModeActive: () => boolean;
4040
}
4141

4242
export const useUserPreferences = create(
@@ -59,7 +59,7 @@ export const useUserPreferences = create(
5959
{ id: 3, name: 'producthunt', type: 'supported' },
6060
],
6161
userCustomCards: [],
62-
pauseTo: 0,
62+
DNDDurarion: 0,
6363
setSearchEngine: (searchEngine: string) => set({ searchEngine: searchEngine }),
6464
setListingMode: (listingMode: ListingMode) => set({ listingMode: listingMode }),
6565
setTheme: (theme: Theme) => set({ theme: theme }),
@@ -95,13 +95,13 @@ export const useUserPreferences = create(
9595

9696
return { cards: newState }
9797
}),
98-
setPauseTo: (value) => set({ pauseTo: value }),
99-
isPauseModeActive: () => {
100-
const pauseTo = get().pauseTo
101-
if (pauseTo === "always") {
98+
setDNDDuration: (value) => set({ DNDDurarion: value }),
99+
isDNDModeActive: () => {
100+
const duration = get().DNDDurarion
101+
if (duration === "always") {
102102
return true;
103103
}
104-
return Boolean(pauseTo && pauseTo - new Date().getTime() > 0)
104+
return Boolean(duration && duration - new Date().getTime() > 0)
105105
}
106106
}),
107107
{

0 commit comments

Comments
 (0)