Skip to content

Commit 850f5f2

Browse files
PLCosterPLCoster
authored
Merge pull request #66 from oslabs-beta/dev
Dev to Master
2 parents 2dbbbf3 + 39a237f commit 850f5f2

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
<!-- STARS -->
2626
<a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a>
2727
<!-- GITHUB RELEASE VERSION -->
28-
<a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a>
28+
<!-- <a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a> -->
2929
<!-- BUILD STATUS -->
3030
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
3131
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml"><img alt="dev CI workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml/badge.svg"></a>
32+
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
3233
<!-- LICENSE -->
33-
<a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a>
34+
<!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a> -->
3435
<!-- CONTRIBUTIONS -->
35-
<a href="https://github.com/oslabs-beta/sapling/blob/master/README.md"><img alt="Contributions" src="https://img.shields.io/badge/contributors-welcome-brightgreen"></a>
36+
<!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/README.md"><img alt="Contributions" src="https://img.shields.io/badge/contributors-welcome-brightgreen"></a> -->
3637
</p>
3738
</p>
3839

‎sapling/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@
2727
<!-- STARS -->
2828
<a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a>
2929
<!-- GITHUB RELEASE VERSION -->
30-
<a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a>
30+
<!-- <a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a> -->
3131
<!-- BUILD STATUS -->
3232
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
3333
<a href="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml"><img alt="dev CI workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml/badge.svg"></a>
34+
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
3435
<!-- LICENSE -->
35-
<a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a>
36+
<!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a> -->
3637
<!-- CONTRIBUTIONS -->
37-
<a href="https://github.com/oslabs-beta/sapling/blob/master/README.md"><img alt="Contributions" src="https://img.shields.io/badge/contributors-welcome-brightgreen"></a>
38+
<!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/README.md"><img alt="Contributions" src="https://img.shields.io/badge/contributors-welcome-brightgreen"></a> -->
3839
</p>
3940
</p>
4041

‎website/components/Carousel.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import secondSlide from '../public/icons_demo.gif';
44
import thirdSlide from '../public/rebuild_on_save_demo.gif';
55
import fourthSlide from '../public/build_tree_demo.gif';
66
import fifthSlide from '../public/settings_theme_demo.gif';
7+
import blurData from '../public/blurData.js';
8+
79

810
const Carousel = () => {
911
return (
@@ -20,31 +22,31 @@ const Carousel = () => {
2022
</div>
2123
<div className="carousel-inner">
2224
<div className="carousel-item active">
23-
<Image className="d-block w-100" src={firstSlide} alt="First slide" priority={true}/>
25+
<Image className="d-block w-100" src={firstSlide} alt="First slide" placeholder="blur" blurDataURL={blurData.gen_tree_demo}/>
2426
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
2527
<p>Open a root component to structure your app&apos;s files so they match its dependency relationships.</p>
2628
</div>
2729
</div>
2830
<div className="carousel-item">
29-
<Image className="d-block w-100" src={secondSlide} alt="Second slide" priority={true}/>
31+
<Image className="d-block w-100" src={secondSlide} alt="Second slide" placeholder="blur" blurDataURL={blurData.icons_demo}/>
3032
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
3133
<p>Use Sapling&apos;s intuitive icons to get a list of props available to each component, see which components are connected to your Redux store, and open the file you wish to edit.</p>
3234
</div>
3335
</div>
3436
<div className="carousel-item">
35-
<Image className="d-block w-100" src={thirdSlide} alt="Third slide" priority={true}/>
37+
<Image className="d-block w-100" src={thirdSlide} alt="Third slide" placeholder="blur" blurDataURL={blurData.rebuild_on_save_demo}/>
3638
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
3739
<p>Sapling is highly responsive, and notices whenever you edit and save a file.</p>
3840
</div>
3941
</div>
4042
<div className="carousel-item">
41-
<Image className="d-block w-100" src={fourthSlide} alt="Fourth slide" priority={true}/>
43+
<Image className="d-block w-100" src={fourthSlide} alt="Fourth slide" placeholder="blur" blurDataURL={blurData.build_tree_demo}/>
4244
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
4345
<p>Rebuild the tree with your currently open file as the root. Note that Sapling retains its expanded state between sessions.</p>
4446
</div>
4547
</div>
4648
<div className="carousel-item">
47-
<Image className="d-block w-100" src={fifthSlide} alt="Fifth slide" priority={true}/>
49+
<Image className="d-block w-100" src={fifthSlide} alt="Fifth slide" placeholder="blur" blurDataURL={blurData.settings_theme_demo} />
4850
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
4951
<p>Toggle the display of third-party and React Router components, and watch as Sapling&apos;s theme changes to match your preferences.</p>
5052
</div>

‎website/components/Links.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ const Links = () => {
99
<h2 className="text-center">Links</h2>
1010
<div className="links">
1111
<div className="link mx-auto">
12-
<p>View the product</p>
12+
<p className="text-center">View the product</p>
1313
<a href="https://github.com/oslabs-beta/sapling" target="_blank" rel="noreferrer">
1414
<Image src={githubIcon} alt="Github OctoCat Logo"/>
1515
</a>
1616
</div>
1717
<div className="link mx-auto">
18-
<p>Read more about Sapling</p>
18+
<p className="text-center">Read more about Sapling</p>
1919
<a href="" target="_blank">
2020
<Image src={mediumIcon} alt="Medium M Logo"/>
2121
</a>

0 commit comments

Comments
 (0)