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

Week12 - design handoff - Yifan&Yia #47

Open
wants to merge 54 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
9cb04c3
build components
Yifan-858 Apr 23, 2024
56f29cc
build components
Yifan-858 Apr 23, 2024
e3a3404
add assets
Yifan-858 Apr 23, 2024
a6de4a8
install styled-components
Yifan-858 Apr 23, 2024
79f45ad
install fonts
Yifan-858 Apr 23, 2024
a7f02f8
Trying to build the cards in the hero section
Apr 23, 2024
55e2e6b
styled NavBar
Yifan-858 Apr 23, 2024
a3b9e9b
hero card fixing images
Apr 23, 2024
2741b90
styling Hero
Yifan-858 Apr 23, 2024
a6a6794
styling Hero
Yifan-858 Apr 23, 2024
e4d4073
trying to get the images out
Apr 23, 2024
9233452
Images out
Apr 23, 2024
9821ef5
styled Hero
Yifan-858 Apr 24, 2024
40510dd
styled Footer
Yifan-858 Apr 24, 2024
ea136c6
update hero comments style
Yifan-858 Apr 24, 2024
c774d8a
Merge pull request #1 from Yifan-858/Yifan
Yifan-858 Apr 24, 2024
5d5bd3d
Trying to position the buttons
Apr 24, 2024
0791bd2
Fixing the button position
Apr 24, 2024
eb20c87
HeroCard + buttons fixed
Apr 24, 2024
1e88aff
style button
Apr 24, 2024
eb712f1
button text no wrap
Apr 24, 2024
41561ea
Merge pull request #2 from Yifan-858/yia
Citronskal Apr 24, 2024
2b93e9c
update style Hero
Yifan-858 Apr 24, 2024
d790fd9
update style & structure for heroCard&Button
Yifan-858 Apr 24, 2024
a1fa10b
update[style] responsiveness for NavBar
Yifan-858 Apr 25, 2024
1b23ee2
update[style] responsiveness for user comments
Yifan-858 Apr 25, 2024
1116d8a
update[style] responsiveness Button and NavBar
Yifan-858 Apr 25, 2024
bd30dba
Merge pull request #3 from Yifan-858/Yifan
Yifan-858 Apr 25, 2024
81b4d83
update[style] responsiveness Footer
Yifan-858 Apr 25, 2024
a4d252b
Merge pull request #4 from Yifan-858/Yifan
Yifan-858 Apr 25, 2024
b7aec09
Add class cards
Apr 25, 2024
b9d3ac5
Added Event Cards
Apr 25, 2024
be861b6
Event button width fixed
Apr 27, 2024
526543b
Center the class buttons
Apr 27, 2024
5255995
fixed typo
Apr 27, 2024
110daea
classcard responsive added
Apr 27, 2024
94333db
Herocard responsive added
Apr 27, 2024
4204ccc
Event card styling added
Apr 27, 2024
5488cd7
fixing event image
Apr 27, 2024
e361df0
gradient-size added
Apr 27, 2024
669e20e
herocard fixing
Apr 27, 2024
2532649
update [style] Button & others
Yifan-858 Apr 28, 2024
7a6ee64
update [style] fix background gradient repeats itself
Yifan-858 Apr 28, 2024
2352308
Merge pull request #6 from Yifan-858/Yifan
Yifan-858 Apr 28, 2024
34f2794
update README
Yifan-858 Apr 28, 2024
6069fc1
update README
Yifan-858 Apr 28, 2024
6e4b6ad
update README
Yifan-858 Apr 28, 2024
8c3f031
update preview
Yifan-858 Apr 28, 2024
264bef6
update README
Yifan-858 Apr 28, 2024
ad18254
update README
Yifan-858 Apr 28, 2024
10271fa
update README
Yifan-858 Apr 28, 2024
2049246
update [style] ClassCard
Yifan-858 Apr 28, 2024
0d82291
update footer mobile
Yifan-858 May 1, 2024
9050bba
update style
Yifan-858 May 3, 2024
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
23 changes: 12 additions & 11 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
"eslint:recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime",
"plugin:react-hooks/recommended",
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parserOptions: { ecmaVersion: "latest", sourceType: "module" },
settings: { react: { version: "18.2" } },
plugins: ["react-refresh"],
rules: {
'react-refresh/only-export-components': [
'warn',
"react/prop-types": "off",
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
},
}
};
39 changes: 6 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,14 @@
<h1 align="center">
<a href="">
<img src="/src/assets/design-handoff.svg" alt="Project Banner Image">
</a>
<img src="/public/preview01.png" alt="Project Preview01" style="display: inline-block; margin-right: 10px;">
<img src="/public/preview02.png" alt="Project Preview02" style="display: inline-block;">
</h1>

### Remove git
### Project Brief

rm -rf .git
A collabration project with Technigo UX designer. A business website made for a gym group named "Curve Pilates". Utilizing **React**, we've ensured an interactive and seamless user experience. Through the implementation of **reusable components** like Buttons and Cards, as well as the styling with **styled-component**, managing updates and maintenance is simplified for long-term sustainability. With **responsive design** in place, our site seamlessly adjusts to various screen sizes, delivering a consistent and enjoyable user experience across devices.

# Design Handoff Project

Replace this readme with your own information about your project.

Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.

## Getting Started with the Project

### Dependency Installation & Startup Development Server

Once cloned, navigate to the project's root directory and this project uses npm (Node Package Manager) to manage its dependencies.

The command below is a combination of installing dependencies, opening up the project on VS Code and it will run a development server on your terminal.

```bash
npm i && code . && npm run dev
```

### The Problem

Describe how you approached to problem, and what tools and techniques you used to solve it. How did you plan? What technologies did you use? If you had more time, what would be next?
UI/UX Designer : Chantal Williams

### View it live

Every project should be deployed somewhere. Be sure to include the link to the deployed project so that the viewer can click around and see what it's all about.

## Instructions

<a href="instructions.md">
See instructions of this project
</a>
[![Netlify Status](https://api.netlify.com/api/v1/badges/dd0034f3-ac8e-4bda-97b1-f48ceac18ef2/deploy-status)](https://app.netlify.com/sites/curve-pilates/deploys)
28 changes: 17 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Music Releases - Project - Week 5</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>

<head>
<meta charset="UTF-8" />
<!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Curve Pilates</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Calistoga&display=swap" rel="stylesheet">
</head>

<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>

</html>
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"styled-components": "^6.1.8"
},
"devDependencies": {
"@types/react": "^18.2.15",
Expand Down
Binary file added public/burger-menu.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/class01.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/class02.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/class03.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/class04.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/curve.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/event01.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/event02.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/event03.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/heading.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/hero01.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/hero02.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/hero03.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/preview01.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/preview02.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/select-scroll.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/socialicon1.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/socialicon2.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/socialicon3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

71 changes: 70 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,72 @@
import { NavBar } from "./components/NavBar";
import { Hero } from "./components/Hero";
import { OurClass } from "./components/OurClass";
import { Event } from "./components/Event";
import { Footer } from "./components/Footer";
import { createGlobalStyle } from "styled-components";
import AvenirBlack from "./assets/Avenir-Black.ttf";
import AvenirMedium from "./assets/Avenir-Medium.ttf";

const GlobalStyles = createGlobalStyle`
@font-face {
font-family: 'AvenirBlack';
src: url(${AvenirBlack}) format('truetype');
}
@font-face {
font-family: 'AvenirMedium';
src: url(${AvenirMedium}) format('truetype');
}

:root {
--main-text-color: #000000;
--secondary-color: #e4dbd2;
--button-static-color: #b3583b;
--button-hover-color: #552a1c;
--button-text-color: #ffffff;
}
Comment on lines +20 to +26

Choose a reason for hiding this comment

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

Nice! ⭐️


* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

body {
height: 100%;
background: linear-gradient(
180deg,
#a6c2c5 9.5%,
#d2dbe0 28.5%,
#d2dbe0 51%,
#9ab8c8 66.5%,
#a6c2c5 86%,
#9cc2d2 100%
) ;
background-repeat: no-repeat;
background-size: cover;

}

main{
position:relative;
}


`;

export const App = () => {
return <div>Find me in src/app.jsx!</div>;
return (
<>
<GlobalStyles />
<main>
<div className="lauch-page">
<NavBar />
<Hero />
</div>
Comment on lines +62 to +65

Choose a reason for hiding this comment

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

Could this have been a header?

<OurClass />
<Event />
<Footer />
</main>
</>
);
};
Binary file added src/assets/Avenir-Black.ttf
Binary file not shown.
Binary file added src/assets/Avenir-Medium.ttf
Binary file not shown.
18 changes: 0 additions & 18 deletions src/assets/design-handoff.svg

This file was deleted.

35 changes: 35 additions & 0 deletions src/components/Buttons.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import styled from "styled-components";

// Styled button component
const StyledButton = styled.button`
border-radius: 12px;
background: #b3583b;
color: #fff;
font-family: Avenir, sans-serif;
font-size: ${(props) => props.fontSize}px;
font-weight: 500;
padding: 8px ${(props) => props.paddinglr}px;
width: ${(props) => props.width}%;
margin: 0 auto 1rem;
border: none;
cursor: pointer;
white-space: nowrap;
transition: background 0.2s;

&:hover {
background: #552a1c;
}
`;

export const Buttons = ({ buttonText, fontSize, paddinglr, width }) => {

Choose a reason for hiding this comment

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

Clever using props like this 🥳

return (
<StyledButton
onClick={() => console.log(buttonText)}

Choose a reason for hiding this comment

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

This can be removed ?

fontSize={fontSize}
paddinglr={paddinglr}
width={width}
>
{buttonText}
</StyledButton>
);
};
Loading