Skip to content

Commit 9adaccf

Browse files
authored
Merge pull request #132 from HackHPI/feature/website-2.0
Feature/website 2.0
2 parents 6bca3e0 + 1d8084f commit 9adaccf

File tree

210 files changed

+3770
-5043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+3770
-5043
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.DS_Store
2+
node_modules
3+
dist

.github/workflows/docker-image.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Docker Image CI
2+
3+
on:
4+
push:
5+
branches: [ "main", "feature/website-2.0" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
env:
10+
REGISTRY: ghcr.io
11+
IMAGE_NAME: ${{ github.repository }}
12+
13+
jobs:
14+
15+
build:
16+
17+
runs-on: ubuntu-latest
18+
19+
permissions:
20+
contents: read
21+
packages: write
22+
23+
steps:
24+
- uses: actions/checkout@v2
25+
- name: Node install and build
26+
uses: actions/setup-node@v3
27+
with:
28+
node-version: '20.x'
29+
- run: npm i
30+
- run: npm run build --if-present
31+
- name: Log in to the Container registry
32+
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
33+
with:
34+
registry: ${{ env.REGISTRY }}
35+
username: ${{ github.actor }}
36+
password: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: Extract metadata (tags, labels) for Docker
39+
id: meta
40+
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
41+
with:
42+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
43+
github-token: ${{ secrets.GITHUB_TOKEN }}
44+
45+
- name: Build and push Docker image
46+
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
47+
with:
48+
context: .
49+
push: true
50+
tags: ${{ steps.meta.outputs.tags }}
51+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/pages.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ pnpm-debug.log*
1818

1919
# macOS-specific files
2020
.DS_Store
21+
.next

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM nginx:alpine
2+
3+
RUN rm /etc/nginx/conf.d/default.conf
4+
COPY ./nginx/nginx.conf /etc/nginx/conf.d
5+
6+
COPY ./out /usr/share/nginx/html/
7+
EXPOSE 80

astro.config.mjs

Lines changed: 0 additions & 7 deletions
This file was deleted.

next-env.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference types="next" />
2+
/// <reference types="next/image-types/global" />
3+
4+
// NOTE: This file should not be edited
5+
// see https://nextjs.org/docs/basic-features/typescript for more information.

next.config.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @type {import('next').NextConfig}
3+
*/
4+
const nextConfig = {
5+
output: 'export',
6+
7+
// Optional: Change links `/me` -> `/me/` and emit `/me.html` -> `/me/index.html`
8+
// trailingSlash: true,
9+
10+
// Optional: Prevent automatic `/me` -> `/me/`, instead preserve `href`
11+
// skipTrailingSlashRedirect: true,
12+
13+
// Optional: Change the output directory `out` -> `dist`
14+
// distDir: 'dist',
15+
}
16+
17+
module.exports = nextConfig

nginx/nginx.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
server {
2+
listen 80;
3+
root /usr/share/nginx/html;
4+
index index.html;
5+
6+
error_page 404 /404.html;
7+
8+
location / {
9+
try_files $uri $uri/ $uri.html =404;
10+
}
11+
}

package.json

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
11
{
22
"name": "hackhpi-website",
3-
"type": "module",
4-
"version": "0.0.1",
3+
"version": "1.0.1",
54
"private": true,
65
"scripts": {
7-
"dev": "astro dev",
8-
"start": "astro dev",
9-
"build": "astro build",
10-
"preview": "astro preview",
11-
"astro": "astro"
6+
"dev": "next dev",
7+
"start": "next dev",
8+
"build": "next build",
9+
"lint": "next lint"
1210
},
1311
"dependencies": {
14-
"@astrojs/tailwind": "^5.0.0",
15-
"astro": "^3.1.1",
16-
"astro-icon": "^0.8.1",
17-
"tailwindcss": "^3.3.3"
12+
"@emotion/cache": "^11.11.0",
13+
"@emotion/react": "^11.11.3",
14+
"@emotion/styled": "^11.11.0",
15+
"@fontsource-variable/open-sans": "^5.0.23",
16+
"@mui/icons-material": "^5.15.5",
17+
"@mui/lab": "^5.0.0-alpha.163",
18+
"@mui/material": "^5.15.5",
19+
"@mui/material-nextjs": "^5.15.9",
20+
"@types/node": "^20.11.24",
21+
"@types/react": "^18.2.48",
22+
"@types/react-dom": "^18.2.18",
23+
"axios": "^1.6.7",
24+
"next": "^14.1.0",
25+
"react": "^18.2.0",
26+
"react-dom": "^18.2.0",
27+
"react-type-animation": "^3.2.0",
28+
"react-visibility-sensor": "^5.1.1",
29+
"sharp": "^0.33.2"
1830
},
1931
"devDependencies": {
20-
"@tailwindcss/typography": "^0.5.10",
2132
"prettier": "^3.0.3",
2233
"prettier-plugin-astro": "^0.12.0",
2334
"prettier-plugin-tailwindcss": "^0.5.4",

0 commit comments

Comments
 (0)