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 Handoff from UX designer #39

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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 Apr 4, 2023
27fab96
updated header content, created signup btn
JohLeo Apr 6, 2023
5b4469f
added styling for classes and adress section
JohLeo Apr 6, 2023
a2994c2
added join us section with reviews
JohLeo Apr 6, 2023
063cf17
smol changes at joinus section
JohLeo Apr 6, 2023
8266084
text align mit h1 moce ur body milady
JohLeo Apr 6, 2023
3f1b2e6
started on signup form with inputs
JohLeo Apr 7, 2023
4b99b05
sign up section styled missing color of buttons when clicked
JohLeo Apr 7, 2023
1e397f4
onClick colorChange choose ur yoga yaz
JohLeo Apr 7, 2023
2c4b87e
created footer for mobilefirst
JohLeo Apr 7, 2023
bc135bd
updated header structure
JohLeo Apr 7, 2023
347386b
how come a stupid hamburger is my biggest nemesis?
JohLeo Apr 7, 2023
e860eaf
toggle all the way one step closer to hamburger
JohLeo Apr 7, 2023
e511750
cursor pointer
JohLeo Apr 7, 2023
a0a9e7f
dissapearing arrow returns hopefully
JohLeo Apr 7, 2023
8b9f506
added infotainer and fixed adress for desktop
JohLeo Apr 8, 2023
e68e4f7
latest but not greatest
JohLeo Apr 8, 2023
faf099e
responsive things are great fun, changed the header and footer for re…
JohLeo Apr 9, 2023
cf06b2a
set responsive for header desktop in intr-text
JohLeo Apr 9, 2023
8b52412
responsive for review and signup
JohLeo Apr 9, 2023
6b094a1
less
JohLeo Apr 9, 2023
8e386ce
Carousel fix
JohLeo Apr 9, 2023
a2ddaea
radius is overrated
JohLeo Apr 9, 2023
ffcc54e
review.css updated with bullet style
JohLeo Apr 9, 2023
3c727a9
tre little dots is at the doorstep
JohLeo Apr 9, 2023
11cc597
carousel no2 almost fixed
JohLeo Apr 9, 2023
ca59771
mobile
JohLeo Apr 9, 2023
0787057
yoga slider failed
JohLeo Apr 9, 2023
666e20b
classes slider size adjusted
JohLeo Apr 9, 2023
e0c4da5
styling for desktop yoga carousel
JohLeo Apr 9, 2023
77c1403
stay in place logo-text thank you
JohLeo Apr 9, 2023
78f24ad
logo bug war smashed for now
JohLeo Apr 9, 2023
bcfbc0e
header text stays in place from now on
JohLeo Apr 9, 2023
efcde1b
just trying to quit
JohLeo Apr 9, 2023
bcbcf99
removed the wrong container take it back ok
JohLeo Apr 10, 2023
89f14f0
readme
JohLeo Apr 18, 2023
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
246 changes: 235 additions & 11 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-awesome-slider": "^4.1.0",
"react-dom": "^18.2.0",
"styled-components": "^5.3.9"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Binary file added public/img/adress.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 public/img/adress192x185.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 public/img/person1.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 public/img/person2.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 public/img/person3.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 public/img/yoga-1.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 public/img/yoga-2.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 public/img/yoga-3.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 public/img/yoga1515x982.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="apple-touch-icon" sizes="180x180" href="./logo/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="./logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="./logo/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<script src="https://kit.fontawesome.com/e51eabe7f5.js" crossorigin="anonymous"></script>
<!--
Copy link

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

Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand All @@ -13,7 +18,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Technigo React App</title>
<title>Santulan Power Yoga Sthlm</title>
</head>

<body>
Expand Down
5 changes: 5 additions & 0 deletions public/logo/Logo.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 public/logo/LogoBlk.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 public/logo/android-chrome-192x192.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 public/logo/android-chrome-512x512.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 public/logo/apple-touch-icon.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 public/logo/favicon-16x16.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 public/logo/favicon-32x32.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 public/logo/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions public/logo/site.webmanifest
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"}
27 changes: 22 additions & 5 deletions src/App.js
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 = () => {
Copy link

Choose a reason for hiding this comment

The 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 />
</>
);
}
60 changes: 60 additions & 0 deletions src/components/Buttons.js
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>
</>
)
}
62 changes: 62 additions & 0 deletions src/components/Classes/ClassCard.js
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>
</>
);
}
30 changes: 30 additions & 0 deletions src/components/Classes/Classes.js
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 />

</>
)
}
66 changes: 66 additions & 0 deletions src/components/Classes/classes.css
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;
}
}
82 changes: 82 additions & 0 deletions src/components/Footer/Footer.js
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>
)
}
Loading