From 066c400ccebf9e505192c3a609acc9c70d3554ed Mon Sep 17 00:00:00 2001 From: Shiba <44804845+DeepDoge@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:34:53 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8D=A3=20Bug=20fixes=20and=20small=20?= =?UTF-8?q?changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dialogs.tsx | 7 +------ src/settings/index.ts | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/dialogs.tsx b/src/components/dialogs.tsx index 6135e96..d62caaa 100644 --- a/src/components/dialogs.tsx +++ b/src/components/dialogs.tsx @@ -46,11 +46,6 @@ export function createDialogManager() { } } -interface DialogElement extends HTMLDivElement { - open: boolean - showModal(): void -} - export function Dialogs(params: { manager: ReturnType }) { const alerts = params.manager.useAlerts() let currentAlert = Object.values(alerts)[0] @@ -60,7 +55,7 @@ export function Dialogs(params: { manager: ReturnType { if (!dialog.current) return if (!dialog.current.open) dialog.current.showModal() diff --git a/src/settings/index.ts b/src/settings/index.ts index eda0ee5..d2d8bc5 100644 --- a/src/settings/index.ts +++ b/src/settings/index.ts @@ -77,7 +77,7 @@ export const targetPlatformSettings = { 'madiator.com': targetPlatform({ domainPrefix: 'https://madiator.com/', displayName: 'Madiator.com', - theme: '#075656', + theme: 'linear-gradient(130deg, #499375, #43889d)', button: { text: 'Watch on', icon: chrome.runtime.getURL('assets/icons/lbry/madiator-logo.svg'), @@ -90,7 +90,7 @@ export const targetPlatformSettings = { odysee: targetPlatform({ domainPrefix: 'https://odysee.com/', displayName: 'Odysee', - theme: '#1e013b', + theme: 'linear-gradient(130deg, #c63d59, #f77937)', button: { text: 'Watch on Odysee', icon: chrome.runtime.getURL('assets/icons/lbry/odysee-logo.svg') @@ -99,7 +99,7 @@ export const targetPlatformSettings = { app: targetPlatform({ domainPrefix: 'lbry://', displayName: 'LBRY App', - theme: '#075656', + theme: 'linear-gradient(130deg, #499375, #43889d)', button: { text: 'Watch on LBRY', icon: chrome.runtime.getURL('assets/icons/lbry/lbry-logo.svg') From 0ba4efd43eca08b9dbbcb75b6ca98d31263a98d2 Mon Sep 17 00:00:00 2001 From: Shiba <44804845+DeepDoge@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:37:03 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8D=99=20New=20button=20style=20with?= =?UTF-8?q?=20gradient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/popup/main.tsx | 13 ++++++++----- src/scripts/ytContent.tsx | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pages/popup/main.tsx b/src/pages/popup/main.tsx index 1b9e319..41bc743 100644 --- a/src/pages/popup/main.tsx +++ b/src/pages/popup/main.tsx @@ -68,11 +68,14 @@ function WatchOnLbryPopup(params: { profile: Awaited loads(generateProfileAndSetNickname(dialogManager)).then(() => renderPopup())} className={`button active`}> Change Nickname - - await dialogManager.confirm("This will delete your keypair from this device.\nStill wanna continue?\n\nNOTE: Without keypair you can't purge your data online.\nSo if you wish to purge, please use purging instead.") - && resetProfileSettings() - && renderPopup() - } + { + if (!await dialogManager.confirm("This will delete your keypair from this device." + + "\nStill wanna continue?" + + "\n\nNOTE: Without keypair you can't purge your data online." + + "\nSo if you wish to purge, please use purging instead.")) return + resetProfileSettings() + renderPopup() + }} className={`button`} > Forget/Logout diff --git a/src/scripts/ytContent.tsx b/src/scripts/ytContent.tsx index b1f97cb..a986107 100644 --- a/src/scripts/ytContent.tsx +++ b/src/scripts/ytContent.tsx @@ -32,6 +32,8 @@ function WatchOnLbryButton({ targetPlatform, lbryPathname, time }: WatchOnLbryBu gap: '12px', borderRadius: '2px', backgroundColor: targetPlatform.theme, + backgroundImage: targetPlatform.theme, + fontWeight: 'bold', border: '0', color: 'whitesmoke', padding: '10px 16px', From f072c95051409b16c202d6ccd06aa624831ac408 Mon Sep 17 00:00:00 2001 From: Shiba <44804845+DeepDoge@users.noreply.github.com> Date: Fri, 1 Jul 2022 20:39:13 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=8D=A4=20Build=20for=20manifest=20v2?= =?UTF-8?q?=20and=20v3=20at=20once=20-=20and=20zip=20them?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d07ee2..6ba85f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .cache dist +build node_modules web-ext-artifacts yarn-error.log diff --git a/package.json b/package.json index e200c3a..751765d 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "build:v2": "npm run clear:dist ; npm run build:base && npm run pick:manifest:v2", "build:v3": "npm run clear:dist ; npm run build:base && npm run pick:manifest:v3", - "build": "npm run build:v3", - + "build": "rm -r ./build ; mkdir ./build && npm run build:v2 && zip -r ./build/manifest-v2.zip ./dist && npm run build:v3 && zip -r ./build/manifest-v3.zip ./dist", + "watch:v2": "npm run clear:dist ; npm run pick:manifest:v2 && npm-run-all -l -p watch:parcel watch:assets", "watch:v3": "npm run clear:dist ; npm run pick:manifest:v3 && npm-run-all -l -p watch:parcel watch:assets",