Skip to content

Commit ad8fb57

Browse files
authored
Merge pull request #290 from Code-4-Community/separate-styling-from-tsx-components
Separate styling from tsx components
2 parents 90ccbb6 + d2e2da3 commit ad8fb57

File tree

6 files changed

+42
-358
lines changed

6 files changed

+42
-358
lines changed

frontend/src/Account.tsx

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

frontend/src/Login.tsx

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const Login = observer(() => {
2828
};
2929

3030
return (
31-
<div className="bg-white grid grid-cols-2" style={styles.pageContainer}>
31+
<div className="bg-white grid grid-cols-[60%_40%] w-screen h-screen relative m-0 p-0 overflow-hidden text-start">
3232
{/*/ Left side: Registration form */}
33-
<div className="w-[60%] h-full py-20 px-24 flex flex-col justify-center items-start">
33+
<div className="h-full py-20 px-24 flex flex-col justify-center items-start">
3434
<div className="mb-12">
3535
<h1 className="text-[32px] pb-4">Welcome back!</h1>
3636
<h2 className="text-lg">
@@ -52,7 +52,6 @@ const Login = observer(() => {
5252
required
5353
onChange={(e) => setUsername(e.target.value)}
5454
placeholder="Enter your email"
55-
style={styles.inputContainer}
5655
className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-medium-gray"
5756
/>
5857
</div>
@@ -70,7 +69,6 @@ const Login = observer(() => {
7069
required
7170
onChange={(e) => setPassword(e.target.value)}
7271
placeholder="Enter your password"
73-
style={styles.inputContainer}
7472
className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-medium-gray"
7573
/>
7674
</div>
@@ -88,7 +86,6 @@ const Login = observer(() => {
8886
<button
8987
type="submit"
9088
className="w-full block mt-8 min-w-0 rounded-md grow bg-dark-orange text-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500"
91-
style={{ ...styles.button, ...styles.helloButton }}
9289
>
9390
Login
9491
</button>
@@ -111,7 +108,7 @@ const Login = observer(() => {
111108
</div>
112109

113110
{/*/ Right side: logo */}
114-
<div className="w-[40%] h-full flex flex-col justify-center items-center">
111+
<div className="h-full flex flex-col justify-center items-center">
115112
<div className="w-full h-full bg-medium-orange rounded-l-4xl flex flex-col justify-center items-center">
116113
<img
117114
className="w-[60%] h-[60%] object-contain p-10 mb-40"
@@ -125,19 +122,3 @@ const Login = observer(() => {
125122
});
126123

127124
export default Login;
128-
129-
// Inline style objects
130-
const styles: { [key: string]: React.CSSProperties } = {
131-
pageContainer: {
132-
position: "relative",
133-
width: "100vw",
134-
height: "100vh",
135-
margin: 0,
136-
padding: 0,
137-
overflow: "hidden",
138-
display: "flex",
139-
justifyContent: "center",
140-
alignItems: "start",
141-
textAlign: "start",
142-
},
143-
};

frontend/src/Profile.tsx

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

0 commit comments

Comments
 (0)