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

Refactor Navbar - Daisy UI Drawer #162

Merged
merged 1 commit into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions corpus/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,8 @@
</head>

<body>
<div class="lg:hidden">
{% include "components/navbar_small.html" %}
</div>

<div class="hidden lg:block">
{% include "components/navbar_large.html" %}
</div>
{% include "components/navbar.html" %}

{% if messages %}
{% for message in messages %}
Expand Down
31 changes: 0 additions & 31 deletions corpus/templates/components/general_dropdown.html

This file was deleted.

73 changes: 73 additions & 0 deletions corpus/templates/components/navbar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{% load static %}

{% block style %}
<link rel="stylesheet" href="{% static 'css/navbar.css' %}" />
{% endblock %}

<div class="drawer ">
<input id="my-drawer-3" type="checkbox" class="drawer-toggle" />
<div class="drawer-content bg-primary text-primary-content flex flex-col">
<!-- Navbar -->
<div class="navbar w-full bg-primary text-primary-content flex justify-between">

{# SECTION: LEFT SIDE NAVBAR MOBILE #}
<div class="flex-none lg:hidden">
<label for="my-drawer-3" aria-label="open sidebar" class="btn btn-square btn-ghost">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h7"/>
</svg>
</label>
</div>
{# !SECTION #}

{# SECTION: CENTER NAVBAR MOBILE / LEFT SIDE NAVBAR DESKTOP #}
<div class="mx-2 px-2">
<a href="{% url 'index' %}" class="btn btn-ghost normal-case text-xl">
<img src="{% static 'img/ieee-nitk.png' %}" alt="IEEE NITK Logo" class="dark-logo logo">
<img src="{% static 'img/ieee-nitk-white.png' %}" alt="IEEE NITK Logo" class="light-logo logo">
</a>
</div>
{# !SECTION #}

{# SECTION: CENTER NAVBAR #}
<div class="hidden flex-none lg:block">
<ul class="menu menu-horizontal text-lg font-bold">
{% include "components/navbar_list.html" %}
</ul>
</div>
{# !SECTION #}

{# SECTION: RIGHT SIDE NAVBAR #}
<div class="flex-none lg:block">
{#{% if user.is_authenticated %}#}
<!-- <div class="w-max dropdown-content menu menu-sm mt-3 z-[1] p-2 shadow bg-base-100 rounded-box flex flex-row bg-primary text-primary-content mx-2 my-2 px-5 py-5">
{# {% include "components/internal_dropdown.html" %}#}
</div> -->
{# {% endif %}#}
{% include "components/navbar_right.html" %}
</div>
{# !SECTION #}
</div>
</div>

{# SECTION: DRAWER FOR MOBILE #}
<div class="drawer-side">
<label for="my-drawer-3" aria-label="close sidebar" class="drawer-overlay">
</label>
<ul class="menu bg-primary text-primary-content min-h-full w-80 p-4 font-bold text-lg">

{# SECTION: CLOSE BUTTON #}
<div class="flex justify-end">
<label for="my-drawer-3" aria-label="close sidebar" class="btn btn-ghost">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block h-6 w-6 stroke-current">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="M6 18L18 6M6 6l12 12"></path>
</svg>
</label>
</div>
{# !SECTION #}

{% include "components/navbar_list.html" %}
</ul>
</div>
{# !SECTION #}
</div>
7 changes: 0 additions & 7 deletions corpus/templates/components/navbar_dropdown.html

This file was deleted.

80 changes: 0 additions & 80 deletions corpus/templates/components/navbar_large.html

This file was deleted.

110 changes: 110 additions & 0 deletions corpus/templates/components/navbar_list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@

<li>
<a href="{% url 'index' %}">
Home
</a>
</li>

<li>
<a href="{% url 'about_us' %}">
About Us
</a>
</li>

<li>
<details>
<summary>
SIGs
</summary>
<ul class='bg-primary'>
<li>
<a href="{% url 'sig' sig_name='compsoc' %}">
CompSoc
</a>
</li>
<li>
<a href="{% url 'sig' sig_name='diode' %}">
Diode
</a>
</li>
<li>
<a href="{% url 'sig' sig_name='piston' %}">
Piston
</a>
</li>
</ul>
</details>
</li>

<li>
<details>
<summary>
Affinity Groups
</summary>
<ul class='bg-primary'>
<li>
<a href="{% url 'sig' sig_name='wie' %}">
WiE
</a>
</li>
<li>
<a href="{% url 'sig' sig_name='sight' %}">
SIGHT
</a>
</li>
</ul>
</details>
</li>

<li>
<details>
<summary>
Events
</summary>
<ul class='bg-primary'>
<li>
<a href="{% url 'embedathon_home' %}">
Embedathon
</a>
</li>
<li>
<a href="{% url 'impulse_home' %}">
Impulse
</a>
</li>
<li>
<a href="{% url 'electrika_home' %}">
Electrika
</a>
</li>
<li>
<a href="{% url 'skyward_expedition_home' %}">
Skyward Expedition
</a>
</li>
<li>
<a href="{% url 'robotrix_home' %}">
Robotrix
</a>
</li>
</ul>
</details>
</li>

<li>
<a href="https://ieee-nitk.github.io/blog/">
Blog
</a>
</li>

<li>
<a href="https://ieee-nitk.github.io/gyan/">
Gyan
</a>
</li>

<li>
<a href="{% url 'virtual_expo_home' %}">
Virtual Expo
</a>
</li>
23 changes: 0 additions & 23 deletions corpus/templates/components/navbar_small.html

This file was deleted.

7 changes: 5 additions & 2 deletions corpus/templates/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
class="hero min-h-screen min-w-screen bg-gradient-to-br from-sky-50 to-blue-300 dark:from-blue-950 dark:to-base-100">
<div id="particles-js" class="h-screen w-full"></div>
<div class="hero-content text-center flex-col">
<h1 class="text-3xl md:text-5xl lg:text-6xl font-extrabold">Advancing Technology for <span
id="typewriter"></span></h1>
<h1 class="text-3xl md:text-5xl lg:text-6xl font-extrabold">Advancing Technology for
<span class="typewrite" data-period="2000" data-type='[ "Solving Problems", "NITK", "Humanity"]'>
<span class="wrap"></span>
</span>
</h1>


<a class="my-5" href="https://www.ieee.org/">
Expand Down
7 changes: 7 additions & 0 deletions corpus/templates/static/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@
0% { transform: translateX(100%); }
100% { transform: translateX(0%); }
}

{% comment %}
THIS IS A HACK TO FIX THE Z-INDEX OF THE HERO CONTENT
{% endcomment %}
.hero-content {
z-index: auto !important;
}
25 changes: 25 additions & 0 deletions corpus/templates/static/css/navbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.drawer-side {
z-index: 1000;
}

img.logo {
width: 125px;
}

@media (min-width: 480px) {
img.logo {
width: 150px;
}
}

@media (min-width: 768px) {
img.logo {
width: 175px;
}
}

@media (min-width: 992px) {
img.logo {
width: 200px;
}
}
Loading
Loading