Skip to content

Commit 2daf21a

Browse files
perdo si m'estic carregant algo (#4)
Co-authored-by: enrique.andujar <enrique.andujar@estudiantat.upc.edu>
1 parent 22ee2f1 commit 2daf21a

8 files changed

Lines changed: 59 additions & 17 deletions

File tree

public/IMG_6219.jpeg

1.96 MB
Loading

src/app/components/Hero.tsx

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,51 @@ import styled from "styled-components";
22
import {
33
MobileBreakpoint,
44
MobileTitleXL,
5-
SpacingL,
65
SpacingM,
76
SpacingXXL,
87
TitleXL,
8+
Primary300,
99
} from "@/app/genericComponents/tokens";
1010
import { hero_data } from "@data/hero_data";
1111
import { PrimaryButton } from "@/app/genericComponents/General";
1212

1313
const Container = styled.div`
14-
margin: ${SpacingL} auto;
14+
position: relative;
15+
margin-top: 5%;
16+
margin-right: 10%;
17+
margin-left: 10%;
1518
padding: ${SpacingXXL};
16-
background-image: url("/hackupcLogo.svg");
17-
background-repeat: no-repeat;
18-
background-position: center;
19-
background-size: contain;
19+
border-radius: 20px;
20+
border: 0.3333rem solid ${Primary300};
21+
overflow: hidden;
2022
2123
@media (max-width: ${MobileBreakpoint}) {
2224
padding: ${SpacingM};
2325
}
26+
27+
&::before {
28+
content: "";
29+
position: absolute;
30+
inset: 0;
31+
background-image: url("/IMG_6219.jpeg");
32+
background-position: center 60%;
33+
background-size: cover;
34+
opacity: 0.3;
35+
z-index: 0;
36+
}
37+
38+
> * {
39+
position: relative;
40+
z-index: 1;
41+
}
2442
`;
2543

2644
const Title = styled.h1`
2745
text-align: center;
2846
font-size: ${TitleXL};
2947
background: transparent;
48+
color: #ffffff;
49+
text-shadow: 0 2px 6px rgba(0, 0, 0, 0);
3050
3151
@media (max-width: ${MobileBreakpoint}) {
3252
font-size: ${MobileTitleXL};

src/app/components/Socials.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,17 @@ import {
1212
SpacingS,
1313
SpacingXS,
1414
TitleM,
15+
Primary300,
1516
} from "@/app/genericComponents/tokens";
1617
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
1718
import { faUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
1819

20+
const BorderedSection = styled(SectionContainer)`
21+
border-radius: 10px;
22+
border: 0.3333rem solid ${Primary300};
23+
padding: ${SpacingM};
24+
`;
25+
1926
const HeaderSocials = styled.a`
2027
font-size: ${TitleM};
2128
font-weight: bold;
@@ -56,9 +63,10 @@ const SocialItem = styled.div`
5663

5764
export default function Socials() {
5865
return (
59-
<SectionContainer>
66+
<BorderedSection>
6067
<SectionTitle>{socials_data.title}</SectionTitle>
6168
<SocialsDescription>{socials_data.description}</SocialsDescription>
69+
6270
<HeaderSocials href={"https://hackupc.com/"} target={"_blank"}>
6371
HackUPC
6472
<FontAwesomeIcon
@@ -67,6 +75,7 @@ export default function Socials() {
6775
style={{ marginLeft: "8px" }}
6876
/>
6977
</HeaderSocials>
78+
7079
<SocialsList>
7180
{socials_data.socialsHackUPC.map((social) => (
7281
<SocialItem key={social.label}>
@@ -81,6 +90,7 @@ export default function Socials() {
8190
</SocialItem>
8291
))}
8392
</SocialsList>
93+
8494
<HeaderSocials href={"https://hackersatupc.org/"} target={"_blank"}>
8595
Hackers@UPC{" "}
8696
<FontAwesomeIcon
@@ -89,6 +99,7 @@ export default function Socials() {
8999
style={{ marginLeft: "8px" }}
90100
/>
91101
</HeaderSocials>
102+
92103
<SocialsList>
93104
{socials_data.socialsHackersUPC.map((social) => (
94105
<SocialItem key={social.label}>
@@ -103,6 +114,6 @@ export default function Socials() {
103114
</SocialItem>
104115
))}
105116
</SocialsList>
106-
</SectionContainer>
117+
</BorderedSection>
107118
);
108119
}

src/app/data/socials_data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ const listSocialsHackersUPC: SocialsItem[] = [
8484
];
8585

8686
export const socials_data: Socials = {
87-
title: "Estigues atent i no et perdis res!",
87+
title: "Estem en contacte!",
8888
description:
89-
"Si tens qualsevol dubte o pregunta, contacta amb nosaltres a través de qualsevol xarxa social!",
89+
"Si tens qualsevol dubte o pregunta, contacta amb nosaltres a través de qualsevol xarxa social.",
9090
socialsHackUPC: listSocialsHackUPC,
9191
socialsHackersUPC: listSocialsHackersUPC,
9292
};

src/app/genericComponents/DepartmentInfoCard.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
BodyTextMedium,
77
MobileBreakpoint,
88
Primary100,
9-
Primary200,
9+
QuestionBoxBackgroundColor,
1010
SpacingS,
1111
SpacingXS,
1212
TitleS,
@@ -57,7 +57,7 @@ const Answer = styled.p<{ isVisible: boolean }>`
5757

5858
const QuestionBox = styled.div`
5959
border-radius: ${SpacingS};
60-
background-color: ${Primary200};
60+
background-color: ${QuestionBoxBackgroundColor};
6161
padding: ${SpacingS};
6262
cursor: pointer;
6363

src/app/genericComponents/EmblaCarousel.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
} from "./EmblaCarouselArrowButtons";
99
import useEmblaCarousel from "embla-carousel-react";
1010
import { ImageInformation } from "@data/interfaces";
11+
import Image from "next/image";
1112

1213
type PropType = {
1314
slides: ImageInformation[];
@@ -32,9 +33,12 @@ const EmblaCarousel: React.FC<PropType> = (props) => {
3233
{slides.map((index) => (
3334
<div className="embla__slide" key={index.index}>
3435
<div>
35-
<img
36+
<Image
3637
src={index.url}
3738
alt={index.alt}
39+
width={800}
40+
height={600}
41+
priority
3842
className="embla__slide__image"
3943
/>
4044
</div>

src/app/genericComponents/tokens.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export const Neutral300: string = "#88A7B7";
3636
export const Neutral200: string = "#EAF7FF";
3737
export const Neutral100: string = "#F9FDFF";
3838

39-
export const BackgroundAccent: string = "#1f2424";
39+
export const BackgroundAccent: string = "#1d1e3b";
40+
export const QuestionBoxBackgroundColor: string = "#304697";
4041

4142
// Responsive breakpoints
4243
export const MobilePixels: number = 640;

src/app/globals.css

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
:root {
2+
--body-color: #1c1e3b;
3+
--webkit-tap-highlight-color: rgba(255, 255, 255, 0.5);
4+
--embla-button-disabled-color: rgb(255, 255, 255);
5+
}
6+
17
* {
28
box-sizing: border-box;
39
padding: 0;
@@ -9,7 +15,7 @@ html,
915
body {
1016
max-width: 100vw;
1117
overflow-x: hidden; /* Prevents horizontal scrollbar */
12-
background-color: #181c19;
18+
background-color: var(--body-color);
1319
}
1420

1521
.embla {
@@ -58,7 +64,7 @@ body {
5864
align-items: center;
5965
}
6066
.embla__button {
61-
-webkit-tap-highlight-color: rgba(49, 49, 49, 0.5);
67+
-webkit-tap-highlight-color: var(--webkit-tap-highlight-color);
6268
-webkit-appearance: none;
6369
appearance: none;
6470
background-color: transparent;
@@ -79,7 +85,7 @@ body {
7985
justify-content: center;
8086
}
8187
.embla__button:disabled {
82-
color: rgb(192, 192, 192);
88+
color: var(--embla-button-disabled-color);
8389
}
8490
.embla__button__svg {
8591
width: 35%;

0 commit comments

Comments
 (0)