diff --git a/src/lib/pc/shared.ts b/src/lib/pc/shared.ts index 1c52c3e..16f537a 100644 --- a/src/lib/pc/shared.ts +++ b/src/lib/pc/shared.ts @@ -215,6 +215,9 @@ export function slotCards(parts: Part[], section: string, at: string): SlotCard[ const i = SLOT_ORDER.indexOf(s); return i < 0 ? 999 : i; }; + // Add-ons (e.g. a monitor-arm tilt pivot) sit after the item they extend. + const addOn = (p: Part) => /\badd-on\b/i.test(p.model); + for (const c of cards.values()) c.parts.sort((a, b) => Number(addOn(a)) - Number(addOn(b))); return [...cards.values()].sort((a, b) => rank(a.slot) - rank(b.slot)); } diff --git a/src/routes/trackers/pc/+page.server.ts b/src/routes/trackers/pc/+page.server.ts index 5887032..be531b8 100644 --- a/src/routes/trackers/pc/+page.server.ts +++ b/src/routes/trackers/pc/+page.server.ts @@ -25,7 +25,7 @@ export const load: PageServerLoad = async (event) => { seo: { title: 'PC setup', description: - 'My PC, desk and devices on one screen, with a time slider that shows the setup on any day since 2021, plus the planned next build and my mouse sensitivities.' + 'My PC, desk and devices on one screen, with a time slider that shows the setup on any day since 2017, plus the planned next build and my mouse sensitivities.' } }; }; diff --git a/static/hardware/acc-as5/1.t.webp b/static/hardware/acc-as5/1.t.webp new file mode 100644 index 0000000..dd3c7cc Binary files /dev/null and b/static/hardware/acc-as5/1.t.webp differ diff --git a/static/hardware/acc-as5/1.webp b/static/hardware/acc-as5/1.webp new file mode 100644 index 0000000..4d70646 Binary files /dev/null and b/static/hardware/acc-as5/1.webp differ diff --git a/static/hardware/acc-as5/2.t.webp b/static/hardware/acc-as5/2.t.webp new file mode 100644 index 0000000..0eb1f3a Binary files /dev/null and b/static/hardware/acc-as5/2.t.webp differ diff --git a/static/hardware/acc-as5/2.webp b/static/hardware/acc-as5/2.webp new file mode 100644 index 0000000..66b8095 Binary files /dev/null and b/static/hardware/acc-as5/2.webp differ diff --git a/static/hardware/arm-hx/1.t.webp b/static/hardware/arm-hx/1.t.webp new file mode 100644 index 0000000..98a298b Binary files /dev/null and b/static/hardware/arm-hx/1.t.webp differ diff --git a/static/hardware/arm-hx/1.webp b/static/hardware/arm-hx/1.webp new file mode 100644 index 0000000..a2c3be1 Binary files /dev/null and b/static/hardware/arm-hx/1.webp differ diff --git a/static/hardware/arm-hx/2.t.webp b/static/hardware/arm-hx/2.t.webp new file mode 100644 index 0000000..f4c6f26 Binary files /dev/null and b/static/hardware/arm-hx/2.t.webp differ diff --git a/static/hardware/arm-hx/2.webp b/static/hardware/arm-hx/2.webp new file mode 100644 index 0000000..62530e4 Binary files /dev/null and b/static/hardware/arm-hx/2.webp differ diff --git a/static/hardware/arm-hx/3.t.webp b/static/hardware/arm-hx/3.t.webp new file mode 100644 index 0000000..defe4c0 Binary files /dev/null and b/static/hardware/arm-hx/3.t.webp differ diff --git a/static/hardware/arm-hx/3.webp b/static/hardware/arm-hx/3.webp new file mode 100644 index 0000000..71889ba Binary files /dev/null and b/static/hardware/arm-hx/3.webp differ diff --git a/static/hardware/case-spec01/1.t.webp b/static/hardware/case-spec01/1.t.webp new file mode 100644 index 0000000..24922a7 Binary files /dev/null and b/static/hardware/case-spec01/1.t.webp differ diff --git a/static/hardware/case-spec01/1.webp b/static/hardware/case-spec01/1.webp new file mode 100644 index 0000000..288f15c Binary files /dev/null and b/static/hardware/case-spec01/1.webp differ diff --git a/static/hardware/case-spec01/2.t.webp b/static/hardware/case-spec01/2.t.webp new file mode 100644 index 0000000..7092a14 Binary files /dev/null and b/static/hardware/case-spec01/2.t.webp differ diff --git a/static/hardware/case-spec01/2.webp b/static/hardware/case-spec01/2.webp new file mode 100644 index 0000000..88bef11 Binary files /dev/null and b/static/hardware/case-spec01/2.webp differ diff --git a/static/hardware/case-spec01/3.t.webp b/static/hardware/case-spec01/3.t.webp new file mode 100644 index 0000000..043cb11 Binary files /dev/null and b/static/hardware/case-spec01/3.t.webp differ diff --git a/static/hardware/case-spec01/3.webp b/static/hardware/case-spec01/3.webp new file mode 100644 index 0000000..8065771 Binary files /dev/null and b/static/hardware/case-spec01/3.webp differ diff --git a/static/hardware/cooler-212evo/1.t.webp b/static/hardware/cooler-212evo/1.t.webp new file mode 100644 index 0000000..7db92e4 Binary files /dev/null and b/static/hardware/cooler-212evo/1.t.webp differ diff --git a/static/hardware/cooler-212evo/1.webp b/static/hardware/cooler-212evo/1.webp new file mode 100644 index 0000000..0a554f5 Binary files /dev/null and b/static/hardware/cooler-212evo/1.webp differ diff --git a/static/hardware/cooler-212evo/2.t.webp b/static/hardware/cooler-212evo/2.t.webp new file mode 100644 index 0000000..ab056f9 Binary files /dev/null and b/static/hardware/cooler-212evo/2.t.webp differ diff --git a/static/hardware/cooler-212evo/2.webp b/static/hardware/cooler-212evo/2.webp new file mode 100644 index 0000000..d25deee Binary files /dev/null and b/static/hardware/cooler-212evo/2.webp differ diff --git a/static/hardware/cpu-6700k/1.t.webp b/static/hardware/cpu-6700k/1.t.webp new file mode 100644 index 0000000..6bee3ab Binary files /dev/null and b/static/hardware/cpu-6700k/1.t.webp differ diff --git a/static/hardware/cpu-6700k/1.webp b/static/hardware/cpu-6700k/1.webp new file mode 100644 index 0000000..04b85dc Binary files /dev/null and b/static/hardware/cpu-6700k/1.webp differ diff --git a/static/hardware/cpu-6700k/2.t.webp b/static/hardware/cpu-6700k/2.t.webp new file mode 100644 index 0000000..b3eb66f Binary files /dev/null and b/static/hardware/cpu-6700k/2.t.webp differ diff --git a/static/hardware/cpu-6700k/2.webp b/static/hardware/cpu-6700k/2.webp new file mode 100644 index 0000000..ba65246 Binary files /dev/null and b/static/hardware/cpu-6700k/2.webp differ diff --git a/static/hardware/fans-sickleflow/1.t.webp b/static/hardware/fans-sickleflow/1.t.webp new file mode 100644 index 0000000..ec450dc Binary files /dev/null and b/static/hardware/fans-sickleflow/1.t.webp differ diff --git a/static/hardware/fans-sickleflow/1.webp b/static/hardware/fans-sickleflow/1.webp new file mode 100644 index 0000000..4929ba7 Binary files /dev/null and b/static/hardware/fans-sickleflow/1.webp differ diff --git a/static/hardware/gpu-gtx1070/1.t.webp b/static/hardware/gpu-gtx1070/1.t.webp new file mode 100644 index 0000000..e7adccd Binary files /dev/null and b/static/hardware/gpu-gtx1070/1.t.webp differ diff --git a/static/hardware/gpu-gtx1070/1.webp b/static/hardware/gpu-gtx1070/1.webp new file mode 100644 index 0000000..0e7451d Binary files /dev/null and b/static/hardware/gpu-gtx1070/1.webp differ diff --git a/static/hardware/gpu-gtx1070/2.t.webp b/static/hardware/gpu-gtx1070/2.t.webp new file mode 100644 index 0000000..ad084e8 Binary files /dev/null and b/static/hardware/gpu-gtx1070/2.t.webp differ diff --git a/static/hardware/gpu-gtx1070/2.webp b/static/hardware/gpu-gtx1070/2.webp new file mode 100644 index 0000000..63124cb Binary files /dev/null and b/static/hardware/gpu-gtx1070/2.webp differ diff --git a/static/hardware/gpu-gtx1070/3.t.webp b/static/hardware/gpu-gtx1070/3.t.webp new file mode 100644 index 0000000..f60847a Binary files /dev/null and b/static/hardware/gpu-gtx1070/3.t.webp differ diff --git a/static/hardware/gpu-gtx1070/3.webp b/static/hardware/gpu-gtx1070/3.webp new file mode 100644 index 0000000..d476458 Binary files /dev/null and b/static/hardware/gpu-gtx1070/3.webp differ diff --git a/static/hardware/hdd-wdblue/1.t.webp b/static/hardware/hdd-wdblue/1.t.webp new file mode 100644 index 0000000..207cf74 Binary files /dev/null and b/static/hardware/hdd-wdblue/1.t.webp differ diff --git a/static/hardware/hdd-wdblue/1.webp b/static/hardware/hdd-wdblue/1.webp new file mode 100644 index 0000000..5b50773 Binary files /dev/null and b/static/hardware/hdd-wdblue/1.webp differ diff --git a/static/hardware/hdd-wdblue/2.t.webp b/static/hardware/hdd-wdblue/2.t.webp new file mode 100644 index 0000000..a9c5b76 Binary files /dev/null and b/static/hardware/hdd-wdblue/2.t.webp differ diff --git a/static/hardware/hdd-wdblue/2.webp b/static/hardware/hdd-wdblue/2.webp new file mode 100644 index 0000000..4beefd1 Binary files /dev/null and b/static/hardware/hdd-wdblue/2.webp differ diff --git a/static/hardware/mb-b150/1.t.webp b/static/hardware/mb-b150/1.t.webp new file mode 100644 index 0000000..32043f8 Binary files /dev/null and b/static/hardware/mb-b150/1.t.webp differ diff --git a/static/hardware/mb-b150/1.webp b/static/hardware/mb-b150/1.webp new file mode 100644 index 0000000..c6ce0f5 Binary files /dev/null and b/static/hardware/mb-b150/1.webp differ diff --git a/static/hardware/mb-b150/2.t.webp b/static/hardware/mb-b150/2.t.webp new file mode 100644 index 0000000..17bd656 Binary files /dev/null and b/static/hardware/mb-b150/2.t.webp differ diff --git a/static/hardware/mb-b150/2.webp b/static/hardware/mb-b150/2.webp new file mode 100644 index 0000000..7adb01c Binary files /dev/null and b/static/hardware/mb-b150/2.webp differ diff --git a/static/hardware/mb-b150/3.t.webp b/static/hardware/mb-b150/3.t.webp new file mode 100644 index 0000000..72bc7a3 Binary files /dev/null and b/static/hardware/mb-b150/3.t.webp differ diff --git a/static/hardware/mb-b150/3.webp b/static/hardware/mb-b150/3.webp new file mode 100644 index 0000000..39fccd3 Binary files /dev/null and b/static/hardware/mb-b150/3.webp differ diff --git a/static/hardware/psu-650g1/1.t.webp b/static/hardware/psu-650g1/1.t.webp new file mode 100644 index 0000000..68cc439 Binary files /dev/null and b/static/hardware/psu-650g1/1.t.webp differ diff --git a/static/hardware/psu-650g1/1.webp b/static/hardware/psu-650g1/1.webp new file mode 100644 index 0000000..6a02a49 Binary files /dev/null and b/static/hardware/psu-650g1/1.webp differ diff --git a/static/hardware/ram-fury/1.t.webp b/static/hardware/ram-fury/1.t.webp new file mode 100644 index 0000000..1808a16 Binary files /dev/null and b/static/hardware/ram-fury/1.t.webp differ diff --git a/static/hardware/ram-fury/1.webp b/static/hardware/ram-fury/1.webp new file mode 100644 index 0000000..ba09f5a Binary files /dev/null and b/static/hardware/ram-fury/1.webp differ diff --git a/static/hardware/ram-fury/2.t.webp b/static/hardware/ram-fury/2.t.webp new file mode 100644 index 0000000..cdfca1b Binary files /dev/null and b/static/hardware/ram-fury/2.t.webp differ diff --git a/static/hardware/ram-fury/2.webp b/static/hardware/ram-fury/2.webp new file mode 100644 index 0000000..16e5395 Binary files /dev/null and b/static/hardware/ram-fury/2.webp differ diff --git a/static/hardware/ssd-850evo/1.t.webp b/static/hardware/ssd-850evo/1.t.webp new file mode 100644 index 0000000..c616e43 Binary files /dev/null and b/static/hardware/ssd-850evo/1.t.webp differ diff --git a/static/hardware/ssd-850evo/1.webp b/static/hardware/ssd-850evo/1.webp new file mode 100644 index 0000000..d7c2868 Binary files /dev/null and b/static/hardware/ssd-850evo/1.webp differ diff --git a/static/hardware/ssd-850evo/2.t.webp b/static/hardware/ssd-850evo/2.t.webp new file mode 100644 index 0000000..fe076a6 Binary files /dev/null and b/static/hardware/ssd-850evo/2.t.webp differ diff --git a/static/hardware/ssd-850evo/2.webp b/static/hardware/ssd-850evo/2.webp new file mode 100644 index 0000000..b46e1cf Binary files /dev/null and b/static/hardware/ssd-850evo/2.webp differ