Skip to content

Commit

Permalink
Merge branch 'main' into hover_social
Browse files Browse the repository at this point in the history
  • Loading branch information
Shekhar-Raj authored Oct 8, 2024
2 parents 7becdb6 + 4da66ee commit 9d394ee
Show file tree
Hide file tree
Showing 18 changed files with 734 additions and 123 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/auto-label-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
labels: |
hacktoberfest
hacktoberfest-accepted
gssoc-ext
gssoc-extd
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>



89 changes: 68 additions & 21 deletions SignUp/signup.css
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
}
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion SignUp/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<link rel="shortcut icon" href="../images/logo.png" type="image/x-icon">
</head>
<body>
<div class="linksHome">
<a href="../index.html">home</a>
</div>
<div class="signup-container">
<h1>Create Your Account</h1>
<form action="#" method="post">
Expand All @@ -30,7 +33,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>

Expand Down
23 changes: 15 additions & 8 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand All @@ -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"
}
}
22 changes: 22 additions & 0 deletions darkMode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const checkbox = document.getElementById('checkbox')
const modeLabel = document.getElementById('mode-label')

// Check if dark mode is already enabled
if (localStorage.getItem('theme') === 'dark') {
document.documentElement.setAttribute('data-theme', 'dark')
checkbox.checked = true
modeLabel.textContent = 'Dark Mode'
}

// Add event listener for toggle switch
checkbox.addEventListener('change', () => {
if (checkbox.checked) {
document.documentElement.setAttribute('data-theme', 'dark')
localStorage.setItem('theme', 'dark')
modeLabel.textContent = 'Dark Mode'
} else {
document.documentElement.setAttribute('data-theme', 'light')
localStorage.setItem('theme', 'light')
modeLabel.textContent = 'Light Mode'
}
})
Binary file added images/7725176.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/X[Twitter Logo].png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/metaquest.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/visionpro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9d394ee

Please sign in to comment.