Added Introduction page and moved to be the homepage

This commit is contained in:
Camerin Figueroa 2021-10-20 22:08:56 -04:00
parent bac8f5a35b
commit 692892a0ad
6 changed files with 23 additions and 14 deletions

View File

@ -13,10 +13,9 @@ const App = (props) => {
<div className="App"> <div className="App">
<Navigation /> <Navigation />
<Switch> <Switch>
<Route path="/" exact component={Home} /> <Route path="/" exact component={Intro} />
<Route path="/github" render={(props) => <Github {...props} />} /> <Route path="/github" render={(props) => <Github {...props} />} />
<Route path="/about" component={About} /> <Route path="/about" component={About} />
<Route path="/intro" component={Intro} />
</Switch> </Switch>
</div> </div>
</BrowserRouter> </BrowserRouter>

View File

@ -108,7 +108,8 @@ class Intro extends React.Component {
} else if (input === "down" && this.state.nextLoc >= this.topics.length) { } else if (input === "down" && this.state.nextLoc >= this.topics.length) {
// Set something to happen when you reach the end // Set something to happen when you reach the end
this.props.showNavigation();
localStorage.setItem('intro', true);
} }
}; };
@ -120,10 +121,12 @@ class Intro extends React.Component {
}); });
}, 100); }, 100);
document.title = "Introduction"; // Set document title document.title = "HomePage"; // Set document title
// Hide the navigation // Hide the navigation
this.props.hideNavigation(); if (!localStorage.getItem('intro')) {
this.props.hideNavigation();
}
} }
@ -139,9 +142,11 @@ class Intro extends React.Component {
</div> </div>
</Topic>, </Topic>,
<Topic title="Studied at Marist College" background="img/marist.webp"> <Topic title="Studied at Marist College" background="img/marist.webp">
<a href="https://www.marist.edu/">Marist.edu</a> Field of Study: Computer Science
...
College: <a href="https://www.marist.edu/">Marist.edu</a>
</Topic>, </Topic>,
<Topic link="/github" title="You can view my github repositories" background="img/space.webp"> <Topic link="/github" title="Github" background="img/space.webp">
View a list of projects I've done right on this website. You can easily direct to github View a list of projects I've done right on this website. You can easily direct to github
where you can see the project code itself. where you can see the project code itself.
</Topic>, </Topic>,

View File

@ -22,10 +22,6 @@ const Navigation = (props) => {
About About
<FileEarmarkPerson /> <FileEarmarkPerson />
</Link> </Link>
<Link to="/intro">
View the Intro
<Flag />
</Link>
<button className="end" onClick={()=>props.toggleContactModal()}> <button className="end" onClick={()=>props.toggleContactModal()}>
Contact Me Contact Me
<Envelope /> <Envelope />

View File

@ -1,5 +1,5 @@
.Navigation { .Navigation {
z-index:9; z-index:18;
position: relative; position: relative;
height: 4rem; height: 4rem;
display: flex; display: flex;

View File

@ -16,4 +16,13 @@
height:fit-content; height:fit-content;
} }
.topic {} .topic .title {
margin-top:10px;
margin-bottom:10px;
padding:0;
}
.topic .children {
margin-top:10px;
margin-bottom: 10px;
}

View File

@ -17,7 +17,7 @@ const Card = (props) => {
style={{backgroundImage: props.background ? `url(${props.background})`:''}} style={{backgroundImage: props.background ? `url(${props.background})`:''}}
> >
<div className="content"> <div className="content">
<div className="title">{props.title}</div> <h1 className="title">{props.title}</h1>
<div className="children"> <div className="children">
{props.children} {props.children}
</div> </div>