nav change, submission portal copy, small changes related to teams (#288

) * page 2 teams, chronological * team discord copy * nav bar changes * copy changes for submission portal * contribution helper text * using new nav hook * add rel="noreferrer" --------- Co-authored-by: namedotget <[email protected]>
Official-MoonDao · Jan 8, 2025 · fd64085 · fd64085
1 parent 54258dd
commit fd64085
Show file tree

Hide file tree

Showing 7 changed files with 139 additions and 71 deletions.
diff --git a/ui/components/contribution/ContributionEditor.tsx b/ui/components/contribution/ContributionEditor.tsx
@@ -27,18 +27,24 @@ const NanceEditor = dynamic(
 )
 
 const CONTRIBUTION_TEMPLATE = `
-## Contribution Summary
-When documenting contributions, please ensure they meet the following criteria:
-	1.	Completed Work Only: Contributions should reflect completed efforts, not ongoing or planned work.
-	2.	Specific and Measurable Results: Describe the tangible outcomes of the contribution. Include metrics, timelines, or other objective measures wherever possible.
-Clear, detailed, and results-focused contributions help us understand and value the impact of your work.
-
-*Example:*
-*Good Contribution:*
-	•	*"Improved search performance by optimizing database queries, reducing response times by 30% within one month."*
-
-*Poor Contribution:*
-	•	*"Worked on improving search performance."*
+## What Did You Get Done?
+
+### Contribution Summary
+Document your contributions clearly and concisely, focusing on **what you accomplished and the tangible results**. Follow these guidelines to ensure your contributions are impactful:  
+
+1. **Completed Work Only:** Share work that is finished, not ongoing or planned.  
+2. **Specific and Measurable Results:** Highlight tangible outcomes, including metrics, timelines, or other objective measures.  
+
+Clear, detailed, and results-focused contributions help us understand the value and impact of your work.  
+
+---
+
+### Example Contributions  
+**Good Contribution:**  
+• *"Improved search performance by optimizing database queries, reducing response times by 30% within one month."*  
+
+**Poor Contribution:**  
+• *"Worked on improving search performance."* 
 
 `
 

diff --git a/ui/components/layout/Sidebar/Navigation.ts b/ui/components/layout/Sidebar/Navigation.ts
@@ -4,6 +4,7 @@ import {
   FolderIcon,
   PlusIcon,
   RocketLaunchIcon,
+  WrenchScrewdriverIcon, 
   Squares2X2Icon,
   UserGroupIcon,
 } from '@heroicons/react/24/outline'
@@ -23,6 +24,11 @@ export const navigation = [
     name: 'Network',
     href: '/network',
     icon: IconOrg,
+    children: [
+      { name: 'Teams', href: '/teams' },
+      { name: 'Citizens', href: '/citizens' },
+      { name: 'Map', href: '/map' },
+    ]
   },
   {
     name: 'Info',
@@ -48,20 +54,26 @@ export const navigation = [
         name: 'All Proposals',
         href: '/vote',
       },
+      {
+        name: 'Get $MOONEY',
+        href: '/get-mooney',
+      },
+      { name: 'Get Voting Power', href: '/lock' },
+    ],
+  },
+  {
+    name: 'Contribute',
+    icon: WrenchScrewdriverIcon,
+    href: '/submit',
+    children: [
       {
         name: 'Submit Proposal',
         href: '/submit',
       },
       {
         name: 'Submit Contribution',
-        href: '/submit?tag=contribution',
+        href: '/contribute',
       },
-      {
-        name: 'Get $MOONEY',
-        href: '/get-mooney',
-      },
-      { name: 'Get Voting Power', href: '/lock' },
-      { name: 'Bridge', href: '/bridge' },
     ],
   },
   {

diff --git a/ui/components/nance/ProposalEditor.tsx b/ui/components/nance/ProposalEditor.tsx
@@ -267,7 +267,7 @@ export default function ProposalEditor() {
 
   return (
     <div className="flex flex-col justify-center items-start animate-fadeIn w-full md:w-full">
-      <Head title="Proposal Editor" />
+      <Head title="Submissions Portal" />
 
       <div className="px-2 w-full md:max-w-[1200px]">
         <form onSubmit={handleSubmit(onSubmit)}>

diff --git a/ui/components/onboarding/CreateTeam.tsx b/ui/components/onboarding/CreateTeam.tsx
@@ -465,7 +465,7 @@ export default function CreateTeam({
                           setTimeout(async () => {
                             await sendDiscordMessage(
                               'networkNotifications',
-                              `[**${teamName}** has minted a team NFT!](${DEPLOYED_ORIGIN}/team/${teamPrettyLink}?_timestamp=123456789)`
+                              `[**${teamName}** has created a team in the Space Acceleration Network!](${DEPLOYED_ORIGIN}/team/${teamPrettyLink}?_timestamp=123456789)`
                             )
 
                             router.push(`/team/${teamPrettyLink}`)

diff --git a/ui/const/whitelist.ts b/ui/const/whitelist.ts
@@ -13,5 +13,4 @@ export const featuredTeams: any = [
   '5',
   '4',
   '2',
-  '3',
 ]
diff --git a/ui/lib/navigation/useNavigation.tsx b/ui/lib/navigation/useNavigation.tsx
@@ -5,6 +5,7 @@ import {
   FolderIcon,
   PlusIcon,
   RocketLaunchIcon,
+  WrenchScrewdriverIcon, 
 } from '@heroicons/react/24/outline'
 import { useMemo } from 'react'
 import IconOrg from '@/components/assets/IconOrg'
@@ -25,6 +26,11 @@ export default function useNavigation(citizen: any) {
         name: 'Network',
         href: '/network',
         icon: IconOrg,
+        children: [
+          { name: 'Teams', href: '/teams' },
+          { name: 'Citizens', href: '/citizens' },
+          { name: 'Map', href: '/map' },
+        ]
       },
       {
         name: 'Projects',
@@ -55,20 +61,26 @@ export default function useNavigation(citizen: any) {
             name: 'All Proposals',
             href: '/vote',
           },
+          {
+            name: 'Get $MOONEY',
+            href: '/get-mooney',
+          },
+          { name: 'Get Voting Power', href: '/lock' },
+        ],
+      },
+      {
+        name: 'Contribute',
+        icon: WrenchScrewdriverIcon,
+        href: '/submit',
+        children: [
           {
             name: 'Submit Proposal',
             href: '/submit',
           },
           {
             name: 'Submit Contribution',
-            href: '/submit?tag=contribution',
+            href: '/contribute',
           },
-          {
-            name: 'Get $MOONEY',
-            href: '/get-mooney',
-          },
-          { name: 'Get Voting Power', href: '/lock' },
-          { name: 'Bridge', href: '/bridge' },
         ],
       },
       {

diff --git a/ui/pages/submit.tsx b/ui/pages/submit.tsx
@@ -1,5 +1,7 @@
 import { Tab } from '@headlessui/react'
 import { NanceProvider } from '@nance/nance-hooks'
+import Image from 'next/image'
+import Link from 'next/link'
 import { useRouter } from 'next/router'
 import React, { useEffect, useState } from 'react'
 import { NANCE_API_URL } from '../lib/nance/constants'
@@ -10,8 +12,6 @@ import ContentLayout from '../components/layout/ContentLayout'
 import WebsiteHead from '../components/layout/Head'
 import { NoticeFooter } from '../components/layout/NoticeFooter'
 import ProposalEditor from '../components/nance/ProposalEditor'
-import Image from 'next/image';
-import Link from 'next/link';
 
 const SubmissionPage: React.FC = () => {
   const router = useRouter()
@@ -83,47 +83,81 @@ const SubmissionPage: React.FC = () => {
                 <Tab.Panels className="mt-4">
                   <Tab.Panel>
                     <div className="mb-8 max-w-[600px]">
-                    <div id="instructions-container" className="flex flex-col md:flex-row items-center justify-center gap-8 pt-5">
-                      <div id="step-1" className="flex flex-col items-center max-w-[200px]">
-                        <Image 
-                          src="/assets/icon-number-1.svg"
-                          alt="Step 1"
-                          width={70}
-                          height={70}
-                        />
-                        <p className="text-center pt-2 pb-5">
-                          (optional) <br></br> Post to <Link href="https://discord.com/channels/914720248140279868/1027658256706961509" className="text-blue-400 hover:text-blue-300 underline">#ideation</Link>
-                        </p>
-                      </div>
-                      <div id="step-2" className="flex flex-col items-center max-w-[200px]">
-                        <Image 
-                          src="/assets/icon-number-2.svg"
-                          alt="Step 1"
-                          width={70}
-                          height={70}
-                        />
-                        <p className="text-center pt-2 pb-5">
-                          Submit your <br></br>proposal below
-                        </p>
-                      </div>
-                      <div id="step-3" className="flex flex-col items-center max-w-[200px]">
-                        <Image 
-                          src="/assets/icon-number-3.svg"
-                          alt="Step 1"
-                          width={70}
-                          height={70}
-                        />
-                        <p className="text-center pt-2 pb-5">
-                          Present Proposal <br></br>at Townhall 
-                        </p>
+                      <div
+                        id="instructions-container"
+                        className="flex flex-col md:flex-row items-center justify-center gap-8 pt-5"
+                      >
+                        <div
+                          id="step-1"
+                          className="flex flex-col items-center max-w-[200px]"
+                        >
+                          <Image
+                            src="/assets/icon-number-1.svg"
+                            alt="Step 1"
+                            width={70}
+                            height={70}
+                          />
+                          <p className="text-center pt-2 pb-5">
+                            (optional) <br></br> Post to{' '}
+                            <Link
+                              href="https://discord.com/channels/914720248140279868/1027658256706961509"
+                              className="text-blue-400 hover:text-blue-300 underline"
+                            >
+                              #ideation
+                            </Link>
+                          </p>
+                        </div>
+                        <div
+                          id="step-2"
+                          className="flex flex-col items-center max-w-[200px]"
+                        >
+                          <Image
+                            src="/assets/icon-number-2.svg"
+                            alt="Step 1"
+                            width={70}
+                            height={70}
+                          />
+                          <p className="text-center pt-2 pb-5">
+                            Submit your <br></br>proposal below
+                          </p>
+                        </div>
+                        <div
+                          id="step-3"
+                          className="flex flex-col items-center max-w-[200px]"
+                        >
+                          <Image
+                            src="/assets/icon-number-3.svg"
+                            alt="Step 1"
+                            width={70}
+                            height={70}
+                          />
+                          <p className="text-center pt-2 pb-5">
+                            Present Proposal <br></br>at Townhall
+                          </p>
+                        </div>
                       </div>
-                    </div>
                       <p className="text-gray-300">
-                        Submit a proposal to receive financing or special permissions from voting MoonDAO members. Please refer to {' '}
-                        <a href="https://docs.moondao.com/Projects/Project-System" className="text-blue-400 hover:text-blue-300 underline">
+                        Submit a proposal to receive financing or special
+                        permissions from the MoonDAO community. Please refer to{' '}
+                        <a
+                          href="https://docs.moondao.com/Projects/Project-System"
+                          className="text-blue-400 hover:text-blue-300 underline"
+                          target="_blank"
+                          rel="noreferrer"
+                        >
                           our documentation
                         </a>{' '}
-                        for more details before getting started.
+                        for more details before getting started. We recommend
+                        starting your draft with the{' '}
+                        <a
+                          href="https://docs.google.com/document/d/1p8rV9RlvFk6nAJzWh-tvroyPvasjjrvgKpyX8ibGX3I/edit?usp=sharing"
+                          className="text-blue-400 hover:text-blue-300 underline"
+                          target="_blank"
+                          rel="noreferrer"
+                        >
+                          Google doc template
+                        </a>
+                        .
                       </p>
                     </div>
                     <NanceProvider apiUrl={NANCE_API_URL}>
@@ -134,11 +168,16 @@ const SubmissionPage: React.FC = () => {
                     <div className="mb-8">
                       <p className="text-gray-300">
                         What have you done to accelerate the impact of MoonDAO's
-                        mission? Submit your results for senate review and
-                        potential rewards. Please refer to{' '}
+                        mission? Submit your non-project work and
+                        accomplishments, even if not tied directly to MoonDAO,
+                        to earn ETH financial rewards and vMOONEY voting power.
+                        If it helps advance our mission and build a
+                        multiplanetary future, it counts! Please refer to{' '}
                         <a
-                          href="https://docs.moondao.com/Projects/Project-System#retroactive-rewards"
+                          href="https://docs.moondao.com/Reference/Nested-Docs/Community-Rewards"
                           className="text-blue-400 hover:text-blue-300 underline"
+                          target="_blank"
+                          rel="noreferrer"
                         >
                           our documentation
                         </a>{' '}
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,5 +13,4 @@ export const featuredTeams: any = [ @@
       '5',
       '4',
       '2',
-      '3',
     ]