From eba9db3600d0122fd34f9e061a29e0a7f398bca7 Mon Sep 17 00:00:00 2001
From: MTG2000 <mtg0987654321@gmail.com>
Date: Fri, 12 Aug 2022 14:41:30 +0300
Subject: [PATCH] fix: remove nostr card from profile, rename 'Apps' to
 'Projects'

---
 src/App.tsx                                   |  8 ++++----
 src/Components/Navbar/NavDesktop.tsx          |  4 ++--
 src/Components/Navbar/NavMobile.tsx           | 20 +++++++++----------
 .../SaveChangesCard/SaveChangesCard.tsx       |  4 +++-
 .../pages/ProfilePage/ProfilePage.tsx         |  4 ----
 .../CategoryPage/HeaderImage/HeaderImage.tsx  |  3 ++-
 .../ExplorePage/Categories/Categories.tsx     |  2 +-
 .../pages/ExplorePage/Header/Header.tsx       |  2 +-
 .../ProjectsSection/ProjectsSection.tsx       |  6 +++---
 src/utils/routing/routes.ts                   |  8 ++++----
 10 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index d672df3..f94279c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -94,9 +94,9 @@ function App() {
         <Route path={PAGES_ROUTES.blog.createPost} element={<ProtectedRoute><CreatePostPage /></ProtectedRoute>} />
 
         <Route element={<NavbarLayout />}>
-          <Route path={PAGES_ROUTES.apps.hottest} element={<HottestPage />} />
-          <Route path={PAGES_ROUTES.apps.byCategoryId} element={<CategoryPage />} />
-          <Route path={PAGES_ROUTES.apps.default} element={<ExplorePage />} />
+          <Route path={PAGES_ROUTES.projects.hottest} element={<HottestPage />} />
+          <Route path={PAGES_ROUTES.projects.byCategoryId} element={<CategoryPage />} />
+          <Route path={PAGES_ROUTES.projects.default} element={<ExplorePage />} />
 
           <Route path={PAGES_ROUTES.blog.postById} element={<PostDetailsPage />} />
           <Route path={PAGES_ROUTES.blog.feed} element={<FeedPage />} />
@@ -111,7 +111,7 @@ function App() {
           <Route path={PAGES_ROUTES.auth.login} element={<LoginPage />} />
           <Route path={PAGES_ROUTES.auth.logout} element={<LogoutPage />} />
 
-          <Route path="/" element={<Navigate to={PAGES_ROUTES.apps.default} />} />
+          <Route path="/" element={<Navigate to={PAGES_ROUTES.projects.default} />} />
         </Route>
 
       </Routes>
diff --git a/src/Components/Navbar/NavDesktop.tsx b/src/Components/Navbar/NavDesktop.tsx
index f69ae78..2b2d625 100644
--- a/src/Components/Navbar/NavDesktop.tsx
+++ b/src/Components/Navbar/NavDesktop.tsx
@@ -47,8 +47,8 @@ export default function NavDesktop() {
                 </Link>
                 <ul className="flex gap-32 xl:gap-64">
                     <li className="relative">
-                        <Link to={'/apps'} className='text-body4 font-bold hover:text-primary-600'>
-                            Apps
+                        <Link to={'/projects'} className='text-body4 font-bold hover:text-primary-600'>
+                            Projects
                         </Link>
                     </li>
                     <li>
diff --git a/src/Components/Navbar/NavMobile.tsx b/src/Components/Navbar/NavMobile.tsx
index 0e32380..3ed8a1d 100644
--- a/src/Components/Navbar/NavMobile.tsx
+++ b/src/Components/Navbar/NavMobile.tsx
@@ -156,10 +156,10 @@ export default function NavMobile() {
 
             <li className="relative">
               <Link
-                to={'/apps'}
+                to={'/projects'}
                 onClick={() => toggleDrawerOpen(false)}
                 className='text-body4 font-bold hover:text-primary-600'>
-                Apps
+                Projects
               </Link>
             </li>
             <li>
@@ -264,28 +264,28 @@ export default function NavMobile() {
           </ul>
           <ul className="px-16 py-16 pb-32 flex flex-wrap gap-y-12  border-t pt-32 mt-auto">
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">About Us</a>
+              <a href="/#">About Us</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Support</a>
+              <a href="/#">Support</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Press</a>
+              <a href="/#">Press</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Contacts</a>
+              <a href="/#">Contacts</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Careers</a>
+              <a href="/#">Careers</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Sitemap</a>
+              <a href="/#">Sitemap</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Legal</a>
+              <a href="/#">Legal</a>
             </li>
             <li className="text-body4 text-gray-500 hover:text-gray-700 w-1/2">
-              <a href="/">Cookies Settings</a>
+              <a href="/#">Cookies Settings</a>
             </li>
 
           </ul>
diff --git a/src/features/Profiles/pages/EditProfilePage/SaveChangesCard/SaveChangesCard.tsx b/src/features/Profiles/pages/EditProfilePage/SaveChangesCard/SaveChangesCard.tsx
index 3476113..3f83f80 100644
--- a/src/features/Profiles/pages/EditProfilePage/SaveChangesCard/SaveChangesCard.tsx
+++ b/src/features/Profiles/pages/EditProfilePage/SaveChangesCard/SaveChangesCard.tsx
@@ -35,7 +35,9 @@ export default function SaveChangesCard(props: Props) {
     return (
         <div className="md:p-24 rounded-16 bg-white md:border-2 border-gray-200 flex flex-col gap-24">
             <div className='hidden md:flex gap-8'>
-                <Link to={createRoute({ type: 'profile', id: profileQuery.data.profile.id, username: profileQuery.data.profile.name })}>
+                <Link
+                    className='shrink-0'
+                    to={createRoute({ type: 'profile', id: profileQuery.data.profile.id, username: profileQuery.data.profile.name })}>
                     <Avatar width={48} src={profileQuery.data.profile.avatar!} />
                 </Link>
                 <div className='overflow-hidden'>
diff --git a/src/features/Profiles/pages/ProfilePage/ProfilePage.tsx b/src/features/Profiles/pages/ProfilePage/ProfilePage.tsx
index 48b00ce..58a265a 100644
--- a/src/features/Profiles/pages/ProfilePage/ProfilePage.tsx
+++ b/src/features/Profiles/pages/ProfilePage/ProfilePage.tsx
@@ -44,10 +44,6 @@ export default function ProfilePage() {
                 <main className="flex flex-col gap-24">
                     <AboutCard user={profileQuery.data.profile} isOwner={isOwner} />
                     <StoriesCard stories={profileQuery.data.profile.stories} isOwner={isOwner} />
-                    {
-                        isOwner &&
-                        <CommentsSettingsCard nostr_prv_key={profileQuery.data.profile.nostr_prv_key} nostr_pub_key={profileQuery.data.profile.nostr_pub_key} isOwner={isOwner} />
-                    }
                 </main>
                 <aside></aside>
             </div>
diff --git a/src/features/Projects/pages/CategoryPage/HeaderImage/HeaderImage.tsx b/src/features/Projects/pages/CategoryPage/HeaderImage/HeaderImage.tsx
index 395039c..2f343ba 100644
--- a/src/features/Projects/pages/CategoryPage/HeaderImage/HeaderImage.tsx
+++ b/src/features/Projects/pages/CategoryPage/HeaderImage/HeaderImage.tsx
@@ -3,6 +3,7 @@ import { FiArrowLeft } from 'react-icons/fi'
 import Skeleton from 'react-loading-skeleton'
 import { Link } from 'react-router-dom'
 import ASSETS from 'src/assets'
+import { PAGES_ROUTES } from 'src/utils/routing'
 
 type Props = {
     isLoading: boolean
@@ -33,7 +34,7 @@ export default function HeaderImage(props: Props) {
             <img src={img.startsWith('https://via.placeholder.com/') ? DEFAULT_IMG : img} alt={`${title} cover`} className='absolute inset-0 w-full h-full object-cover z-[-1]' />
             <div className='absolute inset-0 w-full h-full bg-black bg-opacity-50   z-[-1]' />
             <Link
-                to='/apps'
+                to={PAGES_ROUTES.projects.default}
                 className="
               w-[48px] h-[48px] bg-white hover:bg-gray-200 
               absolute top-24 left-24 md:top-1/2 md:left-40 md:-translate-y-1/2
diff --git a/src/features/Projects/pages/ExplorePage/Categories/Categories.tsx b/src/features/Projects/pages/ExplorePage/Categories/Categories.tsx
index 44bd9cf..b0f32a7 100644
--- a/src/features/Projects/pages/ExplorePage/Categories/Categories.tsx
+++ b/src/features/Projects/pages/ExplorePage/Categories/Categories.tsx
@@ -48,7 +48,7 @@ export default function Categories() {
                     {data?.allCategories.map((category, idx) =>
                         <button
                             key={category.id}
-                            onClick={() => isClickAllowed() && navigate(`/apps/category/${category.id}`)}
+                            onClick={() => isClickAllowed() && navigate(`/projects/category/${category.id}`)}
                             className='min-w-max block p-16 rounded-16 hover:bg-gray-100 active:bg-gray-200 active:scale-90 transition-transform'
                             style={{ backgroundColor: colors[idx % colors.length] }}
                         >{category.icon} {category.title}</button>
diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx
index 6228989..0c2891c 100644
--- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx
+++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx
@@ -11,7 +11,7 @@ const headerLinks = [
     title: <p className="text-body1 font-bolder text-white">Explore a fun directory of lightning web apps</p>,
     img: Assets.Images_ExploreHeader1,
     link: {
-      content: "Submit app",
+      content: "Submit project",
       url: "https://form.jotform.com/220301236112030",
     },
   },
diff --git a/src/features/Projects/pages/ExplorePage/ProjectsSection/ProjectsSection.tsx b/src/features/Projects/pages/ExplorePage/ProjectsSection/ProjectsSection.tsx
index 0b5bac8..0013633 100644
--- a/src/features/Projects/pages/ExplorePage/ProjectsSection/ProjectsSection.tsx
+++ b/src/features/Projects/pages/ExplorePage/ProjectsSection/ProjectsSection.tsx
@@ -20,7 +20,7 @@ export default function ProjectsSection() {
     return (
         <div className='mt-32 lg:mt-48'>
             <ProjectsRow title={<><span className="align-middle mr-8">Hottest</span> <MdLocalFireDepartment className='inline-block text-fire scale-125 ' /></>}
-                link='/apps/hottest'
+                link='/projects/hottest'
                 projects={data.hottestProjects} />
 
             <ProjectsRow title="Recently added"
@@ -28,13 +28,13 @@ export default function ProjectsSection() {
 
             {shockTheWebCategory &&
                 <ProjectsRow title={shockTheWebCategory.title}
-                    link={`/apps/category/${shockTheWebCategory.id}`}
+                    link={`/projects/category/${shockTheWebCategory.id}`}
                     projects={shockTheWebCategory.project!} />}
             {restCategories.map(({ id, title, project, }) => {
                 if (project)
                     return <ProjectsRow
                         key={id}
-                        link={`/apps/category/${id}`}
+                        link={`/projects/category/${id}`}
                         title={title}
                         projects={project} />
                 else return null
diff --git a/src/utils/routing/routes.ts b/src/utils/routing/routes.ts
index 5f7f696..f4c338f 100644
--- a/src/utils/routing/routes.ts
+++ b/src/utils/routing/routes.ts
@@ -61,10 +61,10 @@ export function createRoute(options: RouteOptions) {
 }
 
 export const PAGES_ROUTES = {
-    apps: {
-        default: "/apps",
-        hottest: "/apps/hottest",
-        byCategoryId: "/apps/category/:id"
+    projects: {
+        default: "/projects",
+        hottest: "/projects/hottest",
+        byCategoryId: "/projects/category/:id"
     },
     blog: {
         feed: "/blog",