From 8eaaf8b1f27e6b6efba04b3ed2243dd945e5f2cb Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 00:48:29 +0530 Subject: [PATCH 1/8] minor changes to hamburger --- assets/styles/mask.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/styles/mask.scss b/assets/styles/mask.scss index 54b9c5a..6901d9a 100644 --- a/assets/styles/mask.scss +++ b/assets/styles/mask.scss @@ -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 { @@ -450,7 +450,7 @@ span.navbar-line { } .hamburger-menu hr:not(.border-bottom) { - margin: auto; + margin: 0 4.5%; } #top-line { @@ -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 { From 1ff7cb2d98cb68e7836086cd72a36ae44ddb4cf2 Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 00:55:02 +0530 Subject: [PATCH 2/8] updated instructions to fit current event --- templates/info/instructions.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/info/instructions.njk b/templates/info/instructions.njk index 2808945..980fc32 100644 --- a/templates/info/instructions.njk +++ b/templates/info/instructions.njk @@ -7,7 +7,7 @@

Event Information

    -
  • Date/Time: March 17, 2024, 3:00 PM
    • +
  • Date/Time: March 16, 2025, 3:00 PM
  • Venue: Technology Students' Gymkhana (Front Side)

@@ -34,7 +34,7 @@
  • Note: If you are found to have violated any rules, you can be subject to disqualification.

    • - In case of any doubt, feel free to contact Aman (63773 08533) and Soumil (86975 63554) + In case of any doubt, feel free to contact Nayandeep (81309 70929) and
    Binaya (7205-926337)
    {% endblock %} From af16e1eabf1645486b57f147fb149a1b6263ae64 Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 01:26:16 +0530 Subject: [PATCH 3/8] fixed the scrolling hamburger --- assets/styles/mask.scss | 2 +- templates/_base.njk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/assets/styles/mask.scss b/assets/styles/mask.scss index 6901d9a..6b3a518 100644 --- a/assets/styles/mask.scss +++ b/assets/styles/mask.scss @@ -121,7 +121,7 @@ footer { width: 100%; display: flex; justify-content: center; - z-index: 30; + z-index: 28; } #footer-logo { diff --git a/templates/_base.njk b/templates/_base.njk index 750abc5..5268987 100644 --- a/templates/_base.njk +++ b/templates/_base.njk @@ -107,10 +107,20 @@ {% endblock %} From a12ca9fb685f2e3ac01f4384ac06e6d1aceed6c4 Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 01:56:26 +0530 Subject: [PATCH 4/8] the footer appears on the hamburger now --- assets/styles/mask.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/styles/mask.scss b/assets/styles/mask.scss index 6b3a518..d966750 100644 --- a/assets/styles/mask.scss +++ b/assets/styles/mask.scss @@ -121,7 +121,7 @@ footer { width: 100%; display: flex; justify-content: center; - z-index: 28; + z-index: 30; } #footer-logo { @@ -520,7 +520,7 @@ span.navbar-line { display: block; } - .burger-open>*:not(.plate, .hamburger-menu) { + .burger-open>*:not(.plate, .hamburger-menu, footer) { display: none; } } \ No newline at end of file From 85e7c0344a1a2cb2b1376793af6b08ed481f133d Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 03:03:28 +0530 Subject: [PATCH 5/8] made footer appear on hamburger before it completely opens --- assets/styles/mask.scss | 9 +++++++++ templates/_base.njk | 2 ++ 2 files changed, 11 insertions(+) diff --git a/assets/styles/mask.scss b/assets/styles/mask.scss index d966750..858ed24 100644 --- a/assets/styles/mask.scss +++ b/assets/styles/mask.scss @@ -523,4 +523,13 @@ span.navbar-line { .burger-open>*:not(.plate, .hamburger-menu, footer) { display: none; } + + .footer-open { + position: absolute; + bottom: 0; + } + + .container-open { + margin-bottom: 70px; + } } \ No newline at end of file diff --git a/templates/_base.njk b/templates/_base.njk index 5268987..0a4883a 100644 --- a/templates/_base.njk +++ b/templates/_base.njk @@ -112,6 +112,8 @@ open = (open + 1) % 2; this.classList.toggle('open'); document.querySelector('.hamburger-menu').classList.toggle('slide'); + 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'); From 046f77b6e74fe1459917926a12b36a8004720dce Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 10:31:07 +0530 Subject: [PATCH 6/8] now ppl cant see the location code --- templates/live/interface.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/live/interface.njk b/templates/live/interface.njk index 043e60d..ea497c4 100644 --- a/templates/live/interface.njk +++ b/templates/live/interface.njk @@ -280,7 +280,7 @@
    - {{ forms.field('locationcode', 'Location Code', autocomplete = false) }} + {{ forms.field('locationcode', 'Location Code', autocomplete = false, type='password') }}
    From d7dd80d752fa9f74144d97d77ab69000673fb29c Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 10:35:16 +0530 Subject: [PATCH 7/8] in admin page it shows only this years teams now --- database/handler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/handler.js b/database/handler.js index a81fb57..7a17512 100644 --- a/database/handler.js +++ b/database/handler.js @@ -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) { From 3087839e474753b2554a504db98f3a6c0f2607bc Mon Sep 17 00:00:00 2001 From: Joshua Raj Date: Thu, 13 Mar 2025 10:52:49 +0530 Subject: [PATCH 8/8] minor changes --- templates/auth/login.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/auth/login.njk b/templates/auth/login.njk index e0b5d79..ff88aa7 100644 --- a/templates/auth/login.njk +++ b/templates/auth/login.njk @@ -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')}}
    {{ forms.button('submit', 'Login', 'login') }}