Skip to content
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.

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

Electrika 2024 #109

Merged
merged 25 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
adf59ac
Fixed registration issue in Electrika.
Vignaraj-pai Jan 17, 2024
187c459
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
7d08a16
Refactor register function in views.py
Vignaraj-pai Jan 17, 2024
dc5326d
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 17, 2024
b88cde1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
3636dd2
Update base.html and navbar_dropdown.html templates
Vignaraj-pai Jan 17, 2024
6b1600a
Redirect to registration page if user does not exist in ElectrikaUser…
Vignaraj-pai Jan 17, 2024
a6d3eb5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
4665302
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 17, 2024
c34e24c
Update team creation and acceptance logic
Vignaraj-pai Jan 17, 2024
55ca05b
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 17, 2024
e78d3a6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
ac6e9cf
Fix team creation logic and update FAQ section
Vignaraj-pai Jan 18, 2024
90e2875
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 18, 2024
9ebbe43
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 18, 2024
b3840b9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 18, 2024
778879b
Add phone number and team-up option to user table
Vignaraj-pai Jan 19, 2024
6d5c767
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 19, 2024
37ee2e5
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 19, 2024
527ce0a
Update event description
Vignaraj-pai Jan 20, 2024
e39f34c
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 20, 2024
f8e4768
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 20, 2024
8949c42
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 22, 2024
e8967c7
Add session link to home page
Vignaraj-pai Jan 22, 2024
8e1ef3d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 22, 2024
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
2 changes: 2 additions & 0 deletions corpus/electrika/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def home(request):

registration_done = reg_end_datetime < datetime.now()

args["session_link"] = config["session-link"]

args["registration_active"] = registration_active
args["registration_done"] = registration_done

Expand Down
25 changes: 8 additions & 17 deletions corpus/templates/electrika/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,11 @@ <h2 class="card-title"> DC converters: An overview </h2>
<span>By Naman Agarwal</span>
<span>Naman Agarwal, an MSc graduate in Sustainable Energy Technology from TU Delft, served as the founding chair of the IAS society at IEEE NITK. Graduating from NITK in 2021, Naman specializes in Power Electronics, with experience from roles at Infineon and Lightyear. At Infineon, he contributed to the industrial power control division, focusing on the development of a SiC MOSFET-based wide input voltage auxiliary power supply. Later, at Lightyear, he played a role in designing a bias power supply solution for a GaN-based multilevel inverter.
</span>
<strong>23<sup>rd</sup> Jan, 2024 at 6PM IST</strong>
<div class="card-actions">
<strong>23<sup>rd</sup> Jan, 2024</strong>
<a href="{{session_link}}" target="_blank" class="btn btn-primary">
<strong>Session Link</strong>
</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -282,7 +285,7 @@ <h3 class="title text-xl md:text-2xl lg:text-3xl font-extrabold ">SCHEDULE</h3>
</div>
<div class="timeline-start md:text-end mb-10">
<time class="font-mono italic">23<sup>rd</sup> Jan, 2024</time>
<div class="text-md md:text-lg lg:text-xl font-black">Expert Talk</div>
<div class="text-lg font-black">Expert Talk</div>
6PM IST
</div>
<hr/>
Expand All @@ -292,19 +295,7 @@ <h3 class="title text-xl md:text-2xl lg:text-3xl font-extrabold ">SCHEDULE</h3>
<div class="timeline-middle">
<div class="tick h-5 w-5 m-0 p-0"></div>
</div>
<div class="timeline-end mb-10">
<time class="font-mono italic">24<sup>th</sup> Jan, 2024</time>
<div class="text-lg font-black">Preliminary test</div>

</div>
<hr />
</li>
<li>
<hr />
<div class="timeline-middle">
<div class="tick h-5 w-5 m-0 p-0"></div>
</div>
<div class="timeline-start md:text-end mb-10">
<div class="timeline-end md:text-end mb-10" >
<time class="font-mono italic">25<sup>th</sup> - 30<sup>th</sup> Jan, 2024</time>
<div class="text-lg font-black"> Knowledge sharing sessions and Tasks</div>

Expand All @@ -316,7 +307,7 @@ <h3 class="title text-xl md:text-2xl lg:text-3xl font-extrabold ">SCHEDULE</h3>
<div class="timeline-middle">
<div class="tick h-5 w-5 m-0 p-0"></div>
</div>
<div class="timeline-end mb-10">
<div class="timeline-start mb-10">
<time class="font-mono italic">31<sup>st</sup> Jan, 2024</time>
<div class="text-lg font-black">Main problem statement reveal</div>

Expand All @@ -328,7 +319,7 @@ <h3 class="title text-xl md:text-2xl lg:text-3xl font-extrabold ">SCHEDULE</h3>
<div class="timeline-middle">
<div class="tick h-5 w-5 m-0 p-0"></div>
</div>
<div class="timeline-start mb-10">
<div class="timeline-end mb-10">
<time class="font-mono italic">3<sup>rd</sup> Feb, 2024</time>
<div class="text-lg font-black">Hardware Round at <span class="text-primary sm:text-lg md:text-xl lg:text-2xl">NITK Campus</span></div>

Expand Down