From 846418e9a4c854ceef12058562b813f1fd329879 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:51:48 +0100 Subject: [PATCH 01/21] Add builds card to frontend --- frontend/src/App.svelte | 77 ++++++++++++++++++++- frontend/src/services/api.js | 4 ++ frontend/src/styles/app.css | 129 +++++++++++++++++++++++++++++++++++ 3 files changed, 208 insertions(+), 2 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 0006c32..c1e2c66 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1,7 +1,7 @@ @@ -246,6 +262,63 @@ {/if} +
+
+
+

Historial

+

Builds recientes en Jenkins

+
+ {#if loadingHistory} + actualizando... + {/if} +
+ + {#if buildHistory.length} +
+ {#each buildHistory as build} +
+ +
+ + #{build.number} + {build.branch} +
+
+ #{build.commit} + {build.finished_at} +
+
+
+

+ Autor + {build.author} +

+

+ Duración + {build.duration_seconds} s +

+ {#if build.status === 'failed'} +

+ Stage + {build.failed_stage} +

+

+ {build.fun_message} +

+ {:else} +

+ Correcto +

+ {/if} +
+
+ {/each} +
+ {:else if !loadingHistory} +

No hay builds registradas aún.

+ {/if} +
+
Desayunos
diff --git a/frontend/src/services/api.js b/frontend/src/services/api.js index ff99beb..6713981 100644 --- a/frontend/src/services/api.js +++ b/frontend/src/services/api.js @@ -20,3 +20,7 @@ export async function getPrices() { export async function getCiStatus() { return getJson('/health'); } + +export async function getBuildHistory() { + return getJson('/builds'); +} diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index e6aa29d..6866649 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -477,3 +477,132 @@ li { .mono { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; } + +.history-card { + background: linear-gradient(180deg, #0f172a, #0c1228); +} + +.history-list { + display: flex; + flex-direction: column; + gap: 0.6rem; +} + +.history-item { + border: 1px solid rgba(255, 255, 255, 0.06); + border-radius: 12px; + background: rgba(255, 255, 255, 0.02); + overflow: hidden; + transition: border-color 160ms ease, box-shadow 160ms ease; +} + +.history-item summary { + display: flex; + align-items: center; + justify-content: space-between; + gap: 0.8rem; + padding: 0.75rem 0.9rem; + list-style: none; + cursor: pointer; +} + +.history-item summary::-webkit-details-marker { + display: none; +} + +.summary-left { + display: flex; + align-items: center; + gap: 0.55rem; + flex-wrap: wrap; +} + +.summary-title { + font-weight: 800; + color: #f8fafc; +} + +.summary-branch { + color: #a5b4fc; + font-weight: 700; + font-size: 0.95rem; +} + +.summary-meta { + display: flex; + gap: 0.6rem; + flex-wrap: wrap; + color: #cbd5f5; + font-size: 0.9rem; + justify-content: flex-end; +} + +.status-dot { + width: 10px; + height: 10px; + border-radius: 50%; + display: inline-block; +} + +.status-dot.success { + background: #22c55e; + box-shadow: 0 0 8px rgba(34, 197, 94, 0.6); +} + +.status-dot.failed { + background: #f87171; + box-shadow: 0 0 8px rgba(248, 113, 113, 0.5); +} + +.history-body { + padding: 0.75rem 0.9rem 0.9rem; + border-top: 1px solid rgba(255, 255, 255, 0.05); + display: flex; + flex-direction: column; + gap: 0.35rem; +} + +.history-row { + margin: 0; + display: flex; + justify-content: space-between; + font-weight: 700; + color: #e2e8f0; +} + +.history-row span:last-child { + color: #cbd5f5; +} + +.history-message { + margin: 0.2rem 0 0; + background: rgba(248, 113, 113, 0.12); + border: 1px dashed rgba(248, 113, 113, 0.5); + padding: 0.5rem 0.75rem; + border-radius: 10px; + color: #fecaca; +} + +.history-message.success { + background: rgba(34, 197, 94, 0.12); + border-color: rgba(34, 197, 94, 0.4); + color: #bbf7d0; +} + +.history-item[open] { + box-shadow: 0 10px 30px rgba(0, 0, 0, 0.28); +} + +.history-item.success { + border-color: rgba(34, 197, 94, 0.3); +} + +.history-item.failed { + border-color: rgba(248, 113, 113, 0.35); +} + +.chip.danger { + background: rgba(248, 113, 113, 0.2); + color: #fecdd3; + border: 1px solid rgba(248, 113, 113, 0.4); +} From 80b9f4cb9f2d68142ebf7ae883f63b608b6af5ff Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:51:54 +0100 Subject: [PATCH 02/21] Add mock data --- backend/app/data/build_history.json | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 backend/app/data/build_history.json diff --git a/backend/app/data/build_history.json b/backend/app/data/build_history.json new file mode 100644 index 0000000..cf07192 --- /dev/null +++ b/backend/app/data/build_history.json @@ -0,0 +1,44 @@ +{ + "builds": [ + { + "number": 205, + "status": "success", + "branch": "main", + "commit": "9ac3f91", + "author": "Miau", + "finished_at": "2024-05-04T10:20:00Z", + "duration_seconds": 312 + }, + { + "number": 204, + "status": "failed", + "branch": "feature/nosetioestoesunmock", + "commit": "75c4ba2", + "author": "Miau", + "finished_at": "2024-05-04T09:50:00Z", + "duration_seconds": 188, + "failed_stage": "tests", + "fun_message": "woops" + }, + { + "number": 203, + "status": "failed", + "branch": "main", + "commit": "512ca7e", + "author": "Miau", + "finished_at": "2024-05-04T09:10:00Z", + "duration_seconds": 140, + "failed_stage": "lint", + "fun_message": "Nadie pasa en local el linter" + }, + { + "number": 202, + "status": "success", + "branch": "hotfix/tehedichoqueestoesunmock?", + "commit": "c73d8ab", + "author": "Miau", + "finished_at": "2024-05-03T18:30:00Z", + "duration_seconds": 276 + } + ] +} From 16ff8b13808b9661b1d271558805e0f87f811aff Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:52:10 +0100 Subject: [PATCH 03/21] Add build endpoint --- backend/app/main.py | 6 ++++++ backend/app/services/builds.py | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 backend/app/services/builds.py diff --git a/backend/app/main.py b/backend/app/main.py index f50c67e..41efe2d 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -4,6 +4,7 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware from app.services.menu import build_menu +from app.services.builds import build_history from app.services.prices import prices_payload, random_price from app.settings import settings @@ -55,3 +56,8 @@ def prices(): @app.get("/prices/{item}") def price_for_item(item: str): return random_price(item) + + +@app.get("/builds") +def builds(): + return build_history() diff --git a/backend/app/services/builds.py b/backend/app/services/builds.py new file mode 100644 index 0000000..14edc14 --- /dev/null +++ b/backend/app/services/builds.py @@ -0,0 +1,22 @@ +import json +from pathlib import Path +from typing import Dict, List + +DATA_DIR = Path(__file__).resolve().parent.parent / "data" + + +def _load_json(filename: str) -> Dict: + path = DATA_DIR / filename + with open(path, encoding="utf-8") as file: + return json.load(file) + + +def _sort_builds(builds: List[Dict]) -> List[Dict]: + return sorted(builds, key=lambda build: build.get("number", 0), reverse=True) + + +def build_history() -> Dict: + """Return Jenkins build history data.""" + history = _load_json("build_history.json") + builds = history.get("builds", []) + return {"builds": _sort_builds(builds)} From 22d75adea27774183e3e9f738325358de902d440 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:52:31 +0100 Subject: [PATCH 04/21] Add tests --- backend/tests/test_api.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/backend/tests/test_api.py b/backend/tests/test_api.py index 3a47f10..4cbb309 100644 --- a/backend/tests/test_api.py +++ b/backend/tests/test_api.py @@ -34,3 +34,24 @@ def test_prices_random_list(): first = items[0] assert "item" in first and "price" in first and "currency" in first assert all(item["price"] <= 3 for item in items) + + +def test_build_history(): + response = client.get("/builds") + assert response.status_code == 200 + body = response.json() + builds = body["builds"] + assert isinstance(builds, list) + assert len(builds) >= 1 + + first = builds[0] + assert "number" in first and "status" in first and "branch" in first + + # Ensure descending order by build number + numbers = [build["number"] for build in builds] + assert numbers == sorted(numbers, reverse=True) + + failed_builds = [build for build in builds if build["status"] == "failed"] + if failed_builds: + failed = failed_builds[0] + assert "failed_stage" in failed and "fun_message" in failed From cde0b767d261acd42b650f3cecb4d5079b7e6860 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:52:45 +0100 Subject: [PATCH 05/21] Ruff fix --- backend/app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/app/main.py b/backend/app/main.py index 41efe2d..84d0e02 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -3,8 +3,8 @@ import time from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from app.services.menu import build_menu from app.services.builds import build_history +from app.services.menu import build_menu from app.services.prices import prices_payload, random_price from app.settings import settings From 3360a8fc60d3770f92e8b1c02ff69c77e85497eb Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:15:26 +0100 Subject: [PATCH 06/21] Add fish easter egg --- frontend/src/App.svelte | 60 ++++++++++++++++++++++++++++++++----- frontend/src/styles/app.css | 53 ++++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 9 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index c1e2c66..61d9e54 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -3,6 +3,7 @@ import { API_BASE, ENABLE_POLLING } from './config'; import { getBuildHistory, getCiStatus, getMenu, getPrices } from './services/api'; import { prettify } from './utils/text'; + import { fly, fade } from 'svelte/transition'; let menu = null; let prices = []; @@ -13,6 +14,16 @@ let loadingCiStatus = true; let buildHistory = []; let loadingHistory = true; + let showFishToast = false; + + function onFishClick() { + if (showFishToast) return; + + showFishToast = true; + setTimeout(() => { + showFishToast = false; + }, 2800); + } async function fetchMenu() { loadingMenu = true; @@ -129,7 +140,9 @@
{#if menu} -
+
+ +
+
+
+

Open Bokeron

+

Asociación de software libre

+
+ openbokeron.org +
+ +
+
+

+ La peña que monta este tinglado. Y como esta es mi web pues hago spam gratis y así ves esta + tarjeta durante todo el taller. De nada. +

+
    +
  • Usamos Linux y te juzgamos duramente si te vemos con un Windows.
  • +
  • A veces hacemos cosas, #HazCosas dicen aquí en la ETSII.
  • +
  • ¡Encuesta! Anda, rellena esta encuesta de satisfacción del taller no me seas: [URL].
  • +
+ +
+ +
+
diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 4512e09..00636fc 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -184,6 +184,23 @@ button.outline { border: 1px solid rgba(255, 255, 255, 0.05); } +.openbokeron-card { + background: + radial-gradient(circle at 12% 18%, rgba(34, 211, 238, 0.22), transparent 26%), + radial-gradient(circle at 85% -5%, rgba(124, 58, 237, 0.2), transparent 28%), + linear-gradient(180deg, #0b1224, #0e1530); + position: relative; + overflow: hidden; +} + +.openbokeron-card::after { + content: ''; + position: absolute; + inset: 0; + background: linear-gradient(135deg, rgba(255, 255, 255, 0.02), transparent 55%); + pointer-events: none; +} + .card-head { display: flex; justify-content: space-between; @@ -211,6 +228,21 @@ button.outline { font-size: 0.85rem; } +.tag.link-tag { + text-decoration: none; + border: 1px solid rgba(165, 180, 252, 0.4); + transition: + border-color 120ms ease, + color 120ms ease, + background 120ms ease; +} + +.tag.link-tag:hover { + border-color: rgba(165, 180, 252, 0.8); + background: rgba(165, 180, 252, 0.16); + color: #c7d2fe; +} + .menu-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); @@ -368,6 +400,93 @@ li { align-items: flex-end; } +.openbokeron-body { + display: grid; + grid-template-columns: minmax(0, 1.2fr) minmax(220px, 0.8fr); + gap: 1rem; + align-items: center; +} + +.openbokeron-copy { + display: flex; + flex-direction: column; + gap: 0.65rem; +} + +.openbokeron-text { + margin: 0; + color: #e2e8f0; + line-height: 1.5; +} + +.openbokeron-list { + margin: 0; + padding-left: 1.1rem; + color: #cbd5f5; + display: flex; + flex-direction: column; + gap: 0.35rem; +} + +.openbokeron-actions { + display: flex; + gap: 0.6rem; + align-items: center; + flex-wrap: wrap; +} + +.button-link { + display: inline-flex; + align-items: center; + gap: 0.35rem; + background: linear-gradient(120deg, #22d3ee, #38bdf8); + color: #0b1224; + text-decoration: none; + font-weight: 800; + padding: 0.65rem 1rem; + border-radius: 12px; + box-shadow: 0 12px 26px rgba(34, 211, 238, 0.25); + transition: + transform 120ms ease, + box-shadow 120ms ease; +} + +.button-link:hover { + transform: translateY(-1px); + box-shadow: 0 14px 28px rgba(56, 189, 248, 0.3); +} + +.openbokeron-logo { + display: flex; + flex-direction: column; + gap: 0.4rem; + align-items: center; + text-align: center; +} + +.logo-bubble { + width: 100%; + min-height: 170px; + border-radius: 16px; + border: 1px dashed rgba(148, 163, 184, 0.38); + background: rgba(255, 255, 255, 0.04); + display: flex; + align-items: center; + justify-content: center; + padding: 0.9rem; + box-shadow: + inset 0 0 0 1px rgba(255, 255, 255, 0.03), + 0 12px 28px rgba(0, 0, 0, 0.25); +} + +.logo-bubble img { + display: block; + max-width: 160px; + width: 100%; + height: auto; + filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.32)); +} + .price-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); @@ -455,6 +574,16 @@ li { } } +@media (max-width: 780px) { + .openbokeron-body { + grid-template-columns: 1fr; + } + + .openbokeron-actions { + justify-content: flex-start; + } +} + @media (min-width: 980px) { .menu-card { grid-column: span 2; From 9bc96e6f41e1423c0d22709360b583b54f69359d Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:59:45 +0100 Subject: [PATCH 10/21] Change style --- frontend/src/App.svelte | 82 +++++++++++++++++++++---------------- frontend/src/styles/app.css | 59 +++++++++++++++++--------- 2 files changed, 87 insertions(+), 54 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 67281fc..9c82b04 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -391,48 +391,60 @@
-
-
-

Open Bokeron

-

Asociación de software libre

-
+
+
+

Open Bokeron

+

Quiénes estamos detrás del taller

+
+ + openbokeron.org + +
+ +
+
+

+ Somos Open Bokeron, la asociación de software libre de la ETSII. +

+ +

+ Este tinglado lo hemos montado nosotros, así que sí: esta tarjeta se queda todo el + taller +

+ +
    +
  • Usamos Linux y te juzgamos severamente si vienes con Windows.
  • +
  • A veces hacemos cosas. #HazCosas dicen por aquí en la ETSII.
  • +
+ +
openbokeron.org + Conócenos +
+
-
-
-

- La peña que monta este tinglado. Y como esta es mi web pues hago spam gratis y así ves esta - tarjeta durante todo el taller. De nada. -

-
    -
  • Usamos Linux y te juzgamos duramente si te vemos con un Windows.
  • -
  • A veces hacemos cosas, #HazCosas dicen aquí en la ETSII.
  • -
  • ¡Encuesta! Anda, rellena esta encuesta de satisfacción del taller no me seas: [URL].
  • -
- -
- +
+ + + + diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 00636fc..2718590 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -402,32 +402,47 @@ li { .openbokeron-body { display: grid; - grid-template-columns: minmax(0, 1.2fr) minmax(220px, 0.8fr); + grid-template-columns: minmax(0, 1.4fr) minmax(180px, 0.6fr); gap: 1rem; - align-items: center; + align-items: flex-start; } .openbokeron-copy { display: flex; flex-direction: column; - gap: 0.65rem; + gap: 0.4rem; +} + +.openbokeron-copy>*+* { + margin-top: 0.3rem; } .openbokeron-text { margin: 0; color: #e2e8f0; line-height: 1.5; + font-size: 0.95rem; } +.openbokeron-text.subtle { + opacity: 0.75; + font-size: 0.9rem; +} + + + .openbokeron-list { - margin: 0; + margin: 0.2rem 0 0; padding-left: 1.1rem; color: #cbd5f5; + font-size: 0.88rem; + opacity: 0.85; display: flex; flex-direction: column; - gap: 0.35rem; + gap: 0.3rem; } + .openbokeron-actions { display: flex; gap: 0.6rem; @@ -456,37 +471,43 @@ li { box-shadow: 0 14px 28px rgba(56, 189, 248, 0.3); } +.button-link.subtle { + background: rgba(255, 255, 255, 0.08); + color: #e2e8f0; + box-shadow: none; + font-weight: 700; +} + +.button-link.subtle:hover { + background: rgba(255, 255, 255, 0.14); +} + + .openbokeron-logo { display: flex; - flex-direction: column; - gap: 0.4rem; align-items: center; - text-align: center; + justify-content: center; } .logo-bubble { - width: 100%; - min-height: 170px; - border-radius: 16px; - border: 1px dashed rgba(148, 163, 184, 0.38); + min-height: 120px; + border-radius: 14px; + border: 1px dashed rgba(148, 163, 184, 0.35); background: rgba(255, 255, 255, 0.04); display: flex; align-items: center; justify-content: center; - padding: 0.9rem; - box-shadow: - inset 0 0 0 1px rgba(255, 255, 255, 0.03), - 0 12px 28px rgba(0, 0, 0, 0.25); + padding: 0.8rem; } .logo-bubble img { - display: block; - max-width: 160px; + max-width: 120px; width: 100%; height: auto; - filter: drop-shadow(0 12px 28px rgba(0, 0, 0, 0.32)); + opacity: 0.9; } + .price-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); From 29487436258380547183db4447cae0a490e54130 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:11:03 +0100 Subject: [PATCH 11/21] Change layout and texts --- frontend/src/App.svelte | 161 +++++++++++++++++++----------------- frontend/src/styles/app.css | 7 +- 2 files changed, 85 insertions(+), 83 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 9c82b04..feb4870 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -99,8 +99,8 @@ está inspirada en la de nuestra querida escuela.

- - + +

Backend: {API_BASE} · Endpoints: /menu · /prices · /prices/:item · /health @@ -255,11 +255,42 @@ {/if} +

+
+
Desayunos
+ {#if loadingPrices} + cargando... + {/if} +
+ + {#if prices.length} +
+ {#each prices as price} +
+

{prettify(price.item)}

+

{price.price} €

+

{price.generated_at}

+
+ {/each} +
+

+ Dependiendo de si vas por la mañana o por la tarde los precios cambian. No sé, + como no ponen los precios al público... :p +

+ {:else if !loadingPrices} +

No hay precios que mostrar.

+ {/if} +
+

Estado del sistema

-

Información de build y backend

+

+ Información de build y backend. Tanto el Build, Commit y Autor lo + recuperamos gracias a Jenkins, inyectando ciertas variables a la hora de + hacer despliegue del backend. +

{#if loadingCiStatus} comprobando... @@ -309,7 +340,11 @@

Historial

-

Builds recientes en Jenkins

+

+ Builds recientes en Jenkins. Esto lo conseguimos gracias a que Jenkins nos + expone una API REST muy maja para consultar información de los jobs y + builds. +

{#if loadingHistory} actualizando... @@ -363,88 +398,60 @@ {/if}
-
-
-
Desayunos
- {#if loadingPrices} - cargando... - {/if} -
- - {#if prices.length} -
- {#each prices as price} -
-

{prettify(price.item)}

-

{price.price} €

-

{price.generated_at}

-
- {/each} -
-

- Dependiendo de si vas por la mañana o por la tarde los precios cambian. No sé, - como no ponen los precios al público... :p -

- {:else if !loadingPrices} -

No hay precios que mostrar.

- {/if} -
-
-
-
-

Open Bokeron

-

Quiénes estamos detrás del taller

-
- - openbokeron.org - -
- -
-
-

- Somos Open Bokeron, la asociación de software libre de la ETSII. -

- -

- Este tinglado lo hemos montado nosotros, así que sí: esta tarjeta se queda todo el - taller -

- -
    -
  • Usamos Linux y te juzgamos severamente si vienes con Windows.
  • -
  • A veces hacemos cosas. #HazCosas dicen por aquí en la ETSII.
  • -
- -
+
+
+

Open Bokeron

+

Quiénes estamos detrás del taller

+
- Conócenos + openbokeron.org
-
- -
- + diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 2718590..370a26d 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -413,7 +413,7 @@ li { gap: 0.4rem; } -.openbokeron-copy>*+* { +.openbokeron-copy > * + * { margin-top: 0.3rem; } @@ -429,8 +429,6 @@ li { font-size: 0.9rem; } - - .openbokeron-list { margin: 0.2rem 0 0; padding-left: 1.1rem; @@ -442,7 +440,6 @@ li { gap: 0.3rem; } - .openbokeron-actions { display: flex; gap: 0.6rem; @@ -482,7 +479,6 @@ li { background: rgba(255, 255, 255, 0.14); } - .openbokeron-logo { display: flex; align-items: center; @@ -507,7 +503,6 @@ li { opacity: 0.9; } - .price-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); From bea6b2aaefabad870e4f368e2ef6ab1f54c92ca7 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 08:41:28 +0100 Subject: [PATCH 12/21] Fetch builds from Jenkins API --- backend/app/services/builds.py | 48 +++++++++++++++++++++++++++++++++- backend/app/settings.py | 4 +++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/backend/app/services/builds.py b/backend/app/services/builds.py index 14edc14..e63d7e6 100644 --- a/backend/app/services/builds.py +++ b/backend/app/services/builds.py @@ -1,7 +1,12 @@ +import base64 import json from pathlib import Path from typing import Dict, List +import requests + +from app.settings import settings + DATA_DIR = Path(__file__).resolve().parent.parent / "data" @@ -14,9 +19,50 @@ def _load_json(filename: str) -> Dict: def _sort_builds(builds: List[Dict]) -> List[Dict]: return sorted(builds, key=lambda build: build.get("number", 0), reverse=True) +def normalize_build(build: Dict) -> Dict: + changes = build.get("changeSets", []) + commits = [] + + for cs in changes: + for item in cs.get("items", []): + commits.append({ + "commit": item.get("commitId", "")[:7], + "message": item.get("msg", ""), + "author": item.get("author", {}).get("fullName", "unknown"), + }) + + return { + "number": build.get("number"), + "status": (build.get("result") or "RUNNING").lower(), + "finished_at": build.get("timestamp"), + "duration_seconds": build.get("duration", 0) // 1000, + "url": build.get("url"), + "commits": commits, + } + + +def _auth_header() -> Dict[str, str]: + token = f"{settings.jenkins_user}:{settings.jenkins_token}" + encoded = base64.b64encode(token.encode()).decode() + return {"Authorization": f"Basic {encoded}"} + +def fetch_builds(limit: int = 5) -> List[Dict]: + url = ( + f"{settings.jenkins_base_url}/job/{settings.jenkins_job_name}/api/json" + "?tree=builds[number,url,result,timestamp,duration," + "changesets[items[commitId,msg,author[fullName]]]]" + ) + + resp = requests.get(url, headers = _auth_header(), timeout=5) + resp.raise_for_status() + + builds = resp.json().get("builds", []) + return builds[:limit] def build_history() -> Dict: """Return Jenkins build history data.""" history = _load_json("build_history.json") builds = history.get("builds", []) - return {"builds": _sort_builds(builds)} + return { + "builds": [normalize_build(b) for b in builds] + } diff --git a/backend/app/settings.py b/backend/app/settings.py index 11d9b77..b69ea53 100644 --- a/backend/app/settings.py +++ b/backend/app/settings.py @@ -8,6 +8,10 @@ class RuntimeConfig: git_commit: str = os.getenv("GIT_COMMIT", "local") build_number: str = os.getenv("BUILD_NUMBER", "-") commit_author: str = os.getenv("COMMIT_AUTHOR", "local") + jenkins_base_url: str = os.getenv("JENKINS_BASE_URL", "localhost:8080") + jenkins_job_name: str = os.getenv("JENKINS_JOB_NAME", "") + jenkins_user: str = os.getenv("JENKINS_USER", "") + jenkins_token: str = os.getenv("JENKINS_TOKEN", "") settings = RuntimeConfig() From 64b0e7724d8a7ed16cf22262e3074add430bd450 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:09:53 +0100 Subject: [PATCH 13/21] Update requirements --- backend/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/requirements.txt b/backend/requirements.txt index 3af9cb3..9501efc 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,2 +1,3 @@ fastapi==0.111.0 uvicorn[standard]==0.30.1 +requests==2.32.5 From c7128400c2c501374a55d54d98d1c4915052b628 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:10:19 +0100 Subject: [PATCH 14/21] Fetch builds from Jenkins API --- backend/app/services/builds.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/app/services/builds.py b/backend/app/services/builds.py index e63d7e6..a829dba 100644 --- a/backend/app/services/builds.py +++ b/backend/app/services/builds.py @@ -61,8 +61,7 @@ def fetch_builds(limit: int = 5) -> List[Dict]: def build_history() -> Dict: """Return Jenkins build history data.""" - history = _load_json("build_history.json") - builds = history.get("builds", []) + builds = fetch_builds() return { "builds": [normalize_build(b) for b in builds] } From 8c5d83dc89953db57d641f61016794fcd6a47921 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:10:29 +0100 Subject: [PATCH 15/21] Update tests --- backend/tests/test_api.py | 57 +++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/backend/tests/test_api.py b/backend/tests/test_api.py index 4cbb309..96659a3 100644 --- a/backend/tests/test_api.py +++ b/backend/tests/test_api.py @@ -36,22 +36,57 @@ def test_prices_random_list(): assert all(item["price"] <= 3 for item in items) -def test_build_history(): +def test_build_history(monkeypatch): + jenkins_builds = [ + { + "number": 205, + "result": "SUCCESS", + "timestamp": 1719992400000, + "duration": 75000, + "url": "http://jenkins.local/job/demo/205", + "changeSets": [ + { + "items": [ + { + "commitId": "9ac3f91d9bd0f0b7bfc5", + "msg": "Anade la API de Jenkins", + "author": {"fullName": "Dev One"}, + } + ] + } + ], + }, + { + "number": 204, + "result": None, + "timestamp": 1719988800000, + "duration": 1500, + "url": "http://jenkins.local/job/demo/204", + "changeSets": [], + }, + ] + + monkeypatch.setattr("app.services.builds.fetch_builds", lambda limit=5: jenkins_builds) + response = client.get("/builds") assert response.status_code == 200 body = response.json() builds = body["builds"] assert isinstance(builds, list) - assert len(builds) >= 1 + assert len(builds) == 2 first = builds[0] - assert "number" in first and "status" in first and "branch" in first + assert first["number"] == 205 + assert first["status"] == "success" + assert first["finished_at"] == 1719992400000 + assert first["duration_seconds"] == 75 + assert first["url"].endswith("/205") + assert first["commits"] == [ + {"commit": "9ac3f91", "message": "Anade la API de Jenkins", "author": "Dev One"} + ] - # Ensure descending order by build number - numbers = [build["number"] for build in builds] - assert numbers == sorted(numbers, reverse=True) - - failed_builds = [build for build in builds if build["status"] == "failed"] - if failed_builds: - failed = failed_builds[0] - assert "failed_stage" in failed and "fun_message" in failed + second = builds[1] + assert second["number"] == 204 + assert second["status"] == "running" + assert second["duration_seconds"] == 1 + assert second["commits"] == [] From c9c1eb7e924f1b24692fee54157c4ca455637e5f Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:19:02 +0100 Subject: [PATCH 16/21] Add LICENSE --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From ad5a7798e0ae708bb613cee404d2c48f2e61b90e Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Tue, 16 Dec 2025 09:32:14 +0100 Subject: [PATCH 17/21] Add License header --- backend/app/__init__.py | 15 +++++++++++++++ backend/app/main.py | 16 ++++++++++++++++ backend/app/services/builds.py | 16 ++++++++++++++++ backend/app/services/menu.py | 16 ++++++++++++++++ backend/app/services/prices.py | 16 ++++++++++++++++ backend/app/settings.py | 16 ++++++++++++++++ backend/tests/test_api.py | 16 ++++++++++++++++ frontend/src/App.svelte | 18 ++++++++++++++++++ frontend/src/config.js | 18 ++++++++++++++++++ frontend/src/main.js | 18 ++++++++++++++++++ frontend/src/routes/+layout.svelte | 18 ++++++++++++++++++ frontend/src/services/api.js | 18 ++++++++++++++++++ frontend/src/styles/app.css | 18 ++++++++++++++++++ frontend/src/utils/text.js | 18 ++++++++++++++++++ 14 files changed, 237 insertions(+) diff --git a/backend/app/__init__.py b/backend/app/__init__.py index e69de29..0224155 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -0,0 +1,15 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . diff --git a/backend/app/main.py b/backend/app/main.py index 84d0e02..7451365 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + import time from fastapi import FastAPI diff --git a/backend/app/services/builds.py b/backend/app/services/builds.py index a829dba..d7634b3 100644 --- a/backend/app/services/builds.py +++ b/backend/app/services/builds.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + import base64 import json from pathlib import Path diff --git a/backend/app/services/menu.py b/backend/app/services/menu.py index aa17f91..60d6b7c 100644 --- a/backend/app/services/menu.py +++ b/backend/app/services/menu.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + import json import random from datetime import datetime diff --git a/backend/app/services/prices.py b/backend/app/services/prices.py index 1d30879..a6a836a 100644 --- a/backend/app/services/prices.py +++ b/backend/app/services/prices.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + import json import random from datetime import datetime diff --git a/backend/app/settings.py b/backend/app/settings.py index b69ea53..79c78a5 100644 --- a/backend/app/settings.py +++ b/backend/app/settings.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + import os from dataclasses import dataclass diff --git a/backend/tests/test_api.py b/backend/tests/test_api.py index 96659a3..ee9d833 100644 --- a/backend/tests/test_api.py +++ b/backend/tests/test_api.py @@ -1,3 +1,19 @@ +# CI/CD Workshop +# Copyright (C) 2025 OpenBokeron +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + from fastapi.testclient import TestClient from app.main import app diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index feb4870..776835f 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1,3 +1,21 @@ + + diff --git a/frontend/src/services/api.js b/frontend/src/services/api.js index 6713981..d4369d0 100644 --- a/frontend/src/services/api.js +++ b/frontend/src/services/api.js @@ -1,3 +1,21 @@ +/* +CI/CD Workshop +Copyright (C) 2025 OpenBokeron + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + import { API_BASE } from '../config'; async function getJson(endpoint) { diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 370a26d..412cea7 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -1,3 +1,21 @@ +/* +CI/CD Workshop +Copyright (C) 2025 OpenBokeron + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + @import url('https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@400;500;600;700&display=swap'); body { diff --git a/frontend/src/utils/text.js b/frontend/src/utils/text.js index e9059c7..55af2e5 100644 --- a/frontend/src/utils/text.js +++ b/frontend/src/utils/text.js @@ -1,3 +1,21 @@ +/* +CI/CD Workshop +Copyright (C) 2025 OpenBokeron + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + export function prettify(item) { return item .split('_') From 755a5bf2d0480253378f4c55838611a9ab0c7ea4 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:11:25 +0100 Subject: [PATCH 18/21] Update jenkinsfile using credentials --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index eda257a..11c0851 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -164,7 +164,18 @@ pipeline { stage('Deploy frontend & backend') { agent any + environment { + JENKINS_BASE_URL = 'http://jenkins:8080' + JENKINS_JOB_NAME = 'Espetos' + } steps { + withCredentials([ + usernamePassword( + cretentialsId: 'jenkins-api-token', + usernameVariable: 'JENKINS_USER', + passwordVariable: 'JENKINS_TOKEN' + ) + ]) { sh ''' set -e @@ -175,6 +186,10 @@ pipeline { docker run -d \ --name cafeteria-backend \ + -e JENKINS_BASE_URL \ + -e JENKINS_JOB_NAME \ + -e JENKINS_USER \ + -e JENKINS_TOKEN \ -p 8000:8000 \ cafeteria-backend:${BUILD_NUMBER} @@ -184,6 +199,7 @@ pipeline { cafeteria-frontend:${BUILD_NUMBER} ''' } + } } } From c6c482d1c0e0938bf2773f2901527e124309008f Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:17:56 +0100 Subject: [PATCH 19/21] Fix typo --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11c0851..a038cc0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -171,7 +171,7 @@ pipeline { steps { withCredentials([ usernamePassword( - cretentialsId: 'jenkins-api-token', + credentialsId: 'jenkins-api-token', usernameVariable: 'JENKINS_USER', passwordVariable: 'JENKINS_TOKEN' ) From 4442f08714e3ad88f61deaab4cfdaa042761bbd5 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:34:30 +0100 Subject: [PATCH 20/21] Add backend to docker network --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index a038cc0..4bfe66b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -186,6 +186,7 @@ pipeline { docker run -d \ --name cafeteria-backend \ + --network ci-net \ -e JENKINS_BASE_URL \ -e JENKINS_JOB_NAME \ -e JENKINS_USER \ From a155e64ec75a02da8126bb09c169cb7a789509e4 Mon Sep 17 00:00:00 2001 From: jose-rZM <100773386+jose-rZM@users.noreply.github.com> Date: Thu, 18 Dec 2025 11:53:44 +0100 Subject: [PATCH 21/21] Fix build history styles --- frontend/src/App.svelte | 48 ++++++++++++++++++++----------------- frontend/src/styles/app.css | 6 ++--- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 776835f..5e1298b 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -360,8 +360,7 @@ along with this program. If not, see .

Historial

Builds recientes en Jenkins. Esto lo conseguimos gracias a que Jenkins nos - expone una API REST muy maja para consultar información de los jobs y - builds. + expone una API REST para consultar información de los jobs y builds.

{#if loadingHistory} @@ -371,39 +370,44 @@ along with this program. If not, see . {#if buildHistory.length}
- {#each buildHistory as build} -
+ {#each buildHistory as build, i} +
#{build.number} - {build.branch} + + {#if build.commits.length === 0} + Ejecución manual + {:else} + + {build.commits[0].commit} · {build.commits[0].author} + + {/if}
+
- #{build.commit} - {build.finished_at} + + {new Date(build.finished_at).toLocaleDateString()} +
+
-

- Autor - {build.author} -

+ {#if build.commits.length > 0} +

+ Mensaje + {build.commits[0].message} +

+ {/if} +

Duración {build.duration_seconds} s

- {#if build.status === 'failed'} -

- Stage - {build.failed_stage} -

-

- {build.fun_message} -

+ + {#if build.status === 'failure'} +

Build fallida

{:else}

Correcto

{/if} diff --git a/frontend/src/styles/app.css b/frontend/src/styles/app.css index 412cea7..89e48c6 100644 --- a/frontend/src/styles/app.css +++ b/frontend/src/styles/app.css @@ -691,7 +691,7 @@ li { color: #f8fafc; } -.summary-branch { +.summary-commit { color: #a5b4fc; font-weight: 700; font-size: 0.95rem; @@ -718,7 +718,7 @@ li { box-shadow: 0 0 8px rgba(34, 197, 94, 0.6); } -.status-dot.failed { +.status-dot.failure { background: #f87171; box-shadow: 0 0 8px rgba(248, 113, 113, 0.5); } @@ -766,7 +766,7 @@ li { border-color: rgba(34, 197, 94, 0.3); } -.history-item.failed { +.history-item.failure { border-color: rgba(248, 113, 113, 0.35); }