Zmieniona architektura

JakMac02 · May 25, 2024 · 95542ea · 95542ea
1 parent d314c2e
commit 95542ea
Show file tree

Hide file tree

Showing 19 changed files with 232 additions and 5 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Projekt_IO.iml b/.idea/Projekt_IO.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/MongoDB/__pycache__/kategorie.cpython-310.pyc b/MongoDB/__pycache__/kategorie.cpython-310.pyc
diff --git a/cupboard.png → smieciarka-website/Originals/cupboard.png b/cupboard.png → smieciarka-website/Originals/cupboard.png
diff --git a/smieciarka-website/Originals/map_background.png b/smieciarka-website/Originals/map_background.png
diff --git a/shirt.png → smieciarka-website/Originals/shirt.png b/shirt.png → smieciarka-website/Originals/shirt.png
diff --git a/wardrobe.png → smieciarka-website/Originals/wardrobe.png b/wardrobe.png → smieciarka-website/Originals/wardrobe.png
diff --git a/smieciarka-website/js/login.js b/smieciarka-website/js/login.js
@@ -0,0 +1,28 @@
+document.addEventListener('DOMContentLoaded', function() {
+    const loginTab = document.getElementById('login-tab');
+    const registerTab = document.getElementById('register-tab');
+    const loginForm = document.getElementById('login-form');
+    const registerForm = document.getElementById('register-form');
+    const SignInButton =document.getElementById('b_si');
+    const SignUpButton =document.getElementById('b_su');
+
+    loginTab.addEventListener('click', function() {
+        loginForm.style.display = 'block';
+        registerForm.style.display = 'none';
+    });
+
+    registerTab.addEventListener('click', function() {
+        registerForm.style.display = 'block';
+        loginForm.style.display = 'none';
+    });
+    SignInButton.addEventListener('click', function() {
+        location.href = "https://jakmac02.github.io/Projekt_IO/index.html";
+
+    });
+    SignUpButton.addEventListener('click', function() {
+        location.href = "https://jakmac02.github.io/Projekt_IO/index.html";
+
+    });
+
+
+});
diff --git a/index.js → smieciarka-website/js/main.js b/index.js → smieciarka-website/js/main.js
@@ -10,17 +10,17 @@ var schoesIcon = L.icon({
 });
 
 var shirtIcon = L.icon({
-    iconUrl: 'shirt.png',
+    iconUrl: 'Originals/shirt.png',
 	iconSize:     [60, 60],
 });
 
 var wardrobeIcon = L.icon({
-    iconUrl: 'cupboard.png',
+    iconUrl: 'Originals/cupboard.png',
 	iconSize:     [45, 60],
 });
 
 var cupboardIcon = L.icon({
-    iconUrl: 'wardrobe.png',
+    iconUrl: 'Originals/wardrobe.png',
 	iconSize:     [36, 60],
 });
 

diff --git a/smieciarka-website/js/map_background.png b/smieciarka-website/js/map_background.png
diff --git a/smieciarka-website/login.html b/smieciarka-website/login.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="style/login.css">
+    <script src="js/login.js"></script>
+    <p style="background-image: url('Originals/map_background.png');">
+
+    <title>Smieciara uwu</title>
+</head>
+<body>
+    <div class="tabs">
+        <input type="radio" id="login-tab" name="tabs" checked>
+        <label for="login-tab">Sign in</label>
+        <input type="radio" id="register-tab" name="tabs">
+        <label for="register-tab">Sign up</label>
+        <div id="login-form" class="form">
+            <form>
+                <br>
+                <label for="login-username">Login:<br></label>
+                <input type="text" id="login-username" name="username">
+                <br><br>
+                <label for="login-password">Password:<br></label>
+                <input type="password" id="login-password" name="password">
+                <br><br>
+                <button id ="b_si" type="button">Sign in</button>
+                <br><br>
+            </form>
+        </div>
+        <div id="register-form" class="form">
+            <form>
+                <br>
+                <label for="register-email">E-mail:<br></label>
+                <input type="email" id="register-email" name="email">
+                <br><br>
+                <label for="register-username">Login:<br></label>
+                <input type="text" id="register-username" name="username">
+                <br><br>
+                <label for="register-password">Password:<br></label>
+                <input type="password" id="register-password" name="password">
+                <br><br>
+                <button id="b_su" type="button">Sign up</button>
+                <br><br>
+            </form>
+        </div>
+    </div>
+
+</body>
+</html>
diff --git a/index.html → smieciarka-website/main.html b/index.html → smieciarka-website/main.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="pl-PL">
 	<head>
-		<link rel="stylesheet" href="style.css">
+		<link rel="stylesheet" href="main.css">
 
 		<title>Śmieciarka</title>
 
@@ -69,6 +69,6 @@ <h1 id = "Title"></h1>
 		</div>
 		<div id="map"></div>
 
-		<script src = "index.js"></script>
+		<script src = "main.js"></script>
 	</body>
 </html>
diff --git a/smieciarka-website/style/login.css b/smieciarka-website/style/login.css
@@ -0,0 +1,99 @@
+
+body {
+    background-image: url('../Originals/map_background.png');
+    background-size: cover;
+    font-family: Arial, sans-serif;
+}
+
+.button {
+    background: #BAC9A6; /* Kolor tła */
+    box-shadow: inset 10px 13px 49px -3px #bac9a6;
+    border-radius: 22px;
+    display: inline-block;
+    cursor: pointer;
+    color: #2e2e2e;
+    font-family: Georgia;
+    font-size: 15px;
+    font-weight: bold;
+    padding: 12px 30px;
+    text-decoration: none;
+}
+
+.button:hover {
+    background: linear-gradient(to bottom, #bdd1af 5%, #dbe6c4 100%);
+    background-color: #bdd1af;
+}
+
+.button:active {
+    position: relative;
+    top: 1px;
+}
+
+.tabs {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center; /* Wycentruj elementy .tabs */
+    max-width: 225px;
+    max-height: 80px;
+    margin: 50px auto;
+    padding: 20px;
+    text-align: center;
+
+}
+
+.tabs input[type="radio"] {
+    display: none; /* Ukryj domyślne radio */
+}
+
+.tabs label {
+    padding: 20px;
+    font-weight: bold;
+    cursor: pointer; /* Dodaj kursor wskazujący na etykiecie */
+    border-radius: 5px; /* Zaokrąglenie krawędzi etykiety */
+}
+
+/* Dodaj styl dla niezaznaczonych etykiet */
+.tabs input[type="radio"]:not(:checked) + label {
+    background-color: #ddd; /* Kolor tła dla niezaznaczonych etykiet */
+    color: #555; /* Kolor tekstu dla niezaznaczonych etykiet */
+}
+
+/* Dodaj styl dla zaznaczonych etykiet */
+.tabs input[type="radio"]:checked + label {
+    background-color: #bdd1af; /* Kolor tła dla zaznaczonych etykiet */
+    color: #2e2e2e; /* Kolor tekstu dla zaznaczonych etykiet */
+    box-shadow: inset 0 0 5px rgba(0,0,0,0.3); /* Dodaj cień dla zaznaczonych etykiet */
+}
+
+.tabs .form {
+    width: 100%;
+    padding: 20px;
+    margin: auto;
+    order: 1;
+    display: flex;
+    justify-content: center;
+    box-shadow:inset 0px 1px 0px 0px #ffffff;
+    background:linear-gradient(to bottom, #f9f9f9 5%, #e9e9e9 100%);
+    background-color:#f9f9f9;
+    border-radius:6px;
+    border:1px solid #dcdcdc;
+    display:inline-block;
+    cursor:pointer;
+    color:#666666;
+    font-family:Georgia;
+    font-size:15px;
+    font-weight:bold;
+    padding:100px 150px;
+    text-decoration:none;
+    text-shadow:0px 1px 0px #ffffff; /* Wycentruj elementy formularzy */
+}
+
+/* Ukryj formularz rejestracji na początku */
+#register-form {
+    display: none;
+}
+
+/* Dodaj ten styl, aby wyświetlić tylko formularz logowania na początku */
+#login-form {
+    display: block;
+}
diff --git a/style.css → smieciarka-website/style/main.css b/style.css → smieciarka-website/style/main.css