Skip to content

Commit

Permalink
Reorganize files and imports
Browse files Browse the repository at this point in the history
  • Loading branch information
rachelsoae committed Oct 9, 2023
1 parent 08053a9 commit 1fbef51
Show file tree
Hide file tree
Showing 22 changed files with 178 additions and 161 deletions.
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/favicon_io.zip
Binary file not shown.
Binary file added src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
12 changes: 0 additions & 12 deletions src/components/App.js

This file was deleted.

30 changes: 30 additions & 0 deletions src/components/App/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import {Routes, Route} from 'react-router-dom';
import Nav from '../Nav/Nav';
import Home from '../Home/Home';
import About from '../About/About';
import Contact from '../Contact/Contact';
import Portfolio from '../Portfolio/Portfolio';
import Footer from '../Footer/Footer';

const App = () => {
return (
<>
<Nav />
<main>
<Routes>
<Route
path='/'
element={<Home />}
/>
<Route
path='/about'
/>

</Routes>
</main>
<Footer />
</>
)
}

export default App;
66 changes: 66 additions & 0 deletions src/components/App/_App.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
@use '../../styles/variables' as *;
@use '../../styles/mixins' as *;

* {
// border: 1px solid red;
}

html,
body,
.root,
.page {
margin: 0;
min-height: 100vh;
}

html {
background: linear-gradient(180deg, #D4A29C 0%, #EDCC8B 50%, #B6D8D3 100%);
font-size: 62.5%;
}

h1, h2 {
font-family: v.$header-font;
}

h2 {
font-size: 6rem;
margin: 1rem 0;
align-self: center;
}

h1,
h2,
h3,
button,
p {
color: v.$text-color;
text-shadow: v.$shadow;
}

h3 {
font-family: v.$header-font;
font-size: 3rem;
}

button,
p {
font-size: 3rem;
}

p {
font-family: v.$body-font;
margin: 0;
}

.page {
height: 100%;
width: 100%;
}

.page__box {
width: 100%;
height: 100vh;
display: flex;
@include m.true-center;
background-color: v.$content-box;
}
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions src/components/Footer/_Footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.footer {
height: 10rem;
}
21 changes: 0 additions & 21 deletions src/components/Home.js

This file was deleted.

10 changes: 4 additions & 6 deletions src/components/Landing.js → src/components/Home/Home.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import headshot from '../assets/headshot.jpg'

const Landing = () => {
const Home = () => {
return (
<div id='landing' className='page landing'>
<section className='page__box'>
<div className='landing__text'>
<p>Hi, my name is</p>
<h3 className='landing__header'>Hello and welcome to SoaeSpace! 🌻</h3>
<p>My name is</p>
<h2>Rachel Soae Prather</h2>
<p>I’m a Software Developer specializing in front end technologies including React, JavaScript, and Sass</p>
<button className='landing__button'>View My Work</button>
</div>
<img className='landing__img' src={headshot} />
</section>
</div>
)
}

export default Landing;
export default Home;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@use 'mixins' as m;

.landing {
width: 100%;
display: flex;
@include m.true-center;
}
Expand All @@ -17,6 +16,7 @@
}

.landing__button {
@include m.button;
border-radius: 2px;
border: 1px solid #FFF;
margin-top: 1em;
Expand Down
18 changes: 0 additions & 18 deletions src/components/Nav.js

This file was deleted.

19 changes: 19 additions & 0 deletions src/components/Nav/Nav.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {Link} from 'react-router-dom';

const Nav = () => {
return (
<nav>

<Link to='#' className='nav__text nav__header'>
<h1>🌻 SoaeSpace</h1>
</Link>
<div className='nav__buttons'>
<Link to='/#projects' className='nav__text nav__button'>Portfolio</Link>
<Link to='/#about' className='nav__text nav__button'>About</Link>
<Link to='/#contact' className='nav__text nav__button'>Contact</Link>
</div>
</nav>
)
}

export default Nav;
14 changes: 12 additions & 2 deletions src/styles/_nav.scss → src/components/Nav/_Nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,26 @@ nav {
backdrop-filter: blur(5px)
}

h1 {
font-size: 2.6rem;
}

.nav__text {
font-size: 2.2rem;
}

.nav__header,
.nav__button,
.nav__button:visited {
text-decoration: none;
}


.nav__header,
.nav__buttons {
padding: 0 3rem;
}

.nav__button {
border: none;
padding: 2rem;
@include m.button;
}
File renamed without changes.
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import './styles/output.css';
import App from './components/App';
import App from './components/App/App';
import reportWebVitals from './reportWebVitals';
import { BrowserRouter } from 'react-router-dom';
import {BrowserRouter} from 'react-router-dom';

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
Expand Down
8 changes: 8 additions & 0 deletions src/styles/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
@use 'variables' as v;

@mixin true-center {
justify-content: center;
align-items: center;
}

@mixin button {
font-family: v.$button-font;
background: 0%;
padding: 0.5em 1em;
}
86 changes: 8 additions & 78 deletions src/styles/input.scss
Original file line number Diff line number Diff line change
@@ -1,78 +1,8 @@
@use 'variables' as v;
@use 'mixins' as m;
@use 'landing';
@use 'nav';

* {
// border: 1px solid red;
}

html,
body,
.root,
.page {
margin: 0;
min-height: 100vh;
}

html {
background: linear-gradient(180deg, #D4A29C 0%, #EDCC8B 50%, #B6D8D3 100%);
font-size: 62.5%;
}

h1, h2 {
font-family: v.$header-font;
}

h2 {
font-size: 8rem;
margin: 1rem 0;
align-self: center;
}

h1,
h2,
h3,
button,
p {
color: v.$text-color;
text-shadow: v.$shadow;
}

button {
font-family: v.$button-font;
}

p {
font-family: v.$body-font;
margin: 0;
}

button,
p {
font-size: 3rem;
}

button {
background: 0%;
padding: 0.5em 1em;
}

.page {
height: 100%;
width: 100%;
}

.page__box {
width: 100%;
height: 60vh;
display: flex;
@include m.true-center;
background-color: v.$content-box;
}

h3 {
font-family: v.$header-font;
font-size: 4rem;
}

@use './variables' as *;
@use './mixins' as *;
@use '../components/About/About';
@use '../components/App/App';
@use '../components/Contact/Contact';
@use '../components/Home/Home';
@use '../components/Nav/Nav';
@use '../components/Portfolio/Portfolio';
Loading

0 comments on commit 1fbef51

Please sign in to comment.