Merge branch 'main' into about/aadhi

swaraj-das · Oct 8, 2024 · eb9abb8 · eb9abb8
2 parents 484730d + e8d132d
commit eb9abb8
Show file tree

Hide file tree

Showing 13 changed files with 366 additions and 47 deletions.
diff --git a/.github/workflows/auto-label-action.yml b/.github/workflows/auto-label-action.yml
@@ -25,7 +25,5 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         labels: |
-          hacktoberfest
           hacktoberfest-accepted
           gssoc-ext
-          gssoc-extd
diff --git a/README.md b/README.md
@@ -56,7 +56,11 @@ We welcome all contributions to improve **Collect Your GamingTools**! If you'd l
 | **Swaraj Das** <br> <sub>Project Admin</sub> | **Anit Sarkar** <br> <sub>Maintainer</sub> |
 | [![LinkedIn](https://img.icons8.com/fluency/32/000000/linkedin.png)](https://www.linkedin.com/in/swarajdas01/) | [![LinkedIn](https://img.icons8.com/fluency/32/000000/linkedin.png)](https://www.linkedin.com/in/anit-sarkar-11906a283/) |
 
+## 🙌 Contributors
 
+<a href="https://github.com/rahulsainlll/git-trace/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=swaraj-das/Collect-your-GamingTools" />
+</a>
 
 
 
diff --git a/SignUp/signup.css b/SignUp/signup.css
@@ -1,11 +1,11 @@
 * {
     box-sizing: border-box;
     margin: 0;
-    padding: 0;
+    padding:5px;
 }
 
 body {
-    background: url('https://www.example.com/path/to/your/gaming-background.jpg') no-repeat center center fixed;
+    background: url('https://images.pexels.com/photos/7135057/pexels-photo-7135057.jpeg?auto=compress&cs=tinysrgb&w=1260&h=750&dpr=2') no-repeat center center fixed;
     background-size: cover;
     font-family: 'Trebuchet MS', Arial, sans-serif;
     display: flex;
@@ -17,23 +17,28 @@ body {
 }
 
 .signup-container {
-    background-color: rgba(0, 0, 0, 0.8);
-    padding: 2rem;
-    border-radius: 15px;
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.5);
+
+    opacity: 0.75;
+    background-color: rgba(0, 0, 0, 0);
+    padding: 5rem;
+    border-radius: 20px;
+    box-shadow: 0 0px 0px rgba(0, 0, 0, 0.5);
     text-align: center;
-    max-width: 400px;
+    max-width: 500px;
     width: 100%;
-    animation: fadeIn 1.5s ease-in-out;
+    animation: fadeIn 2s ease-in-out;
+    background-color: black;
+    margin: auto;
 }
 
+
 @keyframes fadeIn {
     from {
         opacity: 0;
         transform: scale(0.9);
     }
     to {
-        opacity: 1;
+        opacity: 0.75;
         transform: scale(1);
     }
 }
@@ -73,20 +78,62 @@ input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focu
 }
 
 .signup-button {
-    background-color: #ba68c8;
-    color: #282c34;
-    padding: 0.75rem 1.5rem;
-    border: none;
-    border-radius: 5px;
-    cursor: pointer;
-    font-family: 'Press Start 2P', cursive;
-    font-size: 18px;
-    transition: background-color 0.3s, transform 0.3s;
+  color:white;
+  font-family:Helvetica, sans-serif;
+  font-weight:bold;
+  font-size:20px;
+  text-align: center;
+  background-color:#FFA12B;
+  display:block;
+  position:relative;
+  padding:15px 60px;
+  margin: auto;
+
+
+
+
+  cursor: pointer;
+  transition: background-color 0.2s, color 0.2s;
+
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  text-shadow: 0px 1px 0px #000;
+  filter: dropshadow(color=#000, offx=0px, offy=1px);
+
+  -webkit-box-shadow:inset 0 1px 0 #FFE5C4, 0 10px 0 #915100;
+  -moz-box-shadow:inset 0 1px 0 #FFE5C4, 0 10px 0 #915100;
+  box-shadow:inset 0 1px 0 #FFE5C4, 0 10px 0 #915100;
+
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
 }
 
-.signup-button:hover {
-    background-color: #ab47bc;
-    transform: scale(1.05);
+.signup-button:active{
+  top:10px;
+  background-color:#F78900;
+
+  -webkit-box-shadow:inset 0 1px 0 #FFE5C4, inset 0 -3px 0 #915100;
+  -moz-box-shadow:inset 0 1px 0 #FFE5C4, inset 0 -3pxpx 0 #915100;
+  box-shadow:inset 0 1px 0 #FFE5C4, inset 0 -3px 0 #915100;
+}
+.signup-button:after{
+  content:"";
+  height:100%;
+  width:100%;
+  padding:4px;
+  position: absolute;
+  bottom:-15px;
+  left:-4px;
+  z-index:-1;
+  background-color:#2B1800;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.signup-button:hover{
+    background-color: #FFD198;
+    color: #F78900;
+
 }
 
 .links {
@@ -104,3 +151,4 @@ input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focu
     color: #ff80ab;
     text-decoration: underline;
 }
+
diff --git a/SignUp/signup.html b/SignUp/signup.html
@@ -30,7 +30,7 @@ <h1>Create Your Account</h1>
             <button type="submit" class="signup-button">Sign Up</button>
         </form>
         <div class="links">
-            <a href="../login/login.html">Already have an account? Login</a>
+            <a href="../login/login.html"><u>Already have an account? Login</u></a>
         </div>
     </div>
 

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start":"nodemon ./index.js",
+    "start": "nodemon ./index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
@@ -14,11 +14,12 @@
     "bcrypt": "^5.1.1",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
+    "crypto": "^1.0.1",
     "dotenv": "^16.4.5",
     "email-validator": "^2.0.4",
     "express": "^4.21.0",
     "jsonwebtoken": "^9.0.2",
-    "mongoose": "^8.6.3",
+    "mongoose": "^8.7.0",
     "nodemon": "^3.1.5"
   }
 }
diff --git a/images/7725176.jpg b/images/7725176.jpg
diff --git a/images/X[Twitter Logo].png b/images/X[Twitter Logo].png
diff --git a/index.html b/index.html
@@ -23,6 +23,10 @@
                         <li><a href="#keyboard">Gaming Keyboard</a></li>
                         <li><a href="#others">Others</a></li>
                         <li class="login"><a href="login/login.html">Login</a></li>
+                    <label class="switch">
+                        <input type="checkbox" id="theme-toggle" onchange="toggleTheme()">
+                        <span class="slider"></span>
+                    </label>
                     </ul>
                 </nav>
 
@@ -34,6 +38,10 @@
 
                 <img src="images/menu.png" class="menu-icon" onclick="toggleMenu()">
             </div>
+            <label class="switch">
+                <input type="checkbox" id="theme-toggle" onchange="toggleTheme()">
+                <span class="slider"></span>
+            </label>
 
             <section class="hero">
                 <div class="overlay"></div>
@@ -322,6 +330,37 @@ <h3>Ergonomic Gaming Chair</h3>
             </div>
         </div>
     </div>
+            <section id="contact us">
+
+                <div class="card pb-5 pt-1">
+                    <div class="card-header">
+                        <h2>Contact Us</h2>
+                    </div>
+                    <div class="card-body">
+                        <div class="form-section">
+                            <form>
+                                <div class="form-group">
+                                    <label for="name">Name</label>
+                                    <input type="text" id="name" name="name" placeholder="Your name">
+                                </div>
+                                <div class="form-group">
+                                    <label for="email">Email</label>
+                                    <input type="email" id="email" name="email" placeholder="Your email">
+                                </div>
+                                <div class="form-group">
+                                    <label for="message">Message</label>
+                                    <textarea id="message" name="message" placeholder="Your message"></textarea>
+                                </div>
+                                <button type="submit">Send</button>
+                            </form>
+                        </div>
+                        <div class="image-section">
+                            <img src="images/7725176.jpg" alt="Contact Image"style="max-width: 80%; height: auto; max-height: 500px;">
+                        </div>
+                    </div>
+                </div>
+            </section>
+
     <footer class="footer">
         <div class="footer-content">
             <div class="footer-section about">
@@ -337,10 +376,11 @@ <h2 class="logo-text">Collect your GamingTools</h2>
                     <span><i class="fas fa-envelope"></i> &nbsp; [email protected]</span>
                 </div>
                 <div class="socials">
-                    <a href="#"><i class="fab fa-facebook"></i></a>
-                    <a href="#"><i class="fab fa-instagram"></i></a>
-                    <a href="#" ><i class="fa-brands fa-x-twitter"></i></a>
-                    <a href="#"><i class="fab fa-youtube"></i></a>
+                    <!-- Added classes to the <a> tags to add the Hover animations -->
+                    <a class="facebook" href="#"><i class="fab fa-facebook"></i></a>
+                    <a class="instagram" href="#"><i class="fab fa-instagram"></i></a>
+                    <a class="twitter" href="#" ><i class="fa-brands fa-x-twitter"></i></a>
+                    <a class="youtube" href="#"><i class="fab fa-youtube"></i></a>
                 </div>
             </div>
             <div class="footer-section links">

diff --git a/login/login.css b/login/login.css
@@ -232,6 +232,37 @@ body{
 .links a:not(:last-child) {
     margin-right: 20px; 
 }
+.hal::after {
+  content: '';
+  position: absolute;
+  width: 100%;
+  height: 2px;
+  bottom: 0;
+  left: 0;
+  background-color: white;
+  transform-origin: bottom left;
+  transition: transform 0.25s ease-out;
+  transform: scaleX(0);
+}
+.hal2::after {
+  content: '';
+  position: absolute;
+  width: 100%;
+  height: 2px;
+  bottom: 0;
+  left: 0;
+  background-color: white;
+  transform-origin: bottom right;
+  transition: transform 0.25s ease-out;
+  transform: scaleX(0);
+}
+.hal:hover::after{
+    transform: scaleX(0.6);
+}
+.hal2:hover::after{
+    transform: scaleX(0.6);
+}
+
 
 .links a: hover {
     color: #ff80ab;

diff --git a/login/login.html b/login/login.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -26,8 +25,8 @@ <h1>Login to Your Account</h1>
 </div>
         </form>
         <div class="links">
-            <a href="forgot.html">Forgot Password?</a>
-            <a href="../SignUp/signup.html">Sign Up</a>
+            <a href="forgot.html" class="hal">Forgot Password?</a>
+            <a href="../SignUp/signup.html" class="hal2">Sign Up</a>
         </div>
     </div>
 </body>

diff --git a/script.js b/script.js
@@ -30,3 +30,26 @@ function scrollToTop() {
         behavior: 'smooth'
     });
 }
+
+function toggleTheme() {
+    const body = document.body;
+    const themeToggle = document.getElementById('theme-toggle');
+    body.classList.toggle('dark-mode', themeToggle.checked);
+
+    // Save the user's preference in localStorage
+    if (themeToggle.checked) {
+        localStorage.setItem('theme', 'dark');
+    } else {
+        localStorage.setItem('theme', 'light');
+    }
+}
+
+// Load theme from localStorage on page load
+window.onload = () => {
+    const savedTheme = localStorage.getItem('theme');
+    const themeToggle = document.getElementById('theme-toggle');
+    if (savedTheme === 'dark') {
+        document.body.classList.add('dark-mode');
+        themeToggle.checked = true;
+    }
+};