diff --git a/dailystone/templates/dailystone/search.html b/dailystone/templates/dailystone/search.html new file mode 100644 index 0000000..4cba2ac --- /dev/null +++ b/dailystone/templates/dailystone/search.html @@ -0,0 +1,220 @@ + + + + + + Search — Daily Stone + + + +
+ +
+
+
Daily Stone
+

Search Minerals

+
+ +
+ + +
+ + {% if results %} +
{{ results|length }} result{{ results|length|pluralize }} for "{{ query }}"
+ + {% else %} +
+

No minerals found for "{{ query }}"

+
+ {% endif %} + + +
+ + diff --git a/dailystone/templates/dailystone/stone.html b/dailystone/templates/dailystone/stone.html index 82f86e5..10d6ccc 100644 --- a/dailystone/templates/dailystone/stone.html +++ b/dailystone/templates/dailystone/stone.html @@ -60,14 +60,90 @@ margin-bottom: 0.25rem; } - .random-btn { + .header-actions { position: absolute; top: 1.5rem; right: 0; + display: flex; + gap: 0.4rem; + align-items: center; + } + + .search-toggle { + display: inline-flex; + align-items: center; + justify-content: center; + width: 34px; + height: 34px; + font-family: 'Georgia', serif; + color: var(--stone-text); + background: var(--stone-muted); + border: 1px solid var(--border); + border-radius: 3px; + text-decoration: none; + cursor: pointer; + transition: background 0.2s; + } + + .search-toggle:hover { + background: color-mix(in srgb, var(--stone-color) 20%, #f5f5f0); + } + + .search-toggle svg { + width: 14px; + height: 14px; + } + + .search-bar { + display: none; + margin: -0.5rem 0 1.5rem; + } + + .search-bar.open { + display: block; + } + + .search-bar form { + display: flex; + gap: 0.4rem; + } + + .search-bar input[type="text"] { + flex: 1; + padding: 0.5rem 0.7rem; + font-family: 'Georgia', serif; + font-size: 0.9rem; + border: 1px solid var(--border); + border-radius: 3px; + background: #fff; + color: var(--text); + outline: none; + } + + .search-bar input[type="text"]:focus { + border-color: var(--stone-color); + } + + .search-bar button { + padding: 0.5rem 0.75rem; + font-family: 'Georgia', serif; + font-size: 0.85rem; + color: var(--stone-text); + background: var(--stone-muted); + border: 1px solid var(--border); + border-radius: 3px; + cursor: pointer; + } + + .search-bar button:hover { + background: color-mix(in srgb, var(--stone-color) 20%, #f5f5f0); + } + + .random-btn { display: inline-flex; align-items: center; gap: 0.35rem; - padding: 0.4rem 0.75rem; + padding: 0.4rem 0.65rem; font-family: 'Georgia', serif; font-size: 0.8rem; color: var(--stone-text); @@ -271,6 +347,13 @@ text-decoration: underline; } + .page-footer .mineral-count { + display: block; + margin-top: 0.5rem; + font-size: 0.75rem; + color: var(--text-secondary); + } + .page-footer .home-link { display: inline-block; margin-top: 1rem; @@ -313,20 +396,34 @@ {% if mineral %}
- - - - - - - Random - +
+ + + + + + + + + + + + Random + +
{% if is_random %}Random Stone{% else %}Daily Stone{% endif %}

{{ mineral.name }}

{% if mineral.formula %}
{{ mineral.formula|chem_formula }}
{% endif %}
{{ today|date:"F j, Y" }}
+ +
{% if mineral.image_urls %} @@ -431,6 +528,9 @@ Read more on Wikipedia → {% endif %} + {% if total_minerals %} + {{ total_minerals }} minerals in collection + {% endif %}
k-boris.tech diff --git a/dailystone/urls.py b/dailystone/urls.py index cdd5e88..91654bd 100644 --- a/dailystone/urls.py +++ b/dailystone/urls.py @@ -7,4 +7,6 @@ app_name = 'dailystone' urlpatterns = [ path('', views.daily_stone, name='daily_stone'), path('random/', views.random_stone, name='random_stone'), + path('search/', views.search_minerals, name='search'), + path('mineral//', views.mineral_detail, name='mineral_detail'), ] diff --git a/dailystone/views.py b/dailystone/views.py index b4810a5..1945ac0 100644 --- a/dailystone/views.py +++ b/dailystone/views.py @@ -1,11 +1,14 @@ from datetime import date -from django.shortcuts import render, redirect -from django.urls import reverse +from django.shortcuts import render, redirect, get_object_or_404 from .models import Mineral +def _base_context(): + return {'total_minerals': Mineral.objects.count()} + + def daily_stone(request): today = date.today() day = today.timetuple().tm_yday @@ -14,11 +17,9 @@ def daily_stone(request): if total == 0: return render(request, 'dailystone/stone.html', {'mineral': None}) - # Wrap around if we have fewer minerals than days in the year index = (day - 1) % total + 1 mineral = Mineral.objects.filter(day_of_year=index).first() - # Fallback: pick by modulo of pk list if not mineral: minerals = list(Mineral.objects.all()) mineral = minerals[(day - 1) % len(minerals)] @@ -26,6 +27,7 @@ def daily_stone(request): return render(request, 'dailystone/stone.html', { 'mineral': mineral, 'today': today, + **_base_context(), }) @@ -37,4 +39,31 @@ def random_stone(request): 'mineral': mineral, 'today': date.today(), 'is_random': True, + **_base_context(), + }) + + +def mineral_detail(request, pk): + mineral = get_object_or_404(Mineral, pk=pk) + return render(request, 'dailystone/stone.html', { + 'mineral': mineral, + 'today': date.today(), + **_base_context(), + }) + + +def search_minerals(request): + query = request.GET.get('q', '').strip() + if not query: + return redirect('dailystone:daily_stone') + + results = Mineral.objects.filter(name__icontains=query) + + if results.count() == 1: + return redirect('dailystone:mineral_detail', pk=results.first().pk) + + return render(request, 'dailystone/search.html', { + 'query': query, + 'results': results, + **_base_context(), })