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

Design handoff project #69

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@
"preview": "vite preview"
},
"dependencies": {
"components": "^0.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"styled": "^1.0.0",
"styled-components": "^6.1.13",
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@types/react": "^18.2.15",
Expand Down
Binary file added public/Images/KC-logo.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/activity-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/Images/activity-image1.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/activity-image2.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/card-image1.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/card-image2.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/card-image3.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/Images/facebook-icon.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/hero-image.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/Images/instagram-icon.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/menu-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/Images/samtalsgrupp-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/Images/search-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/Images/volounter-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ PS. Don't forget to add it in your readme as well.

## Collaborators
Add your collaborators here. Write their GitHub usernames in square brackets. If there's more than one, separate them with a comma, like this:
[github-username-1, github-username-2]
[[github-username-1](https://github.com/Heleneabrahamsson), [github-username-2](https://github.com/smily342)]
25 changes: 24 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
import { Header } from "./Components/Header";
import { Welcome } from "./Components/Welcome";
import { Footer } from "./Components/Footer";
import { Cards } from "./Components/Cards";
import { QuoteCards } from "./Components/QuoteCards";
import { ActivityCards } from "./Components/ActivityCards";
import { AchievementsCards } from "./Components/AchievementsCards";

import { GlobalStyles } from "./styles/GlobalStyles";


export const App = () => {
return <div>Find me in src/app.jsx!</div>;
return (
<>
<GlobalStyles />
<Header />
<Welcome />
<Cards />
<QuoteCards />
<ActivityCards />
<AchievementsCards />
<Footer />

</>
);
};
83 changes: 83 additions & 0 deletions src/Components/AchievementsCards.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import styled from "styled-components";
import { H2, Label } from "../UI/Typography";

export const AchievementsCards = () => {
return (
<Container>

<DashedLine />

<H2>Vår Spridning</H2>
<IconRow>
<IconCard>
<IconImage src="Images/samtalsgrupp-icon.png" alt="Samtalsgrupper" />
<Label>Samtalsgrupper</Label>
</IconCard>
<IconCard>
<IconImage src="Images/volounter-icon.png" alt="Volontärer" />
<Label>Volontärer</Label>
</IconCard>
<IconCard>
<IconImage src="Images/activity-icon.png" alt="Aktiviteter" />
<Label>Aktiviteter</Label>
</IconCard>
</IconRow>
</Container>
);
};

const DashedLine = styled.div`
width: 250px;
border-top: 2px dashed #333;
margin: 20px ;
display: flex;
align-items: center;


/*Styling for tablet*/
@media (min-width: 768px) {
width: 600px;
}


/*Styling for desktop*/

@media (min-width: 1024px) {
width: 1100px;
}

`;
const Container = styled.div`
display: flex;
flex-direction: column;
align-items: center;

`;

const IconRow = styled.div`
display: flex;
gap: 30px;
margin-top: 20px;

`;

const IconCard = styled.div`
display: flex;
flex-direction: column;
align-items: center;
margin-top: 32px;
margin-bottom: 48px;

`;

const IconImage = styled.img`
width: 86px;
height: 83px;
border-radius: 50%;
margin-bottom: 14px;

`;

export default AchievementsCards;


129 changes: 129 additions & 0 deletions src/Components/ActivityCards.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
import React from 'react';
import styled from 'styled-components';
import { H4 } from '../UI/Typography';

const Section = styled.section`
display: flex;
flex-direction: column;
align-items: center;
`;

const Card = styled.article`
display: flex;
flex-direction: column;
border: 2px solid #f2f2f2;
border-radius: 8px;
overflow: hidden;
background-color: #FFCAF8;
margin-bottom: 20px;
margin-top: 30px;

&:hover {
cursor: pointer;
}
`;

const ImageContainer = styled.figure`
position: relative;
margin: 0;
`;

const Image = styled.img`
width: 100%;
height: auto;
`;

const AgeGroup = styled.span`
position: absolute;
bottom: 10px;
right: 10px;
background-color: #FFCAF8;
color: white;
padding: 5px;
border-radius: 50%;
font-weight: bold;
`;

const InfoContainer = styled.section`
padding: 10px;
color: #000;
max-width: 300px;
white-space: normal;
`;

const Title = styled.h3`
font-size: 24px;
margin: 0 0 5px;
font-weight: bold;
white-space: normal;
`;

const Text = styled.p`
margin: 3px 0;
font-size: 22px;
`;

const StyledLink = styled.a`
color: #000;
font-family: 'Inter', sans-serif;
font-size: 16px;
font-weight: 700;
line-height: 130%;
text-decoration: underline;
margin-left: 90px;
display: inline-block;
margin-top: 30px;
margin-right: 100px;
margin-bottom: 30px;

&:hover {
text-decoration: none;
}
`;

const ActivityCard = ({ image, title, place, time, ageGroup }) => {
return (
<Card>
<ImageContainer>
<Image src={image} alt={title} />
{ageGroup && <AgeGroup>{ageGroup}</AgeGroup>}
</ImageContainer>
<InfoContainer>
<Title>
{title === "Film och samtal: Sliding Doors" ? (
<>
Film och samtal: Sliding <br /> Doors
</>
) : (
title
)}
</Title>
<br />
<Text>Plats: {place}</Text>
<Text>Tid: {time}</Text>
</InfoContainer>
</Card>
);
};

export const ActivityCards = () => {
return (
<Section>
<H4>Aktiviteter</H4>
<ActivityCard
image="/Images/activity-image1.png" // Direct path to public folder image
title="Film och samtal: Sliding Doors"
place="Downtown Camper"
time="18.45"
ageGroup="M"
/>
<ActivityCard
image="/Images/activity-image2.png" // Direct path to public folder image
title="Army-träff"
place="Downtown Camper"
time="14-16.30"
/>
<StyledLink href="https://example.com">Fler aktiviteter</StyledLink>
</Section>
);
};
123 changes: 123 additions & 0 deletions src/Components/Cards.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import styled from "styled-components";
import { H2, H3, TextP } from "../UI/Typography";
import { CardsButton1 } from "../UI/Button";
import { CardsButton2 } from "../UI/Button";
import { CardsButton3 } from "../UI/Button";





export const Cards = () => {
return (
<CardsContainer>
<br />
<br />
<H3>Delta i våra samtalsgrupper</H3>


<TextP>
{`Genom att prata med andra - både online
och genom fysiska träffar - blir det enklare
att hantera det som är svårt. Våra
gruppledare har egen erfarenhet och alla
grupper är slutna.

Delta i våra grupper eller starta en ny utifrån dina behov.
`}
</TextP>



<CardsContent>
<StyledImage src="/Images/card-image1.png" alt="Card Image 1" />
<CardsButton1>Utmattning och stress</CardsButton1>

<StyledImage src="/Images/card-image2.png" alt="Card Image 2" />
<CardsButton2>Psykisk ohälsa - BTS</CardsButton2>

<StyledImage src="/Images/card-image3.png" alt="Card Image 3" />
<CardsButton3>Bröstcancer</CardsButton3>
</CardsContent>


<StyledLink href="https://example.com">
Flera aktiva stödgrupper
</StyledLink>

<br />




</CardsContainer>


);
};





/*Background style - colour*/
const CardsContainer = styled.div`
background-color: #FFCAF8;

@media (min-width: 768px) {
text-align: center;
}


`;

/*Styling for the text link at the bottom*/
const StyledLink = styled.a`
color: #000;
font-family: 'Inter', sans-serif;
font-size: 16px;
font-weight: 700;
line-height: 130%;
text-decoration: underline;
margin-left: 90px;
display: inline-block;
margin-top: 1rem;
margin-bottom: 40px;
margin-top: 30px;
display:flex;
text-align: center;


&:hover {
text-decoration: none;
}
@media (min-width: 768px) {
margin-left: 300px;
}
@media (min-width: 1024px) {
margin-left: 620px;

}
`;


const StyledImage = styled.img`
margin: 0 auto;
padding: 0;
display: block;
`;




/*Card content styling */
const CardsContent = styled.div`
border-radius: var(--Radius-200, 8px) var(--Radius-200, 8px) 0px 0px;
margin: 0;
padding: 0;
`;


export default Cards;


Loading