${app.name}
+${app.developerName}
+
+
+
+
+
+ AltStore
++ Add ${sourceName ? "\"" + sourceName + "\"" : "this source"} to AltStore to receive app updates +
+
- ${appHeaderHTML(app) }
+ ${AppHeader(app)}
- `);
+ `);
else document.getElementById("about").remove();
-}
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 68663b5..46e3863 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,54 +1,75 @@
-(function () {
- // If no source
- if (!urlSearchParams.has('source'))
- search();
- // If source is not a valid HTTP URL
- else if (!isValidHTTPURL(sourceURL)) {
- alert("Invalid HTTP URL.");
- search();
- }
-})();
+//
+// main.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
-fetch(sourceURL)
- .then(response => response.json())
- .then(json => {
- // Set tint color
- const tintColor = json.tintColor?.replaceAll("#", "");
- if (tintColor) setTintColor(tintColor);
+import { urlSearchParams, sourceURL, search, isValidHTTPURL, setTintColor, insertAltStoreBanner, setUpBackButton } from "./utilities.js";
- insertAddToAltStoreBanner(json.name);
+export function main(callback) {
+ (() => {
+ // If no source
+ if (!urlSearchParams.has('source'))
+ search();
+ // If source is not a valid HTTP URL
+ else if (!isValidHTTPURL(sourceURL)) {
+ alert("Invalid HTTP URL.");
+ search();
+ }
- setApps(json.apps);
- main(json);
- waitForAllImagesToLoad();
- })
- .catch(error => console.error("An error occurred.", error));
+ var apps;
+ window.setApps = array =>
+ apps = array;
+ window.getAppWithBundleId = bundleId =>
+ apps?.find(app => app.bundleIdentifier == bundleId) ?? undefined;
-function waitForAllImagesToLoad() {
- const allImages = document.querySelectorAll("img");
- var count = 0;
+ setUpBackButton();
+ })();
- allImages.forEach(image => {
- // New img element that won't be rendered to the DOM
- var newImage = document.createElement("img");
- // Attach load listener
- newImage.addEventListener("load", loaded);
- // Set src
- newImage.src = image.src;
+ fetch(sourceURL)
+ .then(response => response.json())
+ .then(json => {
+ // Set tint color
+ const tintColor = json.tintColor?.replaceAll("#", "");
+ if (tintColor) setTintColor(tintColor);
- // Unable to load image
- image.addEventListener("error", (event) => {
- if (event.target.id == "app-icon") {
- event.target.src = "img/generic_app.jpeg";
- } else event.target.remove()
- loaded();
+ insertAltStoreBanner(json.name);
+
+ setApps(json.apps);
+ // main(json);
+ callback(json);
+ waitForAllImagesToLoad();
+ })
+ .catch(error => console.error("An error occurred.", error));
+
+ function waitForAllImagesToLoad() {
+ const allImages = document.querySelectorAll("img");
+ var count = 0;
+
+ allImages.forEach(image => {
+ // New img element that won't be rendered to the DOM
+ var newImage = document.createElement("img");
+ // Attach load listener
+ newImage.addEventListener("load", loaded);
+ // Set src
+ newImage.src = image.src;
+
+ // Unable to load image
+ image.addEventListener("error", (event) => {
+ if (event.target.id == "app-icon") {
+ event.target.src = "img/generic_app.jpeg";
+ } else event.target.remove()
+ loaded();
+ });
});
- });
- function loaded() {
- if (++count == allImages.length) {
- document.querySelector("body").classList.remove("loading");
- document.getElementById("loading").remove();
+ function loaded() {
+ if (++count == allImages.length) {
+ document.querySelector("body").classList.remove("loading");
+ document.getElementById("loading").remove();
+ }
}
}
-}
\ No newline at end of file
+}
diff --git a/js/news.js b/js/news.js
index 87ec0df..e0ae2d5 100644
--- a/js/news.js
+++ b/js/news.js
@@ -1,6 +1,18 @@
+//
+// news.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+import { insertNavigationBar } from "./utilities.js";
+import { NewsItem } from "./components/NewsItem.js";
+import { main } from "./main.js";
+
insertNavigationBar("All News");
-function main(json) {
+main((json) => {
// Set tab title
document.title = `News - ${json.name}`;
@@ -8,5 +20,5 @@ function main(json) {
json.news.sort((a, b) => (new Date(b.date)).valueOf() - (new Date(a.date)).valueOf());
// Create & insert news items
- json.news.forEach(news => document.getElementById("news").insertAdjacentHTML("beforeend", newsItemHTML(news)));
-}
\ No newline at end of file
+ json.news.forEach(news => document.getElementById("news").insertAdjacentHTML("beforeend", NewsItem(news)));
+});
\ No newline at end of file
diff --git a/js/search.js b/js/search.js
index 015127a..2e45913 100644
--- a/js/search.js
+++ b/js/search.js
@@ -1,3 +1,13 @@
+//
+// search.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+import { urlSearchParams, sourceURL } from "./utilities.js";
+
(function main() {
const success = url => window.location.replace(`index.html?source=${url}`);
diff --git a/js/shared.js b/js/shared.js
deleted file mode 100644
index df357ee..0000000
--- a/js/shared.js
+++ /dev/null
@@ -1,135 +0,0 @@
-const urlSearchParams = new URLSearchParams(window.location.search);
-const sourceURL = urlSearchParams.get('source')?.replaceAll("+", "%2B");
-// https://stackoverflow.com/a/8943487
-const urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
-
-(function (global) {
- var apps;
- global.setApps = array =>
- apps = array;
- global.getAppWithBundleId = bundleId =>
- apps?.find(app => app.bundleIdentifier == bundleId) ?? undefined;
-
- setUpBackButton();
-})(this);
-
-const newsItemHTML = (news, minimal = false) => `
-
"); -} - -function setTintColor(color) { - document.querySelector(':root')?.style.setProperty("--accent-color", `#${color}`); -} - -function setUpBackButton() { - document.getElementById("back")?.addEventListener("click", () => history.back(1)); -} - -function search() { - window.location.replace("search.html"); -} - -const $ = selector => selector.startsWith("#") && !selector.includes(".") && !selector.includes(" ") - ? document.getElementById(selector.substring(1)) - : document.querySelectorAll(selector); \ No newline at end of file diff --git a/js/utilities.js b/js/utilities.js new file mode 100644 index 0000000..6ee05aa --- /dev/null +++ b/js/utilities.js @@ -0,0 +1,74 @@ +// +// utilities.js +// altsource-viewer (https://github.com/therealFoxster/altsource-viewer) +// +// Copyright (c) 2023 Foxster. +// MIT License. +// + +import { AltStoreBanner } from "./components/AltStoreBanner.js"; +import { NavigationBar } from "./components/NavigationBar.js"; + +export const urlSearchParams = new URLSearchParams(window.location.search); +export const sourceURL = urlSearchParams.get('source')?.replaceAll("+", "%2B"); +// https://stackoverflow.com/a/8943487 +export const urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig; + +export function insertAltStoreBanner(sourceName) { + document.getElementById("top")?.insertAdjacentHTML("afterbegin", AltStoreBanner(sourceName)); +} + +export function insertNavigationBar(title) { + document.getElementById("top")?.insertAdjacentHTML("beforeend", NavigationBar(title)); + setUpBackButton(); +} + +// https://stackoverflow.com/a/43467144/19227228 +export function isValidHTTPURL(string) { + var url; + try { + url = new URL(string); + } catch (error) { + console.error("An error occurred.", error); + return false; + } + return url.protocol == "http:" || url.protocol == "https:"; +} + +export function formatString(string) { + if (!string) return undefined; + + // URLs + const urlArray = string.match(urlRegex); + // const urlSet = [...new Set(urlArray)]; // Converting to set to remove duplicates + var result = ""; + urlArray?.forEach(url => { + string = string.replace(url, `${url}`) + // Remove formatted substring so it won't get formatted again (prevents tag within the href attribute another tag) + let endIndexOfClosingTag = string.indexOf("") + 4; + let formattedSubstring = string.substring(0, endIndexOfClosingTag); + result += formattedSubstring; + string = string.replace(formattedSubstring, ""); + }); + + result += string; + + // New lines + return result.replaceAll("\n", "
"); +} + +export function setTintColor(color) { + document.querySelector(':root')?.style.setProperty("--accent-color", `#${color}`); +} + +export function setUpBackButton() { + document.getElementById("back")?.addEventListener("click", () => history.back(1)); +} + +export function search() { + window.location.replace("search.html"); +} + +const $ = selector => selector.startsWith("#") && !selector.includes(".") && !selector.includes(" ") + ? document.getElementById(selector.substring(1)) + : document.querySelectorAll(selector); \ No newline at end of file diff --git a/news.html b/news.html index da3168a..ae88805 100644 --- a/news.html +++ b/news.html @@ -1,11 +1,18 @@ + + - - + @@ -18,8 +25,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/search.html b/search.html
index fe8f3c5..73e6a13 100644
--- a/search.html
+++ b/search.html
@@ -1,10 +1,18 @@
+
+
-
+
AltSource Viewer
@@ -68,7 +76,6 @@
${app.subtitle ?? ""}
`; if (app.screenshotURLs) { html += ` @@ -28,4 +40,4 @@ function main(json) { document.getElementById("apps").insertAdjacentHTML("beforeend", html); }); -} \ No newline at end of file +}); \ No newline at end of file diff --git a/js/components/AltStoreBanner.js b/js/components/AltStoreBanner.js new file mode 100644 index 0000000..a7aa2d2 --- /dev/null +++ b/js/components/AltStoreBanner.js @@ -0,0 +1,25 @@ +// +// AltStoreBanner.js +// altsource-viewer (https://github.com/therealFoxster/altsource-viewer) +// +// Copyright (c) 2023 Foxster. +// MIT License. +// + +import { sourceURL } from "../utilities.js"; + +export const AltStoreBanner = (sourceName) => ` +
+ 
+
`;
\ No newline at end of file
diff --git a/js/components/AppHeader.js b/js/components/AppHeader.js
new file mode 100644
index 0000000..4ab7ef0
--- /dev/null
+++ b/js/components/AppHeader.js
@@ -0,0 +1,28 @@
+//
+// AppHeader.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+import { sourceURL } from "../utilities.js";
+
+export const AppHeader = app => app ? `
+
+
+
+
+
` : undefined;
\ No newline at end of file
diff --git a/js/components/NavigationBar.js b/js/components/NavigationBar.js
new file mode 100644
index 0000000..3c9e8db
--- /dev/null
+++ b/js/components/NavigationBar.js
@@ -0,0 +1,22 @@
+//
+// NavigationBar.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+export const NavigationBar = (title) => `
+`;
\ No newline at end of file
diff --git a/js/components/NewsItem.js b/js/components/NewsItem.js
new file mode 100644
index 0000000..3c3cd76
--- /dev/null
+++ b/js/components/NewsItem.js
@@ -0,0 +1,25 @@
+//
+// NewsItem.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+import { AppHeader } from "./AppHeader.js";
+
+export const NewsItem = (news, minimal = false) => `
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ ${news.url ?
+ "" : ""}
+
`;
\ No newline at end of file
diff --git a/js/index.js b/js/index.js
index c6e6eac..337caad 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,4 +1,17 @@
-function main(json) {
+//
+// index.js
+// altsource-viewer (https://github.com/therealFoxster/altsource-viewer)
+//
+// Copyright (c) 2023 Foxster.
+// MIT License.
+//
+
+import { sourceURL, formatString } from "./utilities.js";
+import { NewsItem } from "./components/NewsItem.js";
+import { AppHeader } from "./components/AppHeader.js";
+import { main } from "./main.js";
+
+main((json) => {
// Set "View All News" link
document.querySelector("#news a").href = `news.html?source=${sourceURL}`;
// Set "View All Apps" link
@@ -17,15 +30,15 @@ function main(json) {
(new Date(b.date)).valueOf() - (new Date(a.date)).valueOf());
if (json.news.length == 1) {
- document.getElementById("news-items").insertAdjacentHTML("beforeend", newsItemHTML(json.news[0], true));
+ document.getElementById("news-items").insertAdjacentHTML("beforeend", NewsItem(json.news[0], true));
document.getElementById("news-items").classList.add("one");
} else for (let i = 0; i < 5 && i < json.news.length; i++)
- document.getElementById("news-items").insertAdjacentHTML("beforeend", newsItemHTML(json.news[i], true));
+ document.getElementById("news-items").insertAdjacentHTML("beforeend", NewsItem(json.news[i], true));
} else document.getElementById("news").remove();
// Sort apps in descending order of version date
json.apps.sort((a, b) => (new Date(b.versionDate)).valueOf() - (new Date(a.versionDate)).valueOf());
-
+
//
// Featured apps
let count = 1;
@@ -39,7 +52,7 @@ function main(json) {
// If there are featured apps, ignore non-featured apps
if (json.featuredApps && !json.featuredApps.includes(app.bundleIdentifier)) return;
- document.getElementById("apps").insertAdjacentHTML("beforeend", appHeaderHTML(app));
+ document.getElementById("apps").insertAdjacentHTML("beforeend", AppHeader(app));
count++;
});
@@ -51,6 +64,6 @@ function main(json) {
+
${news.url ?
+ "" : ""} ${news.appID && !minimal ?
+ AppHeader(getAppWithBundleId(news.appID)) ?? "" : ""}
+
+
${news.imageURL && !minimal ?
+ "${news.title}
+${news.caption}
+" +
+ "![](" + news.imageURL + ")
" +
+ "
" : ""}
+ ${description}
${news.url ?
- "" : ""}
-
`;
-
-const appHeaderHTML = app => app ? `
-
-
${news.url ?
- "" : ""} ${news.appID && !minimal ?
- appHeaderHTML(getAppWithBundleId(news.appID)) ?? "" : ""}
-
-
${news.imageURL && !minimal ?
- "${news.title}
-${news.caption}
-" +
- "" +
- "
" : ""}
-
-
` : undefined;
-
-function insertAddToAltStoreBanner(source) {
- document.getElementById("top")?.insertAdjacentHTML("afterbegin", `
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${app.name}
-${app.developerName}
-
-
-
`);
-}
-
-function insertNavigationBar(title) {
- document.getElementById("top")?.insertAdjacentHTML("beforeend", `
- `);
- setUpBackButton();
-}
-
-// https://stackoverflow.com/a/43467144/19227228
-function isValidHTTPURL(string) {
- var url;
- try {
- url = new URL(string);
- } catch (error) {
- console.error("An error occurred.", error);
- return false;
- }
- return url.protocol == "http:" || url.protocol == "https:";
-}
-
-function formatString(string) {
- if (!string) return undefined;
-
- // URLs
- const urlArray = string.match(urlRegex);
- // const urlSet = [...new Set(urlArray)]; // Converting to set to remove duplicates
- var result = "";
- urlArray?.forEach(url => {
- string = string.replace(url, `${url}`)
- // Remove formatted substring so it won't get formatted again (prevents tag within the href attribute another tag)
- let endIndexOfClosingTag = string.indexOf("") + 4;
- let formattedSubstring = string.substring(0, endIndexOfClosingTag);
- result += formattedSubstring;
- string = string.replace(formattedSubstring, "");
- });
-
- result += string;
-
- // New lines
- return result.replaceAll("\n", "
-
-
-
-
-
-
-
- AltStore
-- Add ${source ? "\"" + source + "\"" : "this source"} to AltStore to receive app updates -
-"); -} - -function setTintColor(color) { - document.querySelector(':root')?.style.setProperty("--accent-color", `#${color}`); -} - -function setUpBackButton() { - document.getElementById("back")?.addEventListener("click", () => history.back(1)); -} - -function search() { - window.location.replace("search.html"); -} - -const $ = selector => selector.startsWith("#") && !selector.includes(".") && !selector.includes(" ") - ? document.getElementById(selector.substring(1)) - : document.querySelectorAll(selector); \ No newline at end of file diff --git a/js/utilities.js b/js/utilities.js new file mode 100644 index 0000000..6ee05aa --- /dev/null +++ b/js/utilities.js @@ -0,0 +1,74 @@ +// +// utilities.js +// altsource-viewer (https://github.com/therealFoxster/altsource-viewer) +// +// Copyright (c) 2023 Foxster. +// MIT License. +// + +import { AltStoreBanner } from "./components/AltStoreBanner.js"; +import { NavigationBar } from "./components/NavigationBar.js"; + +export const urlSearchParams = new URLSearchParams(window.location.search); +export const sourceURL = urlSearchParams.get('source')?.replaceAll("+", "%2B"); +// https://stackoverflow.com/a/8943487 +export const urlRegex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig; + +export function insertAltStoreBanner(sourceName) { + document.getElementById("top")?.insertAdjacentHTML("afterbegin", AltStoreBanner(sourceName)); +} + +export function insertNavigationBar(title) { + document.getElementById("top")?.insertAdjacentHTML("beforeend", NavigationBar(title)); + setUpBackButton(); +} + +// https://stackoverflow.com/a/43467144/19227228 +export function isValidHTTPURL(string) { + var url; + try { + url = new URL(string); + } catch (error) { + console.error("An error occurred.", error); + return false; + } + return url.protocol == "http:" || url.protocol == "https:"; +} + +export function formatString(string) { + if (!string) return undefined; + + // URLs + const urlArray = string.match(urlRegex); + // const urlSet = [...new Set(urlArray)]; // Converting to set to remove duplicates + var result = ""; + urlArray?.forEach(url => { + string = string.replace(url, `${url}`) + // Remove formatted substring so it won't get formatted again (prevents tag within the href attribute another tag) + let endIndexOfClosingTag = string.indexOf("") + 4; + let formattedSubstring = string.substring(0, endIndexOfClosingTag); + result += formattedSubstring; + string = string.replace(formattedSubstring, ""); + }); + + result += string; + + // New lines + return result.replaceAll("\n", "
"); +} + +export function setTintColor(color) { + document.querySelector(':root')?.style.setProperty("--accent-color", `#${color}`); +} + +export function setUpBackButton() { + document.getElementById("back")?.addEventListener("click", () => history.back(1)); +} + +export function search() { + window.location.replace("search.html"); +} + +const $ = selector => selector.startsWith("#") && !selector.includes(".") && !selector.includes(" ") + ? document.getElementById(selector.substring(1)) + : document.querySelectorAll(selector); \ No newline at end of file diff --git a/news.html b/news.html index da3168a..ae88805 100644 --- a/news.html +++ b/news.html @@ -1,11 +1,18 @@ + + - - + @@ -18,8 +25,6 @@