fix(changelogs, fix sponsors)

Author: Ajit Kumar

src/dialogs/multiPrompt.js

@@ -78,12 +78,10 @@ export default function multiPrompt(message, inputs, help) {
 				hide();
 			},
 		});
-		const $errorMessage = tag("span", {
-			className: "error-msg",
-		});
-		const $mask = tag("span", {
-			className: "mask",
-		});
+		const $errorMessage = (
+			<span className="error-msg" style={{ display: "block" }} />
+		);
+		const $mask = <span className="mask" />;
 		const $promptDiv = tag("form", {
 			action: "#",
 			className: "prompt multi",

src/pages/about/about.js

@@ -45,15 +45,19 @@ export default function AboutInclude() {
 					<div className="info-item-icon">
 						<span className="icon acode"></span>
 					</div>
-					<div className="info-item-text">Official webpage</div>
-					<small>https://acode.app</small>
+					<div className="info-item-text">
+						Official webpage
+						<div className="info-item-subtext">https://acode.app</div>
+					</div>
 				</a>
 				<a href="https://foxbiz.io" className="info-item">
 					<div className="info-item-icon">
 						<span className="icon foxbiz"></span>
 					</div>
-					<div className="info-item-text">Foxbiz Software Pvt. Ltd.</div>
-					<small>https://www.foxbiz.io</small>
+					<div className="info-item-text">
+						Foxbiz Software Pvt. Ltd.
+						<div className="info-item-subtext">https://www.foxbiz.io</div>
+					</div>
 				</a>
 			</div>
 

src/pages/changelog/changelog.js

@@ -2,11 +2,13 @@ import "./style.scss";
 import fsOperation from "fileSystem";
 import Contextmenu from "components/contextmenu";
 import Page from "components/page";
+import toast from "components/toast";
 import Ref from "html-tag-js/ref";
 import actionStack from "lib/actionStack";
 import markdownIt from "markdown-it";
 import markdownItFootnote from "markdown-it-footnote";
 import markdownItTaskLists from "markdown-it-task-lists";
+import helpers from "utils/helpers";
 
 export default async function Changelog() {
 	const GITHUB_API_URL =
@@ -19,6 +21,7 @@ export default async function Changelog() {
 	let selectedStatus = "current";
 	const versionIndicatorRef = Ref();
 	const versionTextRef = Ref();
+	const body = Ref();
 
 	const versionSelector = (
 		<div className="changelog-version-selector" data-action="select-version">
@@ -39,6 +42,7 @@ export default async function Changelog() {
 		right: "5px",
 		toggler: versionSelector,
 		transformOrigin: "top right",
+		onclick: menuClickHandler,
 		innerHTML: () => {
 			return `
         <li action="current">
@@ -57,10 +61,24 @@ export default async function Changelog() {
 		},
 	});
 
-	const $content = <div className="md" id="changelog"></div>;
-	$content.innerHTML = '<div class="loading">Loading changelog...</div>';
-	$page.content = $content;
+	const changelogMd = await import("../../../CHANGELOG.md");
+
+	toast("Loading changelog...");
+	loadVersionChangelog();
+	body.onref = () => renderChangelog(changelogMd.default);
+	$page.body = <div className="md" id="changelog" ref={body} />;
 	app.append($page);
+	helpers.showAd();
+
+	$page.onhide = function () {
+		actionStack.remove("changelog");
+		helpers.hideAd();
+	};
+
+	actionStack.push({
+		id: "changelog",
+		action: $page.hide,
+	});
 
 	async function loadLatestRelease() {
 		try {
@@ -72,8 +90,8 @@ export default async function Changelog() {
 			updateVersionSelector();
 			return renderChangelog(releases.body);
 		} catch (error) {
-			$content.innerHTML =
-				'<div class="error">Failed to load latest release notes</div>';
+			toast("Failed to load latest release notes");
+			renderChangelog(changelogMd.default);
 		}
 	}
 
@@ -82,16 +100,16 @@ export default async function Changelog() {
 			const releases = await fsOperation(GITHUB_API_URL).readFile("json");
 			const betaRelease = releases.find((r) => r.prerelease);
 			if (!betaRelease) {
-				$content.innerHTML = '<div class="error">No beta release found</div>';
+				body.content = <div className="error">No beta release found</div>;
 				return;
 			}
 			selectedVersion = betaRelease.tag_name.replace("v", "");
 			selectedStatus = "prerelease";
 			updateVersionSelector();
 			return renderChangelog(betaRelease.body);
 		} catch (error) {
-			$content.innerHTML =
-				'<div class="error">Failed to load beta release notes</div>';
+			toast("Failed to load beta release notes");
+			renderChangelog(changelogMd.default);
 		}
 	}
 
@@ -105,8 +123,8 @@ export default async function Changelog() {
 			updateVersionSelector();
 			return renderChangelog(cleanedText);
 		} catch (error) {
-			$content.innerHTML =
-				'<div class="error">Failed to load full changelog</div>';
+			toast("Failed to load full changelog");
+			renderChangelog(changelogMd.default);
 		}
 	}
 
@@ -125,8 +143,8 @@ export default async function Changelog() {
 				return loadLatestRelease();
 			}
 		} catch (error) {
-			$content.innerHTML =
-				'<div class="error">Failed to load version changelog</div>';
+			toast("Failed to load version changelog");
+			renderChangelog(changelogMd.default);
 		}
 	}
 
@@ -137,28 +155,24 @@ export default async function Changelog() {
 			// Convert full PR URLs to #number format with links preserved in markdown
 			.replace(
 				/https:\/\/github\.com\/Acode-Foundation\/Acode\/pull\/(\d+)/g,
-				"[#$1](https://github.com/Acode-Foundation/Acode/pull/$1)",
+				`[#$1](${REPO_URL}/pull/$1)`,
 			)
 			// Convert existing #number references to links if they aren't already
-			.replace(
-				/(?<!\[)#(\d+)(?!\])/g,
-				"[#$1](https://github.com/Acode-Foundation/Acode/pull/$1)",
-			)
+			.replace(/(?<!\[)#(\d+)(?!\])/g, `[#$1](${REPO_URL}/pull/$1)`)
 			// Convert @username mentions to GitHub profile links
 			.replace(/@(\w+)/g, "[@$1](https://github.com/$1)");
 
 		md.use(markdownItTaskLists);
 		md.use(markdownItFootnote);
-		const htmlContent = md.render(processedText);
-		$content.innerHTML = htmlContent;
+		body.innerHTML = md.render(processedText);
 	}
 
 	function updateVersionSelector() {
 		versionTextRef.textContent = selectedVersion;
 		versionIndicatorRef.className = "status-indicator status-" + selectedStatus;
 	}
 
-	versionSelectorMenu.onclick = async function (e) {
+	async function menuClickHandler(e) {
 		const action = e.target.closest("li")?.getAttribute("action");
 		if (!action) return;
 		versionSelectorMenu.hide();
@@ -177,17 +191,5 @@ export default async function Changelog() {
 				await loadFullChangelog();
 				break;
 		}
-	};
-
-	// Load current version changelog by default
-	loadVersionChangelog();
-
-	$page.onhide = function () {
-		actionStack.remove("changelog");
-	};
-
-	actionStack.push({
-		id: "changelog",
-		action: $page.hide,
-	});
+	}
 }

src/pages/sponsor/sponsor.js

@@ -113,6 +113,7 @@ export default function Sponsor(onclose) {
 			if (err !== iap.USER_CANCELED) {
 				alert(strings.error.toUpperCase(), err);
 			}
+			loader.removeTitleLoader();
 		},
 	);
 
@@ -251,6 +252,8 @@ async function handlePurchase(productId, title) {
 			required: false,
 			id: "email",
 			type: "email",
+			match:
+				/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
 		},
 		...extraFields,
 		{
@@ -272,15 +275,7 @@ async function handlePurchase(productId, title) {
 
 	localStorage.setItem(`sponsor_${productId}`, JSON.stringify(result));
 	loader.showTitleLoader();
-	iap.purchase(
-		productId,
-		() => {},
-		(err) => {
-			if (err !== iap.USER_CANCELED) {
-				alert(strings.error, err);
-			}
-		},
-	);
+	iap.purchase(productId);
 }
 
 function onlyTitle(title) {

src/pages/sponsor/style.scss

@@ -103,8 +103,8 @@
   }
 
   .purchase-btn {
-    background: linear-gradient(45deg, #4ecdc4, #44a08d);
-    color: white;
+    background: var(--button-background-color);
+    color: var(--button-text-color);
     border: none;
     padding: 10px 20px;
     border-radius: 20px;

webpack.config.js

@@ -8,7 +8,7 @@ module.exports = (env, options) => {
   const { mode = 'development' } = options;
   const rules = [
     {
-      test: /\.hbs$/,
+      test: /\.(hbs|md)$/,
       use: ['raw-loader'],
     },
     {