🎀 Merge branch 'develop'

MetaFam · Jun 25, 2024 · 70fa330 · 70fa330
2 parents c433442 + 2c516e6
commit 70fa330
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 229 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "develop"
+    ]
+}
diff --git a/packages/discord-bot/src/config.ts b/packages/discord-bot/src/config.ts
@@ -12,7 +12,6 @@ interface IConfig {
   discordBotClientSecret: string;
   sourceCredLedgerBranch: string;
   discordApiBaseUrl: string;
-  discourseInstanceUrl: string;
   botName: string;
 }
 
@@ -55,9 +54,5 @@ export const CONFIG: IConfig = {
     process.env.DISCORD_API_BASE_URL,
     'https://discord.com/api/v8',
   ),
-  discourseInstanceUrl: parseEnv(
-    process.env.DISCOURSE_INSTANCE_URL,
-    'https://forum.metagame.wtf',
-  ),
   botName: 'MetaGameBot',
 };
diff --git a/packages/discord-bot/src/discord/commands/addAlias.ts b/packages/discord-bot/src/discord/commands/addAlias.ts
diff --git a/packages/web/assets/academy/metamodernist.png b/packages/web/assets/academy/metamodernist.png
diff --git a/packages/web/components/ConnectToProgress.tsx b/packages/web/components/ConnectToProgress.tsx
@@ -95,7 +95,7 @@ export const ConnectToProgress: React.FC<{
                   With an{' '}
                   <MetaLink
                     isExternal
-                    href="https://wiki.metagame.wtf/docs/great-houses/house-of-ethereum"
+                    href="https://metagame.wtf/academy/wtf-is-ethereum"
                     color="pink.400"
                     textDecor="underline"
                   >

diff --git a/packages/web/components/Guild/GuildTile.tsx b/packages/web/components/Guild/GuildTile.tsx
@@ -76,19 +76,6 @@ export const GuildTile: React.FC<Props> = ({ guild }) => (
             )}
           </VStack>
         </Flex>
-
-        <Box>
-          <Flex justifyContent="space-between">
-            <VStack spacing={1} align="stretch">
-              <Text textStyle="caption">Barrier of Entry</Text>
-              <Text fontStyle="italic">Coming soon…</Text>
-            </VStack>
-            <VStack spacing={1} align="stretch">
-              <Text textStyle="caption">Contact</Text>
-              <GuildLinksSmall {...{ guild }} />
-            </VStack>
-          </Flex>
-        </Box>
       </MetaTileBody>
     </MetaTile>
   </Link>

diff --git a/packages/web/pages/404.tsx b/packages/web/pages/404.tsx
@@ -98,20 +98,11 @@ const Custom404: FC = () => {
           <Box pt={5}>
             <MetaSecondaryButton
               width={{ base: '100%', md: '50%', lg: '25%', xl: '25%' }}
-              onClick={() => router.push('/learn/wiki')}
+              onClick={() => router.push('/academy')}
             >
-              Wiki
+              dAcademy
             </MetaSecondaryButton>
           </Box>
-          <Box pt={5}>
-            <Link href="https://forum.metagame.wtf">
-              <MetaSecondaryButton
-                width={{ base: '100%', md: '50%', lg: '25%', xl: '25%' }}
-              >
-                Forum
-              </MetaSecondaryButton>
-            </Link>
-          </Box>
           <Box pt={5}>
             <Link href="https://chat.metagame.wtf">
               <MetaSecondaryButton

diff --git a/packages/web/pages/academy/index.tsx b/packages/web/pages/academy/index.tsx
@@ -45,7 +45,7 @@ const AcademyPage: React.FC = () => {
   return (
     <PageContainer>
       <HeadComponent
-        title="Academy"
+        title="dAcademy"
         description="MetaGame is a Massive Online Coordination Game! The Academy is full of Paths and Playbooks to help you find your way and level up in MetaGame & life."
         url="https://metagame.wtf/academy"
       />
@@ -64,7 +64,7 @@ const AcademyPage: React.FC = () => {
             textAlign="center"
             w={{ base: 'full', xl: ' full' }}
           >
-            The Academy
+            dAcademy
           </Heading>
           <Text
             fontSize={{ base: 'md', '2xl': 'xl' }}