From 266a99be96189bea92e0ef593f930bb92d3b5b20 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Wed, 18 Dec 2024 00:45:26 +0100 Subject: [PATCH 1/3] Add vertical screen description option --- src/lib/locales/de.json | 3 ++- src/lib/locales/en.json | 3 ++- src/lib/locales/es.json | 3 ++- src/lib/locales/nl.json | 3 ++- src/lib/style/app.scss | 10 ++++++++-- src/routes/Rendered.svelte | 15 ++++++++------- src/routes/Settings.svelte | 9 +++++++++ src/routes/Status.svelte | 6 +++++- 8 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/lib/locales/de.json b/src/lib/locales/de.json index a26ab60..e9756ff 100644 --- a/src/lib/locales/de.json +++ b/src/lib/locales/de.json @@ -57,7 +57,8 @@ "showAll": "Alle anzeigen", "hideAll": "Alles ausblenden", "flOffWhenDark": "Displaybeleuchtung aus, wenn es dunkel ist", - "luxLightToggleText": "Zum Deaktivieren auf 0 setzen" + "luxLightToggleText": "Zum Deaktivieren auf 0 setzen", + "verticalDesc": "Vrtikale Bildschirmbeschreibung" }, "control": { "systemInfo": "Systeminfo", diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json index 6e829bd..3ab90ed 100644 --- a/src/lib/locales/en.json +++ b/src/lib/locales/en.json @@ -69,7 +69,8 @@ "showAll": "Show all", "hideAll": "Hide all", "flOffWhenDark": "Frontlight off when dark", - "luxLightToggleText": "Set to 0 to disable" + "luxLightToggleText": "Set to 0 to disable", + "verticalDesc": "Use vertical screen description" }, "control": { "systemInfo": "System info", diff --git a/src/lib/locales/es.json b/src/lib/locales/es.json index eb15ced..79b6673 100644 --- a/src/lib/locales/es.json +++ b/src/lib/locales/es.json @@ -56,7 +56,8 @@ "showAll": "Mostrar todo", "hideAll": "Ocultar todo", "flOffWhenDark": "Luz de la pantalla cuando está oscuro", - "luxLightToggleText": "Establecer en 0 para desactivar" + "luxLightToggleText": "Establecer en 0 para desactivar", + "verticalDesc": "Descripción de pantalla vertical" }, "control": { "turnOff": "Apagar", diff --git a/src/lib/locales/nl.json b/src/lib/locales/nl.json index b31f7ad..eb5b5af 100644 --- a/src/lib/locales/nl.json +++ b/src/lib/locales/nl.json @@ -57,7 +57,8 @@ "showAll": "Toon alles", "hideAll": "Alles verbergen", "flOffWhenDark": "Displaylicht uit als het donker is", - "luxLightToggleText": "Stel in op 0 om uit te schakelen" + "luxLightToggleText": "Stel in op 0 om uit te schakelen", + "verticalDesc": "Verticale schermbeschrijving" }, "control": { "systemInfo": "Systeeminformatie", diff --git a/src/lib/style/app.scss b/src/lib/style/app.scss index 0703d06..8e9115c 100644 --- a/src/lib/style/app.scss +++ b/src/lib/style/app.scss @@ -158,12 +158,18 @@ nav { padding: 5px; } - .splitText div:first-child::after { + &.verticalDesc > .splitText:first-child { + .textcontainer { + transform: rotate(-90deg); + } + } + + .splitText .textcontainer :first-child::after { display: block; content: ''; margin-top: 0px; border-bottom: 2px solid; - margin-bottom: 3px; + // margin-bottom: 3px; } .splitText { diff --git a/src/routes/Rendered.svelte b/src/routes/Rendered.svelte index 4c4167b..99c3a26 100644 --- a/src/routes/Rendered.svelte +++ b/src/routes/Rendered.svelte @@ -9,7 +9,7 @@ }; export let className = 'btclock-wrapper'; - + export let verticalDesc = false; // Define the currency symbols as constants const CURRENCY_USD = '$'; const CURRENCY_EUR = '['; @@ -44,15 +44,16 @@
-
+
{#each status.data as char} {#if isSplitText(char)}
- {#if char.split('/').length} - {char.split('/')[0]} -
- {char.split('/')[1]} - {/if} +
+ {#if char.split('/').length} + {char.split('/')[0]} + {char.split('/')[1]} + {/if} +
diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte index 77c8a3d..8130940 100644 --- a/src/routes/Settings.svelte +++ b/src/routes/Settings.svelte @@ -318,6 +318,15 @@ label={$_('section.settings.suffixShareDot')} /> + + + {#if !$settings.actCurrencies} diff --git a/src/routes/Status.svelte b/src/routes/Status.svelte index afe2c87..812ee68 100644 --- a/src/routes/Status.svelte +++ b/src/routes/Status.svelte @@ -151,7 +151,11 @@
{#if $status.data}
- +
{$_('section.status.screenCycle')}: Date: Wed, 18 Dec 2024 01:24:21 +0100 Subject: [PATCH 2/3] Add bitaxe icon and modify tests for it --- src/lib/style/app.scss | 4 ++++ src/routes/Rendered.svelte | 21 ++++++++++++++++-- static/bitaxe.webp | Bin 0 -> 2486 bytes .../screenshots/viewport-screenshots.spec.ts | 5 ++++- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 static/bitaxe.webp diff --git a/src/lib/style/app.scss b/src/lib/style/app.scss index 8e9115c..53eeee8 100644 --- a/src/lib/style/app.scss +++ b/src/lib/style/app.scss @@ -299,3 +299,7 @@ nav { input[type='number'] { text-align: right; } + +.lightMode .bitaxelogo { + filter: brightness(0) saturate(100%); +} diff --git a/src/routes/Rendered.svelte b/src/routes/Rendered.svelte index 99c3a26..d2beb74 100644 --- a/src/routes/Rendered.svelte +++ b/src/routes/Rendered.svelte @@ -59,7 +59,7 @@ {/each} -->
{:else if char.startsWith('mdi')} -
+
{#if char.endsWith('rocket')} {/if} @@ -69,6 +69,9 @@ {#if char.endsWith('bolt')} {/if} + {#if char.endsWith('bitaxe')} + + {/if}
{:else if char === 'STS'}
S
@@ -83,8 +86,22 @@
- diff --git a/static/bitaxe.webp b/static/bitaxe.webp new file mode 100644 index 0000000000000000000000000000000000000000..3c907c12a77647c9f742882dec2ed85e903c5d72 GIT binary patch literal 2486 zcmY*a2|QHm8~(-&V;6%4#WaYLISk3(Xa>nPsK{-(mKn)bW-_)CVaAnR%C${{ERmwR z;*u?-h}4zBwPwu{Zpn5>x7+>y&-Xj$eZKcR&-1?T`JLbIv$rrayDI>Iqv;{?ak8$H zAOK(o_YML;695w{@?i%g0I>OJpZEBOy&E65YxSUKlLwpnd0D%bb+Y?zJr*gd=6N)X_SN;R&!y0bDQQTwn9HD0XXMbxDPmcSLK^$%Vu_u`WKht9r+W(zxNc1ucymbyht z&#gYXn?it*L(Eqs$ItC^R}`08zs>VeUcBq7vO*B;&@z9oiF?NI-jUIxrP_VA-jnCu zM(u{vvgP|48ntdg8j-BR2TZG*eivWi3lfPGA+e;<*oqsU-|#k6#CU7;xe@2#3Vgx$1uTcP}A@nE#`DeaX*FCC7z zy0_MxIrI9`QnEQIN-J8d2y%%p8@s|#6R-@aAzHsjD+%XB5h|VTP(Rx~7~WrL*|3}~ zaUUv+pFW!=v&2qNot$J8!=pu3GLj<@>R;KM%pO#~&0;i)-rd@4AkBB*bHDi5oQ;Uv zQOpOuF_FJUNT>3XWrq9}Hmu!i^mo1EA?zfVH5fyRoKM{q8Fe?`x`{4M-O*26a8|+P<>iY^EtAAD*j>I%mX$(*ODZ~#Dy9RHnTuo?uctjZ+j28W} zJV5bqh1JnnC-?*QR3t3aSdmg;Xy>@#j(xlweN`Y_Pdyx%o@8^hyh^XK{~;b4B>_Tc zOyr`=?pQnB5Noi;{pt5J^-#jvGiX`#jv>CJ`kN0+MpX3;>LLZpNgjQYPxW-pP!ovF z-kgZ2oG)PhTJd!5)yR#5%17si%MhTmND9WDybvr|)O9j_2Xh~C@`H-LZfozGF`RhP z^1!fIO=s0<-dk_7dg8QyRa|6tCAFF}T!%Eqn<)}$nJ3HD$~m2LPnojqB`k&PFc3HJ zyQFy6w)}=nd$XXk6-}7(vZFf-!-g!+R&Tuyw(xN;1u9pf)X4(|bXt;4=DS-%))&9=y3 zr?21t*pt>S40@m&<4=^HOT|xD8IGc1s&2ZMugy8Twxq*!A&(=-wxacb*>_&bSXmBo zszhx}-0t*HQZr!l%t_-Ft9){%U?RD;DTr5;Dx=ZNc*MMmJkgx!9!kxenET5{fL1N? zy8e!+G>g^d_tJVPE`~Ii)0BOxuLYkHBZY@-|)4;VUUx#8pYZ3wRxc@3>ZRf+Z|=6|_Mf}{l_SWjz#jXhuc0l?`IscJdI#s};B;fvlJ!)&L+`8NBNZah z;k+=$a*b<7|GAOE>!p|Tzh*7yn_?3z!cu0soF#1Kjz%|Ro5i4Gyqw$pkw3Rm(|9!6 zu`A`Y#`iZ9ZAeibA#IWmB8yQ`CU#dOqdx`gW^#laB!#l#Z%iYP4b}JxW}!mM@X9J$ z8AVmzoZ+9Iz|l@NFU!V_)wXZzn*Incup7ukL%G*{mcxdRnJlnvx`HQ=7g*j03Pf?r z*wtTa1HzwfVkcI}bOY%% zyQ{loJ}uu5L%+8=&^l%RiS=kT{9+c_=D`63AyG7KLcp=qD&8Z*i`0UJ)lp8$bYUF< z`AHBl6@{o=Av(^j!u`@Y8{4SLZ6N#7BPogY3*lFDYHLq#5AE(O&#=bGq&}GBUEe9z z)EE2*?Bqydc`j^l@3WQPG6*y8e44H0O7Sdd)90|;xY+H%4MVk?5l-v-r9MSVHx{JB zltM*reO*UxQ&A=wYX@2GXv!U6AUf08w^9&vJ|sZbPm#!(N^Ba?m{gW{LNEEC9VTz@ zb}K+EM^fyDY~E}({9nvtv88jeCS!uF6J5}GFWcFRo-5Fue(&^{* zA&9|X;22ssKYtHMQ%_G1(!fJ_ygHYmP7Cs-y9BEH(iHzO`PYX;p}F~co~L{I`C_(w zU0nSx(v7g#twKMpfBK|*Qva*uOT&F@8t3Nc18u#5G;tcx4{xs2a4V~C>+eb7R^IYA k)-?Ra{J-4yI)>0z@&9S&pGm)ExuY5j8bUulo3SAH8~?g1Bme*a literal 0 HcmV?d00001 diff --git a/tests/screenshots/viewport-screenshots.spec.ts b/tests/screenshots/viewport-screenshots.spec.ts index 573b059..5ec5569 100644 --- a/tests/screenshots/viewport-screenshots.spec.ts +++ b/tests/screenshots/viewport-screenshots.spec.ts @@ -1,6 +1,6 @@ import { test, expect } from '@playwright/test'; -import { initMock, settingsJson } from '../shared'; +import { initMock, settingsJson, statusJson } from '../shared'; test.beforeEach(initMock); @@ -69,6 +69,9 @@ test('capture screenshots across devices with bitaxe screens', async ({ page }, } ]; + statusJson.data = ['mdi:bitaxe', '', 'mdi:pickaxe', '6', '3', '7', 'GH/S']; + statusJson.rendered = ['mdi:bitaxe', '', 'mdi:pickaxe', '6', '3', '7', 'GH/S']; + await page.goto('/'); await expect(page.getByRole('heading', { name: 'Control' })).toBeVisible(); await expect(page.getByRole('heading', { name: 'Status' })).toBeVisible(); From 85b9b17506f89696b89ab6f6e6ed231b7a8f6e91 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Wed, 18 Dec 2024 01:28:17 +0100 Subject: [PATCH 3/3] Add alt tag to bitaxe logo --- src/routes/Rendered.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/Rendered.svelte b/src/routes/Rendered.svelte index d2beb74..d544ad8 100644 --- a/src/routes/Rendered.svelte +++ b/src/routes/Rendered.svelte @@ -70,7 +70,7 @@ {/if} {#if char.endsWith('bitaxe')} - + {/if}
{:else if char === 'STS'}