generated from Technigo/react-starter
-
Notifications
You must be signed in to change notification settings - Fork 57
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 Handoff from UX designer #39
Open
JohLeo
wants to merge
36
commits into
Technigo:master
Choose a base branch
from
JohLeo:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
937b6a0
started on comp and header, added button.js
JohLeo 27fab96
updated header content, created signup btn
JohLeo 5b4469f
added styling for classes and adress section
JohLeo a2994c2
added join us section with reviews
JohLeo 063cf17
smol changes at joinus section
JohLeo 8266084
text align mit h1 moce ur body milady
JohLeo 3f1b2e6
started on signup form with inputs
JohLeo 4b99b05
sign up section styled missing color of buttons when clicked
JohLeo 1e397f4
onClick colorChange choose ur yoga yaz
JohLeo 2c4b87e
created footer for mobilefirst
JohLeo bc135bd
updated header structure
JohLeo 347386b
how come a stupid hamburger is my biggest nemesis?
JohLeo e860eaf
toggle all the way one step closer to hamburger
JohLeo e511750
cursor pointer
JohLeo a0a9e7f
dissapearing arrow returns hopefully
JohLeo 8b9f506
added infotainer and fixed adress for desktop
JohLeo e68e4f7
latest but not greatest
JohLeo faf099e
responsive things are great fun, changed the header and footer for re…
JohLeo cf06b2a
set responsive for header desktop in intr-text
JohLeo 8b52412
responsive for review and signup
JohLeo 6b094a1
less
JohLeo 8e386ce
Carousel fix
JohLeo a2ddaea
radius is overrated
JohLeo ffcc54e
review.css updated with bullet style
JohLeo 3c727a9
tre little dots is at the doorstep
JohLeo 11cc597
carousel no2 almost fixed
JohLeo ca59771
mobile
JohLeo 0787057
yoga slider failed
JohLeo 666e20b
classes slider size adjusted
JohLeo e0c4da5
styling for desktop yoga carousel
JohLeo 77c1403
stay in place logo-text thank you
JohLeo 78f24ad
logo bug war smashed for now
JohLeo bcfbc0e
header text stays in place from now on
JohLeo efcde1b
just trying to quit
JohLeo bcbcf99
removed the wrong container take it back ok
JohLeo 89f14f0
readme
JohLeo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,26 @@ | ||
import React from 'react' | ||
import React from 'react'; | ||
import { Header } from 'components/Header/Header'; | ||
import { PowYoga } from './components/Infotainer/PowerYoga'; | ||
import { Classes } from './components/Classes/Classes'; | ||
import { SpyStudio } from './components/Infotainer/Spys'; | ||
import { Adress } from './components/Infotainer/Adress'; | ||
import { SignReview } from './components/SignUp/SignReview'; | ||
import { Foot } from './components/Footer/Footer'; | ||
|
||
export const App = () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice and clean App.js file! Easy to follow :) |
||
return ( | ||
<div> | ||
Find me in src/app.js! | ||
</div> | ||
) | ||
<> | ||
<header className="start-cont"> | ||
<Header /> | ||
</header> | ||
<main> | ||
<PowYoga /> | ||
<Classes /> | ||
<SpyStudio /> | ||
<Adress /> | ||
<SignReview /> | ||
</main> | ||
<Foot /> | ||
</> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import React, { useState } from 'react'; | ||
import styled from 'styled-components'; | ||
|
||
const StyledSignBtn = styled.button` | ||
width: 15rem; | ||
height: 2.4rem; | ||
font-size: 18px; | ||
font-weight: 600; | ||
color: #000; | ||
background-color: #FF9F0A; | ||
border-radius: 15px; | ||
border: none; | ||
margin-top: 30px; | ||
margin-bottom: 10px; | ||
cursor: pointer; | ||
` | ||
|
||
const StyledClassBtn = styled.button` | ||
width: 15rem; | ||
height: 2.4rem; | ||
font-size: 15px; | ||
font-weight: 500; | ||
color: #fff; | ||
background-color: ${({ clicked }) => { | ||
return clicked ? '#66A1AE' : '#888585'; | ||
}}; | ||
border-radius: 15px; | ||
border: none; | ||
margin: 0 0 8px 0 ; | ||
cursor: pointer; | ||
` | ||
|
||
export const SignUpBtn = () => { | ||
return ( | ||
<StyledSignBtn type="button">Sign up for a class</StyledSignBtn> | ||
) | ||
} | ||
|
||
export const ClassBtn = () => { | ||
const [clicked1, setClicked1] = useState(false); | ||
const [clicked2, setClicked2] = useState(false); | ||
const [clicked3, setClicked3] = useState(false); | ||
|
||
const handleClick1 = () => { | ||
setClicked1(!clicked1); | ||
}; | ||
const handleClick2 = () => { | ||
setClicked2(!clicked2); | ||
}; | ||
const handleClick3 = () => { | ||
setClicked3(!clicked3); | ||
}; | ||
return ( | ||
<> | ||
<StyledClassBtn type="button" clicked={clicked1} onClick={handleClick1}>Power Yoga 60</StyledClassBtn> | ||
<StyledClassBtn type="button" clicked={clicked2} onClick={handleClick2}>Power Yoga 75</StyledClassBtn> | ||
<StyledClassBtn type="button" clicked={clicked3} onClick={handleClick3}>Yoga Strong</StyledClassBtn> | ||
</> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import AwesomeSlider from 'react-awesome-slider'; | ||
import 'react-awesome-slider/dist/styles.css'; | ||
|
||
const YogaDesk = styled.div` | ||
display: flex; | ||
flex-direction: row; | ||
gap: 28px; | ||
justify-content: center; | ||
text-align: center; | ||
margin-bottom: 2rem; | ||
|
||
h3 { | ||
margin-bottom: 8px; | ||
} | ||
|
||
@media (max-width: 895px) { | ||
display: none; | ||
} | ||
` | ||
|
||
export const Slider = () => { | ||
return ( | ||
<> | ||
<section className="yoga-container"> | ||
<AwesomeSlider bullets={false}> | ||
<div className="yoga-card"> | ||
<h3>Power Yoga 60</h3> | ||
<img src="./img/yoga-1.png" alt="Power Yoga 60" /> | ||
</div> | ||
|
||
<div className="yoga-card"> | ||
<h3>Power Yoga 75</h3> | ||
<img src="./img/yoga-2.png" alt="Power Yoga 75" /> | ||
</div> | ||
|
||
<div className="yoga-card"> | ||
<h3>Yoga Strong</h3> | ||
<img src="./img/yoga-3.png" alt="Yoga Strong" /> | ||
</div> | ||
</AwesomeSlider> | ||
</section> | ||
<YogaDesk> | ||
<div className="yoga-card"> | ||
<h3>Power Yoga 60</h3> | ||
<img src="./img/yoga-1.png" alt="Power Yoga 60" /> | ||
</div> | ||
|
||
<div className="yoga-card"> | ||
<h3>Power Yoga 75</h3> | ||
<img src="./img/yoga-2.png" alt="Power Yoga 75" /> | ||
</div> | ||
|
||
<div className="yoga-card"> | ||
<h3>Yoga Strong</h3> | ||
<img src="./img/yoga-3.png" alt="Yoga Strong" /> | ||
</div> | ||
</YogaDesk> | ||
</> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import { Slider } from './ClassCard' | ||
import './classes.css'; | ||
|
||
const ArrowDown = styled.i` | ||
margin-left: 1rem; | ||
padding-top: 6px; | ||
|
||
i { | ||
color: #FF9F0A; | ||
font-size: 20px; | ||
} | ||
` | ||
|
||
export const Classes = () => { | ||
return ( | ||
<> | ||
<div className="classes-container"> | ||
<h4>Our Classes</h4> | ||
<ArrowDown> | ||
<i className="fa-sharp fa-solid fa-chevron-down" /> | ||
</ArrowDown> | ||
</div> | ||
|
||
<Slider /> | ||
|
||
</> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
.classes-container { | ||
display: flex; | ||
flex-direction: row; | ||
justify-content: center; | ||
margin: 16px 0 16px 0; | ||
} | ||
|
||
.yoga-container{ | ||
height: 45vh; | ||
} | ||
|
||
.yoga-container h3{ | ||
padding-bottom: 8px; | ||
text-align: center; | ||
} | ||
|
||
.yoga-card img { | ||
width: 200px; | ||
height: 200px; | ||
} | ||
|
||
.awssld__content { | ||
background-color: transparent; | ||
} | ||
|
||
.awssld { | ||
height: 100%; | ||
--organic-arrow-thickness: 3px; | ||
--organic-arrow-height: 13px; | ||
--slider-height-percentage: 60%; | ||
--loader-bar-color: #fff; | ||
--loader-bar-height: 1px; | ||
--organic-arrow-color: #000; | ||
} | ||
|
||
.awssld__controls { | ||
visibility: visible; | ||
} | ||
|
||
.awssld__controls__arrow-left { | ||
right: -100%; | ||
} | ||
|
||
.awssld__controls__arrow-right { | ||
left: -100%; | ||
} | ||
|
||
@media (min-width: 670px) { | ||
.yoga-container{ | ||
height: 35vh; | ||
} | ||
|
||
.awssld__controls__arrow-left { | ||
right: -290%; | ||
} | ||
|
||
.awssld__controls__arrow-right { | ||
left: -290%; | ||
} | ||
} | ||
|
||
@media (min-width: 895px) { | ||
.yoga-container{ | ||
display: none; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import { LogoIcon, LogoText } from '../Logos' | ||
|
||
const Logo = styled.div` | ||
background-color: #2E160E; | ||
color: #fff; | ||
padding-top: 20px; | ||
|
||
img { | ||
height: 48px; | ||
padding-top: 0; | ||
} | ||
|
||
hr { | ||
margin: 20px 50px; | ||
} | ||
` | ||
const NavFoot = styled.div` | ||
display: flex; | ||
flex-direction: row; | ||
justify-content: center; | ||
|
||
ul { | ||
display: flex; | ||
gap: 3rem; | ||
list-style: none; | ||
margin: 20px 0 0 10px; | ||
} | ||
|
||
a { | ||
font-size: 12px; | ||
font-weight: 400; | ||
color: #fff; | ||
text-decoration: none; | ||
cursor: pointer; | ||
} | ||
|
||
a:hover { | ||
opacity: 70%; | ||
} | ||
` | ||
|
||
const IconSome = styled.div` | ||
display: flex; | ||
justify-content: center; | ||
gap: 2rem; | ||
padding-bottom: 20px; | ||
|
||
i { | ||
font-size: 20px; | ||
color: #fff; | ||
cursor: pointer; | ||
} | ||
|
||
i:hover { | ||
opacity: 70%; | ||
} | ||
` | ||
|
||
export const Foot = () => { | ||
return ( | ||
<Logo> | ||
<LogoIcon /> | ||
<LogoText /> | ||
<NavFoot> | ||
<ul> | ||
<li><a href="#">Classes</a></li> | ||
<li><a href="#">About Us</a></li> | ||
<li><a href="#">Contacts</a></li> | ||
</ul> | ||
</NavFoot> | ||
<hr /> | ||
<IconSome> | ||
<i className="fa-brands fa-instagram" /> | ||
<i className="fa-brands fa-facebook" /> | ||
<i className="fa-brands fa-linkedin" /> | ||
<i className="fa-brands fa-twitter" /> | ||
</IconSome> | ||
</Logo> | ||
) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion to add OG tags