Merge pull request #95 from VampireChicken12/dev

Dev
YouTube-Enhancer · Nov 15, 2023 · cff8c4b · cff8c4b
2 parents d6bc179 + ddd44d0
commit cff8c4b
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 43 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -51,17 +51,19 @@
 		"no-useless-escape": "off",
 		"no-empty": ["error", { "allowEmptyCatch": true }],
 		"no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
-		"import/no-commonjs": "error",
 		"import/first": ["error"],
 		"no-secrets/no-secrets": "error",
 		"prettier/prettier": [
 			"error",
 			{
-				"useTabs": true,
+				"arrowParens": "always",
+				"endOfLine": "lf",
+				"printWidth": 150,
 				"semi": true,
+				"singleQuote": false,
+				"tabWidth": 2,
 				"trailingComma": "none",
-				"arrowParens": "always",
-				"printWidth": 150
+				"useTabs": true
 			}
 		],
 		"import/no-unresolved": "off",

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,4 +11,3 @@ updates:
       interval: "weekly"
     target-branch: "dev"
     versioning-strategy: "increase-if-necessary"
-
diff --git a/nodemon.json b/nodemon.json
@@ -5,5 +5,5 @@
 	"watch": ["src", "utils", "vite.config.ts", "public", "public/locales"],
 	"ext": "ts,tsx,css,html,json",
 	"ignore": ["src/**/*.spec.ts", "public/locales/en-US.json.d.ts"],
-	"exec": "concurrently \"vite build\" \"ts-json-as-const public/locales/en-US.json\" \"prettier --write public/locales/en-US.json.d.ts\""
+	"exec": "concurrently \"vite build\" \"ts-json-as-const public/locales/en-US.json\" \"prettier --write public/locales/en-US.json.d.ts\" \"eslint --fix public/locales/en-US.json.d.ts\""
 }
diff --git a/postcss.config.cjs b/postcss.config.cjs
@@ -1,7 +1,7 @@
 module.exports = {
 	plugins: {
 		"@thedutchcoder/postcss-rem-to-px": {},
-		tailwindcss: {},
-		autoprefixer: {}
+		autoprefixer: {},
+		tailwindcss: {}
 	}
 };
diff --git a/prettier.config.cjs b/prettier.config.cjs
@@ -1,11 +1,11 @@
 /** @type {import("prettier").Config} */
 module.exports = {
-	useTabs: true,
-	semi: true,
-	trailingComma: "none",
 	arrowParens: "always",
-	tabWidth: 2,
+	endOfLine: "lf",
 	printWidth: 150,
+	semi: true,
 	singleQuote: false,
-	endOfLine: "lf"
+	tabWidth: 2,
+	trailingComma: "none",
+	useTabs: true
 };
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -40,7 +40,6 @@
 	"settings": {
 		"sections": {
 			"importExportSettings": {
-				"title": "Import/Export Settings",
 				"importButton": {
 					"error": {
 						"validation": "Error importing settings. Please check the file format.\n{{ERROR_MESSAGE}}",

diff --git a/public/locales/en-US.json.d.ts b/public/locales/en-US.json.d.ts
@@ -67,7 +67,6 @@ interface EnUS {
 					title: "Import settings from a JSON file";
 					value: "Import Settings";
 				};
-				title: "Import/Export Settings";
 			};
 			language: {
 				select: { label: "Language"; title: "The language to use for the extension" };

diff --git a/src/@types/index.ts b/src/@types/index.ts
@@ -159,7 +159,10 @@ type TypeToZod<T> = {
 			: z.ZodType<T[K]>
 		: z.ZodObject<TypeToZod<T[K]>>;
 };
-export type PartialConfigurationToZodSchema<T> = z.ZodObject<{
+export type TypeToZodSchema<T> = z.ZodObject<{
+	[K in keyof T]: T[K] extends object ? z.ZodObject<TypeToZod<T[K]>> : z.ZodType<T[K]>;
+}>;
+export type TypeToPartialZodSchema<T> = z.ZodObject<{
 	[K in keyof T]: T[K] extends object ? z.ZodObject<TypeToZod<T[K]>> : z.ZodOptionalType<z.ZodType<T[K]>>;
 }>;
 export type Prettify<T> = {

diff --git a/src/components/Settings/Settings.tsx b/src/components/Settings/Settings.tsx
@@ -356,28 +356,6 @@ export default function Settings({
 						t={i18nInstance.t}
 					/>
 				</Suspense>
-				<SettingSection>
-					<SettingTitle title={t("settings.sections.importExportSettings.title")} />
-					<div className="flex gap-1 p-2">
-						<input
-							className="accent p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
-							id="import_settings_button"
-							onClick={importSettings}
-							title={t("settings.sections.importExportSettings.importButton.title")}
-							type="button"
-							value={t("settings.sections.importExportSettings.importButton.value")}
-						/>
-						<input
-							className="accent p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
-							id="export_settings_button"
-							onClick={exportSettings}
-							style={{ marginLeft: "auto" }}
-							title={t("settings.sections.importExportSettings.exportButton.title")}
-							type="button"
-							value={t("settings.sections.importExportSettings.exportButton.value")}
-						/>
-					</div>
-				</SettingSection>
 				<SettingSection>
 					<SettingTitle title={t("settings.sections.miscellaneous.title")} />
 					<Setting
@@ -613,7 +591,7 @@ export default function Settings({
 						type="select"
 					/>
 				</SettingSection>
-				<div className="sticky bottom-0 left-0 flex gap-1 bg-[#f5f5f5] p-2 dark:bg-[#181a1b]">
+				<div className="sticky bottom-0 left-0 flex justify-between gap-1 bg-[#f5f5f5] p-2 dark:bg-[#181a1b]">
 					<input
 						className="danger p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
 						id="clear_data_button"
@@ -622,6 +600,22 @@ export default function Settings({
 						type="button"
 						value={t("settings.sections.bottomButtons.clear.value")}
 					/>
+					<input
+						className="accent p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
+						id="import_settings_button"
+						onClick={importSettings}
+						title={t("settings.sections.importExportSettings.importButton.title")}
+						type="button"
+						value={t("settings.sections.importExportSettings.importButton.value")}
+					/>
+					<input
+						className="accent p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
+						id="export_settings_button"
+						onClick={exportSettings}
+						title={t("settings.sections.importExportSettings.exportButton.title")}
+						type="button"
+						value={t("settings.sections.importExportSettings.exportButton.value")}
+					/>
 					{notifications.filter((n) => n.action === "reset_settings").length > 0 ? (
 						<input
 							className="danger p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
@@ -636,7 +630,6 @@ export default function Settings({
 
 								addNotification("success", t("pages.options.notifications.success.saved"));
 							}}
-							style={{ marginLeft: "auto" }}
 							title={t("settings.sections.bottomButtons.confirm.title")}
 							type="button"
 							value={t("settings.sections.bottomButtons.confirm.value")}
@@ -646,7 +639,6 @@ export default function Settings({
 							className="warning p-2 text-sm dark:hover:bg-[rgba(24,26,27,0.5)] sm:text-base md:text-lg"
 							id="reset_button"
 							onClick={resetOptions}
-							style={{ marginLeft: "auto" }}
 							title={t("settings.sections.bottomButtons.reset.title")}
 							type="button"
 							value={t("settings.sections.bottomButtons.reset.value")}

diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -1,6 +1,6 @@
 import z from "zod";
 
-import type { PartialConfigurationToZodSchema, configuration } from "../@types";
+import type { TypeToPartialZodSchema, configuration } from "../@types";
 
 import {
 	onScreenDisplayColor,
@@ -42,7 +42,7 @@ export const defaultConfiguration = {
 	volume_boost_amount: 1
 } satisfies configuration;
 
-export const configurationImportSchema: PartialConfigurationToZodSchema<configuration> = z.object({
+export const configurationImportSchema: TypeToPartialZodSchema<configuration> = z.object({
 	enable_automatically_set_quality: z.boolean().optional(),
 	enable_forced_playback_speed: z.boolean().optional(),
 	enable_hide_scrollbar: z.boolean().optional(),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@ updates:
		interval: "weekly"
		target-branch: "dev"
		versioning-strategy: "increase-if-necessary"