diff --git a/package-lock.json b/package-lock.json index 1970515..2802ef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "deprived-main-website", "version": "0.0.1", "dependencies": { + "@lucide/svelte": "^0.487.0", "@tailwindcss/vite": "^4.1.3", "lucide-svelte": "^0.475.0", "svelte-katex": "^0.1.2", @@ -24,7 +25,7 @@ "daisyui": "^5.0.12", "sass": "^1.77.4", "svelte": "^5.25.7", - "svelte-check": "^3.6.0", + "svelte-check": "^3.8.6", "svelte-highlight": "^7.6.0", "tailwindcss": "^4.1.3", "typescript": "^5.0.0", @@ -762,39 +763,13 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" + "node_modules/@lucide/svelte": { + "version": "0.487.0", + "resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-0.487.0.tgz", + "integrity": "sha512-27b/wUzWrqDJu97+1iSV2X8L2JGRWH/mAWAjHgazWxhGxVu/kS0p3SbNu6w3skNmQNEku33EKU1v44IVwULzbw==", + "license": "ISC", + "peerDependencies": { + "svelte": "^5" } }, "node_modules/@polka/url": { @@ -2129,31 +2104,6 @@ "@jridgewell/sourcemap-codec": "^1.4.15" } }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -2749,29 +2699,6 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -3056,26 +2983,6 @@ "dev": true, "license": "MIT" }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -3097,16 +3004,6 @@ "node": ">=4" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -3155,29 +3052,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/sade": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", @@ -3312,15 +3186,14 @@ } }, "node_modules/svelte-check": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.0.tgz", - "integrity": "sha512-7Nxn+3X97oIvMzYJ7t27w00qUf1Y52irE2RU2dQAd5PyvfGp4E7NLhFKVhb6PV2fx7dCRMpNKDIuazmGthjpSQ==", + "version": "3.8.6", + "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.6.tgz", + "integrity": "sha512-ij0u4Lw/sOTREP13BdWZjiXD/BlHE6/e2e34XzmVmsp5IN4kVa3PWP65NM32JAgwjZlwBg/+JtiNV1MM8khu0Q==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", "chokidar": "^3.4.1", - "fast-glob": "^3.2.7", - "import-fresh": "^3.2.1", "picocolors": "^1.0.0", "sade": "^1.7.4", "svelte-preprocess": "^5.1.3", diff --git a/package.json b/package.json index d35608f..0948f7a 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "dev": "vite dev", "build": "vite build", "preview": "vite preview", - "check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json", - "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch" + "check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --compiler-warnings \"css-unused-selector:ignore,unused-export-let:ignore\" --threshold error", + "check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch --threshold error" }, "devDependencies": { "@sveltejs/adapter-auto": "^3.0.0", @@ -19,7 +19,7 @@ "daisyui": "^5.0.12", "sass": "^1.77.4", "svelte": "^5.25.7", - "svelte-check": "^3.6.0", + "svelte-check": "^3.8.6", "svelte-highlight": "^7.6.0", "tailwindcss": "^4.1.3", "typescript": "^5.0.0", @@ -28,6 +28,7 @@ }, "type": "module", "dependencies": { + "@lucide/svelte": "^0.487.0", "@tailwindcss/vite": "^4.1.3", "lucide-svelte": "^0.475.0", "svelte-katex": "^0.1.2", diff --git a/src/lib/images/DeprivedLogo.svelte b/src/lib/images/DeprivedLogo.svelte index 5cd9ee2..2ef0aa7 100644 --- a/src/lib/images/DeprivedLogo.svelte +++ b/src/lib/images/DeprivedLogo.svelte @@ -1,184 +1,143 @@ + width="53.266724mm" + height="49.976624mm" + viewBox="0 0 53.266727 49.976624" + version="1.1" + id="svg1" + xml:space="preserve" + > diff --git a/src/lib/images/HamburgerMenuIcon.svelte b/src/lib/images/HamburgerMenuIcon.svelte index b9ef55f..6faae57 100644 --- a/src/lib/images/HamburgerMenuIcon.svelte +++ b/src/lib/images/HamburgerMenuIcon.svelte @@ -11,9 +11,7 @@ version="1.1" viewBox="0 0 28 20" width="28" - xml:space="preserve" - xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> -
+
{#each Tags as tag} {@const key = tag.replaceAll(" ", "").toLowerCase()} + {@const color = colorManager.getColor(key)} {#if key.indexOf("/") < 0} -
{tag}
- {:else} + +
+ {tag} +
+ {:else} - {#if typeof colors[key] === 'object' && colors[key] !== null} + {#if typeof color === 'object' && color !== null}
+ style="background: linear-gradient({color.rotation}, {color.color2} {color.offset}, {color.color1} {color.offset});"> {tag}
{:else} -
+
{tag}
{/if} @@ -44,12 +76,11 @@ display: inline-flex; align-items: center; justify-content: center; - height: 1.25rem /* 20px */; - line-height: 1.25rem /* 20px */; + height: 1.25rem; /* 20px */ + line-height: 1.25rem; /* 20px */ width: fit-content; - padding-left: 0.563rem /* 9.008px */; - padding-right: 0.563rem /* 9.008px */; - border-radius: var(--rounded-badge, 1.9rem /* 30.4px */); + padding-left: 0.563rem; /* 9.008px */ + padding-right: 0.563rem; /* 9.008px */ + border-radius: var(--rounded-badge, 1.9rem); /* 30.4px */ } - - \ No newline at end of file + diff --git a/src/routes/tools/+page.svelte b/src/routes/tools/+page.svelte index ee4ed89..10a50c6 100644 --- a/src/routes/tools/+page.svelte +++ b/src/routes/tools/+page.svelte @@ -1,7 +1,7 @@
@@ -28,19 +28,19 @@ title="Sleeping battery life" desc="Calculates the battery life depending on sleep and non-sleep power usage." btnText="To calculator" - icon={BatteryMedium} + toolIcon={BatteryMedium} />
diff --git a/src/routes/tools/battery-life-calculator/+page.svelte b/src/routes/tools/battery-life-calculator/+page.svelte index 7037823..ab35b3c 100644 --- a/src/routes/tools/battery-life-calculator/+page.svelte +++ b/src/routes/tools/battery-life-calculator/+page.svelte @@ -3,7 +3,7 @@ import { BatteryLifeCalculator } from "./pageSrc/BatteryCalc"; import { getMCU, type MCU_Type } from "./pageSrc/MCU_defs"; - let mathMachine = new BatteryLifeCalculator(); + // let mathMachine = new BatteryLifeCalculator(); let useCustom: boolean = false; let selectedText: string = ""; diff --git a/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js b/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js deleted file mode 100644 index 2913ab7..0000000 --- a/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.js +++ /dev/null @@ -1,108 +0,0 @@ -export class BatteryLifeCalculator { - constructor( - timeRunSeconds, - timeSleepSeconds, - consumptionActiveMilliAmpHours, - consumptionSleepMilliAmpHours, - powerBatteryTotalMilliAmpHours, - powerBatteryBufferBeforeEmptyPercent = 20) { - this.timeRunSeconds = timeRunSeconds - this.timeSleepSeconds = timeSleepSeconds - this.consumptionActiveMilliAmpHours = consumptionActiveMilliAmpHours - this.consumptionSleepMilliAmpHours = consumptionSleepMilliAmpHours - this.powerBatteryTotalMilliAmpHours = powerBatteryTotalMilliAmpHours - this.powerBatteryBufferBeforeEmptyPercent = powerBatteryBufferBeforeEmptyPercent - - console.log("The source of this battery calc is here: https://github.com/simonneutert/batterylife-calculator\nI was too lazy to make the math myself."); - } - - // public API - - milliAmpToMicroAmp(milliAmps) { - return milliAmps * 1000 - } - - microAmpToMilliAmp(milliAmps) { - return milliAmps * 0.001 - } - - calculate() { - return { - powerAveragePerHour: this.powerEstimatedHourly(), - runtimeHoursEstimated: this.runtimeHoursEstimated(), - runtimeDaysEstimated: this.runtimeDaysEstimated(), - runtimeDaysRemainingHoursEstimated: this.runtimeDaysRemainingHoursEstimated() - } - } - - powerEstimatedHourly() { - return this.calcPowerEst( - this.powerRun(), - this.consumptionActiveMilliAmpHours, - this.powerSleep(), - this.consumptionSleepMilliAmpHours - ) - } - - runtimeHoursEstimated() { - return parseInt(this.powerLipo() / this.powerEstimatedHourly()) - } - - runtimeDaysEstimated() { - return parseInt(this.runtimeHoursEstimated() / 24) - } - - runtimeDaysRemainingHoursEstimated() { - return parseInt(this.runtimeHoursEstimated() % 24) - } - - // private - - roundOff(x) { - return Math.round(x * 100.0) / 100.0 - } - - calcPowerLipo(x, y) { - return parseFloat((x * (100 - y)) / 100) - } - - calcRuns(x, y) { - return parseFloat(60 / (x + y)) - } - - calcRunsHour(x, y) { - return parseFloat(3600 / (x + y)) - } - - calcPowerRun(x, y) { - return parseFloat((x / (x + y)) * 3600) - } - - calcPowerSleep(x, y) { - return parseFloat((y / (x + y)) * 3600) - } - - powerLipo() { - return this.calcPowerLipo(this.powerBatteryTotalMilliAmpHours, this.powerBatteryBufferBeforeEmptyPercent) - } - - runs() { - return this.calcRuns(this.timeRunSeconds, this.timeSleepSeconds) - } - - runsHour() { - return this.calcRunsHour(this.timeRunSeconds, this.timeSleepSeconds) - } - - powerRun() { - return this.calcPowerRun(this.timeRunSeconds, this.timeSleepSeconds) - } - - powerSleep() { - return this.calcPowerSleep(this.timeRunSeconds, this.timeSleepSeconds) - } - - calcPowerEst(a, b, c, d) { - return parseFloat((a / 3600) * b + (c / 3600) * d) - } -} diff --git a/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.ts b/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.ts new file mode 100644 index 0000000..2d05ee8 --- /dev/null +++ b/src/routes/tools/battery-life-calculator/pageSrc/BatteryCalc.ts @@ -0,0 +1,123 @@ +export class BatteryLifeCalculator { + timeRunSeconds: number; + timeSleepSeconds: number; + consumptionActiveMilliAmpHours: number; + consumptionSleepMilliAmpHours: number; + powerBatteryTotalMilliAmpHours: number; + powerBatteryBufferBeforeEmptyPercent: number; + + constructor( + timeRunSeconds: number, + timeSleepSeconds: number, + consumptionActiveMilliAmpHours: number, + consumptionSleepMilliAmpHours: number, + powerBatteryTotalMilliAmpHours: number, + powerBatteryBufferBeforeEmptyPercent: number = 20 + ) { + this.timeRunSeconds = timeRunSeconds; + this.timeSleepSeconds = timeSleepSeconds; + this.consumptionActiveMilliAmpHours = consumptionActiveMilliAmpHours; + this.consumptionSleepMilliAmpHours = consumptionSleepMilliAmpHours; + this.powerBatteryTotalMilliAmpHours = powerBatteryTotalMilliAmpHours; + this.powerBatteryBufferBeforeEmptyPercent = powerBatteryBufferBeforeEmptyPercent; + + console.log( + "The source of this battery calc is here: https://github.com/simonneutert/batterylife-calculator\nI was too lazy to make the math myself." + ); + } + + // public API + + milliAmpToMicroAmp(milliAmps: number): number { + return milliAmps * 1000; + } + + microAmpToMilliAmp(milliAmps: number): number { + return milliAmps * 0.001; + } + + calculate(): { + powerAveragePerHour: number; + runtimeHoursEstimated: number; + runtimeDaysEstimated: number; + runtimeDaysRemainingHoursEstimated: number; + } { + return { + powerAveragePerHour: this.powerEstimatedHourly(), + runtimeHoursEstimated: this.runtimeHoursEstimated(), + runtimeDaysEstimated: this.runtimeDaysEstimated(), + runtimeDaysRemainingHoursEstimated: this.runtimeDaysRemainingHoursEstimated(), + }; + } + + powerEstimatedHourly(): number { + return this.calcPowerEst( + this.powerRun(), + this.consumptionActiveMilliAmpHours, + this.powerSleep(), + this.consumptionSleepMilliAmpHours + ); + } + + runtimeHoursEstimated(): number { + return parseInt((this.powerLipo() / this.powerEstimatedHourly()).toString(), 10); + } + + runtimeDaysEstimated(): number { + return parseInt((this.runtimeHoursEstimated() / 24).toString(), 10); + } + + runtimeDaysRemainingHoursEstimated(): number { + return parseInt((this.runtimeHoursEstimated() % 24).toString(), 10); + } + + // private methods + + private roundOff(x: number): number { + return Math.round(x * 100.0) / 100.0; + } + + private calcPowerLipo(x: number, y: number): number { + return parseFloat(((x * (100 - y)) / 100).toString()); + } + + private calcRuns(x: number, y: number): number { + return parseFloat((60 / (x + y)).toString()); + } + + private calcRunsHour(x: number, y: number): number { + return parseFloat((3600 / (x + y)).toString()); + } + + private calcPowerRun(x: number, y: number): number { + return parseFloat(((x / (x + y)) * 3600).toString()); + } + + private calcPowerSleep(x: number, y: number): number { + return parseFloat(((y / (x + y)) * 3600).toString()); + } + + powerLipo(): number { + return this.calcPowerLipo(this.powerBatteryTotalMilliAmpHours, this.powerBatteryBufferBeforeEmptyPercent); + } + + runs(): number { + return this.calcRuns(this.timeRunSeconds, this.timeSleepSeconds); + } + + runsHour(): number { + return this.calcRunsHour(this.timeRunSeconds, this.timeSleepSeconds); + } + + powerRun(): number { + return this.calcPowerRun(this.timeRunSeconds, this.timeSleepSeconds); + } + + powerSleep(): number { + return this.calcPowerSleep(this.timeRunSeconds, this.timeSleepSeconds); + } + + private calcPowerEst(a: number, b: number, c: number, d: number): number { + return parseFloat(((a / 3600) * b + (c / 3600) * d).toString()); + } +} diff --git a/src/routes/tools/comps/ToolButton.svelte b/src/routes/tools/comps/ToolButton.svelte index 967b4b2..8c369c6 100644 --- a/src/routes/tools/comps/ToolButton.svelte +++ b/src/routes/tools/comps/ToolButton.svelte @@ -1,7 +1,7 @@ - - - - - -
- {#each { length: 100 } as _, i} - - {GrabRandomString()} - - {/each} -
- - - - - - - - -
- - diff --git a/src/routes/zhen/Comps/TopNameTextPlate.svelte b/src/routes/zhen/Comps/TopNameTextPlate.svelte index 426a9a5..0373a2a 100644 --- a/src/routes/zhen/Comps/TopNameTextPlate.svelte +++ b/src/routes/zhen/Comps/TopNameTextPlate.svelte @@ -11,7 +11,7 @@

Alex

-
+
\ No newline at end of file diff --git a/src/routes/zhen/cv/epos/+page.svelte b/src/routes/zhen/cv/epos/+page.svelte index e45b436..7fde922 100644 --- a/src/routes/zhen/cv/epos/+page.svelte +++ b/src/routes/zhen/cv/epos/+page.svelte @@ -74,7 +74,7 @@
-
+
diff --git a/src/routes/zhen/cv/rev1/+page.svelte b/src/routes/zhen/cv/rev1/+page.svelte index a86b831..d6233cc 100644 --- a/src/routes/zhen/cv/rev1/+page.svelte +++ b/src/routes/zhen/cv/rev1/+page.svelte @@ -74,7 +74,7 @@
-
+
diff --git a/src/routes/zhen/cv/rev2/+page.svelte b/src/routes/zhen/cv/rev2/+page.svelte index 55fe6c0..4bc9658 100644 --- a/src/routes/zhen/cv/rev2/+page.svelte +++ b/src/routes/zhen/cv/rev2/+page.svelte @@ -76,7 +76,7 @@
-
+
diff --git a/svelte.config.js b/svelte.config.js index 1745d75..5289fde 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -4,6 +4,14 @@ import adapter from '@sveltejs/adapter-static'; /** @type {import('@sveltejs/kit').Config} */ export default { preprocess: vitePreprocess(), + onwarn: (warning, handler) => { + if (warning.code.startsWith('a11y-')) return + if (warning.code === 'missing-exports-condition') return + if (warning.code === 'a11y-no-static-element-interactions') return + if (warning.code === 'svelte-ignore a11y-autofocus') return + if (warning.code.startsWith('css-unused-selector')) return + handler(warning) + }, kit: { prerender: { handleHttpError: 'fail'