Prepared the react project to avoid merge conflicts

This commit is contained in:
Sage The DM 2024-09-04 12:11:49 +02:00
parent d81827a4a4
commit 77b20785a5
9 changed files with 134 additions and 10 deletions

0
app/App.css Normal file
View file

31
app/Luca.css Normal file
View file

@ -0,0 +1,31 @@
/* Luca.css */
.programmer-space {
padding: 20px;
margin: 10px;
border-radius: 8px;
color: #fff;
}
.luca {
background-color: #4a90e2; /* Blue */
}
.click-button {
padding: 10px 20px;
margin-top: 10px;
border: none;
border-radius: 4px;
background-color: #fff;
color: #4a90e2;
cursor: pointer;
font-size: 16px;
}
.click-button:hover {
background-color: #e3e3e3;
}
.lorem-ipsum {
margin-top: 20px;
font-size: 14px;
}

37
app/Luca.tsx Normal file
View file

@ -0,0 +1,37 @@
// Luca.tsx
"use client";
import React, { useState } from 'react';
import './Luca.css'; // Import specific styles for Luca
const Luca = () => {
// State to keep track of the number of clicks
const [clickCount, setClickCount] = useState(0);
// Function to handle button click
const handleClick = () => {
setClickCount(clickCount + 1);
};
return (
<div className="programmer-space luca">
<h2>Luca's Space</h2>
<p>Welcome, Luca! This is your programming space.</p>
{/* Button to count clicks */}
<button onClick={handleClick} className="click-button">
Click me
</button>
<p>You've clicked the button {clickCount} times!</p>
{/* Lorem Ipsum text */}
<div className="lorem-ipsum">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
</p>
</div>
</div>
);
};
export default Luca;

11
app/Patrick.css Normal file
View file

@ -0,0 +1,11 @@
/* Patrick.css */
.programmer-space {
padding: 20px;
margin: 10px;
border-radius: 8px;
color: #fff;
}
.patrick {
background-color: #e94e77; /* Pink */
}

13
app/Patrick.tsx Normal file
View file

@ -0,0 +1,13 @@
// Patrick.tsx
"use client";
import React from 'react';
import './Patrick.css'; // Import specific styles for Patrick
const Patrick = () => (
<div className="programmer-space patrick">
<h2>Patrick's Space</h2>
<p>Welcome, Patrick! This is your programming space.</p>
</div>
);
export default Patrick;

11
app/Yasin.css Normal file
View file

@ -0,0 +1,11 @@
/* Yasin.css */
.programmer-space {
padding: 20px;
margin: 10px;
border-radius: 8px;
color: #fff;
}
.yasin {
background-color: #50e3c2; /* Teal */
}

13
app/Yasin.tsx Normal file
View file

@ -0,0 +1,13 @@
// Yasin.tsx
"use client";
import React from 'react';
import './Yasin.css'; // Import specific styles for Yasin
const Yasin = () => (
<div className="programmer-space yasin">
<h2>Yasin's Space</h2>
<p>Welcome, Yasin! This is your programming space.</p>
</div>
);
export default Yasin;

View file

@ -13,4 +13,4 @@ export default function RootLayout({
<body>{children}</body>
</html>
)
}
}

View file

@ -1,14 +1,22 @@
// MyApp.tsx
import React from 'react';
import Luca from './Luca';
import Patrick from './Patrick';
import Yasin from './Yasin';
import './App.css'; // Import main styles
function MyButton({ title }: { title: string }) {
return (
<button>{title}</button>
);
return <button>{title}</button>;
}
export default function MyApp() {
return (
<div>
<h1>Welcome to my app</h1>
<MyButton title="I'm a button" />
</div>
);
return (
<div>
<div className="programmer-container">
<Luca />
<Patrick />
<Yasin />
</div>
</div>
);
}