diff --git a/biome.json b/biome.json index bd25946..6f5642d 100644 --- a/biome.json +++ b/biome.json @@ -20,7 +20,8 @@ "formatter": { "enabled": true, "indentStyle": "space", - "indentWidth": 2 + "indentWidth": 2, + "ignore": ["built/", "safari/"] }, "javascript": { "formatter": { diff --git a/chrome/manifest.json b/chrome/manifest.json index ce17a80..3c34edf 100644 --- a/chrome/manifest.json +++ b/chrome/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Kagi Search for Chrome", - "version": "0.4.3", + "version": "0.5.0", "description": "A simple extension for setting Kagi as a default search engine, and automatically logging in to Kagi in incognito browsing windows", "background": { "service_worker": "src/background.js", diff --git a/firefox/manifest.json b/firefox/manifest.json index 4e70c6b..5362bb6 100644 --- a/firefox/manifest.json +++ b/firefox/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Kagi Search for Firefox", - "version": "0.4.3", + "version": "0.5.0", "description": "A simple helper extension for setting Kagi as a default search engine, and automatically logging in to Kagi in incognito browsing windows.", "background": { "page": "src/background_page.html" diff --git a/package-lock.json b/package-lock.json index 1c65284..e340356 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,9 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "@biomejs/biome": "1.4.1", + "@biomejs/biome": "1.5.2", "adm-zip": "0.5.10", - "nodemon": "3.0.1" + "nodemon": "3.0.3" }, "engines": { "node": "20.x", @@ -19,9 +19,9 @@ } }, "node_modules/@biomejs/biome": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.4.1.tgz", - "integrity": "sha512-JccVAwPbhi37pdxbAGmaOBjUTKEwEjWAhl7rKkVVuXHo4MLASXJ5HR8BTgrImi4/7rTBsGz1tgVD1Kwv1CHGRg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.5.2.tgz", + "integrity": "sha512-LhycxGQBQLmfv6M3e4tMfn/XKcUWyduDYOlCEBrHXJ2mMth2qzYt1JWypkWp+XmU/7Hl2dKvrP4mZ5W44+nWZw==", "dev": true, "hasInstallScript": true, "bin": { @@ -35,18 +35,20 @@ "url": "https://opencollective.com/biome" }, "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "1.4.1", - "@biomejs/cli-darwin-x64": "1.4.1", - "@biomejs/cli-linux-arm64": "1.4.1", - "@biomejs/cli-linux-x64": "1.4.1", - "@biomejs/cli-win32-arm64": "1.4.1", - "@biomejs/cli-win32-x64": "1.4.1" + "@biomejs/cli-darwin-arm64": "1.5.2", + "@biomejs/cli-darwin-x64": "1.5.2", + "@biomejs/cli-linux-arm64": "1.5.2", + "@biomejs/cli-linux-arm64-musl": "1.5.2", + "@biomejs/cli-linux-x64": "1.5.2", + "@biomejs/cli-linux-x64-musl": "1.5.2", + "@biomejs/cli-win32-arm64": "1.5.2", + "@biomejs/cli-win32-x64": "1.5.2" } }, "node_modules/@biomejs/cli-darwin-arm64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.4.1.tgz", - "integrity": "sha512-PZWy2Idndqux38p6AXSDQM2ldRAWi32bvb7bMbTN0ALzpWYMYnxd71ornatumSSJYoNhKmxzDLq+jct7nZJ79w==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.5.2.tgz", + "integrity": "sha512-3JVl08aHKsPyf0XL9SEj1lssIMmzOMAn2t1zwZKBiy/mcZdb0vuyMSTM5haMQ/90wEmrkYN7zux777PHEGrGiw==", "cpu": [ "arm64" ], @@ -60,9 +62,9 @@ } }, "node_modules/@biomejs/cli-darwin-x64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.4.1.tgz", - "integrity": "sha512-soj3BWhnsM1M2JlzR09cibUzG1owJqetwj/Oo7yg0foijo9lNH9XWXZfJBYDKgW/6Fomn+CC2EcUS+hisQzt9g==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.5.2.tgz", + "integrity": "sha512-QAPW9rZb/AgucUx+ogMg+9eJNipQDqvabktC5Tx4Aqb/mFzS6eDqNP7O0SbGz3DtC5Y2LATEj6o6zKIQ4ZT+3w==", "cpu": [ "x64" ], @@ -76,9 +78,25 @@ } }, "node_modules/@biomejs/cli-linux-arm64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.4.1.tgz", - "integrity": "sha512-YIZqfJUg4F+fPsBTXxgD7EU2E5OAYbmYSl/snf4PevwfQCWE/omOFZv+NnIQmjYj9I7ParDgcJvanoA3/kO0JQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.5.2.tgz", + "integrity": "sha512-fVLrUgIlo05rO4cNu+Py5EwwmXnXhWH+8KrNlWkr2weMYjq85SihUsuWWKpmqU+bUVR+m5gwfcIXZVWYVCJMHw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.*" + } + }, + "node_modules/@biomejs/cli-linux-arm64-musl": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.2.tgz", + "integrity": "sha512-Z29SjaOyO4QfajplNXSjLx17S79oPN42D094zjE24z7C7p3NxvLhKLygtSP9emgaXkcoESe2chOzF4IrGy/rlg==", "cpu": [ "arm64" ], @@ -92,9 +110,25 @@ } }, "node_modules/@biomejs/cli-linux-x64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.4.1.tgz", - "integrity": "sha512-9YOZw3qBd/KUj63A6Hn2zZgzGb2nbESM0qNmeMXgmqinVKM//uc4OgY5TuKITuGjMSvcVxxd4dX1IzYjV9qvNQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.5.2.tgz", + "integrity": "sha512-ixqJtUHtF0ho1+1DTZQLAEwHGSqvmvHhAAFXZQoaSdABn+IcITYExlFVA3bGvASy/xtPjRhTx42hVwPtLwMHwg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=14.*" + } + }, + "node_modules/@biomejs/cli-linux-x64-musl": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.2.tgz", + "integrity": "sha512-ZolquPEjWYUmGeERS8svHOOT7OXEeoriPnV8qptgWJmYF9EO9HUGRn1UtCvdVziDYK+u1A7PxjOdkY1B00ty5A==", "cpu": [ "x64" ], @@ -108,9 +142,9 @@ } }, "node_modules/@biomejs/cli-win32-arm64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.4.1.tgz", - "integrity": "sha512-nWQbvkNKxYn/kCQ0yVF8kCaS3VzaGvtFSmItXiMknU4521LDjJ7tNWH12Gol+pIslrCbd4E1LhJa0a3ThRsBVg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.5.2.tgz", + "integrity": "sha512-DN4cXSAoFTdjOoh7f+JITj1uQgQSXt+1pVea9bFrpbgip+ZwkONqQq+jUcmFMMehbp9LuiVtNXFz/ReHn6FY7A==", "cpu": [ "arm64" ], @@ -124,9 +158,9 @@ } }, "node_modules/@biomejs/cli-win32-x64": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.4.1.tgz", - "integrity": "sha512-88fR2CQxQ4YLs2BUDuywWYQpUKgU3A3sTezANFc/4LGKQFFLV2yX+F7QAdZVkMHfA+RD9Xg178HomM/6mnTNPA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.5.2.tgz", + "integrity": "sha512-YvWWXZmk936FdrXqc2jcP6rfsXsNBIs9MKBQQoVXIihwNNRiAaBD9Iwa/ouU1b7Zxq2zETgeuRewVJickFuVOw==", "cpu": [ "x64" ], @@ -238,12 +272,20 @@ "dev": true }, "node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { - "ms": "^2.1.1" + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/fill-range": { @@ -366,19 +408,19 @@ } }, "node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "node_modules/nodemon": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz", - "integrity": "sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.3.tgz", + "integrity": "sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==", "dev": true, "dependencies": { "chokidar": "^3.5.2", - "debug": "^3.2.7", + "debug": "^4", "ignore-by-default": "^1.0.1", "minimatch": "^3.1.2", "pstree.remy": "^1.1.8", diff --git a/package.json b/package.json index 7cbc1de..af18b47 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ }, "homepage": "https://github.com/kagisearch/browser_extensions#readme", "devDependencies": { - "@biomejs/biome": "1.4.1", + "@biomejs/biome": "1.5.2", "adm-zip": "0.5.10", - "nodemon": "3.0.1" + "nodemon": "3.0.3" }, "engines": { "node": "20.x", diff --git a/shared/src/popup.css b/shared/src/popup.css index 12457fe..dfcc45c 100644 --- a/shared/src/popup.css +++ b/shared/src/popup.css @@ -36,7 +36,7 @@ input { border: 1px solid #e1e0db; } -input[type="password"] { +input[type="password"], input[type="text"] { background-color: #f7f6f2; border: 1px solid #e1e0db; height: 48px; @@ -44,7 +44,7 @@ input[type="password"] { padding: 0 10px; } -input[type="password"]:focus { +input[type="password"]:focus, input[type="text"]:focus { outline: 1px solid #ffb319; } @@ -60,15 +60,41 @@ input[type="password"]:focus { .logo { width: 58px; height: 29px; - flex: 1; + flex: 0; justify-content: flex-start; display: flex; + margin: 0 15px; } .logo svg { height: 100%; } +#links { + flex: 1; + justify-content: flex-start; + display: flex; + font-size: 11px; + color: rgba(0, 0, 0, 0.6); + margin: 0 10px; + visibility: hidden; +} + +#links a { + display: inline-block; + color: rgba(0, 0, 0, 0.6); + text-decoration: none; +} + +#links a:hover, #links a:focus { + text-decoration: underline; +} + +#links span { + display: inline-block; + margin: 0 7px; +} + #status { font-size: 0.875rem; flex: 0; @@ -288,28 +314,37 @@ p { right: 2px; } -#summarize, #request_permissions { +#fastgpt, #summarize, #request_permissions { margin-top: 10px; width: 100%; padding: 0 15px; } -#summarize .setting_row, #request_permissions .setting_row { +#summarize .setting_row, #request_permissions .setting_row, #fastgpt .setting_row { margin-top: 10px; padding: 0; justify-content: space-between; } -#summarize .setting_row > div, #request_permissions .setting_row > div { +#summarize .setting_row > div, #request_permissions .setting_row > div, #fastgpt .setting_row > form { margin-right: 10px; } +#fastgpt_form { + width: 100%; + display: flex; +} + +#fastgpt_form input { + margin-right: 10px +} + #summarize .setting_row label { display: block; margin-bottom: 5px; } -#summarize_page, #request_permissions_button { +#summarize_page, #request_permissions_button, #fastgpt_submit { background-color: #ffb319; border: 1px solid #ffb319; color: #191919; @@ -323,13 +358,18 @@ p { margin-right: 10px; } +#fastgpt_submit { + width: 120px; + margin-right: 0; +} + #request_permissions_button { max-width: 400px; margin-left: auto; margin-right: auto; } -#summarize_page:hover, #request_permissions_button:hover { +#summarize_page:hover, #request_permissions_button:hover, #fastgpt_submit { background-color: #f7a808; border: 1px solid #d9950d; } diff --git a/shared/src/popup.html b/shared/src/popup.html index 2bd532e..5ad69dc 100644 --- a/shared/src/popup.html +++ b/shared/src/popup.html @@ -18,6 +18,10 @@ + +
- +
@@ -146,7 +150,7 @@
- +
+ +