Compare commits

..

21 Commits

Author SHA1 Message Date
Daniel (elordenador) 27c06fe0b5 Merge pull request #33 from dsaub/development
Build and Push Docker Image / test (push) Waiting to run
Build and Push Docker Image / docker (push) Blocked by required conditions
Fix mobile header alignment and improve navbar responsiveness
2026-04-20 15:57:04 +02:00
Daniel (elordenador) 69da8d81e7 Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-04-20 14:08:30 +02:00
Daniel (elordenador) 4011f96ca6 Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-04-20 14:04:29 +02:00
Daniel (elordenador) f736597b8c Merge pull request #32 from dsaub/copilot/create-docker-workflow-without-push
Split Docker CI by branch: push only on `development`/`latest`, build-only elsewhere
2026-04-20 13:49:45 +02:00
copilot-swe-agent[bot] 58127de1a7 Add explicit workflow token permissions to docker-no-push workflow
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/3c214772-f4aa-46da-8791-a049cb3ca666

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:44:27 +00:00
copilot-swe-agent[bot] 03399077d0 Separate Docker workflows by branch and remove push on non-release branches
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/3c214772-f4aa-46da-8791-a049cb3ca666

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:43:26 +00:00
Daniel (elordenador) 1b872f1905 Merge pull request #30 from dsaub/copilot/fix-navbar-button-positioning
Adjust responsive navbar layout so search stays visible and action buttons collapse cleanly
2026-04-20 13:37:28 +02:00
copilot-swe-agent[bot] 769915b962 chore: merge development - resolve conflicts, keep .pyc files removed
Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:35:54 +00:00
copilot-swe-agent[bot] a5562623c1 chore: remove all tracked .pyc cache files from git index
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/98022683-01d1-44fd-8264-e4f025890faa

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:29:45 +00:00
Daniel (elordenador) 5da73a9408 Merge pull request #31 from dsaub/copilot/add-categories-toggle-button
Mostrar categorías en móvil con botón desplegable sobre el grid de productos
2026-04-20 13:23:30 +02:00
Daniel (elordenador) 3337503473 Merge branch 'development' into copilot/add-categories-toggle-button 2026-04-20 13:23:04 +02:00
copilot-swe-agent[bot] cd40105bbb test: harden navbar responsive structure checks
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/7bd2469a-6cfb-4a01-824a-07dfafa2392c

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:22:54 +00:00
Daniel (elordenador) ccd65d87a7 Delete tienda/migrations/__pycache__/0001_initial.cpython-312.pyc 2026-04-20 13:21:51 +02:00
copilot-swe-agent[bot] 23abe3f832 fix: improve responsive navbar button placement
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/7bd2469a-6cfb-4a01-824a-07dfafa2392c

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:19:30 +00:00
copilot-swe-agent[bot] 362a636f5f chore: ajustar acento en categorías tras validación
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/2db304a5-95b5-4161-99c1-ce4d68b014df

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:17:32 +00:00
copilot-swe-agent[bot] b0edc7a1f3 fix: mostrar categorias con toggle en diseño móvil
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/2db304a5-95b5-4161-99c1-ce4d68b014df

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:14:53 +00:00
copilot-swe-agent[bot] 82376b0aed chore: plan mobile categories toggle fix
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/2db304a5-95b5-4161-99c1-ce4d68b014df

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:06:46 +00:00
copilot-swe-agent[bot] 465e71e83d chore: plan navbar responsive fix
Agent-Logs-Url: https://github.com/dsaub/proyecto-final/sessions/7bd2469a-6cfb-4a01-824a-07dfafa2392c

Co-authored-by: dsaub <54474838+dsaub@users.noreply.github.com>
2026-04-20 11:04:43 +00:00
copilot-swe-agent[bot] 6b194623c8 Initial plan 2026-04-20 11:02:52 +00:00
copilot-swe-agent[bot] f4ec7aab13 Initial plan 2026-04-20 11:02:44 +00:00
Daniel (elordenador) 44bf6df686 Merge pull request #22 from dsaub/development
Enhance stock management, payment systems, and testing coverage
2026-04-20 12:25:33 +02:00
25 changed files with 83 additions and 7 deletions
+49
View File
@@ -0,0 +1,49 @@
name: Build Docker Image (No Push)
on:
push:
branches-ignore:
- development
- latest
permissions:
contents: read
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout del código
uses: actions/checkout@v6
- name: Configurar Python
uses: actions/setup-python@v6
with:
python-version: '3.14'
- name: Instalar dependencias
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Ejecutar tests
env:
DJANGO_SETTINGS_MODULE: proyecto.settings
run: |
python manage.py test
docker:
runs-on: ubuntu-latest
needs: test
permissions:
contents: read
steps:
- name: Checkout del código
uses: actions/checkout@v6
- name: Configurar Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Build (sin push)
uses: docker/build-push-action@v6
with:
context: .
push: false
+3 -2
View File
@@ -3,7 +3,8 @@ name: Build and Push Docker Image
on:
push:
branches:
- '**' # Esto aplica para cualquier rama
- development
- latest
jobs:
test:
@@ -56,4 +57,4 @@ jobs:
context: .
push: true
# Sanitizamos el nombre de la rama (reemplazamos / por -)
tags: ghcr.io/dsaub/proyecto-mvc:${{ env.IMAGE_TAG }}
tags: ghcr.io/dsaub/proyecto-mvc:${{ env.IMAGE_TAG }}
+3 -1
View File
@@ -3,5 +3,7 @@ db.sqlite3
.venv
.env
logs/
__pycache__/
*.pyc
tienda/__pycache__/
proyecto/__pycache__/
proyecto/__pycache__/
Binary file not shown.
Binary file not shown.
+20 -4
View File
@@ -2,8 +2,24 @@
{% load vat_filters %}
{% block content %}
<div class="row mt-2">
<div class="col-md-2 d-none d-lg-block">
<h5 class="categorias-titulo">Categorias</h5>
<div class="col-12 d-lg-none mb-3">
<button class="btn btn-outline-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#mobileCategoriasCollapse" aria-expanded="false" aria-controls="mobileCategoriasCollapse">
Categorías
</button>
<div class="collapse mt-2" id="mobileCategoriasCollapse">
<ul class="list-group categorias-lista">
{% if categories %}
{% for category in categories %}
<li class="list-group-item categoria-item">
<a href="{% url 'categoria' category.id %}">{{ category.name }}</a>
</li>
{% endfor %}
{% endif %}
</ul>
</div>
</div>
<div class="col-lg-2 d-none d-lg-block">
<h5 class="categorias-titulo">Categorías</h5>
<ul class="list-group categorias-lista">
{% if categories %}
{% for category in categories %}
@@ -14,7 +30,7 @@
{% endif %}
</ul>
</div>
<div class="col-12 col-md-10 grid">
<div class="col-12 col-lg-10 grid">
{% if products %}
{% for producto in products %}
<div class="card card-producto mt-5" style="width: 18rem;">
@@ -39,4 +55,4 @@
{% endif %}
</div>
</div>
{% endblock %}
{% endblock %}
+8
View File
@@ -1358,6 +1358,14 @@ class EndpointViewTests(TestCase):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
def test_index_shows_mobile_categories_toggle(self):
response = self.client.get(reverse("index"))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'data-bs-target="#mobileCategoriasCollapse"')
self.assertContains(response, 'id="mobileCategoriasCollapse"')
self.assertContains(response, "Categorías")
def test_home_header_renders_mobile_title_outside_collapsible_menu(self):
response = self.client.get(reverse("home"))
self.assertEqual(response.status_code, 200)