Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project Design Handoff #48

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,341 changes: 3,791 additions & 2,550 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"styled-components": "^5.3.9"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Empty file added src/App.css
Empty file.
23 changes: 19 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
import React from 'react'
import React from 'react';
import Header from 'components/Header.js';
import Intro from 'components/Intro.js';
import Overview from 'components/Overview.js';
import Selection from 'components/Selection.js';
import Quiz from 'components/Quiz.js';
import Reviews from 'components/Reviews.js';
import Form from 'components/Form.js';
import Footer from 'components/Footer.js';

export const App = () => {
return (
<div>
Find me in src/app.js!
<div className="landingPage">

Choose a reason for hiding this comment

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

Curious as to why you need a landing page classname if you’re not going to do any additional styling to it?

<Header />
<Intro />
<Overview />
<Selection />
<Quiz />
<Reviews />
<Form />
<Footer />
</div>
)
}
}
Binary file added src/assets/Barre Basic Card Mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Barre Basic Card Tablet Desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/Blob 1 Mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/Blob 2 Mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Card row Mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/Hamburger Menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Hero – Hands on Barre.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/InstagramIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/assets/Logo Small on Light Background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Picture frame half pill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/TikTokIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* eslint-disable */

import React from 'react';
import '../css/Footer.css';

import LogoSmallonLightBackground from '../assets/Logo Small on Light Background.svg';
import FacebookIcon from '../assets/Facebook.svg'
import InstagramIcon from '../assets/InstagramIcon.svg'
import TikTokIcon from '../assets/TikTokIcon.svg'

const Footer = () => {
return (
<div className="footerContainer">
<img className="logoFooter" src={LogoSmallonLightBackground} alt="Logo for Raise Studio" />
<p>Vallgatan 6</p>
<p>223 61, Lund</p>
<div className="company">
<h4>Company</h4>
<p>About Us</p>
<p>Contact Us</p>
<p>Our Studio</p>
<p>FAQs</p>
</div>
<div className="classes">
<h4>Classes</h4>
<p>Pricing</p>
<p>Schedule</p>
<p>Instructors</p>
<p>About Barre</p>
<p className="followUs">Follow Us</p>
</div>
<div className="iconsContainer">
<img className="facebook" src={FacebookIcon} alt="Facebook" />
<img className="instagram" src={InstagramIcon} alt="Instagram" />
<img className="tikTok" src={TikTokIcon} alt="TikTok" />
</div>
</div>
)
}

export default Footer;
Loading