Merge branch 'JonasTestBranch' into main

projekt/package-lock.json

@@ -15,6 +15,9 @@
         "react-dom": "^18.2.0",
         "react-scripts": "5.0.1",
         "web-vitals": "^2.1.4"
+      },
+      "devDependencies": {
+        "tailwindcss": "^3.3.2"
       }
     },
     "node_modules/@adobe/css-tools": {

projekt/package.json

@@ -34,5 +34,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "tailwindcss": "^3.3.2"
   }
 }

projekt/src/App.css

@@ -1,38 +1,26 @@
-.App {
+.round-border
-  text-align: center;
+{
+    border-radius: 10px;
+    border-width: 0;
 }
 
-.App-logo {
+.default-button
-  height: 40vmin;
+{
-  pointer-events: none;
+    background-color: #0d52ce;
+    color: #ffffff;
 }
 
-@media (prefers-reduced-motion: no-preference) {
+.font-small
-  .App-logo {
+{
-    animation: App-logo-spin infinite 20s linear;
+    font-size: 15px;
-  }
 }
 
-.App-header {
+.font-middle
-  background-color: #282c34;
+{
-  min-height: 100vh;
+    font-size: 20px ;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
 }
 
-.App-link {
+.font-big
-  color: #61dafb;
+{
-}
+    font-size: 30px;
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
 }

projekt/src/App.js

@@ -1,23 +1,10 @@
-import logo from './logo.svg';
 import './App.css';
+import Button from "./components/Button";
 
 function App() {
     return (
         <div className="App">
-      <header className="App-header">
+            <Button/>
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
         </div>
     );
 }

projekt/src/components/Button.jsx

@@ -0,0 +1,28 @@
+import "../App.css"
+
+export default function Button(p) {
+
+    let text = p.text;
+    let paddingY = p.paddingY, paddingX = p.paddingX;
+    let width = p.width, height = p.height;
+    let color = p.color;
+
+    if (paddingY == null) paddingY = 10;
+    if (paddingX == null) paddingX = 20;
+    if (height == null) height = 50;
+    if (width == null) width = 100;
+
+
+    return (
+        <button className={"default-button round-border font font-middle"}
+                style={{
+                    paddingTop: paddingY,
+                    paddingBottom: paddingY,
+                    paddingLeft: paddingX,
+                    paddingRight: paddingX,
+                    width: width,
+                    height: height,
+                    color: color
+                }}>{text}</button>
+    );
+}