From 0a0d6f4bf465fdbb6a925f5b6ad5cc466c883f41 Mon Sep 17 00:00:00 2001
From: Tom <mottoes_recap0u@icloud.com>
Date: Mon, 1 May 2023 18:41:10 +0200
Subject: [PATCH] add navbar design to all views

---
 src/components/views/Catalog.jsx | 27 ++++++++++++++++-----------
 src/components/views/Thread.jsx  | 32 ++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 02cd8119..96e36536 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -237,26 +237,31 @@ const Catalog = () => {
         closeModal={() => setIsSettingsOpen(false)} />
         <NavBar selectedStyle={selectedStyle}>
           <>
-            {defaultSubplebbits.map(subplebbit => (
+          <span className="boardList">
+              [
+                <Link to="" onClick={() => {}}>Subscriptions</Link>
+              ]&nbsp;[
+            </span>
+            {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>
-                [
-                <Link to={`/p/${subplebbit.address}`} key={`a-${subplebbit.address}`} 
-                onClick={() => {
+                {index === 0 ? null : "\u00a0"}
+                <Link to={`/p/${subplebbit.address}`} key={`a-${subplebbit.address}`} onClick={() => {
                 setSelectedTitle(subplebbit.title);
                 setSelectedAddress(subplebbit.address);
                 }}
                 >{subplebbit.title ? subplebbit.title : subplebbit.address}</Link>
-                ]&nbsp;
+                {index !== defaultSubplebbits.length - 1 ? " /" : null}
               </span>
             ))}
-            <span className="nav">
-            [
+              ]
+              [
               <button style={{all: 'unset', cursor: 'pointer'}} onClick={
                 () => alert(
                   'To create a board, first you have to run a full node.\nYou can run a full node by simply browsing with the plebbit desktop app. After you download it, open it, wait for it loading, then click on "Home" in the top left, then "Create Community".\n\nAfter you create the community, you can go back to plebchan at any time to see it as a board by pasting its address (begins with p/12D3KooW...) in the search bar, which is in the Home.\n\nNote:\n\n- Your community will be online for as long as you leave the app open, because it functions like a server for the community.\n- The longer you leave the app open, the more data you are seeding to the protocol, which helps performance for everybody.\n - All the data in the plebbit protocol is just text, which is extremely lightweight. All media is generated by links, which is text, embedded by the clients.\n\nDownload the plebbit app here: https://github.com/plebbit/plebbit-react/releases\n\nRunning boards in the plebchan app is a planned feature.\n\n'
                   )
               }>Create Board</button>
               ]
+            <span className="nav">
               [
               <Link to={`/p/${selectedAddress}/catalog/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
               ]
@@ -274,14 +279,14 @@ const Catalog = () => {
                       <option key={`option-${subplebbit.address}`} value={subplebbit.address}
                       >{subplebbit.title ? subplebbit.title : subplebbit.address}</option>
                     ))}
-                </select>
-              </div>
-              <div className="page-jump">
+                </select> 
                 <button style={{all: 'unset', cursor: 'pointer'}} onClick={
                   () => alert(
                     'To create a board, first you have to run a full node.\nYou can run a full node by simply browsing with the plebbit desktop app. After you download it, open it, wait for it loading, then click on "Home" in the top left, then "Create Community".\n\nAfter you create the community, you can go back to plebchan at any time to see it as a board by pasting its address (begins with p/12D3KooW...) in the search bar, which is in the Home.\n\nNote:\n\n- Your community will be online for as long as you leave the app open, because it functions like a server for the community.\n- The longer you leave the app open, the more data you are seeding to the protocol, which helps performance for everybody.\n - All the data in the plebbit protocol is just text, which is extremely lightweight. All media is generated by links, which is text, embedded by the clients.\n\nDownload the plebbit app here: https://github.com/plebbit/plebbit-react/releases\n\nRunning boards in the plebchan app is a planned feature.\n\n'
                     )
-                  }>Create Board</button> 
+                  }>Create Board</button>
+              </div>
+              <div className="page-jump">
                 <Link to={`/p/${selectedAddress}/catalog/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
                 &nbsp;
                 <Link to="/" onClick={() => handleStyleChange({target: {value: "Yotsuba"}}
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index f5b79c5d..a7f9bcd5 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -279,27 +279,31 @@ const Thread = () => {
         closeModal={() => setIsSettingsOpen(false)} />
         <NavBar selectedStyle={selectedStyle}>
           <>
-            {defaultSubplebbits.map(subplebbit => (
+          <span className="boardList">
+              [
+                <Link to="" onClick={() => {}}>Subscriptions</Link>
+              ]&nbsp;[
+            </span>
+            {defaultSubplebbits.map((subplebbit, index) => (
               <span className="boardList" key={`span-${subplebbit.address}`}>
-                [
-                <Link key={`a-${subplebbit.address}`} 
-                to={`/p/${subplebbit.address}`} 
-                onClick={() => {
-                  setSelectedTitle(subplebbit.title);
-                  setSelectedAddress(subplebbit.address);
+                {index === 0 ? null : "\u00a0"}
+                <Link to={`/p/${subplebbit.address}`} key={`a-${subplebbit.address}`} onClick={() => {
+                setSelectedTitle(subplebbit.title);
+                setSelectedAddress(subplebbit.address);
                 }}
                 >{subplebbit.title ? subplebbit.title : subplebbit.address}</Link>
-                ]&nbsp;
+                {index !== defaultSubplebbits.length - 1 ? " /" : null}
               </span>
             ))}
-            <span className="nav">
-            [
+              ]
+              [
               <button style={{all: 'unset', cursor: 'pointer'}} onClick={
                 () => alert(
                   'To create a board, first you have to run a full node.\nYou can run a full node by simply browsing with the plebbit desktop app. After you download it, open it, wait for it loading, then click on "Home" in the top left, then "Create Community".\n\nAfter you create the community, you can go back to plebchan at any time to see it as a board by pasting its address (begins with p/12D3KooW...) in the search bar, which is in the Home.\n\nNote:\n\n- Your community will be online for as long as you leave the app open, because it functions like a server for the community.\n- The longer you leave the app open, the more data you are seeding to the protocol, which helps performance for everybody.\n - All the data in the plebbit protocol is just text, which is extremely lightweight. All media is generated by links, which is text, embedded by the clients.\n\nDownload the plebbit app here: https://github.com/plebbit/plebbit-react/releases\n\nRunning boards in the plebchan app is a planned feature.\n\n'
                   )
               }>Create Board</button>
               ]
+            <span className="nav">
               [
               <Link to={`/p/${selectedAddress}/c/${selectedThread}/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
               ]
@@ -317,14 +321,14 @@ const Thread = () => {
                       <option key={`option-${subplebbit.address}`} value={subplebbit.address}
                       >{subplebbit.title ? subplebbit.title : subplebbit.address}</option>
                     ))}
-                </select>
-              </div>
-              <div className="page-jump">
+                </select> 
                 <button style={{all: 'unset', cursor: 'pointer'}} onClick={
                   () => alert(
                     'To create a board, first you have to run a full node.\nYou can run a full node by simply browsing with the plebbit desktop app. After you download it, open it, wait for it loading, then click on "Home" in the top left, then "Create Community".\n\nAfter you create the community, you can go back to plebchan at any time to see it as a board by pasting its address (begins with p/12D3KooW...) in the search bar, which is in the Home.\n\nNote:\n\n- Your community will be online for as long as you leave the app open, because it functions like a server for the community.\n- The longer you leave the app open, the more data you are seeding to the protocol, which helps performance for everybody.\n - All the data in the plebbit protocol is just text, which is extremely lightweight. All media is generated by links, which is text, embedded by the clients.\n\nDownload the plebbit app here: https://github.com/plebbit/plebbit-react/releases\n\nRunning boards in the plebchan app is a planned feature.\n\n'
                     )
-                  }>Create Board</button> 
+                  }>Create Board</button>
+              </div>
+              <div className="page-jump">
                 <Link to={`/p/${selectedAddress}/c/${selectedThread}/settings`} onClick={() => setIsSettingsOpen(true)}>Settings</Link>
                 &nbsp;
                 <Link to="/" onClick={() => handleStyleChange({target: {value: "Yotsuba"}}