From 7a06b3120a82b34bae5dfefd097383516ff985be Mon Sep 17 00:00:00 2001 From: manmohansingh325 Date: Tue, 21 Nov 2023 03:13:36 +0530 Subject: [PATCH 1/2] login form modified --- CSS/index-login.css | 212 ++++++++++++++++++------------------ JAVA-SCRIPTS/login-close.js | 22 ++++ JAVA-SCRIPTS/login.js | 7 -- index-login.html | 65 ++++++----- 4 files changed, 162 insertions(+), 144 deletions(-) create mode 100644 JAVA-SCRIPTS/login-close.js diff --git a/CSS/index-login.css b/CSS/index-login.css index 0b350d3..a41d2e4 100644 --- a/CSS/index-login.css +++ b/CSS/index-login.css @@ -1,111 +1,107 @@ - -header, footer, main{ - filter: blur(6px); - overflow: hidden; +footer, +main { + filter: blur(5px); } body { - font-family: 'Montserrat', sans-serif; - text-align: center; - background-color: #f7f7f7; - } - - .h { - font-family: 'Montserrat', sans-serif; - text-align: center; - text-decoration: underline; - font-size: xx-large; - color: orange; - font-weight: bolder; - - } - .form-container { - width: 400px; - margin: 50px auto; - background-color: #FFFFFF; - border-radius: 10px; - padding: 35px; - box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); - position: fixed; - top: 170px; - left: 550px; - z-index: 8; - - } - - - .form-toggle { - display: flex; - justify-content: center; - margin-bottom: 20px; - } - - .form-toggle button { - font-size: 16px; - padding: 10px 20px; - border: none; - cursor: pointer; - outline: none; - border-radius: 2px; - background-color: olivedrab; - color: #fff; - margin: 0 5px; - transition: background-color 0.3s; - } - - .form-toggle button.active { - background-color: #042141; - } - - .form-section { - display: none; - } - .form-section.show { - display: block; - } - - .form-section h2 { - margin-bottom: 20px; - } - - .input-field { - margin-bottom: 15px; - } - - input { - width: 90%; - padding: 10px; - border: 1px solid #ccc; - border-radius: 5px; - font-size: 16px; - outline: none; - } - - button { - width: 100%; - padding: 14px 20px; - border: none; - border-radius: 2px; - font-size: 16px; - cursor: pointer; - background-color: rgb(255, 168, 6); - color: #fff; - transition: background-color 0.3s; - } - - button:hover { - opacity: 0.8; - background-color: rgb(235, 84, 84); - } - .line{ - margin-left: -350px; - } - .close-btn{ - cursor: pointer; - margin-left: 340px; - margin-top: -35px; - padding: 7px 0px; - font-size: 25px; - display: block; - } - \ No newline at end of file + font-family: "Montserrat", sans-serif; + text-align: center; + background-color: #f7f7f7; + overflow: hidden; +} + +.h { + font-family: "Montserrat", sans-serif; + text-align: center; + text-decoration: underline; + font-size: xx-large; + color: orange; + font-weight: bolder; +} +.form-container { + width: 400px; + margin: 50px auto; + background-color: #ffffff; + border-radius: 10px; + padding: 35px; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + position: fixed; + top: 170px; + left: 550px; + z-index: 8; +} + +.form-toggle { + display: flex; + justify-content: center; + margin-bottom: 20px; +} + +.form-toggle button { + font-size: 16px; + padding: 10px 20px; + border: none; + cursor: pointer; + outline: none; + border-radius: 2px; + background-color: olivedrab; + color: #fff; + margin: 0 5px; + transition: background-color 0.3s; +} + +.form-toggle button.active { + background-color: #042141; +} + +.form-section { + display: none; +} +.form-section.show { + display: block; +} + +.form-section h2 { + margin-bottom: 20px; +} + +.input-field { + margin-bottom: 15px; +} + +input { + width: 90%; + padding: 10px; + border: 1px solid #ccc; + border-radius: 5px; + font-size: 16px; + outline: none; +} + +button { + width: 100%; + padding: 14px 20px; + border: none; + border-radius: 2px; + font-size: 16px; + cursor: pointer; + background-color: rgb(255, 168, 6); + color: #fff; + transition: background-color 0.3s; +} + +button:hover { + opacity: 0.8; + background-color: rgb(235, 84, 84); +} +.line { + margin-left: -350px; +} +.close-btn { + cursor: pointer; + margin-left: 340px; + margin-top: -35px; + padding: 7px 0px; + font-size: 25px; + display: block; +} diff --git a/JAVA-SCRIPTS/login-close.js b/JAVA-SCRIPTS/login-close.js new file mode 100644 index 0000000..d4d0dfa --- /dev/null +++ b/JAVA-SCRIPTS/login-close.js @@ -0,0 +1,22 @@ +/*function openForm() { + var modal = document.getElementById("formscontainer"); + modal.style.display = "block"; + + document.body.style.overflow = + "hidden"; //isse use kr k blur krna yhn changes kr k Disable scrolling on the background + + //document.body.style.filter = "blur(5px)";// + document.getElementById("head").style.filter = "blur(5px)"; + document.getElementById("main").style.filter = "blur(5px)"; + document.getElementById("footer").style.filter = "blur(5px)"; +}*/ + +// Close the modal +function closeForm() { + var modal = document.getElementById("formscontainer"); + modal.style.display = "none"; + document.body.style.overflow = "scroll"; // Enable scrolling on the background + document.getElementById("main").style.filter = "blur(0px)"; + document.getElementById("footer").style.filter = "blur(0px)"; +} +/*document.element.style.filter = "null";*/ diff --git a/JAVA-SCRIPTS/login.js b/JAVA-SCRIPTS/login.js index 98b737c..0c547de 100644 --- a/JAVA-SCRIPTS/login.js +++ b/JAVA-SCRIPTS/login.js @@ -15,11 +15,4 @@ document.addEventListener("DOMContentLoaded", function () { signUpForm.style.display = "block"; signInForm.style.display = "none"; }); - }); - - - - - - diff --git a/index-login.html b/index-login.html index 42f503f..79447ac 100644 --- a/index-login.html +++ b/index-login.html @@ -11,11 +11,7 @@ - + @@ -24,11 +20,21 @@
@@ -38,7 +44,7 @@ -
+
Plant image @@ -220,33 +226,33 @@

Where Does Your Electronic Waste Go?

-
+
@@ -271,6 +277,7 @@

Sign Up

+ \ No newline at end of file From 3d8afc18783c522c7401ad086f598176d956fd57 Mon Sep 17 00:00:00 2001 From: manmohansingh325 Date: Tue, 21 Nov 2023 12:51:33 +0530 Subject: [PATCH 2/2] location modified --- JSON/locations.json | 138 +++++++++++++++++++++++++++++++++----------- 1 file changed, 105 insertions(+), 33 deletions(-) diff --git a/JSON/locations.json b/JSON/locations.json index c840c57..c6dc3ca 100644 --- a/JSON/locations.json +++ b/JSON/locations.json @@ -1,34 +1,106 @@ [ - { - "id" : 1, - "company" : "Moonstar Enterprises", - "address" : "Sector B, Sanwer Road Industrial Road Area", - "city" : "Indore", - "state" : "Madhya Pradesh - 452015" , - "link" : "https://maps.app.goo.gl/N2mgG6JgAk82sZhCA" - }, - { - "id" : 2, - "company" : "Advanced E-Waste Recycler", - "address" : "MG Road Near Kothari Market Square", - "city" : "Indore", - "state" : "Madhya Pradesh - 452007", - "link" : "https://maps.app.goo.gl/HFZTAYw1R3y6VxZJA" - }, - { - "id" : 3, - "company" : "Unique Eco Recycle", - "address" : "RD Udyog Nagar, Nemawar Rd, Palda Area", - "city" : "Indore", - "state" : "Madhya Pradesh - 452020", - "link" : "https://maps.app.goo.gl/89cUz5YK34a91nqL7" - }, - { - "id" : 4, - "company" : "E-Waste Samadhan", - "address" : "Plot No. 15, IT Park, Dhar Road", - "city" : "Pune", - "state" : "Madhya Pradesh - 452001" , - "link" : "https://maps.app.goo.gl/78XQRJLSzqCHjWWX7" - } -] \ No newline at end of file + { + "id": 1, + "company": "Moonstar Enterprises", + "address": "Sector B, Sanwer Road Industrial Road Area", + "city": "Indore", + "state": "Madhya Pradesh - 452015", + "link": "https://maps.app.goo.gl/N2mgG6JgAk82sZhCA" + }, + { + "id": 2, + "company": "Advanced E-Waste Recycler", + "address": "MG Road Near Kothari Market Square", + "city": "Indore", + "state": "Madhya Pradesh - 452007", + "link": "https://maps.app.goo.gl/HFZTAYw1R3y6VxZJA" + }, + { + "id": 3, + "company": "Unique Eco Recycle", + "address": "RD Udyog Nagar, Nemawar Rd, Palda Area", + "city": "Indore", + "state": "Madhya Pradesh - 452020", + "link": "https://maps.app.goo.gl/89cUz5YK34a91nqL7" + }, + { + "id": 4, + "company": "E-Waste Samadhan", + "address": "Plot No. 15, IT Park, Dhar Road", + "city": "Pune", + "state": "Madhya Pradesh - 452001", + "link": "https://maps.app.goo.gl/78XQRJLSzqCHjWWX7" + }, + { + "id": 12, + "company": "Zolopik", + "address": "1, H.No: 3-7/38, Khaswa Enclave,Narsingi", + "city": "Hyderabad,", + "state": " Telangana - 500075", + "link": "https://maps.app.goo.gl/wEs6vmFt6n2ARcx37" + }, + { + "id": 13, + "company": "E-WASTE EXCHANGE", + "address": "IIITH Himalaya, Road, Gachibowli", + "city": "Hyderabad,", + "state": " Telangana - 500032", + "link": "https://maps.app.goo.gl/nxa5DR1xTWMqabQa8" + }, + { + "id": 14, + "company": "Crapbin", + "address": "16-9-406/A/80, Ground Floor, Wahed Nagar", + "city": "Hyderabad,", + "state": " Telangana - 500036", + "link": "https://maps.app.goo.gl/T3npWr435twFQMrFA" + }, + { + "id": 15, + "company": "Global scrap mart", + "address": "11-13-749/2, Dena Bank Colony, Kothapet", + "city": "Hyderabad,", + "state": " Telangana - 500035", + "link": "https://maps.app.goo.gl/H6FwgKu2a8Tszg4LA" + }, + { + "id": 16, + "company": "E-Waste Recycling process", + "address": "GPRA CUMPUS, Indira Nagar, Gachibowli", + "city": "Hyderabad,", + "state": " Telangana - 500032", + "link": "https://maps.app.goo.gl/CmJS2U5W6MfczZTS6" + }, + { + "id": 17, + "company": "E-Waste Recycling process", + "address": "Plot No:- 147, 3rd Floor, Patparganj", + "city": "Delhi,", + "state": " Delhi- 110092", + "link": "https://maps.app.goo.gl/MdBJjDn4TuH6Q2gD6" + }, + { + "id": 18, + "company": "3R Recycler Pvt. Ltd.", + "address": "502,DDA Complex, Distt. Center, Laxmi Nagar", + "city": "Delhi,", + "state": " Delhi- 110092", + "link": "https://maps.app.goo.gl/dbYizxDTTgnb43ns5" + }, + { + "id": 19, + "company": "Hindustan E-waste", + "address": "8, Central Rd, Jangpura, Bhogal", + "city": "Delhi,", + "state": " Delhi- 110014", + "link": "https://maps.app.goo.gl/HWwcXsAMr2S5Fiu66" + }, + { + "id": 20, + "company": "The Online Kabadiwala", + "address": "Swapeco IIIT Delhi Incubation Center", + "city": "Delhi,", + "state": " Delhi- 110021", + "link": "https://maps.app.goo.gl/35qFVFCDBadAwMQQ7" + } +]