Skip to content

Commit 0e575ba

Browse files
Markkos89Markkos89
committed
feat: dependency fix and some Layout arrangements
1 parent 97ac964 commit 0e575ba

File tree

8 files changed

+285
-344
lines changed

8 files changed

+285
-344
lines changed

‎package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"dependencies": {
1313
"@chakra-ui/icons": "^2.0.19",
1414
"@chakra-ui/react": "^2.7.1",
15-
"@codingwithmanny/blockies": "^1.1.0",
1615
"@emotion/react": "^11.11.1",
1716
"@emotion/styled": "^11.11.0",
1817
"@fontsource/inter": "^5.0.3",

‎src/pages/_app.tsx

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import "@/styles/globals.css";
99
import { WagmiConfig, createConfig, configureChains } from "wagmi";
1010
import { polygonMumbai } from "wagmi/chains";
1111
import { publicProvider } from "wagmi/providers/public";
12-
import { Box, ChakraProvider } from "@chakra-ui/react";
12+
import { ChakraProvider } from "@chakra-ui/react";
1313
import { theme } from "@/theme";
14-
import Topbar from "@/components/Topbar";
1514
import { MetaMaskConnector } from "wagmi/connectors/metaMask";
1615
import { MDXProvider } from "@mdx-js/react";
1716
import Components from "@/components/mdx/Components";
1817
import { InjectedConnector } from "wagmi/connectors/injected";
1918
import { CoinbaseWalletConnector } from "wagmi/connectors/coinbaseWallet";
19+
import Layout from "@/components/Layout";
2020

2121
// Config
2222
// ========================================================
@@ -63,16 +63,11 @@ const MyApp: AppType<{ session: Session | null }> = ({
6363
<ChakraProvider theme={theme}>
6464
<WagmiConfig config={config}>
6565
<SessionProvider session={session} refetchInterval={0}>
66-
{/* <Box
67-
p="1.25em"
68-
px="5%"
69-
mx={{ base: "2rem", md: "6rem", lg: "10rem" }}
70-
> */}
71-
{/* <Topbar /> */}
7266
<MDXProvider components={Components}>
73-
<Component {...pageProps} />
67+
<Layout>
68+
<Component {...pageProps} />
69+
</Layout>
7470
</MDXProvider>
75-
{/* </Box> */}
7671
</SessionProvider>
7772
</WagmiConfig>
7873
</ChakraProvider>

‎src/pages/getting-started.tsx

Lines changed: 143 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import path from "path";
2222
import matter from "gray-matter";
2323
import { CONTENT_PATH } from "@/lib/constants";
2424
import { useEffect, useState } from "react";
25-
import Layout from "@/components/Layout";
2625

2726
interface Lesson {
2827
frontMatter: any;
@@ -53,189 +52,156 @@ const GettingStarted: React.FC<LessonProps> = ({ lessons }) => {
5352
}, [lessons]);
5453

5554
return (
56-
<Layout>
57-
<Flex
58-
// as="main"
59-
py={5}
60-
px={[4, 10, 16]}
61-
direction="column"
62-
minH="100vh"
63-
mt="6"
64-
borderRadius="5px"
65-
>
66-
<Stack spacing={5} direction="column">
67-
<Heading
68-
as="h2"
69-
fontSize="3xl"
70-
textAlign="center"
71-
color="#F96C9D"
72-
apply="mdx.h2"
73-
>
74-
Getting Started
75-
</Heading>
55+
<Flex
56+
py={5}
57+
px={[4, 10, 16]}
58+
direction="column"
59+
minH="100vh"
60+
mt="6"
61+
borderRadius="5px"
62+
>
63+
<Stack spacing={5} direction="column">
64+
<Heading
65+
as="h2"
66+
fontSize="3xl"
67+
textAlign="center"
68+
color="#F96C9D"
69+
apply="mdx.h2"
70+
>
71+
Getting Started
72+
</Heading>
7673

77-
<Heading
78-
apply="mdx.h3"
79-
as="h3"
80-
fontSize="2xl"
81-
textAlign="center"
82-
p={5}
83-
>
84-
What is D_D Academy?
85-
</Heading>
86-
<Text apply="mdx.p" as="p" fontSize="xl" textAlign="center">
87-
<strong>D_D Academy</strong> is an open-source education platform
88-
created by the Developer DAO.
89-
</Text>
90-
<Text apply="mdx.p" as="p" fontSize="xl" textAlign="center">
91-
We seek to{" "}
92-
<Text fontWeight="bold" as="strong" color="#F96C9D">
93-
empower learners
94-
</Text>{" "}
95-
with knowledge and tools that can be applied to real-world projects
96-
while promoting a healthy learning environment.
97-
</Text>
98-
<Divider />
99-
<Heading
100-
apply="mdx.h3"
101-
as="h3"
102-
fontSize="2xl"
103-
textAlign="center"
104-
px={5}
105-
>
106-
Current Lessons
107-
</Heading>
108-
{Object.entries(formattedLessons).map((track: any, idx: number) => {
109-
return (
110-
<UnorderedList
111-
listStyleType="none"
112-
textAlign="center"
113-
as="div"
114-
key={idx}
115-
>
116-
<Heading size="md" color="yellow.300">
117-
{track[0].toUpperCase()}
118-
</Heading>
119-
<>
120-
{track[1].map((lesson: Lesson, idx: number) => (
121-
<ListItem
122-
key={idx}
123-
my="2"
124-
py="2"
125-
maxW="40vw"
126-
margin="0 auto"
74+
<Heading apply="mdx.h3" as="h3" fontSize="2xl" textAlign="center" p={5}>
75+
What is D_D Academy?
76+
</Heading>
77+
<Text apply="mdx.p" as="p" fontSize="xl" textAlign="center">
78+
<strong>D_D Academy</strong> is an open-source education platform
79+
created by the Developer DAO.
80+
</Text>
81+
<Text apply="mdx.p" as="p" fontSize="xl" textAlign="center">
82+
We seek to{" "}
83+
<Text fontWeight="bold" as="strong" color="#F96C9D">
84+
empower learners
85+
</Text>{" "}
86+
with knowledge and tools that can be applied to real-world projects
87+
while promoting a healthy learning environment.
88+
</Text>
89+
<Divider />
90+
<Heading
91+
apply="mdx.h3"
92+
as="h3"
93+
fontSize="2xl"
94+
textAlign="center"
95+
px={5}
96+
>
97+
Current Lessons
98+
</Heading>
99+
{Object.entries(formattedLessons).map((track: any, idx: number) => {
100+
return (
101+
<UnorderedList
102+
listStyleType="none"
103+
textAlign="center"
104+
as="div"
105+
key={idx}
106+
>
107+
<Heading size="md" color="yellow.300">
108+
{track[0].toUpperCase()}
109+
</Heading>
110+
<>
111+
{track[1].map((lesson: Lesson, idx: number) => (
112+
<ListItem key={idx} my="2" py="2" maxW="40vw" margin="0 auto">
113+
<Link
114+
as={NextLink}
115+
href={`/lessons/${lesson.path}/${lesson.slug}`}
116+
passHref
127117
>
128-
<Link
129-
as={NextLink}
130-
href={`/lessons/${lesson.path}/${lesson.slug}`}
131-
passHref
118+
<Button
119+
height="auto"
120+
style={{
121+
whiteSpace: "normal",
122+
wordWrap: "break-word",
123+
padding: "0.5rem",
124+
width: "100%",
125+
fontSize: "xl",
126+
}}
132127
>
133-
<Button
134-
height="auto"
135-
style={{
136-
whiteSpace: "normal",
137-
wordWrap: "break-word",
138-
padding: "0.5rem",
139-
width: "100%",
140-
fontSize: "xl",
141-
}}
142-
>
143-
{lesson.frontMatter.title}
144-
</Button>
145-
</Link>
146-
</ListItem>
147-
))}
148-
</>
149-
</UnorderedList>
150-
);
151-
})}
152-
<Divider />
128+
{lesson.frontMatter.title}
129+
</Button>
130+
</Link>
131+
</ListItem>
132+
))}
133+
</>
134+
</UnorderedList>
135+
);
136+
})}
137+
<Divider />
153138

154-
<Heading
155-
apply="mdx.h3"
156-
as="h3"
157-
fontSize="2xl"
158-
textAlign="center"
159-
p={5}
160-
>
161-
This project is just getting started.
162-
</Heading>
139+
<Heading apply="mdx.h3" as="h3" fontSize="2xl" textAlign="center" p={5}>
140+
This project is just getting started.
141+
</Heading>
163142

164-
<Text apply="mdx.div" as="div" fontSize="xl" textAlign="center">
165-
<UnorderedList listStyleType="none">
166-
<ListItem>
167-
We&apos;re looking for{" "}
168-
<Text fontWeight="bold" as="strong" color="#F96C9D">
169-
feedback
170-
</Text>{" "}
171-
about this project and our current lessons.{" "}
172-
<Link
173-
as={NextLink}
174-
href={
175-
"https://github.com/Developer-DAO/academy/issues/new?assignees=&labels=needs+triage%2C+bug&template=bug_report.md&title="
176-
}
177-
passHref
178-
isExternal
179-
textDecoration="underline"
180-
>
181-
Submit your suggestion or bug report.
182-
</Link>
183-
</ListItem>
184-
<ListItem>
185-
We&apos;re also looking for{" "}
186-
<Text fontWeight="bold" as="strong" color="#F96C9D">
187-
Developer DAO members
188-
</Text>{" "}
189-
who are interested in writing lesson content, or building
190-
website and blockchain features. The team can be found in the
191-
Developer DAO Discord{" "}
192-
<Text fontWeight="bold" as="strong">
193-
#d_d-academy
194-
</Text>{" "}
195-
channel.
196-
</ListItem>
197-
</UnorderedList>
198-
</Text>
199-
<Divider />
143+
<Text apply="mdx.div" as="div" fontSize="xl" textAlign="center">
144+
<UnorderedList listStyleType="none">
145+
<ListItem>
146+
We&apos;re looking for{" "}
147+
<Text fontWeight="bold" as="strong" color="#F96C9D">
148+
feedback
149+
</Text>{" "}
150+
about this project and our current lessons.{" "}
151+
<Link
152+
as={NextLink}
153+
href={
154+
"https://github.com/Developer-DAO/academy/issues/new?assignees=&labels=needs+triage%2C+bug&template=bug_report.md&title="
155+
}
156+
passHref
157+
isExternal
158+
textDecoration="underline"
159+
>
160+
Submit your suggestion or bug report.
161+
</Link>
162+
</ListItem>
163+
<ListItem>
164+
We&apos;re also looking for{" "}
165+
<Text fontWeight="bold" as="strong" color="#F96C9D">
166+
Developer DAO members
167+
</Text>{" "}
168+
who are interested in writing lesson content, or building website
169+
and blockchain features. The team can be found in the Developer
170+
DAO Discord{" "}
171+
<Text fontWeight="bold" as="strong">
172+
#d_d-academy
173+
</Text>{" "}
174+
channel.
175+
</ListItem>
176+
</UnorderedList>
177+
</Text>
178+
<Divider />
200179

201-
<Heading
202-
apply="mdx.h3"
203-
as="h3"
204-
fontSize="2xl"
205-
textAlign="center"
206-
p={5}
207-
>
208-
Highlights of Resources
209-
</Heading>
210-
<Box alignSelf="center">
211-
<Image
212-
src="/assets/getting-started/img_1.png"
213-
alt="highlights of resources"
214-
w="40em"
215-
/>
216-
</Box>
217-
<Divider />
180+
<Heading apply="mdx.h3" as="h3" fontSize="2xl" textAlign="center" p={5}>
181+
Highlights of Resources
182+
</Heading>
183+
<Box alignSelf="center">
184+
<Image
185+
src="/assets/getting-started/img_1.png"
186+
alt="highlights of resources"
187+
w="40em"
188+
/>
189+
</Box>
190+
<Divider />
218191

219-
<Heading
220-
apply="mdx.h3"
221-
as="h3"
222-
fontSize="2xl"
223-
textAlign="center"
224-
p={5}
225-
>
226-
Roadmap
227-
</Heading>
228-
<Box alignSelf="center" pb="1.25rem">
229-
<Image
230-
src="/assets/getting-started/img_2.png"
231-
alt="3 month roadmap"
232-
w="40em"
233-
borderRadius="0.875rem"
234-
/>
235-
</Box>
236-
</Stack>
237-
</Flex>
238-
</Layout>
192+
<Heading apply="mdx.h3" as="h3" fontSize="2xl" textAlign="center" p={5}>
193+
Roadmap
194+
</Heading>
195+
<Box alignSelf="center" pb="1.25rem">
196+
<Image
197+
src="/assets/getting-started/img_2.png"
198+
alt="3 month roadmap"
199+
w="40em"
200+
borderRadius="0.875rem"
201+
/>
202+
</Box>
203+
</Stack>
204+
</Flex>
239205
);
240206
};
241207

0 commit comments

Comments
 (0)