Skip to content

Commit 38b275b

Browse files
authored
Merge branch 'ep2025' into ep2025-end
2 parents 849033b + 06fc6de commit 38b275b

28 files changed

+577
-111
lines changed

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ RUN corepack enable
88
RUN pnpm config set store-dir /home/node/.local/share/pnpm/store
99

1010
WORKDIR /app
11+
12+
COPY package.json pnpm-lock.yaml ./
13+
RUN pnpm install
14+
15+
RUN mkdir -p /app/src

astro.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ export default defineConfig({
9090
metaTags(),
9191
pagefind(),
9292
deleteUnusedImages(),
93-
compress(),
93+
(await import("astro-compress")).default({
94+
SVG: false,
95+
}),
9496
],
9597
output: "static",
9698
build: {

docker-compose.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile
6-
entrypoint: ["bash", "-c"]
7-
command: ["pnpm install && pnpm run dev --host 0.0.0.0"]
8-
volumes:
9-
- .:/app
6+
command: ["pnpm", "run", "dev", "--host", "0.0.0.0"]
107
ports:
118
- "4321:4321"
129
environment:
1310
- ASTRO_TELEMETRY_DISABLED=1
11+
- NODE_ENV=development
12+
volumes:
13+
- .:/app
14+
- node_modules:/app/node_modules
15+
- .pnpm-store:/app/.pnpm-store
16+
17+
volumes:
18+
node_modules:

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@astrojs/mdx": "^4.2.6",
1717
"@astrojs/sitemap": "^3.3.1",
1818
"@astrojs/tailwind": "^5.1.5",
19-
"@fontsource-variable/inter": "^5.2.5",
2019
"@fortawesome/fontawesome-free": "^6.7.2",
2120
"@tailwindcss/typography": "^0.5.16",
2221
"astro": "^5.7.5",

pnpm-lock.yaml

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

public/social/bg2.png

45.4 KB
Loading

public/social/bg3.png

591 KB
Loading

public/social/bg4.png

423 KB
Loading

scripts/download_social.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const puppeteer = require("puppeteer");
66
args: ["--no-sandbox", "--disable-setuid-sandbox"],
77
});
88
const page = await browser.newPage();
9-
await page.goto("http://localhost:4321/media/social_media_cards");
9+
await page.goto("http://localhost:4321/media/speakers");
1010

1111
const elements = await page.$$(".social");
1212

src/components/Footer.astro

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const gitVersion = __GIT_VERSION__;
5757
Excited about our mission? Want to collaborate or contribute? Let's
5858
connect! We're open to partnership opportunities and would love to
5959
hear your ideas.
60-
<a class="text-white" href="mailto:[email protected]"
60+
<a class="text-white/80 hover:text-white underline" href="mailto:[email protected]"
6161
6262
>
6363
</p>
@@ -88,7 +88,7 @@ const gitVersion = __GIT_VERSION__;
8888
links.terms.map((item) => (
8989
<a
9090
href={item.path}
91-
class="text-gray-700 hover:text-primary-hover transition-colors duration-200 mx-2"
91+
class="text-white/80 hover:text-primary-hover transition-colors duration-200 mx-2"
9292
>
9393
{item.name}
9494
{item.path.startsWith("http") && (
@@ -104,14 +104,14 @@ const gitVersion = __GIT_VERSION__;
104104
<SocialLinks
105105
socials={links["socials"]}
106106
variant="white"
107-
class="opacity-40 pb-4"
107+
class="opacity-60 pb-4"
108108
/>
109109
)
110110
}
111111
</div>
112112
</div>
113113

114-
<p class="mb-16 text-text-inverted text-center">
114+
<p class="mb-16 text-white/80 text-center">
115115
version: {gitVersion} @ {buildTimestamp}
116116
</p>
117117
</div>
@@ -122,6 +122,5 @@ const gitVersion = __GIT_VERSION__;
122122
}
123123
.terms {
124124
font-size: 0.8rem;
125-
opacity: 0.4;
126125
}
127126
</style>

0 commit comments

Comments
 (0)