Skip to content

Commit 478766c

Browse files
amandapolariamandapolari
committed
[fix] removing dark theme
1 parent 51a7c9e commit 478766c

File tree

11 files changed

+19
-162
lines changed

11 files changed

+19
-162
lines changed

‎labeddit/src/App.jsx‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
import { Router } from './routes';
2-
import { useContext } from 'react';
32
import { ThemeProvider } from '@mui/material';
4-
// import { ThemeProvider } from '@mui/material/styles';
5-
6-
import { darkTheme, lightTheme } from './styles/theme';
7-
import GlobalContext from './contexts/GlobalContext';
3+
import { theme } from './styles/theme';
84

95
const App = () => {
10-
const context = useContext(GlobalContext);
11-
const { darkMode } = context;
12-
136
return (
14-
<ThemeProvider theme={darkMode ? darkTheme : lightTheme}>
7+
<ThemeProvider theme={theme}>
158
<Router />
169
</ThemeProvider>
1710
);

‎labeddit/src/components/Header/syled.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import styled from 'styled-components';
2-
import { defaultTheme } from '../../styles';
2+
import { theme } from '../../styles';
33

44
export const ContainerHeaderComponent = styled.div`
55
border: 2px solid red;
6-
background-color: ${defaultTheme.backgrounds.bg_page_white};
6+
background-color: ${theme.backgrounds.bg_page_white};
77
height: 6vh;
88
width: 100vw;
99
/* display: flex;

‎labeddit/src/components/ThemeSelector/index.js‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎labeddit/src/components/ThemeSelector/styled.js‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎labeddit/src/components/index.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,3 @@ export * from './PostCard';
33
export * from './CommentCard';
44
export * from './Loading';
55
export * from './Error';
6-
export * from './ThemeSelector';
7-
8-
// export * from './CreatePost';
9-
// export * from './CreateComment';
10-
// export * from './LikeButton';
11-
// export * from './DislikeButton';
12-
// export * from './Loading';
13-
// export * from './PostDetails';
14-
// export * from './CommentDetails';

‎labeddit/src/contexts/GlobalState.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@ const GlobalState = ({ children }) => {
88
const [errorMessage, setErrorMessage] = useState('');
99
const [errorMessagePost, setErrorMessagePost] = useState('');
1010
const [errorMessageComment, setErrorMessageComment] = useState('');
11-
const [darkMode, setDarkMode] = useState(false);
1211
const [isCommentPage, setIsCommentPage] = useState(false);
1312
const [isSignupPage, setIsSignupPage] = useState(false);
1413
const [isFeedOrCommentsPage, setIsFeedOrCommentsPage] = useState(false);
1514

16-
const toggleDarkMode = () => {
17-
setDarkMode(!darkMode);
18-
setIsUpdate(!isUpdate);
19-
};
20-
2115
const datas = {
2216
dataReceivedFromApi,
2317
setDataReceivedFromApi,
@@ -31,9 +25,6 @@ const GlobalState = ({ children }) => {
3125
setErrorMessagePost,
3226
errorMessageComment,
3327
setErrorMessageComment,
34-
darkMode,
35-
setDarkMode,
36-
toggleDarkMode,
3728
isCommentPage,
3829
setIsCommentPage,
3930
isSignupPage,

‎labeddit/src/pages/LoginPage/index.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
InputLabel,
1616
OutlinedInput,
1717
} from '@mui/material';
18-
import { ThemeSelector } from '../../components';
1918
import {
2019
ButtonCreateAccount,
2120
ButtonLoginPage,
@@ -33,7 +32,7 @@ import VisibilityOff from '@mui/icons-material/VisibilityOff';
3332
export const LoginPage = () => {
3433
const navigator = useNavigate();
3534
const context = useContext(GlobalContext);
36-
const { errorMessage, setErrorMessage, darkMode } = context;
35+
const { errorMessage, setErrorMessage } = context;
3736

3837
const [showPassword, setShowPassword] = useState(false);
3938
const handleClickShowPassword = () => setShowPassword((show) => !show);
@@ -70,8 +69,7 @@ export const LoginPage = () => {
7069
};
7170

7271
return (
73-
<ContainerPageLogin darkMode={darkMode}>
74-
{/* <ThemeSelector /> */}
72+
<ContainerPageLogin>
7573
<ContainerLogoAndTitle>
7674
<ImageLogo alt='logo da labeddit' src={images.logo_and_title} />
7775
<SubtitleLogin>
@@ -91,14 +89,7 @@ export const LoginPage = () => {
9189
/> */}
9290

9391
{/* ---------------- */}
94-
<InputLabel
95-
htmlFor='outlined-adornment-email'
96-
// sx={
97-
// darkMode
98-
// ? { backgroundColor: 'black' }
99-
// : { backgroundColor: 'white' }
100-
// }
101-
>
92+
<InputLabel htmlFor='outlined-adornment-email'>
10293
E-mail
10394
</InputLabel>
10495
<OutlinedInput

‎labeddit/src/pages/LoginPage/syled.js‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import styled from 'styled-components';
2-
import { darkTheme, lightTheme, defaultTheme } from '../../styles/index';
3-
4-
// console.log(darkTheme);
2+
import { theme } from '../../styles/index';
53

64
/* RESPONSIVIDADE:
75
@@ -25,10 +23,7 @@ import { darkTheme, lightTheme, defaultTheme } from '../../styles/index';
2523
export const ContainerPageLogin = styled.div`
2624
padding: 1.5rem;
2725
border: 2px solid red;
28-
background: ${({ darkMode }) =>
29-
darkMode
30-
? darkTheme.backgrounds.bg_page_gray_one
31-
: lightTheme.palette.white.one};
26+
background: ${theme.palette.white.one};
3227
height: 94.5vh;
3328
display: flex;
3429
flex-direction: column;
@@ -52,9 +47,8 @@ export const SubtitleLogin = styled.h2`
5247
font-family: 'IBM Plex Sans';
5348
font-weight: 400;
5449
font-size: 0.8rem;
55-
color: ${({ darkMode }) =>
56-
darkMode ? darkTheme.palette.black.one : lightTheme.palette.black.two};
5750
51+
color: ${theme.palette.black.one};
5852
@media (min-width: 769px) {
5953
font-size: 1rem;
6054
}
@@ -116,22 +110,22 @@ export const ContainerForms = styled.div`
116110

117111
export const ButtonLoginPage = styled.button`
118112
margin-top: 4rem;
119-
background: ${defaultTheme.backgrounds.bg_btn_login};
113+
background: ${theme.backgrounds.bg_btn_login};
120114
width: 80vw;
121115
border: none;
122116
border-radius: 2.5rem;
123117
height: 2.9rem;
124-
color: ${lightTheme.palette.white.one};
118+
color: ${theme.palette.white.one};
125119
font-size: 0.9rem;
126120
font-family: 'Noto Sans';
127121
font-weight: 700;
128122
`;
129123

130124
export const ButtonCreateAccount = styled.button`
131125
/* margin-top: 1rem; */
132-
border: 1px solid ${defaultTheme.palette.orange};
133-
color: ${defaultTheme.palette.orange};
134-
background: ${defaultTheme.palette.white.one};
126+
border: 1px solid ${theme.palette.orange};
127+
color: ${theme.palette.orange};
128+
background: ${theme.palette.white.one};
135129
width: 80vw;
136130
border-radius: 2.5rem;
137131
height: 2.9rem;
@@ -142,6 +136,6 @@ export const ButtonCreateAccount = styled.button`
142136

143137
export const Hr = styled.hr`
144138
/* width: 80vw; */
145-
border: 1px solid ${defaultTheme.palette.orange};
139+
border: 1px solid ${theme.palette.orange};
146140
margin: 1rem 1rem;
147141
`;

‎labeddit/src/pages/SignupPage/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ export const SignupPage = () => {
102102
isSignupPage={isSignupPage}
103103
isFeedOrCommentsPage={isFeedOrCommentsPage}
104104
/>
105-
{/* <ThemeSelector /> */}
106105

107106
<p>SignupPage</p>
108107

‎labeddit/src/pages/SignupPage/syled.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import styled from 'styled-components';
2-
import { darkTheme, lightTheme } from '../../styles';
2+
import { theme } from '../../styles';
33

44
export const ContainerPageSignup = styled.div`
55
border: 2px solid red;
66
height: 100vh;
7-
background: ${({ darkMode }) =>
8-
darkMode
9-
? darkTheme.backgrounds.bg_page_gray_one
10-
: lightTheme.palette.white.one};
7+
background: ${theme.palette.white.one};
118
`;

0 commit comments

Comments
 (0)