From 77b20785a5f39a449ca43cef01ab237091c3a2af Mon Sep 17 00:00:00 2001 From: Sage The DM Date: Wed, 4 Sep 2024 12:11:49 +0200 Subject: [PATCH] Prepared the react project to avoid merge conflicts --- app/App.css | 0 app/Luca.css | 31 +++++++++++++++++++++++++++++++ app/Luca.tsx | 37 +++++++++++++++++++++++++++++++++++++ app/Patrick.css | 11 +++++++++++ app/Patrick.tsx | 13 +++++++++++++ app/Yasin.css | 11 +++++++++++ app/Yasin.tsx | 13 +++++++++++++ app/layout.tsx | 2 +- app/page.tsx | 26 +++++++++++++++++--------- 9 files changed, 134 insertions(+), 10 deletions(-) create mode 100644 app/App.css create mode 100644 app/Luca.css create mode 100644 app/Luca.tsx create mode 100644 app/Patrick.css create mode 100644 app/Patrick.tsx create mode 100644 app/Yasin.css create mode 100644 app/Yasin.tsx diff --git a/app/App.css b/app/App.css new file mode 100644 index 0000000..e69de29 diff --git a/app/Luca.css b/app/Luca.css new file mode 100644 index 0000000..3e6bd4c --- /dev/null +++ b/app/Luca.css @@ -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; +} diff --git a/app/Luca.tsx b/app/Luca.tsx new file mode 100644 index 0000000..3c5c8a9 --- /dev/null +++ b/app/Luca.tsx @@ -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 ( +
+

Luca's Space

+

Welcome, Luca! This is your programming space.

+ + {/* Button to count clicks */} + +

You've clicked the button {clickCount} times!

+ + {/* Lorem Ipsum text */} +
+

+ 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. +

+
+
+ ); +}; + +export default Luca; diff --git a/app/Patrick.css b/app/Patrick.css new file mode 100644 index 0000000..101f408 --- /dev/null +++ b/app/Patrick.css @@ -0,0 +1,11 @@ +/* Patrick.css */ +.programmer-space { + padding: 20px; + margin: 10px; + border-radius: 8px; + color: #fff; +} + +.patrick { + background-color: #e94e77; /* Pink */ +} diff --git a/app/Patrick.tsx b/app/Patrick.tsx new file mode 100644 index 0000000..e1f02aa --- /dev/null +++ b/app/Patrick.tsx @@ -0,0 +1,13 @@ +// Patrick.tsx +"use client"; +import React from 'react'; +import './Patrick.css'; // Import specific styles for Patrick + +const Patrick = () => ( +
+

Patrick's Space

+

Welcome, Patrick! This is your programming space.

+
+); + +export default Patrick; diff --git a/app/Yasin.css b/app/Yasin.css new file mode 100644 index 0000000..f6d48df --- /dev/null +++ b/app/Yasin.css @@ -0,0 +1,11 @@ +/* Yasin.css */ +.programmer-space { + padding: 20px; + margin: 10px; + border-radius: 8px; + color: #fff; +} + +.yasin { + background-color: #50e3c2; /* Teal */ +} diff --git a/app/Yasin.tsx b/app/Yasin.tsx new file mode 100644 index 0000000..979f2d3 --- /dev/null +++ b/app/Yasin.tsx @@ -0,0 +1,13 @@ +// Yasin.tsx +"use client"; +import React from 'react'; +import './Yasin.css'; // Import specific styles for Yasin + +const Yasin = () => ( +
+

Yasin's Space

+

Welcome, Yasin! This is your programming space.

+
+); + +export default Yasin; diff --git a/app/layout.tsx b/app/layout.tsx index a14e64f..6bb8bbd 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -13,4 +13,4 @@ export default function RootLayout({ {children} ) -} +} diff --git a/app/page.tsx b/app/page.tsx index 464f71b..a89aead 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -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 ( - - ); + return ; } export default function MyApp() { - return ( -
-

Welcome to my app

- -
- ); + return ( +
+
+ + + +
+
+ ); }