Skip to content

Commit e53e30c

Browse files
authored
Merge branch 'main' into feat/resize-carrousel
2 parents c7766f2 + 14366e6 commit e53e30c

File tree

8 files changed

+47
-22
lines changed

8 files changed

+47
-22
lines changed

package-lock.json

Lines changed: 33 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"axios": "^1.7.7",
1717
"clsx": "^2.1.1",
1818
"date-fns": "^4.1.0",
19-
"framer-motion": "^11.11.8",
19+
"framer-motion": "^11.15.0",
2020
"google-map-react": "^2.2.1",
2121
"moment": "^2.30.1",
2222
"primeicons": "^7.0.0",
134 Bytes
Loading

public/images/devbcn25.png

902 KB
Loading

public/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8" />
55
<meta content="width=device-width, initial-scale=1" name="viewport" />
66
<title>DevBcn 2025 - Barcelona Developers Conference in Spain — July
7-
13-14 </title>
7+
08-10 </title>
88
<link href="https://www.google-analytics.com" rel="preconnect" />
99
<link href="https://www.devbcn.com" rel="canonical" />
1010
<link as="image" href="/images/logo.png" rel="preload"/>
@@ -17,7 +17,7 @@
1717
<meta content="#002454" name="theme-color" />
1818
<meta content="index,follow" lang="en" name="robots">
1919
<meta
20-
content="DevBcn - Barcelona Developers Conference - July 13th - 14th 2025"
20+
content="DevBcn - Barcelona Developers Conference - July 8th - 10th 2025"
2121
name="description"
2222
/>
2323
<meta
@@ -26,7 +26,7 @@
2626
/>
2727
<!-- start: Facebook Open Graph -->
2828
<meta
29-
content="DevBcn 2025 - Barcelona Developers Conference in Spain — 13-14 — July"
29+
content="DevBcn 2025 - Barcelona Developers Conference in Spain — 8-10 — July"
3030
property="og:title"
3131
/>
3232
<meta
@@ -36,7 +36,7 @@
3636
<meta content="website" property="og:type" />
3737
<meta content="en_GB" property="og:locale" />
3838
<meta content="devbcn.com" property="og:site_name" />
39-
<meta content="https://www.devbcn.com/images/devbcn24.png" property="og:image" />
39+
<meta content="https://www.devbcn.com/images/devbcn25.png" property="og:image" />
4040
<meta content="https://www.devbcn.com" property="og:url" />
4141
<!-- end: Facebook Open Graph -->
4242
<!-- start: Twitter cards -->
@@ -45,14 +45,14 @@
4545
<meta content="https://www.devbcn.com/" property="twitter:url" />
4646
<meta content="@dev_bcn" name="twitter:site" />
4747
<meta content="@dev_bcn" name="twitter:creator" />
48-
<meta content="https://www.devbcn.com/images/devbcn24.png" name="twitter:image" />
48+
<meta content="https://www.devbcn.com/images/devbcn25.png" name="twitter:image" />
4949
<meta
5050
content="DevBcn - Barcelona Developers Conference in Spain"
5151
name="twitter:image:alt"
5252
/>
5353
<!-- for Slack -->
5454
<meta content="Date" name="twitter:label1" />
55-
<meta content="July 9th-10th, 2025" name="twitter:data1"/>
55+
<meta content="July 8th-10th, 2025" name="twitter:data1"/>
5656
<meta content="Location" name="twitter:label2" />
5757
<meta content="La Farga, Barcelona" name="twitter:data2" />
5858
<!-- end: Twitter cards -->
@@ -117,7 +117,7 @@
117117
"@context": "https://schema.org",
118118
"@type": "Event",
119119
"name": "DevBcn — Barcelona Developers Conference",
120-
"startDate": "2025-07-09",
120+
"startDate": "2025-07-08",
121121
"endDate": "2025-07-10",
122122
"eventAttendanceMode": "https://schema.org/OfflineEventAttendanceMode",
123123
"eventStatus": "https://schema.org/EventScheduled",
@@ -134,7 +134,7 @@
134134
}
135135
},
136136
"image": [
137-
"https://www.devbcn.com/images/devbcn24.png",
137+
"https://www.devbcn.com/images/devbcn25.png",
138138
"https://www.devbcn.com/images/2023/FaqsImage0.png"
139139
],
140140
"performers": [],

src/App.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe("navigation pages", () => {
1919
).toBeInTheDocument();
2020

2121
expect(
22-
await screen.findByText(/July 9th - 10th, 2025/i),
22+
await screen.findByText(/July 8th - 10th, 2025/i),
2323
).toBeInTheDocument();
2424
expect(
2525
await screen.findByText(/4 tracks with the following topics:/i),

src/data/2025.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"startDate": "2024-01-01T09:00:00",
3131
"endDate": "2025-06-09T09:00:00"
3232
},
33-
"startDay": "2025-07-09T09:00:00",
33+
"startDay": "2025-07-08T09:00:00",
3434
"tickets": {
3535
"startDay": "2025-01-01T00:00:00",
3636
"endDay": "2025-06-01T00:00:00"

src/views/sponsorship/Sponsorship.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import "@egjs/react-flicking/dist/flicking.css";
2525
import Button from "../../components/UI/Button";
2626
import {gaEventTracker} from "../../components/analytics/Analytics";
2727

28+
2829
const StyledWaveContainer = styled.div`
2930
background: ${Color.DARK_BLUE};
3031
overflow-y: hidden;
@@ -214,8 +215,8 @@ const Sponsorship: FC<React.PropsWithChildren<unknown>> = () => {
214215
<StyledSponsorshipText>
215216
<h4>Mark Your Calendars!</h4>
216217
<p>
217-
DevBcn {data?.edition} is set for <strong>July 9th
218-
10th</strong> at the
218+
DevBcn <strong>{data?.edition}</strong> is set for <strong>{format(new Date(data.startDay),"MMMM do")}
219+
{" ".concat(format(data.endDay,"do"))}</strong> at the
219220
iconic La Farga, Hospitalet de Llobregat. This year,
220221
we're diving
221222
deep into the realms of Java, JVM, Cloud, DevOps,

0 commit comments

Comments
 (0)