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

Random Acts Of Kindness (R.A.O.K) - Fanny Henriques & Gabriella Iofe #72

Open
wants to merge 148 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
be41221
started with project design handoff
Fannyhenriques Nov 5, 2024
f437674
gibberish in links.json
gabster94 Nov 6, 2024
862aa66
testing.jsx
gabster94 Nov 6, 2024
ceba242
Co-authored-by: Gabriella Iofe <[email protected]>
Fannyhenriques Nov 6, 2024
f1a8897
testing on steps.jsx
Fannyhenriques Nov 6, 2024
23b3a48
Merge pull request #1 from Fannyhenriques/gabys-branch
gabster94 Nov 6, 2024
511f939
Merge pull request #2 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
5957651
removed testing.jsx
gabster94 Nov 6, 2024
b0d4f75
Merge pull request #3 from Fannyhenriques/gabysbranch
gabster94 Nov 6, 2024
c6acbe5
added content in buttoncomponent and in introcomponent
Fannyhenriques Nov 6, 2024
51fe9ec
Merge pull request #4 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
23f66a2
finished reviews.json
gabster94 Nov 6, 2024
4b21eec
Merge pull request #5 from Fannyhenriques/gabysbranch
gabster94 Nov 6, 2024
a36aa53
added a sectiontitle with content in reusable components
Fannyhenriques Nov 6, 2024
b72c4e2
Merge pull request #6 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
1a386fc
finished steps.json and updated reviews
gabster94 Nov 6, 2024
151c19f
Merge pull request #7 from Fannyhenriques/gabysbranch
gabster94 Nov 6, 2024
1c800d4
added content in app.jsx
Fannyhenriques Nov 6, 2024
136cf4f
Merge pull request #8 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
c3f363a
added images to doodles
Fannyhenriques Nov 6, 2024
3e7e396
Merge pull request #9 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
4d866c9
imported icons
gabster94 Nov 6, 2024
11a402a
Merge pull request #10 from Fannyhenriques/gabysbranch
gabster94 Nov 6, 2024
054bbd0
added icon to icaonfolder and imported images and added them to slide…
Fannyhenriques Nov 6, 2024
50dd770
Merge pull request #11 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
7330c21
finished links.json
gabster94 Nov 6, 2024
b42dd3e
Merge pull request #12 from Fannyhenriques/gabysbranch
gabster94 Nov 6, 2024
d400750
moved buttoncontent to button.jsx
Fannyhenriques Nov 6, 2024
c6c3192
Merge pull request #13 from Fannyhenriques/fannybranch
Fannyhenriques Nov 6, 2024
0e825bc
created a globalstyles component and moved the css from index.css there
Fannyhenriques Nov 7, 2024
a877763
Merge pull request #14 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
608c534
deleted style from index.css
Fannyhenriques Nov 7, 2024
3f46bcb
added globalstyles to app.jsx
Fannyhenriques Nov 7, 2024
576a8b2
Merge pull request #15 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
94cbedc
installed babel and updated vite.config.js file
gabster94 Nov 7, 2024
f6ee753
Merge pull request #16 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
cd37ef4
went back to the original code in vite.config.js due to error 500
gabster94 Nov 7, 2024
640634f
Merge pull request #17 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
1e64963
changed the folder system
gabster94 Nov 7, 2024
17d29be
Merge pull request #18 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
9eae116
connected the instructions tree
gabster94 Nov 7, 2024
10d8711
Merge pull request #19 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
6698f6a
added content in themes.js and removed reduntant code from globalstyl…
Fannyhenriques Nov 7, 2024
71d650e
Merge pull request #20 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
cd43633
added themes and themeprovider in app.jsx
Fannyhenriques Nov 7, 2024
03adace
Merge pull request #21 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
5badf2d
connected almost everything to app.jsx and fixed the images
gabster94 Nov 7, 2024
458960d
Merge branch 'main' into gabysbranch
gabster94 Nov 7, 2024
ebd2efe
Merge pull request #22 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
fa66289
cleaned up a little in app.jsx
gabster94 Nov 7, 2024
7fd1db0
Merge pull request #23 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
a6312dd
added content in typography from styled.js
Fannyhenriques Nov 7, 2024
1374852
Merge branch 'main' into fannybranch
Fannyhenriques Nov 7, 2024
71b8479
Merge pull request #24 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
88592b8
added SubH1 to introcontent
Fannyhenriques Nov 7, 2024
7cee7de
Merge pull request #25 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
3bc1e95
added introcontainer to introcontent
Fannyhenriques Nov 7, 2024
5e5d3ac
Merge pull request #26 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
a415c20
added content in introcontent
Fannyhenriques Nov 7, 2024
50899f9
Merge pull request #27 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
06671ef
commented out code in themes.js
Fannyhenriques Nov 7, 2024
f0aebfb
Merge pull request #28 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
9c204b0
added px into themes.js
gabster94 Nov 7, 2024
8d1dd8a
Merge pull request #29 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
8a154dd
slideshow jsx/css. it works but looks weird and css code needs to go …
gabster94 Nov 7, 2024
d64890e
Merge pull request #30 from Fannyhenriques/gabysbranch
gabster94 Nov 7, 2024
90b5b47
added sectiontitle to socialproof and instructions.jsx
Fannyhenriques Nov 7, 2024
1169be8
changed pathways in jsonfile for icons, added content to stepcard and…
Fannyhenriques Nov 7, 2024
1ad7523
Merge pull request #31 from Fannyhenriques/fannybranch
Fannyhenriques Nov 7, 2024
2e0485c
added content in reviewcard, socialproof and added a jsxfile to wrap…
Fannyhenriques Nov 8, 2024
c18b481
fixed an error
Fannyhenriques Nov 8, 2024
5713e5e
Merge pull request #32 from Fannyhenriques/fannybranch
Fannyhenriques Nov 8, 2024
d2f3e43
styling for slideshow
gabster94 Nov 8, 2024
6183950
edited the reviewcard and edited the sofialproof so that the reviews …
Fannyhenriques Nov 8, 2024
cd5ac07
Merge pull request #33 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
5d434a8
Merge pull request #34 from Fannyhenriques/fannybranch
Fannyhenriques Nov 8, 2024
e97ea09
tried again with the slider
gabster94 Nov 8, 2024
2f67a97
did som things in slideshow and socialproof
Fannyhenriques Nov 8, 2024
ef6f389
Merge pull request #35 from Fannyhenriques/fannybranch
Fannyhenriques Nov 8, 2024
81b6257
Merge pull request #36 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
765b926
added more arrays in links.json
gabster94 Nov 8, 2024
e6c32ef
Merge pull request #37 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
3b15e03
buttons are working. needs syling now
gabster94 Nov 8, 2024
f758a57
Merge pull request #38 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
d60abf6
buttond divided into divs, unfortunately stylinh still doesnt work
gabster94 Nov 8, 2024
17bcee1
Merge pull request #39 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
0033683
changed the slideshow and added styles from styledcomponent
Fannyhenriques Nov 8, 2024
752de6c
Merge pull request #40 from Fannyhenriques/fannybranch
Fannyhenriques Nov 8, 2024
c694221
figured out components in SocialLinks and did a little bit of styling…
gabster94 Nov 8, 2024
dbc9346
Merge pull request #41 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
f3d2be1
created more reusable button components to be ablte to style each one…
gabster94 Nov 8, 2024
7d4e760
Merge pull request #42 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
eb2d52c
some styling
gabster94 Nov 8, 2024
9a4707f
Merge pull request #43 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
cf1dc06
styling done for button 2 and 3
gabster94 Nov 8, 2024
4fa0f30
Merge pull request #44 from Fannyhenriques/gabysbranch
gabster94 Nov 8, 2024
fa0be92
added animated logo in the footer
Fannyhenriques Nov 9, 2024
ae32496
Merge branch 'main' into fannybranch
Fannyhenriques Nov 9, 2024
cce9afb
Merge pull request #45 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
d87ac26
FINISHED FOOTER STYLING FOR BUTTONS
gabster94 Nov 9, 2024
b6ff3b0
Merge pull request #46 from Fannyhenriques/gabysbranch
gabster94 Nov 9, 2024
a6231d4
cleaned up redundant code in footer
Fannyhenriques Nov 9, 2024
dd65641
Merge pull request #47 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
be26dea
added styling for the fineprintfooter
Fannyhenriques Nov 9, 2024
ab529b7
Merge pull request #48 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
48395d1
tror jag fixade saker
gabster94 Nov 9, 2024
342e13b
Merge pull request #49 from Fannyhenriques/gabysbranch
gabster94 Nov 9, 2024
736de83
fixed some more styling issues
gabster94 Nov 9, 2024
5ad404a
Merge pull request #50 from Fannyhenriques/gabysbranch
gabster94 Nov 9, 2024
8f6d629
tried fixing the slideshow
Fannyhenriques Nov 9, 2024
3e160e8
Merge pull request #51 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
691e3cd
changed px to rem in themes.js
Fannyhenriques Nov 9, 2024
dc60b7d
changed px to rem where it was possible
Fannyhenriques Nov 9, 2024
5057a37
Merge pull request #52 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
af9734f
removed svrg from vite-config
Fannyhenriques Nov 9, 2024
1d447ce
Merge pull request #53 from Fannyhenriques/fannybranch
Fannyhenriques Nov 9, 2024
2cf5800
changed path to icons/svg in links.json
gabster94 Nov 9, 2024
beb4268
Merge pull request #54 from Fannyhenriques/gabysbranch
gabster94 Nov 9, 2024
c81b055
added mediaqueries in typography
Fannyhenriques Nov 9, 2024
5920e7d
mounted first startoday button and changed a bit in the code sociallinks
gabster94 Nov 9, 2024
df24ad8
Merge pull request #55 from Fannyhenriques/gabysbranch
gabster94 Nov 9, 2024
75ceebf
added padding using conditionals on the first button and some hover e…
gabster94 Nov 9, 2024
eee5bcc
a lot of stuff... media, themes, styling a little bit of everywhere, …
gabster94 Nov 10, 2024
ff617e8
Merge pull request #56 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
894dff5
added a favicon and changed the title of the website
gabster94 Nov 10, 2024
cb31048
did some more styling for desktop
gabster94 Nov 10, 2024
b6858f8
Merge pull request #57 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
ec68314
mediaq for arrow-desktop
gabster94 Nov 10, 2024
2b456b0
Merge pull request #58 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
dddb721
finished styling for Tablet
gabster94 Nov 10, 2024
b2f8734
Merge pull request #59 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
ed3977b
desktop- grid for header, title section, flex for cards
gabster94 Nov 10, 2024
dba0024
Merge pull request #60 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
103aa03
some more styling for footer
gabster94 Nov 10, 2024
5b37ceb
Merge pull request #61 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
54743d7
added a comment in footer.jsx
gabster94 Nov 10, 2024
4a5690e
Merge pull request #62 from Fannyhenriques/gabysbranch
gabster94 Nov 10, 2024
7fb9e1f
new push to try and merge
Fannyhenriques Nov 10, 2024
5cbac0b
Merge branch 'main' into fannybranch
Fannyhenriques Nov 10, 2024
0ae1f5a
Merge pull request #63 from Fannyhenriques/fannybranch
Fannyhenriques Nov 10, 2024
6638c3e
cleaned up code
Fannyhenriques Nov 10, 2024
6113774
Merge pull request #64 from Fannyhenriques/fannybranch
Fannyhenriques Nov 10, 2024
738f677
added media for slideshow and put stars in a div in the reviewcard
Fannyhenriques Nov 10, 2024
e43344b
Merge pull request #65 from Fannyhenriques/fannybranch
Fannyhenriques Nov 10, 2024
2191bd9
updated styling and solved conflict in sociallinks
Fannyhenriques Nov 10, 2024
aeb9f16
Merge pull request #66 from Fannyhenriques/fannybranch
Fannyhenriques Nov 10, 2024
3a5ce3c
added readme
Fannyhenriques Nov 10, 2024
eb88bcb
Merge pull request #67 from Fannyhenriques/fannybranch
Fannyhenriques Nov 10, 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
45 changes: 27 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
<h1 align="center">
<a href="">
<img src="/src/assets/design-handoff.svg" alt="Project Banner Image">
</a>
</h1>

# Design Handoff Project

Replace this readme with your own information about your project.
This project aimed to replicate a Figma design for a web page titled Random Acts of Kindness (R.A.O.K) provided by a UX designer. The goal was to build a responsive and maintainable React application using reusable components and styled-components.

Start by briefly describing the assignment in a sentence or two. Keep it short and to the point.
🔍 Project Overview
The page is built using React and leverages styled-components for styling. We focused on creating a modular structure with reusable components to ensure a scalable and easily maintainable codebase.

## Getting Started with the Project
### The Problem

### Dependency Installation & Startup Development Server
- Structuring the Layout
Problem: Structuring the layout and organizing it into components was the primary challenge.
Solution: We approached the project by first building the smallest reusable components (e.g., typography components) and then progressively creating larger section components. As the project evolved, we had to refactor and reorganize some components for better maintainability.

Once cloned, navigate to the project's root directory and this project uses npm (Node Package Manager) to manage its dependencies.
- JSON Data Management
Problem: Handling the page content in a scalable way.
Solution: We stored the content in JSON files, allowing for easy updates and a more maintainable code structure. This approach also makes it simpler to modify content in the future.

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.
- Working with Branches
Problem: Managing code changes collaboratively.
Solution: We followed a branching strategy with frequent commits and pull requests to minimize merge conflicts. This practice helped us maintain a clean and stable codebase throughout development.

```bash
npm i && code . && npm run dev
```
- Handling Inconsistent Spacing
Problem: The design had inconsistent spacing values, making it challenging to implement a unified spacing system.
Solution: We defined a set of spacing values in themes.js but had to introduce custom margins and paddings in specific components where unique spacings were required. This helped maintain a balance between design fidelity and code maintainability.

### The Problem
- Slideshow Implementation
Problem: Creating a seamless image slideshow with smooth transitions.
Solution: Despite multiple attempts to refine the animation, the slideshow still has a minor "jump" when it reloads. This remains an area for future improvement.

if we had more time:

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?
- Fix the slideshow issue to ensure a smooth, seamless transition between images.
- Refactor component naming to make the names more logical and easier to understand for future developers.
- Create reusable button components for the social links section to follow the DRY principle and ensure consistent styling across the application.
- Enhance the responsive layout for tablet and desktop views, making it more aligned with the provided design specifications.
- Add comments and documentation throughout the components to explain their purpose and functionality, improving code readability.

### 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.
https://act-of-kindness.netlify.app

## Instructions

Expand Down
6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="icon" href="logo/heartslogo.svg" type="image/svg+xml">
<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>
<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=Bebas+Neue&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
<title>Acts of Kindness</title>
</head>
<body>
<div id="root"></div>
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"styled-components": "^6.1.13"
},
"devDependencies": {
"@svgr/webpack": "^8.1.0",
"@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",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.5"
"vite": "^4.4.5",
"vite-plugin-svgr": "^4.3.0"
}
}
Binary file added public/doodles/Doodles_Step1.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/doodles/Doodles_Step2.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/doodles/Doodles_Step3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/arrow-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/check-icon.svg
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/instagram.svg
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/share.svg
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/star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions public/icons/tiktok.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/img1.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/img2.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/img3.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/img4.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/img5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading