Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dark mode & refactor styling #323

Merged
merged 51 commits into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
5ce3502
Progress on dark mode
js0mmer May 27, 2023
d304d39
Dark mode seems to be working
js0mmer May 28, 2023
dea82dd
Move body theme css to index.css
js0mmer May 28, 2023
b63419e
Restore package lock back to before
js0mmer May 28, 2023
fb46dec
Remove old/broken imports
js0mmer May 28, 2023
aa0c269
Space for consistency
js0mmer May 28, 2023
2c07f5c
Remove styled-components remnants
js0mmer May 28, 2023
76d49c7
Add theming to reports page
js0mmer May 28, 2023
d48e50d
Fix popover on theming
js0mmer May 28, 2023
7ec3b5d
Dark mode looks done
js0mmer May 28, 2023
d3ec2ac
Few theming tweaks to roadmap page
js0mmer May 28, 2023
b5af43e
Remove unused css tag
js0mmer May 28, 2023
a95db49
Fix hidden overflow for search bar box shadow
js0mmer May 28, 2023
e808653
Recenter sidebar mini icons
js0mmer May 28, 2023
445431f
Fix styling with modals, bootstrap, and semantic
js0mmer May 29, 2023
5c6e636
Change semantic-ui dropdown item hover color (dark mode)
js0mmer May 29, 2023
994edc2
Change SideBar to use useContext for theme context
js0mmer May 29, 2023
785df84
Fix dropdown color in search popup
js0mmer May 29, 2023
8cf5c3f
Update dark theme comments
js0mmer May 29, 2023
6fb6340
Center report modal to hide floating border that appears on the top o…
js0mmer May 29, 2023
8d26f60
Fix sidebar link hover color on dark mode
js0mmer May 29, 2023
5ff799d
Fix dropdown active color in dark mode
js0mmer May 29, 2023
75643ff
Fix search bar border color on dark mode
js0mmer May 30, 2023
8ce4623
Save user's theme preference to mongo
js0mmer May 31, 2023
fce09ae
Fix quarter and year menu button hover/focus colors
js0mmer May 31, 2023
177dbf4
Merge remote-tracking branch 'origin/master' into jacob/dark-mode
js0mmer Jun 2, 2023
c388e6c
Fix add year popup input dark theme color
js0mmer Jun 2, 2023
5173676
Merge remote-tracking branch 'origin' into jacob/dark-mode
js0mmer Jun 2, 2023
47d0782
Merge remote-tracking branch 'origin/jacob/dark-mode' into jacob/dark…
js0mmer Jun 2, 2023
2de8323
Merge branch 'master' into jacob/dark-mode
js0mmer Jun 11, 2023
e16a47f
Add dark mode to user reviews page
js0mmer Jun 11, 2023
f4d8c6e
Use color-scheme css prop for dark mode
js0mmer Jun 23, 2023
11d4d2d
Merge branch 'master' into jacob/dark-mode
js0mmer Oct 21, 2023
914886c
Merge branch 'master' into jacob/dark-mode
js0mmer Nov 6, 2023
9b6ef23
Remove old search graphic
js0mmer Nov 6, 2023
1c204e8
Dark theme for recaptcha and verified review checkbox
js0mmer Nov 12, 2023
f02b010
Merge remote-tracking branch 'origin/master' into jacob/dark-mode
js0mmer Jan 21, 2024
1025aec
Fix merging on beta popup
js0mmer Jan 21, 2024
e231f77
Format
js0mmer Jan 21, 2024
e21e3c2
Merge remote-tracking branch 'origin/master' into jacob/dark-mode
js0mmer Jan 21, 2024
ee18c00
Remove unneeded width.config.scss
js0mmer Jan 21, 2024
ad0d835
Merge branch 'master' into jacob/dark-mode
js0mmer Jan 24, 2024
4bc5ea7
Address comments for /users/preferences endpoint
js0mmer Jan 24, 2024
4f98781
refactor: function for default dark mode value. remove test stuff
js0mmer Jan 24, 2024
0c63c43
add future support for setting to system theme
js0mmer Jan 24, 2024
a850e3f
Fix border colors and year name bg
js0mmer Jan 24, 2024
614103d
Dark theme for toggles
js0mmer Jan 24, 2024
62dc70c
Recaptcha dark theme patch
js0mmer Jan 24, 2024
3f41f9d
Boost contrast of primary color and more info button slightly for dar…
js0mmer Jan 24, 2024
04dcde5
Merge branch 'master' into jacob/dark-mode
js0mmer Jan 27, 2024
bc8666d
Add dark-friendly default avatar and custom 404 image
js0mmer Jan 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 0 additions & 176 deletions site/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"react-transition-group": "^4.4.1",
"react-twemoji": "^0.5.0",
"semantic-ui-react": "^2.1.4",
"styled-components": "^5.3.11",
"typescript": "^4.3.5",
"websoc-fuzzy-search": "^0.8.0-rc.1"
},
Expand Down
Binary file removed site/public/searching.png
Binary file not shown.
7 changes: 6 additions & 1 deletion site/src/App.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
body {
color: var(--text);
background: var(--background);
}

.app-body {
display: flex;
height: 92vh;
Expand All @@ -14,6 +19,6 @@
height: 100%;
overflow-y: auto;
overflow-x: hidden;
background-color: var(--peterportal-gray-blue);
background-color: var(--background);
box-sizing: border-box;
}
20 changes: 12 additions & 8 deletions site/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useEffect, useState } from 'react';

import {
BrowserRouter as Router,
Expand All @@ -7,6 +7,7 @@ import {
} from 'react-router-dom';
import 'bootstrap/dist/css/bootstrap.min.css';
import 'react-bootstrap-range-slider/dist/react-bootstrap-range-slider.css';
import './style/theme.scss';
import './App.scss';
import { Fade } from 'react-bootstrap';

Expand All @@ -24,26 +25,29 @@ import SideBar from './component/SideBar/SideBar';
import { useAppSelector } from './store/hooks';
import { darkTheme, lightTheme } from './style/theme';
import { ThemeProvider } from 'styled-components';
import GlobalStyle from './style/globalStyle';
import ThemeContext from './style/theme-context';

export default function App() {
const [darkMode, setDarkMode] = useState(localStorage.getItem('darkMode') === 'true' ? true : (localStorage.getItem('darkMode') === 'false' ? false : (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches)));
const sidebarOpen = useAppSelector(state => state.ui.sidebarOpen);
const [isShown, setIsShown] = useState(false);

useEffect(() => {
localStorage.setItem('darkMode', darkMode ? 'true' : 'false');
document.querySelector('body')!.setAttribute('data-theme', darkMode ? 'dark' : 'light');
}, [darkMode])

const toggleTheme = () => {
localStorage.setItem('darkMode', darkMode ? 'false' : 'true');
setDarkMode(!darkMode);
}

return (
<Router basename={process.env.PUBLIC_URL}>
<ThemeProvider theme={darkMode ? darkTheme : lightTheme}>
<GlobalStyle />
<AppHeader />
<ThemeContext.Provider value={{ darkMode: darkMode, toggleTheme: toggleTheme }} >
<AppHeader/>
<div className='app-body'>
<div className='app-sidebar'>
<SideBar darkMode={darkMode} toggleTheme={toggleTheme} />
<SideBar/>
</div>
<div className='app-content'>
<Switch>
Expand All @@ -67,7 +71,7 @@ export default function App() {
<Footer />
</div>
</div>
</ThemeProvider>
</ThemeContext.Provider>
</Router>
)
}
Binary file added site/src/asset/searching.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading