Skip to content

Commit

Permalink
Merge pull request #66 from oslabs-beta/dev
Browse files Browse the repository at this point in the history 
Dev to Master
  • Loading branch information
@PLCoster
PLCoster committed Oct 6, 2021
2 parents 2dbbbf3 + 39a237f commit 850f5f2
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 13 deletions.
7 changes: 4 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
<!-- STARS -->
<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>
<!-- GITHUB RELEASE VERSION -->
<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>
<!-- <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> -->
<!-- BUILD STATUS -->
<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>
<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>
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
<!-- LICENSE -->
<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>
<!-- <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> -->
<!-- CONTRIBUTIONS -->
<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>
<!-- <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> -->
</p>
</p>

Expand Down
7 changes: 4 additions & 3 deletions sapling/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@
<!-- STARS -->
<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>
<!-- GITHUB RELEASE VERSION -->
<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>
<!-- <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> -->
<!-- BUILD STATUS -->
<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>
<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>
<img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
<!-- LICENSE -->
<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>
<!-- <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> -->
<!-- CONTRIBUTIONS -->
<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>
<!-- <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> -->
</p>
</p>

Expand Down
12 changes: 7 additions & 5 deletions website/components/Carousel.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import secondSlide from '../public/icons_demo.gif';
import thirdSlide from '../public/rebuild_on_save_demo.gif';
import fourthSlide from '../public/build_tree_demo.gif';
import fifthSlide from '../public/settings_theme_demo.gif';
import blurData from '../public/blurData.js';


const Carousel = () => {
return (
Expand All @@ -20,31 +22,31 @@ const Carousel = () => {
</div>
<div className="carousel-inner">
<div className="carousel-item active">
<Image className="d-block w-100" src={firstSlide} alt="First slide" priority={true}/>
<Image className="d-block w-100" src={firstSlide} alt="First slide" placeholder="blur" blurDataURL={blurData.gen_tree_demo}/>
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
<p>Open a root component to structure your app&apos;s files so they match its dependency relationships.</p>
</div>
</div>
<div className="carousel-item">
<Image className="d-block w-100" src={secondSlide} alt="Second slide" priority={true}/>
<Image className="d-block w-100" src={secondSlide} alt="Second slide" placeholder="blur" blurDataURL={blurData.icons_demo}/>
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
<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>
</div>
</div>
<div className="carousel-item">
<Image className="d-block w-100" src={thirdSlide} alt="Third slide" priority={true}/>
<Image className="d-block w-100" src={thirdSlide} alt="Third slide" placeholder="blur" blurDataURL={blurData.rebuild_on_save_demo}/>
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
<p>Sapling is highly responsive, and notices whenever you edit and save a file.</p>
</div>
</div>
<div className="carousel-item">
<Image className="d-block w-100" src={fourthSlide} alt="Fourth slide" priority={true}/>
<Image className="d-block w-100" src={fourthSlide} alt="Fourth slide" placeholder="blur" blurDataURL={blurData.build_tree_demo}/>
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
<p>Rebuild the tree with your currently open file as the root. Note that Sapling retains its expanded state between sessions.</p>
</div>
</div>
<div className="carousel-item">
<Image className="d-block w-100" src={fifthSlide} alt="Fifth slide" priority={true}/>
<Image className="d-block w-100" src={fifthSlide} alt="Fifth slide" placeholder="blur" blurDataURL={blurData.settings_theme_demo} />
<div className="carousel-caption w-75 mx-auto d-none d-md-block">
<p>Toggle the display of third-party and React Router components, and watch as Sapling&apos;s theme changes to match your preferences.</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions website/components/Links.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ const Links = () => {
<h2 className="text-center">Links</h2>
<div className="links">
<div className="link mx-auto">
<p>View the product</p>
<p className="text-center">View the product</p>
<a href="https://github.com/oslabs-beta/sapling" target="_blank" rel="noreferrer">
<Image src={githubIcon} alt="Github OctoCat Logo"/>
</a>
</div>
<div className="link mx-auto">
<p>Read more about Sapling</p>
<p className="text-center">Read more about Sapling</p>
<a href="" target="_blank">
<Image src={mediumIcon} alt="Medium M Logo"/>
</a>
Expand Down
Loading

1 comment on commit 850f5f2

@vercel
Copy link

@vercel vercel bot commented on 850f5f2 Oct 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

Please sign in to comment.