Merge branch 'main', commit 'refs/pull/53/head' of https://github.com/MathMan05/JankClient

This commit is contained in:
MathMan05 2024-09-02 17:12:49 -05:00
commit 7cc6a0b914
6 changed files with 72 additions and 172 deletions

View file

@ -99,9 +99,8 @@ class Channel {
let expires = 1800;
const copycontainer = document.createElement("div");
copycontainer.classList.add("copycontainer");
const copy = document.createElement("img");
copy.src = "/icons/copy.svg";
copy.classList.add("copybutton", "svgtheme");
const copy = document.createElement("span");
copy.classList.add("copybutton", "svgtheme", "svg-copy");
copycontainer.append(copy);
copycontainer.onclick = _ => {
if (text.textContent) {
@ -365,9 +364,8 @@ class Channel {
this.sortchildren();
const caps = document.createElement("div");
const decdiv = document.createElement("div");
const decoration = document.createElement("img");
decoration.src = "/icons/category.svg";
decoration.classList.add("svgtheme", "colaspeicon");
const decoration = document.createElement("span");
decoration.classList.add("svgtheme", "collapse-icon", "svg-category");
decdiv.appendChild(decoration);
const myhtml = document.createElement("p2");
myhtml.textContent = this.name;
@ -424,22 +422,19 @@ class Channel {
const myhtml = document.createElement("span");
myhtml.textContent = this.name;
if (this.type === 0) {
const decoration = document.createElement("img");
decoration.src = "/icons/channel.svg";
const decoration = document.createElement("span");
div.appendChild(decoration);
decoration.classList.add("space", "svgtheme");
decoration.classList.add("space", "svgtheme", "svg-channel");
}
else if (this.type === 2) { //
const decoration = document.createElement("img");
decoration.src = "/icons/voice.svg";
const decoration = document.createElement("span");
div.appendChild(decoration);
decoration.classList.add("space", "svgtheme");
decoration.classList.add("space", "svgtheme", "svg-voice");
}
else if (this.type === 5) { //
const decoration = document.createElement("img");
decoration.src = "/icons/announce.svg";
const decoration = document.createElement("span");
div.appendChild(decoration);
decoration.classList.add("space", "svgtheme");
decoration.classList.add("space", "svgtheme", "svg-announce");
}
else {
console.log(this.type);

View file

@ -500,21 +500,20 @@ class Localuser {
buildservers() {
const serverlist = document.getElementById("servers"); //
const outdiv = document.createElement("div");
const img = document.createElement("img");
const home = document.createElement("span");
const div = document.createElement("div");
div.classList.add("home", "servericon");
img.src = "/icons/home.svg";
img.classList.add("svgtheme", "svgicon");
img["all"] = this.guildids.get("@me");
home.classList.add("svgtheme", "svgicon", "svg-home");
home["all"] = this.guildids.get("@me");
this.guildids.get("@me").html = outdiv;
const unread = document.createElement("div");
unread.classList.add("unread");
outdiv.append(unread);
outdiv.append(div);
div.appendChild(img);
div.appendChild(home);
outdiv.classList.add("servernoti");
serverlist.append(outdiv);
img.onclick = function () {
home.onclick = function () {
this["all"].loadGuild();
this["all"].loadChannel();
};
@ -546,9 +545,8 @@ class Localuser {
this.createGuild();
};
const guilddsdiv = document.createElement("div");
const guildDiscoveryContainer = document.createElement("img");
guildDiscoveryContainer.src = "/icons/explore.svg";
guildDiscoveryContainer.classList.add("svgtheme", "svgicon");
const guildDiscoveryContainer = document.createElement("span");
guildDiscoveryContainer.classList.add("svgtheme", "svgicon", "svg-explore");
guilddsdiv.classList.add("home", "servericon");
guilddsdiv.appendChild(guildDiscoveryContainer);
serverlist.appendChild(guilddsdiv);
@ -922,7 +920,6 @@ class Localuser {
{
const userinfos = getBulkInfo();
tas.addColorInput("Accent color:", _ => {
fixsvgtheme();
userinfos.accent_color = _;
localStorage.setItem("userinfos", JSON.stringify(userinfos));
document.documentElement.style.setProperty("--accent-color", userinfos.accent_color);
@ -1437,60 +1434,3 @@ class Localuser {
}
}
export { Localuser };
let fixsvgtheme;
{
let last;
const dud = document.createElement("p");
dud.classList.add("svgtheme");
document.body.append(dud);
const css = window.getComputedStyle(dud);
function fixsvgtheme_() {
//console.log(things);
const color = css.color;
if (color === last) {
return;
}
last = color;
const thing = color.replace("rgb(", "").replace(")", "").split(",");
//sconsole.log(thing);
const r = Number(thing[0]) / 255;
const g = Number(thing[1]) / 255;
const b = Number(thing[2]) / 255;
const max = Math.max(r, g, b);
const min = Math.min(r, g, b);
const l = (max + min) / 2;
let s;
let h;
if (max !== min) {
if (l <= 0.5) {
s = (max - min) / (max + min);
}
else {
s = (max - min) / (2 - max - min);
}
if (r === max) {
h = (g - b) / (max - min);
}
else if (g === max) {
h = 2 + (b - r) / (max - min);
}
else {
h = 4 + (r - g) / (max - min);
}
}
else {
s = 0;
h = 0;
}
const rot = Math.floor(h * 60) + "deg";
const invert = 0.5 - (s / 2) + "";
const brightness = Math.floor((l * 200)) + "%";
document.documentElement.style.setProperty("--rot", rot);
document.documentElement.style.setProperty("--invert", invert);
document.documentElement.style.setProperty("--brightness", brightness);
}
fixsvgtheme = fixsvgtheme_;
setTimeout(fixsvgtheme_, 100);
fixsvgtheme_();
}
export { fixsvgtheme };