@articles-media/articles-dev-box 1.0.36 → 1.0.38

package/README.md

@@ -73,6 +73,8 @@ npm run dev
     - Array of strings that every game published by Articles Media would want to normally exclude from persisting in base game store.
 - typicalZustandStoreStateSlice
     - Slice of zustand states that every game normally uses
+- getSignOutRedirectUrl
+    - Handles signout redirect api logic
 
 # Usage Examples
 For newly developed components I sometimes find myself trying to remember what repos used it. Here is a short list of recent components developed and what project is using it. Doing this until AMPM can search by imports or enough projects adopted the component.
@@ -80,6 +82,7 @@ For newly developed components I sometimes find myself trying to remember what r
 - typicalZustandStoreExcludes - Catching Game and School Run
 - SessionButton - Catching Game and School Run
 - GameMenu - Catching Game and School Run use Static Panel for sidebarStyle and Corner Button for menuBarStyle. Ice Slide uses Floating Panel for sidebarStyle and Bar for menuBarStyle.
+- getSignOutRedirectUrl - Catching Game
 
 # Roadmap
 ⏹️ Remove Bootstrap reliance?  

package/dist/{Ad-BsG4C_lR.js → Ad-DluWOnz3.js}

@@ -279,8 +279,8 @@ var useAds = (params) => {
 //#endregion
 //#region src/components/Ads/Ad.jsx
 var import_classnames = /* @__PURE__ */ __toESM(require_classnames(), 1);
-var AdDetailsModal = lazy(() => import("./AdDetailsModal-D2-4lh9e.js"));
-var AdConfirmExitModal = lazy(() => import("./AdConfirmExitModal-heFPJNdX.js"));
+var AdDetailsModal = lazy(() => import("./AdDetailsModal-DNDxC0AS.js"));
+var AdConfirmExitModal = lazy(() => import("./AdConfirmExitModal-C4PR4e_i.js"));
 function generateRandomInteger(min, max) {
 	return Math.floor(Math.random() * (max - min + 1)) + min;
 }

package/dist/Ad.js

@@ -1,2 +1,2 @@
-import { t as Ad_default } from "./Ad-BsG4C_lR.js";
+import { t as Ad_default } from "./Ad-DluWOnz3.js";
 export { Ad_default as default };

package/dist/GameMenu.js

@@ -1,2 +1,2 @@
-import { t as GameMenu } from "./GameMenu-DrqaN2Qg.js";
+import { t as GameMenu } from "./GameMenu-CyW1MF3Y.js";
 export { GameMenu as default };

package/dist/GameScoreboard.js

@@ -1,2 +1,2 @@
-import { t as GameScoreboard } from "./GameScoreboard-DVoXXDnM.js";
+import { t as GameScoreboard } from "./GameScoreboard-CYuTBE_E.js";
 export { GameScoreboard as default };

package/dist/GlobalBody.js

@@ -1,11 +1,11 @@
 "use client";
 import { n as __toESM, t as require_classnames } from "./classnames-No-mjhw1.js";
-import { n as useMainSiteStatus, t as useAuthSiteStatus } from "./useAuthSiteStatus-ZK1GbPBV.js";
+import { n as useMainSiteStatus, t as useAuthSiteStatus } from "./useAuthSiteStatus-D-D-KwEN.js";
 import { Suspense, lazy, memo, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/components/Global/GlobalBody.jsx
 var import_classnames = /* @__PURE__ */ __toESM(require_classnames(), 1);
-var StatusModal = lazy(() => import("./StatusModal-BXRbJQ10.js"));
+var StatusModal = lazy(() => import("./StatusModal-DkHAimHp.js"));
 function GlobalBody(props) {
 	const [statusModal, setStatusModal] = useState(false);
 	const { data: mainSiteStatus, error: mainSiteStatusError, isLoading: mainSiteStatusLoading, mutate: mainSiteStatusMutate } = useMainSiteStatus({ disable: process.env.NODE_ENV !== "development" });

package/dist/SessionButton-D3cupnzD.js

@@ -0,0 +1,102 @@
+import { t as ArticlesButton } from "./Button-DvEZjsVV.js";
+import SignInButton from "./SignInButton.js";
+import useUserDetails from "./useUserDetails.js";
+import useUserToken from "./useUserToken.js";
+import { t as ViewUserModal } from "./ViewUserModal-Dgo1C4sR.js";
+import FriendsList from "./FriendsList.js";
+import { useState } from "react";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { Modal } from "react-bootstrap";
+//#region src/components/User/SignOutModal.jsx
+function SignOutModal({ show, setShow, action }) {
+	return /* @__PURE__ */ jsxs(Modal, {
+		show,
+		size: "md",
+		className: `articles-modal`,
+		centered: true,
+		onHide: () => setShow(false),
+		children: [
+			/* @__PURE__ */ jsx(Modal.Header, { children: /* @__PURE__ */ jsx(Modal.Title, { children: "Confirm Sign Out" }) }),
+			/* @__PURE__ */ jsx(Modal.Body, { children: "Are you sure you want to sign out? This will also sign you out on https://articles.media and other Articles Media services." }),
+			/* @__PURE__ */ jsxs(Modal.Footer, {
+				className: "justify-content-between",
+				children: [/* @__PURE__ */ jsxs(ArticlesButton, {
+					variant: "articles",
+					onClick: () => {
+						setShow(false);
+					},
+					children: [/* @__PURE__ */ jsx("i", { className: "fad fa-redo me-2" }), /* @__PURE__ */ jsx("span", { children: "Cancel" })]
+				}), /* @__PURE__ */ jsxs(ArticlesButton, {
+					variant: "articles",
+					onClick: () => {
+						action();
+						setShow(false);
+					},
+					children: [/* @__PURE__ */ jsx("i", { className: "fad fa-times me-2" }), "Confirm"]
+				})]
+			})
+		]
+	});
+}
+//#endregion
+//#region src/components/User/SessionButton.jsx
+function SessionButton({ port, friendsButton }) {
+	const { data: userToken, error: userTokenError, isLoading: userTokenLoading, mutate: userTokenMutate } = useUserToken(port);
+	const { data: userDetails, error: userDetailsError, isLoading: userDetailsLoading, mutate: userDetailsMutate } = useUserDetails({ token: userToken });
+	const [showFriendsModal, setShowFriendsModal] = useState(false);
+	const [confirmSignOut, setConfirmSignOut] = useState(false);
+	return /* @__PURE__ */ jsx(Fragment, { children: !userDetails ? /* @__PURE__ */ jsx(SignInButton, { className: "mb-2" }) : /* @__PURE__ */ jsxs("div", {
+		className: "w-100 d-flex align-items-stretch mb-2",
+		children: [
+			/* @__PURE__ */ jsx(ViewUserModal, {
+				buttonType: "Link",
+				className: "w-100",
+				children: /* @__PURE__ */ jsxs(ArticlesButton, {
+					className: "w-100",
+					small: true,
+					onClick: () => {
+						console.log("userDetails", userDetails);
+					},
+					children: [
+						/* @__PURE__ */ jsx("i", { className: "fad fa-sign-out" }),
+						"Logged in as ",
+						userDetails?.display_name || "Unknown User"
+					]
+				})
+			}),
+			confirmSignOut && /* @__PURE__ */ jsx(SignOutModal, {
+				show: confirmSignOut,
+				setShow: setConfirmSignOut,
+				action: () => {
+					const logoutLink = `/api/signout?redirect=${encodeURIComponent(window.location.href)}`;
+					window.location.assign(logoutLink);
+				}
+			}),
+			showFriendsModal && /* @__PURE__ */ jsx(FriendsList, {
+				show: showFriendsModal,
+				setShow: setShowFriendsModal,
+				componentType: "modal"
+			}),
+			friendsButton && /* @__PURE__ */ jsx(ArticlesButton, {
+				className: "",
+				small: true,
+				title: "My Friends",
+				onClick: () => {
+					setShowFriendsModal(true);
+				},
+				children: /* @__PURE__ */ jsx("i", { className: "fad fa-users" })
+			}),
+			/* @__PURE__ */ jsx(ArticlesButton, {
+				className: "",
+				small: true,
+				title: "Sign out",
+				onClick: () => {
+					setConfirmSignOut(true);
+				},
+				children: /* @__PURE__ */ jsx("i", { className: "fad fa-sign-out" })
+			})
+		]
+	}) });
+}
+//#endregion
+export { SessionButton as t };

package/dist/SessionButton.js

@@ -1,70 +1,7 @@
-import { t as ArticlesButton } from "./Button-DvEZjsVV.js";
-import SignInButton from "./SignInButton.js";
-import useUserDetails from "./useUserDetails.js";
-import useUserToken from "./useUserToken.js";
-import { t as ViewUserModal } from "./ViewUserModal-Dgo1C4sR.js";
-import FriendsList from "./FriendsList.js";
-import { useState } from "react";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-//#region src/components/User/SessionButton.jsx
-function SessionButton({ port, friendsButton }) {
-	const { data: userToken, error: userTokenError, isLoading: userTokenLoading, mutate: userTokenMutate } = useUserToken(port);
-	const { data: userDetails, error: userDetailsError, isLoading: userDetailsLoading, mutate: userDetailsMutate } = useUserDetails({ token: userToken });
-	const logoutLink = `/api/signout`;
-	const [showFriendsModal, setShowFriendsModal] = useState(false);
-	return /* @__PURE__ */ jsx(Fragment, { children: !userDetails ? /* @__PURE__ */ jsx(SignInButton, { className: "mb-2" }) : /* @__PURE__ */ jsxs("div", {
-		className: "w-100 d-flex align-items-stretch mb-2",
-		children: [
-			/* @__PURE__ */ jsx(ViewUserModal, {
-				buttonType: "Link",
-				className: "w-100",
-				children: /* @__PURE__ */ jsxs(ArticlesButton, {
-					className: "w-100",
-					small: true,
-					onClick: () => {
-						console.log("userDetails", userDetails);
-					},
-					children: [
-						/* @__PURE__ */ jsx("i", { className: "fad fa-sign-out" }),
-						"Logged in as ",
-						userDetails?.display_name || "Unknown User"
-					]
-				})
-			}),
-			showFriendsModal && /* @__PURE__ */ jsx(FriendsList, {
-				show: showFriendsModal,
-				setShow: setShowFriendsModal,
-				componentType: "modal"
-			}),
-			friendsButton && /* @__PURE__ */ jsx(ArticlesButton, {
-				className: "",
-				small: true,
-				title: "My Friends",
-				onClick: () => {
-					setShowFriendsModal(true);
-				},
-				children: /* @__PURE__ */ jsx("i", { className: "fad fa-users" })
-			}),
-			/* @__PURE__ */ jsx(ArticlesButton, {
-				className: "",
-				small: true,
-				title: "Sign out",
-				onClick: () => {
-					fetch(logoutLink, {
-						method: "GET",
-						headers: {}
-					}).then((response) => response.json()).then((data) => {
-						console.log("Logout successful:", data);
-						userTokenMutate(null);
-						userDetailsMutate(null);
-					}).catch((error) => {
-						console.error("Logout error:", error);
-					});
-				},
-				children: /* @__PURE__ */ jsx("i", { className: "fad fa-sign-out" })
-			})
-		]
-	}) });
-}
-//#endregion
+"use client";
+import "./SignInButton.js";
+import "./useUserDetails.js";
+import "./useUserToken.js";
+import "./FriendsList.js";
+import { t as SessionButton } from "./SessionButton-D3cupnzD.js";
 export { SessionButton as default };

package/dist/{SettingsModal-DkLtzl7B.js → SettingsModal-DDrykvTH.js}

@@ -232,7 +232,7 @@ function OtherTab({ useStore, config }) {
 var package_default = {
 	name: "@articles-media/articles-dev-box",
 	description: "Shared code, functions, and components for different Articles Media projects.",
-	version: "1.0.36",
+	version: "1.0.38",
 	type: "module",
 	imports: { "#root/src/*": "./src/*" },
 	main: "./dist/index.js",
@@ -266,6 +266,7 @@ var package_default = {
 		"./useFullscreen": "./dist/useFullscreen.js",
 		"./typicalZustandStoreExcludes": "./dist/typicalZustandStoreExcludes.js",
 		"./typicalZustandStoreStateSlice": "./dist/typicalZustandStoreStateSlice.js",
+		"./getSignOutRedirectUrl": "./dist/getSignOutRedirectUrl.js",
 		"./dist/style.css": "./dist/articles-dev-box.css",
 		"./dist/articles-dev-box.css": "./dist/articles-dev-box.css"
 	},

package/dist/SettingsModal.js

@@ -1,2 +1,2 @@
-import { t as SettingsModal } from "./SettingsModal-DkLtzl7B.js";
+import { t as SettingsModal } from "./SettingsModal-DDrykvTH.js";
 export { SettingsModal as default };

package/dist/{StatusModal-BXRbJQ10.js → StatusModal-DkHAimHp.js}

@@ -1,5 +1,5 @@
 import { t as ArticlesButton } from "./Button-DvEZjsVV.js";
-import { n as useMainSiteStatus, t as useAuthSiteStatus } from "./useAuthSiteStatus-ZK1GbPBV.js";
+import { n as useMainSiteStatus, t as useAuthSiteStatus } from "./useAuthSiteStatus-D-D-KwEN.js";
 import { useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Modal } from "react-bootstrap";

package/dist/getSignOutRedirectUrl.js

@@ -0,0 +1,8 @@
+//#region src/util/getSignOutRedirectUrl.js
+async function getSignOutRedirectUrl(req) {
+	const { searchParams } = new URL(req.url);
+	const passedRedirect = searchParams.get("redirect") || "/";
+	return `${process.env.NODE_ENV === "development" ? "http://localhost:3012" : "https://accounts.articles.media"}/api/signout?redirect=${encodeURIComponent(passedRedirect)}`;
+}
+//#endregion
+export { getSignOutRedirectUrl as default };

package/dist/index.js

@@ -3,16 +3,16 @@ import SignInButton from "./SignInButton.js";
 import useUserDetails from "./useUserDetails.js";
 import useUserToken from "./useUserToken.js";
 import { t as ViewUserModal } from "./ViewUserModal-Dgo1C4sR.js";
-import { t as Ad_default } from "./Ad-BsG4C_lR.js";
+import { t as Ad_default } from "./Ad-DluWOnz3.js";
 import useUserFriends from "./useUserFriends.js";
 import FriendsList from "./FriendsList.js";
-import SessionButton from "./SessionButton.js";
+import { t as SessionButton } from "./SessionButton-D3cupnzD.js";
 import ArticlesAd from "./ArticlesAd.js";
-import { t as GameMenu } from "./GameMenu-DrqaN2Qg.js";
-import { t as GameScoreboard } from "./GameScoreboard-DVoXXDnM.js";
+import { t as GameMenu } from "./GameMenu-CyW1MF3Y.js";
+import { t as GameScoreboard } from "./GameScoreboard-CYuTBE_E.js";
 import GlobalHead from "./GlobalHead.js";
 import GlobalBody_default from "./GlobalBody.js";
-import { t as SettingsModal } from "./SettingsModal-DkLtzl7B.js";
+import { t as SettingsModal } from "./SettingsModal-DDrykvTH.js";
 import CreditsModal from "./CreditsModal.js";
 import DarkModeHandler from "./DarkModeHandler.js";
 import ToontownModeHandler from "./ToontownModeHandler.js";
@@ -20,4 +20,5 @@ import SocketServerUrlHandler from "./SocketServerUrlHandler.js";
 import useFullscreen from "./useFullscreen.js";
 import typicalZustandStoreExcludes from "./typicalZustandStoreExcludes.js";
 import typicalZustandStoreStateSlice from "./typicalZustandStoreStateSlice.js";
-export { Ad_default as Ad, ArticlesAd, CreditsModal, DarkModeHandler, FriendsList, GameMenu, GameScoreboard, GlobalBody_default as GlobalBody, GlobalHead, ReturnToLauncherButton, SessionButton, SettingsModal, SignInButton, SocketServerUrlHandler, ToontownModeHandler, ViewUserModal, typicalZustandStoreExcludes, typicalZustandStoreStateSlice, useFullscreen, useUserDetails, useUserFriends, useUserToken };
+import getSignOutRedirectUrl from "./getSignOutRedirectUrl.js";
+export { Ad_default as Ad, ArticlesAd, CreditsModal, DarkModeHandler, FriendsList, GameMenu, GameScoreboard, GlobalBody_default as GlobalBody, GlobalHead, ReturnToLauncherButton, SessionButton, SettingsModal, SignInButton, SocketServerUrlHandler, ToontownModeHandler, ViewUserModal, getSignOutRedirectUrl, typicalZustandStoreExcludes, typicalZustandStoreStateSlice, useFullscreen, useUserDetails, useUserFriends, useUserToken };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@articles-media/articles-dev-box",
   "description": "Shared code, functions, and components for different Articles Media projects.",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "type": "module",
   "imports": {
     "#root/src/*": "./src/*"
@@ -39,6 +39,7 @@
     "./useFullscreen": "./dist/useFullscreen.js",
     "./typicalZustandStoreExcludes": "./dist/typicalZustandStoreExcludes.js",
     "./typicalZustandStoreStateSlice": "./dist/typicalZustandStoreStateSlice.js",
+    "./getSignOutRedirectUrl": "./dist/getSignOutRedirectUrl.js",
     "./dist/style.css": "./dist/articles-dev-box.css",
     "./dist/articles-dev-box.css": "./dist/articles-dev-box.css"
   },