Skip to content

Commit

Permalink
Working filters!
Browse files Browse the repository at this point in the history
  • Loading branch information
@garrettc
garrettc committed Aug 19, 2024
1 parent 67225f0 commit 8ff0fc3
Show file tree
Hide file tree
Showing 8 changed files with 923 additions and 42 deletions.
2 changes: 1 addition & 1 deletion digitaloxford/scss/custom/_custom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ body.home {
button {
color: $green;
background-color: $yellow;
padding: 4px 15px 2px 15px;
padding: 0 15px 0 15px;
border: 1px solid $green;

&:hover {
Expand Down
1 change: 1 addition & 0 deletions digitaloxford/settings/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
# "allauth.socialaccount",
"anymail",
"django_htmx",
"template_partials",
]

MIDDLEWARE = [
Expand Down
53 changes: 25 additions & 28 deletions digitaloxford/templates/links/link_index_page.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "base.html" %}

{% load wagtailcore_tags wagtailimages_tags %}
{% load wagtailcore_tags wagtailimages_tags partials %}

{% block body_class %}{{ page.title|slugify }}{% endblock %}

Expand All @@ -14,42 +14,39 @@ <h1>{{ page.title }}</h1>
action="{{ page.url }}"
method="get"
class="filter-links"
data-hx-target="ul.links"
data-hx-swap="outerHTML"
data-hx-get="{{ page.url }}"
data-hx-push-url="true"
>
{{ filter.form.as_p }}

<button type="submit">Filter</button>

<div class="htmx-indicator"></div>
</form>
</search>


{% if links %}
<ul class="links list-reset">
{% for link in links %}
<li class="link">
<a href="{{ link.link }}">

<div class="details">
<h2>{{ link.title }}</h2>

{% if link.description %}

<p class="description">{{ link.description }}</p>

{% endif %}

{% if link.testimonial %}

<blockquote>{{ link.testimonial }}</blockquote>

{% endif %}
</div>
</a>
</li>

{% endfor %}
</ul>
{% partialdef links-results inline=True %}
<ul class="links list-reset">
{% for link in links %}
<li class="link">
<a href="{{ link.link }}">
<div class="details">
<h2>{{ link.title }}</h2>
{% if link.description %}
<p class="description">{{ link.description }}</p>
{% endif %}

{% if link.testimonial %}
<blockquote>{{ link.testimonial }}</blockquote>
{% endif %}
</div>
</a>
</li>
{% endfor %}
</ul>
{% endpartialdef %}
{% else %}
<p>Hmm, there are no links. Possibly something has gone wrong. Sorry about that.</p>
{% endif %}
Expand Down
285 changes: 285 additions & 0 deletions home/migrations/0015_alter_basicpage_struct_org_actions_and_more.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
# Generated by Django 4.2.15 on 2024-08-19 10:37

from django.db import migrations
import wagtail.blocks
import wagtail.fields


class Migration(migrations.Migration):

dependencies = [
("home", "0014_alter_modelcategory_options"),
]

operations = [
migrations.AlterField(
model_name="basicpage",
name="struct_org_actions",
field=wagtail.fields.StreamField(
[
(
"actions",
wagtail.blocks.StructBlock(
[
(
"action_type",
wagtail.blocks.ChoiceBlock(
choices=[
("OrderAction", "OrderAction"),
("ReserveAction", "ReserveAction"),
],
verbose_name="Action Type",
),
),
(
"target",
wagtail.blocks.URLBlock(verbose_name="Target URL"),
),
(
"language",
wagtail.blocks.CharBlock(
default="en-US",
help_text="If the action is offered in multiple languages, create separate actions for each language.",
verbose_name="Language",
),
),
(
"result_type",
wagtail.blocks.ChoiceBlock(
choices=[
("Reservation", "Reservation"),
("BusReservation", "BusReservation"),
("EventReservation", "EventReservation"),
("FlightReservation", "FlightReservation"),
(
"FoodEstablishmentReservation",
"FoodEstablishmentReservation",
),
(
"LodgingReservation",
"LodgingReservation",
),
(
"RentalCarReservation",
"RentalCarReservation",
),
(
"ReservationPackage",
"ReservationPackage",
),
("TaxiReservation", "TaxiReservation"),
("TrainReservation", "TrainReservation"),
],
help_text="Leave blank for OrderAction",
required=False,
verbose_name="Result Type",
),
),
(
"result_name",
wagtail.blocks.CharBlock(
help_text='Example: "Reserve a table", "Book an appointment", etc.',
required=False,
verbose_name="Result Name",
),
),
(
"extra_json",
wagtail.blocks.RawHTMLBlock(
form_classname="monospace",
help_text="Additional JSON-LD inserted into the Action dictionary. Must be properties of https://schema.org/Action.",
required=False,
verbose_name="Additional action markup",
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Actions",
),
),
migrations.AlterField(
model_name="basicpage",
name="struct_org_hours",
field=wagtail.fields.StreamField(
[
(
"hours",
wagtail.blocks.StructBlock(
[
(
"days",
wagtail.blocks.MultipleChoiceBlock(
choices=[
("Monday", "Monday"),
("Tuesday", "Tuesday"),
("Wednesday", "Wednesday"),
("Thursday", "Thursday"),
("Friday", "Friday"),
("Saturday", "Saturday"),
("Sunday", "Sunday"),
],
help_text="For late night hours past 23:59, define each day in a separate block.",
verbose_name="Days",
),
),
(
"start_time",
wagtail.blocks.TimeBlock(
verbose_name="Opening time"
),
),
(
"end_time",
wagtail.blocks.TimeBlock(
verbose_name="Closing time"
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Hours of operation",
),
),
migrations.AlterField(
model_name="homepage",
name="struct_org_actions",
field=wagtail.fields.StreamField(
[
(
"actions",
wagtail.blocks.StructBlock(
[
(
"action_type",
wagtail.blocks.ChoiceBlock(
choices=[
("OrderAction", "OrderAction"),
("ReserveAction", "ReserveAction"),
],
verbose_name="Action Type",
),
),
(
"target",
wagtail.blocks.URLBlock(verbose_name="Target URL"),
),
(
"language",
wagtail.blocks.CharBlock(
default="en-US",
help_text="If the action is offered in multiple languages, create separate actions for each language.",
verbose_name="Language",
),
),
(
"result_type",
wagtail.blocks.ChoiceBlock(
choices=[
("Reservation", "Reservation"),
("BusReservation", "BusReservation"),
("EventReservation", "EventReservation"),
("FlightReservation", "FlightReservation"),
(
"FoodEstablishmentReservation",
"FoodEstablishmentReservation",
),
(
"LodgingReservation",
"LodgingReservation",
),
(
"RentalCarReservation",
"RentalCarReservation",
),
(
"ReservationPackage",
"ReservationPackage",
),
("TaxiReservation", "TaxiReservation"),
("TrainReservation", "TrainReservation"),
],
help_text="Leave blank for OrderAction",
required=False,
verbose_name="Result Type",
),
),
(
"result_name",
wagtail.blocks.CharBlock(
help_text='Example: "Reserve a table", "Book an appointment", etc.',
required=False,
verbose_name="Result Name",
),
),
(
"extra_json",
wagtail.blocks.RawHTMLBlock(
form_classname="monospace",
help_text="Additional JSON-LD inserted into the Action dictionary. Must be properties of https://schema.org/Action.",
required=False,
verbose_name="Additional action markup",
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Actions",
),
),
migrations.AlterField(
model_name="homepage",
name="struct_org_hours",
field=wagtail.fields.StreamField(
[
(
"hours",
wagtail.blocks.StructBlock(
[
(
"days",
wagtail.blocks.MultipleChoiceBlock(
choices=[
("Monday", "Monday"),
("Tuesday", "Tuesday"),
("Wednesday", "Wednesday"),
("Thursday", "Thursday"),
("Friday", "Friday"),
("Saturday", "Saturday"),
("Sunday", "Sunday"),
],
help_text="For late night hours past 23:59, define each day in a separate block.",
verbose_name="Days",
),
),
(
"start_time",
wagtail.blocks.TimeBlock(
verbose_name="Opening time"
),
),
(
"end_time",
wagtail.blocks.TimeBlock(
verbose_name="Closing time"
),
),
]
),
)
],
blank=True,
use_json_field=True,
verbose_name="Hours of operation",
),
),
]
Loading

0 comments on commit 8ff0fc3

Please sign in to comment.