refactor: navigation

src/App.tsx

@@ -2,7 +2,7 @@ import { BrowserRouter, Routes, Route } from 'react-router-dom';
 
 import { PageView } from '~/components/app';
 import ScrollToTop from './hooks/ScrollToTop';
-import { Landing, Team, Home, Lore, Portfolio, Blog, IntroductionPage, Posts } from './pages';
+import { Landing, Squad, Home, Ethos, Creations, Insights, IntroductionPage, Posts } from './pages';
 
 function App() {
   return (
@@ -13,11 +13,11 @@ function App() {
           <Route path='/' element={<IntroductionPage />} />
           <Route path='*' element={<Home />}>
             <Route path='landing' element={<Landing />} />
-            <Route path='lore' element={<Lore />} />
-            <Route path='team' element={<Team />} />
-            <Route path='portfolio' element={<Portfolio />} />
-            <Route path='blog' element={<Blog />} />
-            <Route path='blog/:id' element={<Posts />} />
+            <Route path='ethos' element={<Ethos />} />
+            <Route path='squad' element={<Squad />} />
+            <Route path='creations' element={<Creations />} />
+            <Route path='insights' element={<Insights />} />
+            <Route path='insights/:id' element={<Posts />} />
           </Route>
         </Routes>
       </BrowserRouter>

src/components/common/Section.tsx

@@ -74,7 +74,7 @@ export interface SectionBackgroundProps {
 export const SectionBackground: FC<SectionBackgroundProps> = ({ type, align, ...props }) => {
   return (
     <StyledSectionBackground type={type} align={align} {...props}>
-      <img src={`/img/lore/00${type}_grad.jpg`} alt='' loading='lazy' />
+      <img src={`/img/ethos/00${type}_grad.jpg`} alt='' loading='lazy' />
     </StyledSectionBackground>
   );
 };

src/components/common/SectionArticle.tsx

@@ -9,7 +9,7 @@ import {
   MOBILE_MAX_WIDTH,
   SPACING_530,
 } from '~/components/common';
-import STAR from '~/assets/lore-stars.svg';
+import STAR from '~/assets/ethos-stars.svg';
 
 export const TextContainer = styled.p`
   color: inherit;

src/containers/Navbar/index.tsx

@@ -13,23 +13,23 @@ interface NavLink {
 
 const navLinks: NavLink[] = [
   {
-    name: 'lore',
-    url: '/lore',
+    name: 'ethos',
+    url: '/ethos',
     disabled: false,
   },
   {
-    name: 'team',
-    url: '/team',
+    name: 'squad',
+    url: '/squad',
     disabled: false,
   },
   {
-    name: 'portfolio',
-    url: '/portfolio',
+    name: 'creations',
+    url: '/creations',
     disabled: false,
   },
   {
-    name: 'blog',
-    url: '/blog',
+    name: 'insights',
+    url: '/insights',
     disabled: false,
   },
 ];
@@ -91,7 +91,7 @@ export const Navbar = ({ className }: NavbarProps) => {
             id={showNavbar ? '' : 'hide'}
             to={link.url}
             key={link.name}
-            disabled={link.disabled && !pathname.includes('/blog/')}
+            disabled={link.disabled && !pathname.includes('/insights/')}
             className={link.disabled ? 'gradient' : ''}
           >
             {link.name}

src/data/blog.json

@@ -10,23 +10,23 @@
   {
     "id": "oracle-manipulation-101",
     "name": "Oracle Manipulation 101",
-    "description": "What does an Uniswap v3 oracle manipulation look like?",
+    "description": "What does a Uniswap v3 oracle manipulation look like?",
     "date": "12/26/22",
     "tags": ["Price", "Oracles", "Uniswap V3"],
     "image": "https://price-oracle.notion.site/image/https%3A%2F%2Fs3-us-west-2.amazonaws.com%2Fsecure.notion-static.com%2F9297e650-550e-4395-97f6-84ea64d688fd%2Fimage.jpeg?table=block&id=cbcea67b-7796-4969-9543-7907d3b1b4ba&spaceId=de552277-5ae2-4d88-932f-dd538421d024&width=2000&userId=&cache=v2"
   },
   {
     "id": "oracle-manipulation-101-math-edition",
     "name": "Oracle Manipulation 101 (Math edition)",
-    "description": "What does an Uniswap v3 oracle manipulation look like?",
+    "description": "What does a Uniswap v3 oracle manipulation look like?",
     "date": "12/26/22",
     "tags": ["Price", "Oracles", "Uniswap V3", "Math"],
     "image": "https://price-oracle.notion.site/image/https%3A%2F%2Fs3-us-west-2.amazonaws.com%2Fsecure.notion-static.com%2F645a9912-e67f-4cca-a108-4d9ea0dbc64c%2Fimage.png?table=block&id=e9ceba01-98dc-4cc3-84bb-7de919806a9c&spaceId=de552277-5ae2-4d88-932f-dd538421d024&width=1360&userId=&cache=v2"
   },
   {
     "id": "rip-oracles",
     "name": "RIP, Oracles",
-    "description": "Status quo: Current dangers and how to solve it.",
+    "description": "Status quo: Current hazards and how to solve them",
     "date": "12/26/22",
     "tags": ["Price", "Oracles"],
     "image": "https://mirror-media.imgix.net/publication-images/Go3xqXtpWA1ze8b-ULayp.png?height=1440&width=2880&h=1440&w=2880&auto=compress"

src/data/projects.json

@@ -2,26 +2,26 @@
   "partnerProjects": [
     {
       "name": "OpOO (with Optimism)",
-      "description": "Modular optimistic oracle solution, built alongside Optimism. Enables secure, permissionless delivery of real-world data and attestations."
+      "description": "Modular optimistic oracle solution, built alongside Optimism. OpOO enables secure, permissionless delivery of real-world data and attestations."
     },
     {
       "name": "HAI (with Reflexer)",
-      "description": "Fork of the RAI protocol in Optimism that supports new collaterals such as OP, LSD, and RAI.",
+      "description": "Fork of the RAI protocol, deployed on Optimism. HAI supports new collaterals such as OP, LSD, and RAI.",
       "github": "https://github.com/hai-on-op",
       "docs": "",
       "twitter": "https://twitter.com/letsgethai",
       "web": "https://www.letsgethai.com"
     },
     {
       "name": "Optimistic Roots (with Connext)",
-      "description": "The current canonical bridge implementations are quite expensive. This project aims to reduce costs and increase transfer speeds by implementing an Optimistic approach with cross-chain Merkle root aggregations.",
+      "description": "Existing canonical bridge implementations are quite expensive. This project significantly reduces costs and increases transfer speeds by implementing an Optimistic approach with cross-chain Merkle root aggregations.",
       "github": "https://github.com/connext",
       "twitter": "https://twitter.com/ConnextNetwork",
       "web": "https://www.connext.network/"
     },
     {
       "name": "Crosschain Governance (with Connext)",
-      "description": "User-friendly React component library that enables users to deploy and manage their Avatar's Zodiac Connext Module and easily build the transaction data required for executing desired actions through an xcall function in Connext.",
+      "description": "A user-friendly library of React components that empowers users to set up and oversee their Avatar's Zodiac Connext Module. It simplifies the construction of transaction data necessary for implementing preferred actions via an xcall function within Connext.",
       "github": "https://github.com/defi-wonderland/crosschain-widget"
     },
     {
@@ -30,21 +30,21 @@
       "github": "https://github.com/defi-wonderland/xTokens"
     },
     {
-      "name": "Amphora (with Adam Cochran)",
-      "description": "Amphora is a lending market, forked from Interest Protocol, that supports various types of collateral, such as single-type collateral like ETH and liquidity provider tokens from Curve, including TriCrypto2. It also provides a USDA stablecoin.",
+      "name": "Amphora",
+      "description": "Amphora, a lending market forked from Interest Protocol, accommodates diverse collateral forms including single-type ones like ETH and Curve's liquidity provider tokens, like TriCrypto2. Additionally, it offers a USDA stablecoin.",
       "docs": "https://amphora-protocol.gitbook.io/amphora-protocol/",
       "twitter": "https://twitter.com/amphoraprotocol"
     },
     {
       "name": "Keep3r Network v2",
-      "description": "Decentralized and permissionless network for projects that need external DevOps. We rebuilt the protocol from scratch, improving the code quality, gas usage, tokenomics and adding automatic credit mining.",
+      "description": "Decentralized and permissionless network for projects that need external DevOps. We rebuilt the protocol from scratch, improving the code quality, gas usage, and tokenomics. We also added automatic credit mining.",
       "github": "https://github.com/keep3r-network/keep3r-network-v2",
       "twitter": "https://twitter.com/thekeep3r",
       "web": "https://keep3r.network"
     },
     {
       "name": "Royalties Support (with Sudoswap)",
-      "description": "The Router is a separate mechanism that issues royalties by querying the Manifold.xyz Royalty Registry. The team was responsible for designing the solution and developing the smart contracts. The Router is now deployed and being leveraged by Reservoir.",
+      "description": "The Router is an independent system that grants royalties by accessing the Manifold.xyz Royalty Registry. Currently, this tool is operational and actively utilized by Reservoir.",
       "github": "https://github.com/sudoswap/lssvm/pull/35"
     }
   ],
@@ -59,13 +59,13 @@
     },
     {
       "name": "Smock",
-      "description": "Smock is a testing framework for Hardhat that is used by around 800 repositories. It is a Solidity mocking library and a plugin for Hardhat that allows developers to create mock Solidity contracts using JavaScript or TypeScript. Smock makes it easier to test smart contracts and eliminates the need to write mock contracts in Solidity. Smock is inspired by sinon, sinon-chai, and Python's unittest.mock and currently only works with Hardhat. However, the team plans to extend support to other testing frameworks like Truffle in the future.",
+      "description": "Smock is a Solidity mocking library and Hardhat plugin, used by approximately 800 repositories. It allows developers to form mock Solidity contracts using JavaScript or TypeScript, simplifying smart contract testing and negating the necessity for Solidity mock contracts. Influenced by sinon, sinon-chai, and Python's unittest.mock, Smock presently supports only Hardhat, with future plans to expand to other frameworks like Truffle.",
       "github": "https://github.com/defi-wonderland/smock",
       "docs": "https://smock.readthedocs.io/en/latest/"
     },
     {
       "name": "Sidechain Oracle (with Keep3r Network)",
-      "description": "This mechanism provides the price history of Uniswap V3 pools to chains where the pair may not be available or has insufficient liquidity. This is achieved by creating a virtual Uniswap V3 pool with bridged data from the Mainnet. The team was responsible for the architecture design, off-chain scripts, and smart contract development. The mechanism has recently been launched and is already working on Optimism and Polygon.",
+      "description": "This mechanism provides the price history of Uniswap V3 pools to chains where the pair may not be available or has insufficient liquidity. This is achieved by creating a virtual Uniswap V3 pool with bridged data from Mainnet. The team was responsible for the architecture design, off-chain scripts, and smart contract development. The mechanism has recently been launched and is already working on Optimism and Polygon.",
       "github": "https://github.com/defi-wonderland/sidechain-oracles"
     }
   ]

src/data/team.json → src/data/squad.json

@@ -2,7 +2,7 @@
   {
     "name": "Matias Nisenson",
     "position": "Co-founder & CEO",
-    "description": "- 3x Startup founder & CEO\n- Founder & GP at a $50m deep-tech VC\n\nFun fact: Used to run a tenebrio molitor farm and has become somewhat of an expert on breeding mealworms. Bet you didn't see that one coming!"
+    "description": "- 3x Startup founder & CEO\n- Founder & GP at a $50m deep-tech VC\n\nFun fact: He used to run a tenebrio molitor farm and has become somewhat of an expert on breeding mealworms."
   },
   {
     "name": "Pepo",
@@ -12,37 +12,37 @@
   {
     "name": "Skeletor Spaceman",
     "position": "Co-founder & Architect",
-    "description": "- First contract deployed on 25/07/2017\n- Likes breaking things\n\nFun fact: Never went to space."
+    "description": "- First contract deployed on 25/07/2017\n- Enjoys breaking things\n\nFun fact: He has never been to space."
   },
   {
     "name": "0xGorilla",
     "position": "CTO",
-    "description": "- 10+ years in Software Development\n- Addicted to scalability and conventions\n\nFun fact: His OCD forces him to make the dishwasher look like a Tetris game!"
+    "description": "- 10+ years in Software Development\n- Addicted to scalability and conventions\n\nFun fact: His OCD compels him to arrange the dishwasher like a Tetris game!"
   },
   {
     "name": "Billi",
     "position": "COO",
-    "description": "- Addicted to meetings and context switching\n\nFun fact: Loves scaring buns. Have you seen one around?."
+    "description": "- Addicted to meetings and context switching\n\nFun fact: Loves scaring buns. Have you seen any around?."
   },
   {
     "name": "Parti",
     "position": "Lead Researcher",
-    "description": "- Managed to get a PhD in Physics, specializing in quantum information theory\n- Changed particles for nodes now: \"Pls parti, stop asking about the Beacon Chain's entropy.\"\n- Average chaos enjoyer\n- Definitely not a Furry\nSad fact: Die-hard Boca Juniors fan."
+    "description": "- Managed to earn a PhD in Physics, specializing in quantum information theory\n- Switched from particles for nodes: \"Pls Parti, stop asking about the Beacon Chain's entropy.\"\n- Average chaos enjoyer\n- Definitely not a Furry\nSad fact: Die-hard Boca Juniors fan."
   },
   {
     "name": "Joxes",
     "position": "Researcher",
-    "description": "- Background in Engineering\n- Incubated four different communities to concentrate knowledge on Ethereum\n\nFun fact: Although I love life, I love commenting on DeFi and Ethereum's scaling solutions even more."
+    "description": "- Background in Engineering\n- Incubated four different communities to spread the word about Ethereum\n\nFun fact: His passion for discussing DeFi and Ethereum's scaling solutions surpasses even his love for life."
   },
   {
     "name": "0xMono",
     "position": "Researcher",
-    "description": "- Studies IT infrastructure\n- Defi research and scalability enthusiast\n\nFun fact: I also spend my spare time in DeFi."
+    "description": "- Enrolled in IT infrastructure studies\n- Defi research and scalability enthusiast\n\nFun fact: He also spends his spare time in DeFi."
   },
   {
     "name": "Wei3er Hase",
     "position": "Developer",
-    "description": "- Just a bun from Görli 🥕\n\nFun fact: afraid of bugs and owls."
+    "description": "- Just a bun from Görli 🥕\n\nFun fact: He is afraid of bugs and owls."
   },
   {
     "name": "NG",
@@ -67,12 +67,12 @@
   {
     "name": "0xJabberwock",
     "position": "Developer",
-    "description": "- Recruited directly by Wonderland\n- Codes even his life\n\nFun fact: Holds a dumbbell everyday."
+    "description": "- Recruited by Wonderland\n- Codes even his life\n\nFun fact: Lifts a dumbbell everyday."
   },
   {
     "name": "Shaito",
     "position": "Developer",
-    "description": "- Flying bison addicted crypto and building stuff\n- Normie dev turned Solidity enjoyor\n\nFun fact: Have been rewatching avatar the last airbender for the past 7 years."
+    "description": "- Flying bison addicted to crypto and building stuff\n- Normie dev turned Solidity enjoyor\n\nFun fact: Have been rewatching avatar the last airbender for the past 7 years."
   },
   {
     "name": "Gotzen",
@@ -82,17 +82,17 @@
   {
     "name": "Turtlemoji",
     "position": "Developer",
-    "description": "- Co-created and helped in multiple onchain and normie products/companies\n- Loves swimming, video games, anime, science and to debate anything"
+    "description": "- Co-created and helped in multiple onchain and normie products/companies\n- Loves swimming, video games, anime, science and to debate anything\n\nFun fact: He's addicted to Coke (the drink)."
   },
   {
     "name": "0xRaccoon",
     "position": "Developer",
-    "description": "- Systems engineer who studied at UTN\n- Believes that adaptability is an important feature\n\nFun fact: Like to travel and do outdoor activities."
+    "description": "- UTN Systems engineer\n- Believes that adaptability is an important feature\n\nFun fact: He likes to travel and do outdoor activities."
   },
   {
     "name": "0xAustrian",
     "position": "Developer",
-    "description": "- Studied Software Developer\n- Learned Solidity because he was bored at work\n\nFun fact: 90's horror movies fan."
+    "description": "- Software Developer\n- Learned Solidity because he was bored at work\n\nFun fact: 90's horror movies fan."
   },
   {
     "name": "OneTony",

src/pages/Portfolio/index.tsx → src/pages/Creations/index.tsx

@@ -12,14 +12,14 @@ import {
   Ball_2,
   Ball_3,
   TitleVideo,
-} from './Portfolio.styles';
+} from './Creations.styles';
 import { ProjectsList } from './ProjectsList';
 import { Divider } from './ProjectsList/ProjectsList.styles';
 import { partnerProjects, publicGoods } from '~/data/projects.json';
-import VIDEO_CHROME from '~/assets/videos/portfolio.webm';
-import VIDEO_SAFARI from '~/assets/videos/portfolio.mp4';
+import VIDEO_CHROME from '~/assets/videos/creations.webm';
+import VIDEO_SAFARI from '~/assets/videos/creations.mp4';
 
-export function Portfolio() {
+export function Creations() {
   return (
     <>
       <Container>

src/pages/Lore/Lore.tsx → src/pages/Ethos/Ethos.tsx

@@ -7,8 +7,8 @@ import TextSection from './TextSection';
 import Cone from '~/assets/cone.png';
 import HoopTop from '~/assets/hoop-top.png';
 import HoopBottom from '~/assets/hoop-bottom.png';
-import VIDEO_CHROME from '~/assets/videos/lore.webm';
-import VIDEO_SAFARI from '~/assets/videos/lore.mp4';
+import VIDEO_CHROME from '~/assets/videos/ethos.webm';
+import VIDEO_SAFARI from '~/assets/videos/ethos.mp4';
 import { TitleContainer } from '../Landing/HeroSection';
 
 const StyledApproachSection = styled(ApproachSection)`
@@ -77,7 +77,7 @@ const STitleContainer = styled(TitleContainer)`
   }
 `;
 
-export function Lore() {
+export function Ethos() {
   return (
     <PageContent>
       <HeroDivider>

src/pages/Lore/TextSection.tsx → src/pages/Ethos/TextSection.tsx

@@ -1,7 +1,7 @@
-import { Link } from 'react-router-dom';
 import styled, { css } from 'styled-components';
 
 import {
+  Link,
   Button,
   FONT_SIZE_18,
   MOBILE_MAX_WIDTH,
@@ -102,8 +102,8 @@ function TextSection() {
               something in common though, we all love building cool sh*t.
             </SecondaryText>
 
-            <Link to='/team'>
-              <Button>Meet the team</Button>
+            <Link to='/squad'>
+              <Button>Meet the squad</Button>
             </Link>
           </div>
         </FirstLoreSectionArticle>
@@ -125,8 +125,8 @@ function TextSection() {
               <b>Our pledge is to stand by our partners, supporting them in every way we can.</b>
             </SecondaryText>
 
-            <Link to='/portfolio'>
-              <Button>Portfolio</Button>
+            <Link to='/creations'>
+              <Button>Creations</Button>
             </Link>
           </div>
         </LoreSectionArticle>
@@ -144,7 +144,7 @@ function TextSection() {
             </SecondaryText>
 
             <SecondaryText>Long term, long term, long term…</SecondaryText>
-            <Link to='/contact'>
+            <Link to='https://docs.google.com/forms/d/1n70jsL4sFkOwPNBTdciPqlWF2RirgQwejjztpS4-2L8/viewform' external>
               <Button>Join us</Button>
             </Link>
           </div>

src/pages/Ethos/index.tsx

@@ -0,0 +1 @@
+export * from './Ethos';