Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
1a72bba
adding all needed components and predetermend colors we need.
ohitsnathalie Apr 21, 2024
c2ed0c0
added needed font and changed title tag
ohitsnathalie Apr 21, 2024
d684d39
adding packages to json
ohitsnathalie Apr 21, 2024
7a108b3
put info to header
ohitsnathalie Apr 21, 2024
2f9fa1b
fixed tailwind
ohitsnathalie Apr 21, 2024
91195c8
button styling
ohitsnathalie Apr 21, 2024
99d76f5
Connenting most of the compontents together
ohitsnathalie Apr 21, 2024
7ba728a
added color in root
ohitsnathalie Apr 21, 2024
499c139
added more styling to the header. Realized that custom config didn't …
ohitsnathalie Apr 21, 2024
e74f4b6
change readme
ohitsnathalie Apr 21, 2024
b4bd8ab
forgot the tailwind imports. Still didn't change the outcome
ohitsnathalie Apr 22, 2024
7cf3344
added some dependencies
ohitsnathalie Apr 22, 2024
3224efc
re-added some css
ohitsnathalie Apr 22, 2024
6a54547
adjusted the header section
ohitsnathalie Apr 22, 2024
4b73954
color overlay hero section
ohitsnathalie Apr 22, 2024
d9dc19c
added statistics
ohitsnathalie Apr 22, 2024
53a873b
re-arranging things
ohitsnathalie Apr 22, 2024
35cb39e
changed screen size for large
ohitsnathalie Apr 22, 2024
27c6384
navbar
ohitsnathalie Apr 22, 2024
89cb364
deleted most of the stye.css
ohitsnathalie Apr 22, 2024
d1fcaed
Merge branch 'main' into statistics
ohitsnathalie Apr 22, 2024
a2d80c8
class card done
trista1987 Apr 22, 2024
58aaaad
instructor cards done
trista1987 Apr 22, 2024
f16f1a1
for merge
trista1987 Apr 22, 2024
07191a5
statistic section done
ohitsnathalie Apr 22, 2024
9e190ed
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie Apr 22, 2024
23cb230
Merge branch 'header'
ohitsnathalie Apr 22, 2024
5273a94
added about us section
ohitsnathalie Apr 22, 2024
c3dbbd5
value done half
trista1987 Apr 22, 2024
ff39f05
added black text to search bar
ohitsnathalie Apr 23, 2024
d70f795
added divider
ohitsnathalie Apr 23, 2024
0877a6b
hover
trista1987 Apr 23, 2024
e7533ff
put logo in a component
ohitsnathalie Apr 23, 2024
1af870f
adjusted button and change footer location
ohitsnathalie Apr 23, 2024
9de703b
black logo added. changed old svg to better resoluted svg
ohitsnathalie Apr 23, 2024
218b0bb
adding language icon
ohitsnathalie Apr 23, 2024
34dbdd3
responsiveness
trista1987 Apr 23, 2024
2129da1
partially done with address
ohitsnathalie Apr 23, 2024
39ebf76
added social media icons
ohitsnathalie Apr 24, 2024
eaf7d00
test change hero image url
ohitsnathalie Apr 24, 2024
010bb65
changed hero image location
ohitsnathalie Apr 24, 2024
74a5717
trying to fix footer. Adjusted line height on header and button height
ohitsnathalie Apr 24, 2024
1ac1701
footer responsivenes
ohitsnathalie Apr 24, 2024
67533cf
responsiveness footer
ohitsnathalie Apr 24, 2024
284bd96
fixed margin of statistics and about us
ohitsnathalie Apr 25, 2024
03478d4
added some spacing
ohitsnathalie Apr 25, 2024
bb41655
changed details
trista1987 Apr 25, 2024
3f63f7a
basic membership content. still need adjust responsivness and divider
ohitsnathalie Apr 25, 2024
2ede6f0
membership responsiveness
ohitsnathalie Apr 26, 2024
42c78e7
become member content
ohitsnathalie Apr 26, 2024
7b4b0f3
finishing become member part
ohitsnathalie Apr 26, 2024
d41d407
button on click color change
ohitsnathalie Apr 26, 2024
be38a8b
uncomment components.
ohitsnathalie Apr 26, 2024
789ca74
added fake social links
ohitsnathalie Apr 26, 2024
6e704a4
value card done
trista1987 Apr 26, 2024
10367d4
Resolved merge conflict in tailwind.config.js
trista1987 Apr 26, 2024
5934db5
changed text size
trista1987 Apr 26, 2024
b6acbd3
added search icon to search bar
ohitsnathalie Apr 26, 2024
f3304ac
instructor card done
trista1987 Apr 26, 2024
126f1a1
class card done
trista1987 Apr 26, 2024
73e9a02
carousel not done yet, dots added
trista1987 Apr 26, 2024
88ab3f5
changed back to previous cards components
trista1987 Apr 26, 2024
54d35c6
changed details
trista1987 Apr 27, 2024
a0f8753
merged
trista1987 Apr 27, 2024
8802ece
fixing some paths and commented out value cards
ohitsnathalie Apr 28, 2024
df47aca
temporary changes
ohitsnathalie Apr 28, 2024
b0507b1
merged branch carousel manually
trista1987 Apr 28, 2024
03cd503
changed app
trista1987 Apr 28, 2024
ad2db86
changed app again
trista1987 Apr 28, 2024
6d14279
text slider
trista1987 Apr 28, 2024
61ab900
delete test swiper
trista1987 Apr 28, 2024
96f7700
value photo changed
trista1987 Apr 28, 2024
6aa5179
test another way of swipe
trista1987 Apr 28, 2024
d0cabaa
swipe works but layout failed
trista1987 Apr 28, 2024
c61ec51
test scroll
trista1987 Apr 28, 2024
de47894
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie Apr 29, 2024
ea8c287
changed readme
ohitsnathalie Apr 29, 2024
abb1919
adjusted header image
ohitsnathalie Apr 29, 2024
4f8a008
carousel failed, wait for answer
trista1987 Apr 29, 2024
fa5462e
carousel failed, wait for answer
trista1987 Apr 29, 2024
b4e4903
carousel failed
trista1987 Apr 29, 2024
32c5820
adjusted buttons
ohitsnathalie Apr 29, 2024
c15ae5b
Merge branch 'main' of https://github.com/ohitsnathalie/project-desig…
ohitsnathalie Apr 29, 2024
7e546e4
test scroll again
trista1987 Apr 29, 2024
f2d1002
scroll works and cleaned code
trista1987 Apr 29, 2024
c564ba7
updated readme
trista1987 Apr 29, 2024
f159cf8
Update README.md
ohitsnathalie Apr 29, 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
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
rules: {
"react/prop-types": "off",
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
Expand Down
Binary file added src/assets/JustZumba.jpeg
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/ZumbaEnergetic.jpeg
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/ZumbaHeavy.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 25 additions & 1 deletion src/components/ClassCards.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
import { ClassPieces } from "./ClassPieces"
import ZumbaEnergetic from "../assets/ZumbaEnergetic.jpeg"
import ZumbaHeavy from "../assets/ZumbaHeavy.jpeg"
import JustZumba from "../assets/JustZumba.jpeg"

export const ClassCards = () => {
return <div>ClassCards</div>
return (
<div className='flex flex-col justify-center items-center gap-y-5 px-[60px]'>
<h4 className='ubuntu text-3xl text-white' >Some of our classes!</h4>
<div className='flex gap-[27px]'>
<ClassPieces image={ZumbaEnergetic} alt={'People are having Zumba class'}
courseName={'Zumba Energetic'} courseInfo={'A class for you that want a fast paced and high cardio workout!'}
/>
<ClassPieces image={ZumbaHeavy} alt={'People are having Zumba Heavy'}
courseName={'Zumba Heavy'} courseInfo={'This class will challenge you a bit further - dance with weights!'}
/>
<ClassPieces image={JustZumba} alt={'People are having standard Zumba'}
courseName={'Just Zumba'} courseInfo={'The classic Zumba concept! follow along with dance steps!'}
/>

</div>

</div>

)

}
12 changes: 12 additions & 0 deletions src/components/ClassPieces.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const ClassPieces = ({image, alt, courseName, courseInfo}) => {
return (
<div className='flex flex-col w-[422px] h-[552px] rounded-[10px] bg-purple px-[40px] pt-[40px] pb-[45px] gap-y-[25px] shadow-base shadow-yellow '>
<img src={image} alt={alt} className='w-[342px] h-[289px] rounded-[10px]'/>
<div className="flex flex-col gap-y-2">
<h5 className="text-xl">{courseName}</h5>
<p className="text-5xl">{courseInfo}</p>

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I had a similar problem as you still have in safari for text - it overflows the container- use "white-space:normal" in order to keep it within the container.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Thank you for the tip. We really need to keep an eye on other browser.

</div>

</div>
)
}
5 changes: 5 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default {
"2xl": ["35px", { fontWeight: "700" }],
"3xl": ["40px", { fontWeight: "700" }],
"4xl": ["55px", { fontWeight: "700" }],
"5xl": ["25px", {fontWeight: "400"}]
},
spacing: {
1: "16px",
Expand All @@ -41,6 +42,10 @@ export default {
"hero-image": "url('src/assets/images/woman-dancing.jpg')",
},
},
boxShadow: {
'sm': '3px 3px rgba(0, 0, 0, 0.5)',
'base': '5px 5px rgba(0, 0, 0, 0.5)',
}
},
plugins: ["prettier-plugin-tailwindcss"],
};