From 4b2724d2f928549e59a9be9f8ac896115dbe07e5 Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 13:35:55 +0000 Subject: [PATCH 1/7] =?UTF-8?q?[=F0=9F=92=84]=20Add=20battery=20emoji=20to?= =?UTF-8?q?=20battery=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/battery.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/battery.ts b/src/modules/battery.ts index dce3252..3909381 100644 --- a/src/modules/battery.ts +++ b/src/modules/battery.ts @@ -9,5 +9,5 @@ export const run = (element: HTMLDivElement): void => { element.style.alignItems = 'center' element.style.paddingLeft = '15px' element.style.paddingRight = '15px' - element.innerHTML = '100%' + element.innerHTML = '🔋 100%' } From 86d2958a824fe1869412175b27b7eeef713f281f Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 13:36:45 +0000 Subject: [PATCH 2/7] =?UTF-8?q?[=F0=9F=92=84]=20Add=20gradient=20to=20laun?= =?UTF-8?q?cher=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style.less | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/style.less b/src/style.less index 6e19dd6..73be354 100644 --- a/src/style.less +++ b/src/style.less @@ -11,7 +11,12 @@ --crust: #11111b; } -body, html { +.bx-category { + color: #181926; +} + +body, +html { background-color: var(--crust); width: 100vw; @@ -25,7 +30,6 @@ body, html { overflow: hidden; } - *::-webkit-scrollbar { display: none; } @@ -34,7 +38,7 @@ body, html { -ms-overflow-style: none; scrollbar-width: none; - font-family: 'Satoshi', sans-serif; + font-family: "Satoshi", sans-serif; font-weight: 600; color: var(--text); @@ -50,12 +54,17 @@ toolbar { margin: 0 0 0 0; justify-content: center; + div[data-toolbar-id="appview"] { + background: rgb(150, 181, 246); + background: linear-gradient(45deg, rgba(150, 181, 246, 1) 0%, rgba(150, 181, 246, 1) 12%, rgba(77, 129, 236, 1) 100%); + color: black; + } & > div { background: var(--base); padding: 5px; border-radius: 5px; box-shadow: 0 10px 10px rgba(0, 0, 0, 0.1), 0 0px 10px rgba(0, 0, 0, 0.1); - height: 40px!important; + height: 40px !important; display: flex; app { @@ -80,7 +89,6 @@ window-area { margin-bottom: 20px; height: 100%; overflow: hidden; - window { background: var(--base); @@ -91,8 +99,8 @@ window-area { overflow: hidden; border: 1px solid rgba(255, 255, 255, 0.2); background: var(--crust); - transition: .2s opacity, .2s width, .2s height; - + transition: 0.2s opacity, 0.2s width, 0.2s height; + window-header { height: 20px; padding: 7.5px; @@ -106,7 +114,7 @@ window-area { border-radius: 40%; } } - + window-content { height: 100%; border-radius: 10px 10px 0 0; @@ -132,7 +140,7 @@ launcher { width: 100vw; height: calc(100vh + 20px); gap: 20px; - transition: .2s opacity, .2s backdrop-filter; + transition: 0.2s opacity, 0.2s backdrop-filter; apps { max-height: 70vh; @@ -167,11 +175,11 @@ launcher { width: 300px; max-width: 100vw; text-align: center; - transition: border .2s; + transition: border 0.2s; &:focus { outline: none; border: 2px solid var(--text); } } -} \ No newline at end of file +} From f46558038800977a6f9818ee5f9e13aa3cd51463 Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 13:39:10 +0000 Subject: [PATCH 3/7] =?UTF-8?q?[=F0=9F=90=9B]=20Fixed=20weird=20margin=20i?= =?UTF-8?q?n=20the=20launcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/style.less b/src/style.less index 73be354..9efce8c 100644 --- a/src/style.less +++ b/src/style.less @@ -137,10 +137,12 @@ launcher { top: 0; background: rgba(0, 0, 0, 0.5); z-index: 99999999999999999999999; - width: 100vw; + width: calc(100vw + 20px); height: calc(100vh + 20px); gap: 20px; transition: 0.2s opacity, 0.2s backdrop-filter; + margin: 0; + left: 0; apps { max-height: 70vh; From 86cc529c24c153263a0ef0e0f956d4bdd9606a69 Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 13:52:09 +0000 Subject: [PATCH 4/7] =?UTF-8?q?[=E2=9C=A8]=20Added=20eruda=20debug=20(=3Fd?= =?UTF-8?q?ebug=3Dtrue)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 ++++++ package.json | 1 + src/index.ts | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbfd532..2667fe3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "MIT", "dependencies": { "@ptkdev/logger": "^1.8.0", + "eruda": "^3.0.1", "filer": "^1.4.1", "prism-code-editor": "^1.2.2", "prismjs": "^1.29.0", @@ -1846,6 +1847,11 @@ "is-arrayish": "^0.2.1" } }, + "node_modules/eruda": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eruda/-/eruda-3.0.1.tgz", + "integrity": "sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ==" + }, "node_modules/es-abstract": { "version": "1.22.2", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", diff --git a/package.json b/package.json index d91f9ff..2283b5d 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ }, "dependencies": { "@ptkdev/logger": "^1.8.0", + "eruda": "^3.0.1", "filer": "^1.4.1", "prism-code-editor": "^1.2.2", "prismjs": "^1.29.0", diff --git a/src/index.ts b/src/index.ts index ea1346d..a6201d0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,7 @@ import './style.less' -import StatusBar from './statusbar.ts' -import WM from './wm.ts' +import StatusBar from './statusbar' +import WM from './wm' import * as fs from 'fs' @@ -16,3 +16,12 @@ declare global { window.statusBar = new StatusBar() window.wm = new WM() window.fs = new (window as any).Filer.FileSystem() + +const params = new URLSearchParams(window.location.search) + +async function enableDebug() { + const { default: eruda } = await import("eruda") + eruda.init() +} + +if (params.get("debug")) enableDebug() \ No newline at end of file From 356e18abd280a558e637a879d766a78f8b500a03 Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 13:57:15 +0000 Subject: [PATCH 5/7] =?UTF-8?q?[=E2=9A=A1]=20Favicon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 6360138..734e681 100644 --- a/index.html +++ b/index.html @@ -1,12 +1,13 @@ - - - - Flow OS - - - - - - \ No newline at end of file + + + + Flow OS + + + + + + + From cd7af324271600080cc1fb42ae8aa6841502c258 Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 14:15:26 +0000 Subject: [PATCH 6/7] =?UTF-8?q?[=E2=9A=A1]=20Add=20preview=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2283b5d..494ea71 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "ts-standard", "dev": "vite", "build": "vite build", - "serve": "vite serve" + "preview": "vite preview" }, "keywords": [], "author": "", From 73530afebd531ab03426591272fa53c37dcff02c Mon Sep 17 00:00:00 2001 From: Parrot Date: Tue, 17 Oct 2023 22:33:46 +0000 Subject: [PATCH 7/7] =?UTF-8?q?[=F0=9F=94=A8]=20Fixing=20ts-standard=20err?= =?UTF-8?q?ors=20I=20made=20earlier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index a6201d0..24f0676 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,9 +19,12 @@ window.fs = new (window as any).Filer.FileSystem() const params = new URLSearchParams(window.location.search) -async function enableDebug() { - const { default: eruda } = await import("eruda") +async function enableDebug (): Promise { + const { default: eruda } = await import('eruda') eruda.init() + return await Promise.resolve() } -if (params.get("debug")) enableDebug() \ No newline at end of file +if (params.get('debug') !== null && params.get('debug') !== undefined) { + enableDebug().catch(e => console.error(e)) +}