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

Shanti Studio | UX collab | Week 12 | Eliane #54

Open
wants to merge 55 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8979b66
created components and base structure
El1an3 Apr 20, 2024
92f5060
importing fonts and working on button component
El1an3 Apr 20, 2024
3800817
fixed font import
El1an3 Apr 20, 2024
fe22372
created quote section and started with about section
El1an3 Apr 20, 2024
8b5d5d8
started working on header
El1an3 Apr 21, 2024
c81843c
deleted component
El1an3 Apr 21, 2024
4903725
fixed path for images
El1an3 Apr 21, 2024
6067910
header, navigation still missing
El1an3 Apr 21, 2024
196d02b
styled about component
El1an3 Apr 21, 2024
51b8c1c
fixed button on hover
El1an3 Apr 22, 2024
e61c584
styled arrow component
El1an3 Apr 22, 2024
6243556
started membership card
El1an3 Apr 22, 2024
a1b87fa
fixed logo logic for footer and header
El1an3 Apr 22, 2024
236e180
started footer
El1an3 Apr 22, 2024
b69baab
finished footer
El1an3 Apr 24, 2024
64e3f4f
basic logic for form created
El1an3 Apr 24, 2024
a6813d2
added styling to form section
El1an3 Apr 24, 2024
a67c0d5
form small changes
El1an3 Apr 24, 2024
54a8231
created logic of FAQ
El1an3 Apr 24, 2024
9bdbadb
finished FAQ
El1an3 Apr 24, 2024
3b18db2
handled resize of button in MembershipCard
El1an3 Apr 24, 2024
3224612
fixed on image on faq
El1an3 Apr 24, 2024
15452cc
fixed image in faq section
El1an3 Apr 25, 2024
3d807dd
styled membership section
El1an3 Apr 25, 2024
5dc6de9
created logic for philosophy section
El1an3 Apr 25, 2024
bb01729
mobile styling for philo section
El1an3 Apr 25, 2024
353ad1c
deleted outcoded code
El1an3 Apr 25, 2024
1d05b3a
added purple coler to selected part
El1an3 Apr 26, 2024
a3e18e6
fixed hover and selected, placed image on tablet
El1an3 Apr 26, 2024
2e96a77
fixed position of the image on mobile & tablet
El1an3 Apr 26, 2024
b44f167
fixed desktop style for philo section
El1an3 Apr 26, 2024
4e35f58
fixed desktop philo section
El1an3 Apr 26, 2024
24292da
started yogi section
El1an3 Apr 26, 2024
9d3a44e
import element fixed for deploy
El1an3 Apr 26, 2024
2cf8acf
added alt tags to arrows
El1an3 Apr 26, 2024
c693cc8
added slick for carousel
El1an3 Apr 27, 2024
e762478
fixed carousel with slick
El1an3 Apr 27, 2024
af6ada2
position arrows in yogi section
El1an3 Apr 27, 2024
9335d1b
data for happening section rendered
El1an3 Apr 27, 2024
cf281ef
styling of happening cards done
El1an3 Apr 27, 2024
87d342d
added custom arrows to happenings section
El1an3 Apr 27, 2024
014232f
fixed about section
El1an3 Apr 28, 2024
d014746
created language component
El1an3 Apr 28, 2024
5275f1b
fixed heading on header
El1an3 Apr 28, 2024
d1196ef
fixed header image
El1an3 Apr 28, 2024
b8edd8d
fixed custom styling of checkbox
El1an3 Apr 28, 2024
5e57ec1
hide arrows on mobile in happening section
El1an3 Apr 28, 2024
21500d3
worked on membership
El1an3 Apr 28, 2024
b1a1c85
cleaning up code and update readme
El1an3 Apr 28, 2024
8022165
last fixes footer
El1an3 Apr 28, 2024
2be1a03
fix membership section, adjusted accessibility
El1an3 Apr 29, 2024
c1f9a34
minor fix
El1an3 Apr 29, 2024
77e9820
fix spacing on membership card
El1an3 Apr 29, 2024
fe72e6b
membership cards
El1an3 Apr 29, 2024
1f3ef63
centered the button in the header component
El1an3 May 1, 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
27 changes: 8 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,21 @@ rm -rf .git

# 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.
This weeks assignment was to work with a designer from the UX bootcamp. We were asked to follow their design and should either use styled components or tailwind css instead of vanilla css to style the project.

## 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.
I started by setting up the basic components and reusable components for the project.
Then I set up and styled the first components starting with the easier ones like the quote or the about part. This made it easier for me to get used to the styled components approach.

```bash
npm i && code . && npm run dev
```
I finished the membership part last -> it's a carousel in mobile and 3 cards next to each other in tablet/desktop.
My approach seems to be super complicated. I tried to find an easier way, but no success yet.
Also have to look at the buttons again. It works, but seems to be too complicated. Problem: I defined the sizes with media queries. But the membership part needed a new logic... 😅 Small buttons on tablet size.

### 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?
Used styled components and slick for the carousels.

### 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>
https://shanti-studio.netlify.app/
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<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>
<title>Shanti Studio</title>
</head>
<body>
<div id="root"></div>
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,17 @@
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-scripts": "^5.0.1",
"react-slick": "^0.30.2",
"slick-carousel": "^1.8.1",
"styled-components": "^6.1.8"
},
"devDependencies": {
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.3",
"babel-plugin-styled-components": "^2.1.4",
"eslint": "^8.45.0",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand Down
Binary file added public/icons/arrow-left.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/icons/arrow-right.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 public/icons/dropdown.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/icons/facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/icons/globe.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/icons/instagram.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/icons/location.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 public/icons/location.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/icons/youtube.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/images/cartwheel.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/images/cobrapose2.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 public/images/element.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/images/gradient.jpg
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/images/lotus.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/images/rocks.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/images/stretching2.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/images/sunset.jpg
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/images/teacher-black2.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/images/teacher-grey2.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/images/teacher-white2.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/primary-big.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/primary-small.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/secondary-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/* basic css */

/* import fonts */
/* Poppins (from google fonts) */
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;700&display=swap");

/*Argue (download)*/
@font-face {
font-family: "Argue";
src: local("Argue"), url("./fonts/Argue.otf") format("opentype");
}

/*Gerbera (download)*/
@font-face {
font-family: "Gerbera";
src: local("Gerbera-Bold"), url("./fonts/Gerbera-Bold.otf") format("opentype");
}

/* create variables for colours */
:root {
--primary-blk: #111111;
--primary-grey: #505050;
--primary-prpl: #620981;
--primary-white: #ffffff;
--hover-prpl: #430159;
--secondary-blue: rgba(213, 224, 252, 0.5);
/* 50% transparent */
}

/* basics */
* {
padding: 0;
margin: 0;
box-sizing: border-box;
font-family: Poppins, sans-serif;
font-weight: 400;
color: var(--primary-blk);
}

body {
background-image: url("../public/images/gradient.jpg");
background-size: cover;
background-position: center;
background-repeat: no-repeat;
/* height: 100vh; */
}

/* overriding slick formatting, couldn't find any other way 😅*/
.slick-initialized .slick-slide {
display: grid;
justify-content: center;
}

.slick-dots li button:before {
color: var(--primary-prpl);
}
.slick-dots li.slick-active button:before {
color: var(--primary-white);
}
32 changes: 31 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
//components
import { Happenings } from "./components/Happenings";
import { Header } from "./components/Header";
import { About } from "./components/About";
import { Philosophy } from "./components/Philosophy";
import { Membership } from "./components/Membership";
import { Yogis } from "./components/Yogis";
import { Quote } from "./components/Quote";
import { FAQ } from "./components/FAQ";
import { Form } from "./components/Form";
import { Footer } from "./components/Footer";
import { Navigation } from "./components/Navigation";

//stylesheet
import "./App.css";

export const App = () => {
return <div>Find me in src/app.jsx!</div>;
return (
<>
<Navigation />
<Header />
<About />
<Philosophy />
<Yogis />
<Happenings />
<Membership />
<Quote />
<FAQ />
<Form />
<Footer />
</>
);
};
103 changes: 103 additions & 0 deletions src/components/About.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
//import styled
import styled from "styled-components";

//styles
const AboutContainer = styled.section`
padding: 68px 16px;
background: var(--primary-white);

@media all and (min-width: 744px) {
padding: 44px 24px;
}

@media all and (min-width: 1024px) {
padding: 148px 124px;
display: flex;
}
`;

const AboutTitleWrapper = styled.div`
@media all and (min-width: 744px) {
display: flex;
justify-content: center;
padding-bottom: 23px;
}
@media all and (min-width: 1024px) {
flex-direction: column;
padding-bottom: 0;
}
`;

const AboutTitle = styled.h1`
font-family: Argue;
font-size: 48px;
color: var(--primary-prpl);
text-align: center;
padding-bottom: 9px;

@media all and (min-width: 744px) {
font-size: 40px;
padding-bottom: 0;
}

@media all and (min-width: 1024px) {
font-size: 112px;
text-align: left;
padding-right: 36px;
}
`;

const AboutSubtitle = styled.h1`
font-family: Argue;
font-size: 24px;
color: var(--primary-prpl);
text-align: center;

@media all and (min-width: 744px) {
font-size: 40px;
}

@media all and (min-width: 1024px) {
font-size: 64px;
text-align: left;
padding-bottom: 25px;
}
`;

const AboutText = styled.p`
font-size: 14px;
text-align: center;

@media all and (min-width: 1024px) {
font-size: 16px;
text-align: left;
display: grid;
grid-template-columns: repeat(2, 1fr);
column-gap: 36px;
align-items: center;
}
`;

//component
export const About = () => {
return (
<AboutContainer>
<AboutTitleWrapper>
<AboutSubtitle>About&#160;</AboutSubtitle>
<AboutTitle>SHANTI</AboutTitle>
</AboutTitleWrapper>
<AboutText>
<span>
Shanti believes in fostering inner peace and personal growth. Our
mission is to provide urban sanctuaries where individuals can connect,
explore, and find resilience.
</span>{" "}
<span>
Named after the Sanskrit word for &#34;peace&#34;, Shanti encapsulates
our commitment to fostering inner tranquility and empowerment among
our students.
</span>
</AboutText>
</AboutContainer>
);
};
Loading