From 88aa0b5779001ab4ebbaeeca7feab6076018f400 Mon Sep 17 00:00:00 2001
From: Tom <mottoes_recap0u@icloud.com>
Date: Sun, 7 May 2023 17:22:55 +0200
Subject: [PATCH] change subscriptions route

---
 src/App.js                             |  5 ++++-
 src/components/views/Board.jsx         |  4 ++--
 src/components/views/Catalog.jsx       |  4 ++--
 src/components/views/Home.jsx          |  2 +-
 src/components/views/Subscriptions.jsx | 18 ++++++++++++++----
 src/components/views/Thread.jsx        |  4 ++--
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/App.js b/src/App.js
index 862ce2e5..4e96653c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -162,9 +162,12 @@ export default function App() {
         <Route path={`/profile/c/:index`} element={<Pending setBodyStyle={setBodyStyle} /> }>
           <Route path='settings' element={<Pending />} />
         </Route>
-        <Route path={`/profile/p/subscriptions`} element={<Subscriptions setBodyStyle={setBodyStyle} /> }>
+        <Route path={`/p/subscriptions`} element={<Subscriptions setBodyStyle={setBodyStyle} /> }>
           <Route path='settings' element={<Subscriptions />} />
         </Route>
+        <Route path={`p/subscriptions/catalog`} element={<SubscriptionsCatalog setBodyStyle={setBodyStyle} /> }>
+          <Route path='settings' element={<SubscriptionsCatalog />} />
+        </Route>
         <Route path='*' element={<NotFound setBodyStyle={setBodyStyle} />} />
       </Routes>
       <Toast />
diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index 4dc9a91c..c3338104 100644
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -321,7 +321,7 @@ const Board = () => {
     const selected = event.target.value;
 
     if (selected === 'subscriptions') {
-      navigate(`/profile/p/subscriptions`);
+      navigate(`/p/subscriptions`);
       return;
     }
 
@@ -363,7 +363,7 @@ const Board = () => {
           <>
             <span className="boardList">
               [
-                <Link to={`/profile/p/subscriptions`}>Subscriptions</Link>
+                <Link to={`/p/subscriptions`}>Subscriptions</Link>
               ]&nbsp;[
               {defaultSubplebbits.map((subplebbit, index) => (
                 <span className="boardList" key={`span-${subplebbit.address}`}>
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 936c581c..8a709fc9 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -235,7 +235,7 @@ const Catalog = () => {
     const selected = event.target.value;
 
     if (selected === 'subscriptions') {
-      navigate(`/profile/p/subscriptions`);
+      navigate(`/p/subscriptions`);
       return;
     }
 
@@ -272,7 +272,7 @@ const Catalog = () => {
           <>
           <span className="boardList">
             [
-              <Link to={`/profile/p/subscriptions`}>Subscriptions</Link>
+              <Link to={`/p/subscriptions`}>Subscriptions</Link>
             ]&nbsp;[
             {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>
diff --git a/src/components/views/Home.jsx b/src/components/views/Home.jsx
index 1cb10b23..317bad21 100644
--- a/src/components/views/Home.jsx
+++ b/src/components/views/Home.jsx
@@ -98,7 +98,7 @@ const Home = () => {
                   <h3 style={{textDecoration: 'underline', display: 'inline'}}>
                     You have subscribed to {account?.subscriptions?.length} board{account?.subscriptions?.length > 1 ? "s" : null}
                   </h3>&nbsp;
-                  <Link to="/profile/p/subscriptions" id="view-all">[view all]</Link>
+                  <Link to="/p/subscriptions" id="view-all">[view all]</Link>
                   <br />
                   {account?.subscriptions?.map((subscription, index) => (
                     <>
diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx
index 73227ec9..1097ed6d 100644
--- a/src/components/views/Subscriptions.jsx
+++ b/src/components/views/Subscriptions.jsx
@@ -171,7 +171,7 @@ const Subscriptions = () => {
         <>
             <span className="boardList">
               [
-                <Link to={`/profile/p/subscriptions`}>Subscriptions</Link>
+                <Link to={`/p/subscriptions`}>Subscriptions</Link>
               ]&nbsp;[
             {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>
@@ -196,7 +196,7 @@ const Subscriptions = () => {
               }>Create Board</button>
               ]
               [
-              <Link to={`/profile/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
+              <Link to={`/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
               ]
               [
               <Link to="/" onClick={() => handleStyleChange({target: {value: "Yotsuba"}}
@@ -221,7 +221,7 @@ const Subscriptions = () => {
                 }>Create Board</button>
               </div>
               <div className="page-jump">
-                <Link to={`/profile/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
+                <Link to={`/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
                 &nbsp;
                 <Link to="/" onClick={() => handleStyleChange({target: {value: "Yotsuba"}}
                   )}>Home</Link>
@@ -263,6 +263,16 @@ const Subscriptions = () => {
               <option value="Photon">Photon</option>
             </select>
           </span>
+          <div id="catalog-button-desktop">
+            [
+            <Link to={`/p/subscriptions/catalog`}>Catalog</Link>
+            ]
+          </div>
+          <div id="catalog-button-mobile">
+            <span className="btn-wrap">
+              <Link to={`/p/subscriptions/catalog`}>Catalog</Link>
+            </span>
+          </div>
         </TopBar>
         <Tooltip id="tooltip" className="tooltip" />
         <BoardForm selectedStyle={selectedStyle}>
@@ -1033,7 +1043,7 @@ const Subscriptions = () => {
                 }>Create Board</button>
                 ]
                 [
-                <Link to={`/profile/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
+                <Link to={`/p/subscriptions/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
                 ]
                 [
                 <Link to="/" onClick={() => handleStyleChange({target: {value: "Yotsuba"}}
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index 74a0b97b..ac49693b 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -253,7 +253,7 @@ const Thread = () => {
     const selected = event.target.value;
 
     if (selected === 'subscriptions') {
-      navigate(`/profile/p/subscriptions`);
+      navigate(`/p/subscriptions`);
       return;
     }
 
@@ -288,7 +288,7 @@ const Thread = () => {
           <>
           <span className="boardList">
             [
-              <Link to={`/profile/p/subscriptions`}>Subscriptions</Link>
+              <Link to={`/p/subscriptions`}>Subscriptions</Link>
             ]&nbsp;[
             {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>