Skip to content

fix: Restrict course listing to published courses and adjust map link placement (#349 issue) #362

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

Closed
ajaykumar246 wants to merge 2 commits into from
Closed

fix: Restrict course listing to published courses and adjust map link placement (#349 issue) #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
184ab8b
fix : classes near me alignment and course filter.
ajaykumar246 Mar 29, 2025
d57812a
fix: Restrict course listing to published courses and adjust map link…
ajaykumar246 Mar 29, 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
21 changes: 13 additions & 8 deletions web/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,28 +154,33 @@
<body class="min-h-screen flex flex-col bg-white text-gray-900 dark:bg-black dark:text-gray-100 transition-colors duration-300 overflow-x-hidden">
<!-- HEADER -->
<header class="w-full bg-teal-600 dark:bg-teal-800 text-white shadow-md">
<div class="max-w-[90rem] mx-auto px-4 md:px-6 flex items-center justify-between h-[70px] relative">
<div class="max-w-[90rem] mx-auto px-4 md:px-6 flex items-center justify-between h-[70px] relative gap-2">
<!-- Logo and Title -->
<a href="{% url 'index' %}" class="flex items-center space-x-2">
<a href="{% url 'index' %}"
class="flex flex-1 min-w-[150px] max-w-[50%] items-center space-x-2">
<img src="{% static 'images/logo.png' %}"
alt="Alpha One Labs Logo"
height="40"
width="40"
class="h-10 w-10" />
<span class="text-xl font-bold text-white">Alpha One Labs</span>
<span class="text-xl font-bold text-white ">Alpha One Labs</span>
</a>
<!-- Mobile Menu Button -->
<button class="md:hidden p-2 hover:bg-teal-700 rounded-lg"
onclick="toggleMobileMenu()">
<i class="fas fa-bars text-xl"></i>
</button>
<!-- Nav and additional actions -->
<nav class="hidden md:flex items-center space-x-6">
<nav class="hidden md:flex items-center space-x-3">
<!-- Main navigation links with dropdowns -->
<div class="flex space-x-6 items-center">
<a class="nav-link" href="{% url 'classes_map' %}">
<i class="fas fa-map-marker-alt"></i> Classes Near Me
</a>
<div class="flex space-x-2 items-center">
<div class="relative group ">
<a class="nav-link flex flex-1 min-w-[150px] max-w-[50%] items-center space-x-2"
href="{% url 'classes_map' %}">
<i class="fas fa-map-marker-alt"></i>
<span>Classes Near Me</span>
</a>
</div>
<!-- LEARN Dropdown -->
<div class="relative group">
<button class="flex items-center space-x-1 text-white hover:text-teal-100 focus:outline-none py-2">
Expand Down
4 changes: 2 additions & 2 deletions web/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6059,7 +6059,7 @@ def classes_map(request):
teaching_style = request.GET.get("teaching_style")
# Apply filters
if course_id:
sessions = sessions.filter(course_id=course_id)
sessions = sessions.filter(course_id=course_id, status="published")
if teaching_style:
sessions = sessions.filter(teaching_style=teaching_style)
# Fetch only necessary course fields
Expand All @@ -6086,7 +6086,7 @@ def map_data_api(request):
age_group = request.GET.get("age_group")

if course_id:
sessions = sessions.filter(course__id=course_id)
sessions = sessions.filter(course__id=course_id, status="published")
if age_group:
sessions = sessions.filter(course__level=age_group)

Expand Down