diff --git a/client/admin/index.html b/client/admin/index.html index e9ed643..2b49576 100755 --- a/client/admin/index.html +++ b/client/admin/index.html @@ -5,7 +5,7 @@ Administrator Tools | Floofi Voice Generator - + @@ -87,6 +87,7 @@

Administrator Tools

+ @@ -122,6 +122,7 @@ + diff --git a/client/assets/src/main.js b/client/assets/src/main.js index 9655f08..1b41501 100755 --- a/client/assets/src/main.js +++ b/client/assets/src/main.js @@ -409,7 +409,7 @@ configureRefresh(); await prepareNavbar(); - document.getElementById("loader").style.display = "none"; + completeLoad(); document.getElementById("app").style.display = ""; })(); diff --git a/client/assets/src/navbar.js b/client/assets/src/navbar.js index 7a5d922..b297c9e 100755 --- a/client/assets/src/navbar.js +++ b/client/assets/src/navbar.js @@ -1,15 +1,3 @@ -window.onscroll = () => { - updateScroll(); -} - -function updateScroll() { - if (window.scrollY === 0) { - document.getElementById("navbar").classList.add("fella-nav-no-border"); - } else { - document.getElementById("navbar").classList.remove("fella-nav-no-border"); - } -} - async function prepareNavbar() { let isAdministrator = (await (await fetch(window.SERVER + "/api/v2/admin/available", { credentials: "include", @@ -100,123 +88,4 @@ async function prepareNavbar() { `; loadNavigation(); -} - -function loadNavigation() { - window.categoryNavigationItem = null; - window.categorySection = null; - window.lastPosition = -1; - - Array.from(document.getElementsByClassName("fella-nav-navigation-item")).map(i => { - i.onmouseenter = (e) => { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - if (e.target.getAttribute("data-category-id")) { - let category = document.getElementById("navbar-category-base-" + e.target.getAttribute("data-category-id")); - document.getElementById("navbar-category").style.width = category.clientWidth + "px"; - document.getElementById("navbar-category").style.height = category.clientHeight + "px"; - - if (window.categoryNavigationItem) { // noinspection JSCheckFunctionSignatures - document.getElementById("navbar-category-outer").onmouseleave({ - _switching: true - }); - } - - category.classList.remove("hide"); - category.classList.add("show"); - window.categorySection = category; - } else { - // noinspection JSCheckFunctionSignatures - document.getElementById("navbar-category-outer").onmouseleave({}); - } - - document.getElementById("navbar-tabs").style.left = e.target.getBoundingClientRect().left + "px"; - document.getElementById("navbar-category-indicator").style.left = (e.target.getBoundingClientRect().left + e.target.clientWidth / 3) + "px"; - document.getElementById("navbar-tabs").style.width = e.target.clientWidth + "px"; - document.getElementById("navbar-tabs").style.opacity = "1"; - e.target.classList.add("open"); - if (window.categoryNavigationItem) { - window.categoryNavigationItem.classList.remove("open"); - } - window.categoryNavigationItem = e.target; - }; - - i.onmouseleave = (e) => { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - if (e.target.classList.contains("fella-nav-navigation-item-with-category")) return; - e.target.classList.remove("open"); - } - }); - - document.getElementById("navbar-category-outer").onmouseleave = document.body.onmouseleave = (e) => { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - if (window.categoryNavigationItem) { - window.categoryNavigationItem.classList.remove("open"); - window.categoryNavigationItem = null; - } - if (window.categorySection) { - window.categorySection.classList.remove("show"); - Array.from(document.getElementsByClassName("fella-nav-category-base")).map(i => i.classList.remove("hide")); - window.categorySection.classList.add("hide"); - window.categorySection = null; - } - if (!e._switching) document.getElementById("navbar-navigation").onmouseleave(null); - } - - document.getElementById("navbar-inner-left").onmouseleave = () => { - document.getElementById("navbar-tabs").style.transition = "opacity 150ms ease"; - } - - document.getElementById("navbar-navigation").onmousemove = (e) => { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - document.getElementById("navbar-category-outer").onmousemove(e); - document.getElementById("navbar-category").style.transition = "width 150ms ease, height 150ms ease"; - document.getElementById("navbar-tabs").style.transition = "left 250ms ease, width 250ms ease, opacity 150ms ease"; - document.getElementById("navbar-category-indicator").style.transition = "left 250ms ease"; - }; - - document.getElementById("navbar-navigation").onmouseleave = (e) => { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - if (window.categoryNavigationItem && window.categoryNavigationItem.classList.contains("fella-nav-navigation-item-with-category")) return; - document.getElementById("navbar-tabs").style.opacity = "0"; - if (e) document.getElementById("navbar-tabs").style.transition = "opacity 150ms ease"; - document.getElementById("navbar-category").style.transition = ""; - document.getElementById("navbar-category-indicator").style.transition = ""; - document.getElementById("navbar-tabs").style.left = "0"; - document.getElementById("navbar-tabs").style.width = "0"; - }; - - document.getElementById("navbar-category-outer").onmousemove = (e) => { - document.getElementById("navbar-inner-left").classList.remove("navigating"); - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) return; - if (window.lastPosition === -1) { - window.lastPosition = e.clientX; - } - - if (e.clientX - window.lastPosition < -2) { - Array.from(document.getElementsByClassName("fella-nav-category-base")).map(i => i.classList.add("reverse")); - } else if (e.clientX - window.lastPosition > 2) { - Array.from(document.getElementsByClassName("fella-nav-category-base")).map(i => i.classList.remove("reverse")); - } - - window.lastPosition = e.clientX; - } - - document.getElementById("navbar-tabs").style.opacity = "0"; - document.getElementById("navbar-tabs").style.transition = "opacity 150ms ease"; - document.getElementById("navbar-tabs").style.left = "0"; - document.getElementById("navbar-tabs").style.width = "0"; - - window.onresize = () => { - if (window.innerWidth > 900) { - document.getElementById("navbar").classList.remove("fella-nav-mobile-open"); - } - } -} - -function mobileNavbar() { - if (document.getElementById("navbar").classList.contains("fella-nav-mobile-open")) { - document.getElementById("navbar").classList.remove("fella-nav-mobile-open"); - } else { - document.getElementById("navbar").classList.add("fella-nav-mobile-open"); - } -} +} \ No newline at end of file diff --git a/client/banned/index.html b/client/banned/index.html index de69950..1e768b7 100755 --- a/client/banned/index.html +++ b/client/banned/index.html @@ -5,7 +5,7 @@ Floofi Voice Generator - + @@ -82,6 +82,7 @@ + @@ -102,6 +102,7 @@

Please keep your content family-friendly

+ @@ -73,6 +73,7 @@ + @@ -81,6 +81,7 @@ + @@ -170,6 +170,7 @@

5. Modifications

+