Skip to content

Commit 0171aba

Browse files
authored
Merge pull request #31 from arrayinc/blog-five-nine
added blog content
2 parents 16b44ba + e813129 commit 0171aba

File tree

7 files changed

+54
-39
lines changed

7 files changed

+54
-39
lines changed

src/blogdata/BlogPageInfo.js

Lines changed: 42 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
64.3 KB
Loading
52.1 KB
Loading
40.7 KB
Loading
719 KB
Loading

src/pages/homebreak/HomeBreakBlogs.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ export default function HomeBreakPage(props) {
1212
<Navbar.Brand className="blogpage-nav-title" href="#home">Home Break</Navbar.Brand>
1313
<Nav className="mr-auto">
1414
<Nav.Link onClick={() => setBlogClicked(3)}>Morning Ritual</Nav.Link>
15-
<Nav.Link onClick={() => setBlogClicked(4)}>Meditation</Nav.Link>
16-
<Nav.Link onClick={() => setBlogClicked(5)}>Movement</Nav.Link>
15+
<Nav.Link onClick={() => setBlogClicked(4)}>Holistic Health</Nav.Link>
16+
<Nav.Link onClick={() => setBlogClicked(5)}>Sensory Play</Nav.Link>
1717
</Nav>
1818
</Navbar>
1919
</div>
@@ -47,6 +47,10 @@ export default function HomeBreakPage(props) {
4747
<p className="blog-text">{props.BlogPageInfo[blogClicked].contentblocktwo}</p>
4848
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockthree}</p>
4949
<p className="blog-text">{props.BlogPageInfo[blogClicked].contentblockthree}</p>
50+
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockfour}</p>
51+
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockfive}</p>
52+
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblocksix}</p>
53+
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockseven}</p>
5054
</Container>
5155
</Row>
5256
</>

src/pages/playbreak/PlayBreakBlogs.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,17 @@ import React, { useState } from "react";
22
import { Navbar, Nav, Row, Button, Container, Badge, Image } from 'react-bootstrap';
33
import { Facebook, Twitter, Instagram, Bookmark, ThreeDotsVertical, Calendar } from "react-bootstrap-icons";
44

5-
export default function HomeBreakPage(props) {
5+
export default function PlayBreakPage(props) {
66
const [blogClicked, setBlogClicked] = useState(6);
77
return (
88
<>
99
<div>
1010
<Navbar className="blogpage-nav" bg="light" variant="light">
1111
<Navbar.Brand className="blogpage-nav-title" href="#home">Play Break</Navbar.Brand>
1212
<Nav className="mr-auto">
13-
work-break-styling
14-
<Nav.Link onClick={() => setBlogClicked(6)}>Morning Ritual</Nav.Link>
15-
<Nav.Link onClick={() => setBlogClicked(7)}>Meditation</Nav.Link>
16-
<Nav.Link onClick={() => setBlogClicked(8)}>Movement</Nav.Link>
17-
18-
<Nav.Link>Art Therapy</Nav.Link>
19-
<Nav.Link href="/workbreak/blogs">Meditation</Nav.Link>
20-
<Nav.Link href="/workbreak/blogs">Creation</Nav.Link>
21-
main
13+
<Nav.Link onClick={() => setBlogClicked(6)}>Art Therapy</Nav.Link>
14+
<Nav.Link onClick={() => setBlogClicked(7)}>Mindfulness</Nav.Link>
15+
<Nav.Link onClick={() => setBlogClicked(8)}>Play Hard</Nav.Link>
2216
</Nav>
2317
</Navbar>
2418
</div>
@@ -47,7 +41,9 @@ work-break-styling
4741
<libr />
4842
<p className="blog-intro-text">{props.BlogPageInfo[blogClicked].introtext}</p>
4943
<p className="blog-text">{props.BlogPageInfo[blogClicked].contentblockone}</p>
44+
<p className="blog-text">{props.BlogPageInfo[blogClicked].contentblockthree}</p>
5045
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblocktwo}</p>
46+
<p className="blog-text">{props.BlogPageInfo[blogClicked].contentblockfour}</p>
5147
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockthree}</p>
5248
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockfour}</p>
5349
<p className="blog-header">{props.BlogPageInfo[blogClicked].headerblockfive}</p>

0 commit comments

Comments
 (0)