switch to bulma and remove pure css, improve the messaging

Cette révision appartient à :
arabcoders committed 2025-05-23 01:45:24 +03:00
1 Parent 7d32fd8340
révision bf8c0f3d44
7 files changed
+25031 -173

No files matched your search

+31 -38
Voir le fichier
@@ -49,17 +49,17 @@ const getOption = async key => {
}
}
const sendRequest = async user_url => {
const instanceUrl = await getOption("instance_url");
const sendRequest = async (path, data) => {
let instanceUrl = await getOption("instance_url");
if (!instanceUrl) {
notify('YTPTube instance url not configured.');
return;
throw new Error('YTPTube instance url not configured.');
}
if (instanceUrl.endsWith('/')) {
instanceUrl = instanceUrl.slice(0, -1);
}
let headers = {};
let data = {
url: user_url,
}
const auth_username = await getOption("username");
const auth_password = await getOption("password");
@@ -67,41 +67,34 @@ const sendRequest = async user_url => {
headers['Authorization'] = 'Basic ' + btoa(`${auth_username}:${auth_password}`);
}
const preset = await getOption("preset");
if (preset) {
data['preset'] = preset;
}
const template = await getOption("template");
if (template) {
data['template'] = template;
}
const folder = await getOption("folder");
if (folder) {
data['folder'] = folder;
}
const url = new URL(instanceUrl);
url.pathname = path;
console.debug(`Sending to '${instanceUrl}'.`, data, headers.length > 0 ? 'with auth header' : 'without auth header');
const url = new URL(instanceUrl);
url.pathname = '/api/history';
let opts = {method: data.length > 0 ? 'POST' : 'GET', headers: headers};
const req = await fetch(url, {
method: 'POST',
headers: {
...headers,
'Content-Type': 'application/json',
},
body: JSON.stringify(data)
});
if (200 === req.status) {
notify('Request sent successfully.');
return
if (data) {
opts.headers['Content-Type'] = 'application/json';
opts.body = JSON.stringify(data);
}
notify(`Failed to send request. '${req.status}: ${req.statusText}'.`);
const req = await fetch(url, opts);
return {status: req.status, statusText: req.statusText, data: req};
};
const sendUrl = async user_url => {
try {
const data = await sendRequest('/api/history', {url: user_url});
if (200 === data.status) {
notify('Request sent successfully.');
return
}
notify(`Failed to send request. '${data.status}: ${data.statusText}'.`);
}catch (e) {
console.error(e);
notify(`Failed to send request. '${e.message}'.`);
}
};
chrome.contextMenus.onClicked.addListener(async (info, _) => {
@@ -113,7 +106,7 @@ chrome.contextMenus.onClicked.addListener(async (info, _) => {
return;
}
await sendRequest(info.linkUrl);
await sendUrl(info.linkUrl);
});
chrome.runtime.onMessage.addListener(async (message) => {
@@ -128,7 +121,7 @@ chrome.runtime.onMessage.addListener(async (message) => {
return;
}
await sendRequest(url);
await sendUrl(url);
});
+24826
Voir le fichier
Fichier diff supprimé car celui-ci est trop grand Voir la Diff
-11
Voir le fichier
@@ -1,11 +0,0 @@
/*!
Pure v3.0.0
Copyright 2013 Yahoo!
Licensed under the BSD License.
https://github.com/pure-css/pure/blob/master/LICENSE
*/
/*!
normalize.css v | MIT License | https://necolas.github.io/normalize.css/
Copyright (c) Nicolas Gallagher and Jonathan Neal
*/
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}html{font-family:sans-serif}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto;display:block}.pure-g{display:flex;flex-flow:row wrap;align-content:flex-start}.pure-u{display:inline-block;vertical-align:top}.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;user-select:none;box-sizing:border-box}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-0.43em}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:rgba(0,0,0,.8);border:none transparent;background-color:#e6e6e6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;opacity:.4;cursor:not-allowed;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-buLine truncated
+4 -1
Voir le fichier
@@ -7,7 +7,7 @@
]
},
"name": "YTPTube Extension",
"version": "0.0.3",
"version": "1.0.0",
"description": "Add URLs to YTPTube instance",
"permissions": [
"activeTab",
@@ -41,5 +41,8 @@
"id": "ytptube@arabcoders.org",
"strict_min_version": "113.0"
}
},
"content_security_policy": {
"extension_pages": "script-src 'self'; object-src 'self';"
}
}
+66 -59
Voir le fichier
@@ -4,75 +4,82 @@
<head>
<meta charset="utf-8">
<title>Options menu for YTPTube Extension</title>
<link rel="stylesheet" href="css/pure.css"/>
<style>
@media (prefers-color-scheme: dark) {
body {
color: white;
background-color: #19191c;
}
input {
background-color: #19191c;
color: white;
}
fieldset > legend {
color: white !important;
}
}
</style>
<link rel="stylesheet" href="css/bulma.css"/>
</head>
<body>
<form id="ytptube_options" class="pure-form pure-form-stacked">
<fieldset style="padding:1em">
<legend>Settings</legend>
<body class="container">
<div class="columns is-multiline">
<div class="column is-12">
<form id="ytptube_options" class="content m-1">
<div class="field">
<label class="label" for="instance_url">YTPTube URL</label>
<div class="control">
<input type="text" class="input" id="instance_url" placeholder="https://ytptube.example.org">
</div>
<span class="help">URL to your YTPTube instance</span>
</div>
<div class="pure-control-group">
<label for="instance_url">YTPTube URL</label>
<input type="text" class="pure-input-1" id="instance_url" placeholder="https://ytptube.example.org">
<span class="pure-form-message">URL to your YTPTube instance</span><br>
</div>
<div class="field">
<label class="label" for="preset">Preset</label>
<div class="control">
<input type="text" class="input" id="preset" placeholder="Leave empty to use default preset.">
</div>
<span class="help">Preset to use for the URL</span>
</div>
<div class="pure-control-group">
<label for="preset">Preset</label>
<input type="text" class="pure-input-1" id="preset" placeholder="Leave empty to use default preset.">
<span class="pure-form-message">Preset to use for the URL</span><br>
</div>
<div class="field">
<label class="label" for="template">Output Template</label>
<div class="control">
<input type="text" class="input" id="template"
placeholder="Leave empty to use default output template.">
</div>
<span class="help">Filename template to use for the output file.</span>
</div>
<div class="pure-control-group">
<label for="template">Output Template</label>
<input type="text" class="pure-input-1" id="template"
placeholder="Leave empty to use default output template.">
<span class="pure-form-message">Filename template to use for the output file.</span><br>
</div>
<div class="field">
<label class="label" for="folder">Download Folder</label>
<div class="control">
<input type="text" class="input" id="folder"
placeholder="Leave empty to use default download path.">
</div>
<span class="help">Where to save downloaded files.</span>
</div>
<div class="pure-control-group">
<label for="folder">Download Folder</label>
<input type="text" class="pure-input-1" id="folder" placeholder="Leave empty to use default download path.">
<span class="pure-form-message">Where to save downloaded files.</span><br>
</div>
<div class="field">
<label class="label" for="username">Auth Username</label>
<div class="control">
<input type="text" class="input" id="username" placeholder="Auth username">
</div>
<span class="help">Leave empty if you have not configured a authentication.</span>
</div>
<div class="pure-control-group">
<label for="username">Auth Username</label>
<input type="text" class="pure-input-1" id="username"
placeholder="Leave empty if you have not configured a authentication.">
<span class="pure-form-message">Username to use for authentication.</span><br>
</div>
<div class="field">
<label class="label" for="password">Auth Password</label>
<div class="control">
<input type="password" class="input" id="password" placeholder="Auth Password">
</div>
<span class="help">Leave empty if you have not configured a authentication.</span>
</div>
<div class="pure-control-group">
<label for="password">Auth Password</label>
<input type="password" class="pure-input-1" id="password"
placeholder="Leave empty if you have not configured a authentication.">
<span class="pure-form-message">Password to use for authentication.</span><br>
</div>
<label class="checkbox mb-1" for="showContextMenu">
<input type="checkbox" id="showContextMenu"/> Show context menu in supported sites
</label>
<label for="showContextMenu">
<input type="checkbox" id="showContextMenu"/> Show context menu in supported sites
</label><br>
<div class="field has-text-danger">
<p id="error_msg"></p>
</div>
<button class="pure-button pure-input-1 pure-button-primary" type="submit">Save</button>
</fieldset>
</form>
<div class="field is-grouped">
<div class="control is-expanded">
<button class="button is-primary is-fullwidth" type="submit">Save</button>
</div>
<div class="control is-expanded">
<button class="button is-info is-fullwidth" type="button" id="test_config">Test</button>
</div>
</div>
</form>
</div>
</div>
<script src="options.js"></script>
</body>
+71 -9
Voir le fichier
@@ -3,10 +3,63 @@
const str_keys = ["instance_url", "preset", "template", "folder", "username", "password"]
if (typeof chrome === 'undefined') {
// noinspection JSUnusedLocalSymbols
let chrome = browser
}
const notify = (message, no_inline) => {
if (!no_inline) {
document.querySelector('#error_msg').innerText = message;
}
chrome.notifications.create({
"type": "basic",
"iconUrl": chrome.runtime.getURL("icons/icon-128.png"),
"title": 'YTPTube Extension',
"message": message,
});
}
const testConfig = async () => {
document.querySelector('#error_msg').innerText = "";
let instance_url = document.querySelector("#instance_url").value;
if (!instance_url) {
notify("Please enter a valid YTPTube instance URL.");
return false;
}
if (instance_url.endsWith('/')) {
instance_url = instance_url.slice(0, -1);
}
let username = document.querySelector("#username").value;
let password = document.querySelector("#password").value;
let headers = {}
if (username && password) {
headers['Authorization'] = 'Basic ' + btoa(username + ':' + password);
}
try {
const req = await fetch(`${instance_url}/api/ping`, {
method: 'GET',
headers: headers
});
if (200 === req.status) {
notify("Connection successful.", true);
return true;
}
const json = await req.json();
notify(json.error ?? "Unknown error.");
} catch (e) {
notify("Error: " + e);
}
return false;
}
document.addEventListener("DOMContentLoaded", () => {
function onError(error) {
console.log(`Error: ${error}`);
@@ -19,9 +72,13 @@ document.addEventListener("DOMContentLoaded", () => {
chrome.storage.sync.get("showContextMenu").then(r => document.querySelector("#showContextMenu").checked = r.showContextMenu || false);
});
document.getElementById("ytptube_options").addEventListener("submit", (e) => {
document.getElementById("ytptube_options").addEventListener("submit", async e => {
e.preventDefault();
if (false === (await testConfig())) {
return false;
}
let showContextMenu = document.querySelector("#showContextMenu").checked;
let data = {presets: {presets: ['default'], last_updated: 0}}
@@ -31,12 +88,17 @@ document.getElementById("ytptube_options").addEventListener("submit", (e) => {
chrome.storage.sync.set(data);
chrome.contextMenus.update("send-to-ytptube", {visible: showContextMenu});
chrome.notifications.create({
"type": "basic",
"iconUrl": chrome.runtime.getURL("icons/icon-128.png"),
"title": 'YTPTube Extension',
"message": "Options saved."
});
notify("Options saved.", true);
setTimeout(() => window.close(), 1000);
setTimeout(() => {
try {
window.close()
} catch (e) {
}
}, 1000);
});
document.getElementById("test_config").addEventListener("click", async e => {
e.preventDefault();
await testConfig();
});
+33 -55
Voir le fichier
@@ -3,64 +3,42 @@
<head>
<meta charset="UTF-8">
<title>YTPTube Extension</title>
<link rel="stylesheet" href="css/pure.css"/>
<style>
#ytptube_popup {
min-width: 250px;
min-height: 120px;
margin: 1em;
}
body {
font-size: 100%;
}
@media (prefers-color-scheme: dark) {
body {
color: white;
background-color: #19191c;
}
input {
background-color: #19191c;
color: white;
}
fieldset > legend {
color: white !important;
}
}
.button-secondary {
background: rgb(66, 184, 221);
}
</style>
<link rel="stylesheet" href="css/bulma.css"/>
</head>
<body>
<body class="container">
<form id="ytptube_popup" class="pure-form pure-form-stacked">
<div class="pure-control-group">
<label for="preset">Preset</label>
<select id="preset" class="pure-input-1" style="padding-top:0;padding-bottom:0">
<option value="default">default</option>
</select>
<span class="pure-form-message">Select preset to use with the URL.</span>
<div class="columns is-multiline">
<div class="column is-12">
<form id="ytptube_popup" class="pl-2 pr-2 pt-2">
<div class="field">
<label class="label" for="preset">Preset</label>
<div class="select is-fullwidth">
<select id="preset" class="is-fullwidth">
<option value="default">default</option>
</select>
</div>
<span class="help">Select preset to use with the URL.</span>
</div>
<div class="field">
<label class="label" for="user_url">URL:</label>
<div class="control">
<input id="user_url" class="input" type="text" placeholder="https://..">
</div>
<span class="help">The URL to send.</span>
</div>
<div class="field is-grouped">
<div class="control is-expanded">
<button class="button is-primary is-fullwidth" type="submit">Send to YTPTube</button>
</div>
<div class="control is-expanded">
<button class="button is-info is-fullwidth" type="button" id="go-to-options">
Open options page
</button>
</div>
</div>
</form>
</div>
<div class="pure-control-group">
<label for="user_url">URL:</label>
<input id="user_url" class="pure-input-1" type="text" placeholder="https://..">
<span class="pure-form-message">The URL to send to YTPTube instance</span>
</div>
<div class="pure-control-group">
<button class="pure-button pure-input-1 pure-button-primary" type="submit">Send to YTPTube</button>
</div>
<br>
<div class="pure-control-group">
<button class="pure-button pure-input-1 button-secondary" type="button" id="go-to-options">
Open options page
</button>
</div>
</form>
</div>
<script src="popup.js"></script>