diff --git a/apps/calc/apps/web/Dockerfile b/apps/calc/apps/web/Dockerfile new file mode 100644 index 000000000..2ffd62102 --- /dev/null +++ b/apps/calc/apps/web/Dockerfile @@ -0,0 +1,30 @@ +# syntax=docker/dockerfile:1 +FROM sveltekit-base:local AS builder + +ARG PUBLIC_MANA_CORE_AUTH_URL=http://mana-auth:3001 +ENV PUBLIC_MANA_CORE_AUTH_URL=$PUBLIC_MANA_CORE_AUTH_URL + +COPY apps/calc/apps/web ./apps/calc/apps/web +COPY apps/calc/packages ./apps/calc/packages + +RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \ + pnpm install --no-frozen-lockfile --ignore-scripts + +WORKDIR /app/apps/calc/apps/web +RUN pnpm exec svelte-kit sync +RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build + +FROM node:20-alpine AS production +WORKDIR /app/apps/calc/apps/web +COPY --from=builder /app/node_modules/.pnpm /app/node_modules/.pnpm +COPY --from=builder /app/apps/calc/apps/web/node_modules ./node_modules +COPY --from=builder /app/apps/calc/apps/web/build ./build +COPY --from=builder /app/apps/calc/apps/web/package.json ./ + +EXPOSE 5018 +ENV NODE_ENV=production PORT=5018 HOST=0.0.0.0 + +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ + CMD wget --no-verbose --tries=1 --spider http://localhost:5018/health || exit 1 + +CMD ["node", "build"] diff --git a/apps/calc/apps/web/src/lib/components/skins/CasioSkin.svelte b/apps/calc/apps/web/src/lib/components/skins/CasioSkin.svelte index 4ceeefcb1..fd6209bcc 100644 --- a/apps/calc/apps/web/src/lib/components/skins/CasioSkin.svelte +++ b/apps/calc/apps/web/src/lib/components/skins/CasioSkin.svelte @@ -1,8 +1,17 @@ @@ -100,65 +127,101 @@
-
-
-
- {expression || ' '} +
+ +
+ +
-
-
- {error || display} -
-
- - -
- {#each SCIENTIFIC_CONSTANTS.slice(0, 6) as constant} - {/each} +
-
- {#each sciButtons as row} - {#each row as btn} - - {/each} - {/each} -
+ {#if showSkinPicker} +
+
+ {#each CALCULATOR_SKINS as skin} + + {/each} +
+
+ {/if} -
- - -
+ + {#if showExtraKeys} +
+ +
+ {#each SCIENTIFIC_CONSTANTS.slice(0, 6) as constant} + + {/each} +
+ + +
+ {#each sciExtraButtons as row} + {#each row as btn} + + {/each} + {/each} +
+
+ {/if} + + + {#if activeSkin === 'modern'} + + {:else if activeSkin === 'hp35'} + + {:else if activeSkin === 'casio-fx'} + + {:else if activeSkin === 'ti84'} + + {:else if activeSkin === 'minimal'} + + {/if}
@@ -188,7 +251,7 @@ diff --git a/apps/calc/apps/web/src/routes/(app)/standard/+page.svelte b/apps/calc/apps/web/src/routes/(app)/standard/+page.svelte index 27ce5c155..2fb16792b 100644 --- a/apps/calc/apps/web/src/routes/(app)/standard/+page.svelte +++ b/apps/calc/apps/web/src/routes/(app)/standard/+page.svelte @@ -12,6 +12,16 @@ let display = $state('0'); let hasResult = $state(false); let error = $state(''); + let copied = $state(false); + + async function copyToClipboard() { + if (display === '0' || error) return; + try { + await navigator.clipboard.writeText(display); + copied = true; + setTimeout(() => (copied = false), 1500); + } catch {} + } // Skin state — persisted to localStorage let activeSkin = $state('modern'); @@ -123,10 +133,12 @@ expression, display, error, + copied, onButton: appendToExpression, onClear: clear, onBackspace: backspace, onEquals: calculate, + onCopy: copyToClipboard, });