Skip to content

Commit

Permalink
Merge pull request #132 from HackHPI/feature/website-2.0
Browse files Browse the repository at this point in the history
Feature/website 2.0
  • Loading branch information
DerCed authored Mar 20, 2024
2 parents 6bca3e0 + 1d8084f commit 9adaccf
Show file tree
Hide file tree
Showing 210 changed files with 3,770 additions and 5,043 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
node_modules
dist
51 changes: 51 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Docker Image CI

on:
push:
branches: [ "main", "feature/website-2.0" ]
pull_request:
branches: [ "main" ]

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:

build:

runs-on: ubuntu-latest

permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v2
- name: Node install and build
uses: actions/setup-node@v3
with:
node-version: '20.x'
- run: npm i
- run: npm run build --if-present
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
30 changes: 0 additions & 30 deletions .github/workflows/pages.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ pnpm-debug.log*

# macOS-specific files
.DS_Store
.next
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM nginx:alpine

RUN rm /etc/nginx/conf.d/default.conf
COPY ./nginx/nginx.conf /etc/nginx/conf.d

COPY ./out /usr/share/nginx/html/
EXPOSE 80
7 changes: 0 additions & 7 deletions astro.config.mjs

This file was deleted.

5 changes: 5 additions & 0 deletions next-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
17 changes: 17 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
output: 'export',

// Optional: Change links `/me` -> `/me/` and emit `/me.html` -> `/me/index.html`
// trailingSlash: true,

// Optional: Prevent automatic `/me` -> `/me/`, instead preserve `href`
// skipTrailingSlashRedirect: true,

// Optional: Change the output directory `out` -> `dist`
// distDir: 'dist',
}

module.exports = nextConfig
11 changes: 11 additions & 0 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
server {
listen 80;
root /usr/share/nginx/html;
index index.html;

error_page 404 /404.html;

location / {
try_files $uri $uri/ $uri.html =404;
}
}
35 changes: 23 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
{
"name": "hackhpi-website",
"type": "module",
"version": "0.0.1",
"version": "1.0.1",
"private": true,
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro build",
"preview": "astro preview",
"astro": "astro"
"dev": "next dev",
"start": "next dev",
"build": "next build",
"lint": "next lint"
},
"dependencies": {
"@astrojs/tailwind": "^5.0.0",
"astro": "^3.1.1",
"astro-icon": "^0.8.1",
"tailwindcss": "^3.3.3"
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@fontsource-variable/open-sans": "^5.0.23",
"@mui/icons-material": "^5.15.5",
"@mui/lab": "^5.0.0-alpha.163",
"@mui/material": "^5.15.5",
"@mui/material-nextjs": "^5.15.9",
"@types/node": "^20.11.24",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"axios": "^1.6.7",
"next": "^14.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-type-animation": "^3.2.0",
"react-visibility-sensor": "^5.1.1",
"sharp": "^0.33.2"
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.10",
"prettier": "^3.0.3",
"prettier-plugin-astro": "^0.12.0",
"prettier-plugin-tailwindcss": "^0.5.4",
Expand Down
Binary file added public/HackHPI24_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions public/HackHPI24_white.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 removed public/favicon.ico
Binary file not shown.
Binary file added public/favicon.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/fonts/NeoSansStdBold.otf
Binary file not shown.
Binary file added public/fonts/NeoSansStdLight.otf
Binary file not shown.
Binary file added public/fonts/NeoSansStdRegular.otf
Binary file not shown.
Binary file removed public/hero.jpg
Binary file not shown.
Binary file removed public/img/sponsors/dataport.jpeg
Binary file not shown.
Binary file removed public/img/sponsors/nexenio.jpeg
Binary file not shown.
Binary file removed public/img/team/an_nguyen.jpg
Binary file not shown.
Binary file removed public/img/team/benedikt_helfrich.jpg
Binary file not shown.
Binary file removed public/img/team/benjamin_frost.jpg
Binary file not shown.
Binary file removed public/img/team/cedric_rische.jpg
Binary file not shown.
Binary file removed public/img/team/leon_hermann.jpg
Binary file not shown.
Binary file removed public/img/team/mathilda_heise.jpg
Binary file not shown.
Binary file removed public/img/team/matti_schmidt.jpg
Binary file not shown.
Binary file removed public/img/team/nikolas_rieger.jpg
Binary file not shown.
Binary file removed public/img/team/placeholder.jpg
Binary file not shown.
Binary file removed public/img/team/tanja_lehmann.jpg
Binary file not shown.
Binary file removed public/img/team/theo_klinke.jpg
Binary file not shown.
9 changes: 9 additions & 0 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "HackHPI 24",
"short_name": "HackHPI 2024",
"description": "Explore the future of urban living at HPI in Potsdam. Join motivated students for two days of innovation, workshops, and collaboration with top-notch sponsors offering support and expertise. Tackle a challenge and dive into the world of smart cities.",
"start_url": "/",
"display": "standalone",
"background_color": "#13101B",
"theme_color": "#13101B"
}
Loading

0 comments on commit 9adaccf

Please sign in to comment.