Skip to content

Joshua raj treasure hunt #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnabara4 merged 9 commits into from
Mar 13, 2025
Merged

Joshua raj treasure hunt #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8eaaf8b
minor changes to hamburger
Jx-ls Mar 12, 2025
1ff7cb2
updated instructions to fit current event
Jx-ls Mar 12, 2025
af16e1e
fixed the scrolling hamburger
Jx-ls Mar 12, 2025
cabaedf
Merge branch 'joshua-raj-treasure-hunt' of https://github.com/kgpmask…
Jx-ls Mar 12, 2025
a12ca9f
the footer appears on the hamburger now
Jx-ls Mar 12, 2025
85e7c03
made footer appear on hamburger before it completely opens
Jx-ls Mar 12, 2025
046f77b
now ppl cant see the location code
Jx-ls Mar 13, 2025
d7dd80d
in admin page it shows only this years teams now
Jx-ls Mar 13, 2025
3087839
minor changes
Jx-ls Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions assets/styles/mask.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ span.navbar-line {
text-align: left;
font-size: 20px;
z-index: 29;
-webkit-tap-highlight-color: var(--dark-red);
-webkit-tap-highlight-color: rgba($color: #ce0e0e, $alpha: 0.5);
}

.slide {
Expand All @@ -450,7 +450,7 @@ span.navbar-line {
}

.hamburger-menu hr:not(.border-bottom) {
margin: auto;
margin: 0 4.5%;
}

#top-line {
Expand All @@ -462,8 +462,7 @@ span.navbar-line {
background-color: var(--tinted-gray);
border-color: var(--tinted-gray);
color: var(--tinted-gray);
margin-left: 5.5%;
margin-right: 10%;
margin: 0 4.5%;
}

.hamburger-menu #most-bottom {
Expand Down Expand Up @@ -521,7 +520,16 @@ span.navbar-line {
display: block;
}

.burger-open>*:not(.plate, .hamburger-menu) {
.burger-open>*:not(.plate, .hamburger-menu, footer) {
display: none;
}

.footer-open {
position: absolute;
bottom: 0;
}

.container-open {
margin-bottom: 70px;
}
}
2 changes: 1 addition & 1 deletion database/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ async function getLocations () {
}

async function getTeams () {
return await Team.find({ isAdmin: [undefined, false] }).lean();
return await Team.find({ isAdmin: [undefined, false], _id: { $gte: 8000, $lte: 9000 } }).lean();
}

async function getTeamById (_id) {
Expand Down
14 changes: 13 additions & 1 deletion templates/_base.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,22 @@
</div>

<script>
let open = 0;
document.querySelector('.burger').addEventListener('click', function () {
open = (open + 1) % 2;
this.classList.toggle('open');
document.querySelector('.hamburger-menu').classList.toggle('slide');
// document.querySelector('#content-wrap').classList.toggle('burger-open');
document.querySelector('footer').classList.toggle('footer-open');
document.querySelector('#interface-container').classList.toggle('container-open');
if (open === 1) {
setTimeout (() => {
document.querySelector('#page-container').classList.toggle('burger-open');
document.querySelector('#interface-container').classList.toggle('burger-open');
}, 300);
} else {
document.querySelector('#page-container').classList.toggle('burger-open');
document.querySelector('#interface-container').classList.toggle('burger-open');
}
});
</script>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion templates/auth/login.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{ forms.heading('h1','Login') }}
{{ forms.description('h2','Kindly login to participate in the hunt ^-^') }}
{{ forms.field('username','Team ID')}}
{{ forms.field('password','User Password',type='password')}}
{{ forms.field('password','Password',type='password')}}
<div class="buttons">
{{ forms.button('submit', 'Login', 'login') }}
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/info/instructions.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div id="main-page">
<h1> Event Information </h1>
<ul>
<li> <span style="color: var(--red);">Date/Time:</span> March 17, 2024, 3:00 PM </li>
<li> <span style="color: var(--red);">Date/Time:</span> March 16, 2025, 3:00 PM </li>
<li> <span style="color: var(--red);">Venue:</span> Technology Students' Gymkhana (Front Side) </li>
</ul>
<br>
Expand All @@ -34,7 +34,7 @@
<li> <span style="color: var(--red);">Note:</span> If you are found to have violated any rules, you can be subject to disqualification. </li>
<br/>
</ul>
In case of any doubt, feel free to contact Aman <r>(63773 08533)</r> and Soumil <r>(86975 63554)</r> </li>
In case of any doubt, feel free to contact Nayandeep <r>(81309 70929)</r> and <br> Binaya <r>(7205-926337)</r> </li>
</div>
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion templates/live/interface.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
</div>
<div class="form-field">
<div style="width: 250px">
{{ forms.field('locationcode', 'Location Code', autocomplete = false) }}
{{ forms.field('locationcode', 'Location Code', autocomplete = false, type='password') }}
</div>
</div>
<div class="buttons">
Expand Down