Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

„Mit der neuen Webseite kommt das alles in Ordnung“ #224

Merged
merged 84 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
f7b8540
Add github.svg image
thelegy Apr 30, 2023
da5c089
Add beginnings of new astro-based website and a new theme
thelegy Jan 29, 2024
6813c79
Move required assets to astro dir
thelegy Jan 29, 2024
5584a05
Improve footer consistency
thelegy Jan 29, 2024
7d6f030
Improve print output
thelegy Jan 29, 2024
edb34e5
Use current date to query the wiki for events
thelegy Jan 29, 2024
7cf5b15
Add some settings for vscode
thelegy Jan 29, 2024
841f947
Improve colors of NextKoMa box
thelegy Jan 29, 2024
a034b5e
Move KoMa logo to reusable component
thelegy Jan 30, 2024
a31e286
Make Menu more responsive
thelegy Jan 30, 2024
e3bea3f
Remove astro-compress as it leads to build issues
thelegy Jan 30, 2024
6a4f959
Add ThemeToggle
thelegy Jan 30, 2024
da91d73
Move index to new BaseLayout
thelegy Jan 30, 2024
f4b1cbf
Introduce new darktheme
thelegy Jan 30, 2024
2df32c3
Move prettier config to package.json
thelegy Jan 30, 2024
e727821
Add vscode setting for wordwrap and tabSize
thelegy Jan 30, 2024
063816d
Fix menu bg in dark theme
thelegy Jan 30, 2024
b5b7f89
Remove code formatting for IBAN
thelegy Jan 30, 2024
d83ee7c
Fix menu button icon for firefox
thelegy Jan 30, 2024
1f1d33e
Split c/o to seperate lines
thelegy Jan 30, 2024
f8c5c00
Add gap for footer
thelegy Jan 30, 2024
d693b61
Fix layout with width right above the breakpoint
thelegy Jan 30, 2024
8ceb3c4
Improve layout at small screen sizes
thelegy Jan 30, 2024
93e67be
Move footer to a more semantic position in the html
thelegy Jan 30, 2024
0858c79
Fix prettier in vscode
thelegy Jan 31, 2024
6fa478f
Rework menu to work in firefox and be a little nicer
thelegy Jan 31, 2024
d832183
Simplify theme toggle aesthetics
thelegy Jan 31, 2024
d15b4cc
Increase contrast of NextKoMa box in dark mode
thelegy Jan 31, 2024
2fa726b
Workaround for some inconsistency with chrome based browsers
thelegy Jan 31, 2024
b7e6f96
Allow closing the menu by clicking the background
thelegy Jan 31, 2024
989685a
Reduce contrast on the headings a little
thelegy Jan 31, 2024
d4524bc
Exchange focus between the menu buttons on click
thelegy Feb 1, 2024
68b9ce6
Expose stroke configuration of the ThemeToggle
thelegy Feb 1, 2024
571a0af
Inline the header in the base layout
thelegy Feb 1, 2024
339196a
Make header fixed, have single menu toggle, improve accessability
thelegy Feb 1, 2024
b76cbbc
Add open/close animation for the menu
thelegy Feb 1, 2024
ccb872a
Make columns in the footer have a common width
thelegy Feb 2, 2024
2fe7fd6
Move theme toggle to its own script
thelegy Feb 2, 2024
279f207
Merge theme switch buttons to retain focus
thelegy Feb 2, 2024
f04159f
Integrate astro-compress
thelegy Feb 3, 2024
2ed9dff
Add basic flake with a dev shell for the new website toolchain
thelegy Feb 3, 2024
3891291
Add flake apps to build the new website and host a dev server
thelegy Feb 3, 2024
9e88d65
Add adaprive favicon
thelegy Feb 3, 2024
eb86cec
Move next-koma box generation to server side
thelegy Feb 11, 2024
1bd730e
Add initial-scale
thelegy Feb 11, 2024
b823427
Remove react integration
thelegy Feb 11, 2024
1e2b56b
Clean up next-koma box
thelegy Feb 11, 2024
3dfe3a8
Add generation of the menu from the pages
thelegy Feb 11, 2024
246f4ea
Add a template for page redirection
thelegy Feb 11, 2024
b3b31c8
Add support for mdx
thelegy Feb 11, 2024
06426b0
switch index to mdx format
thelegy Feb 11, 2024
7f26bdf
Add some more example pages
thelegy Feb 11, 2024
b02c502
Fix html viewport
thelegy Feb 11, 2024
d67953c
Add default layout
thelegy Feb 11, 2024
d6708a0
Integrate optional redirect into BaseLayout
thelegy Feb 11, 2024
dcb10d3
Allow entries to be disabled for the menu
thelegy Feb 11, 2024
a8e4b95
Create definitions for collections
thelegy Feb 11, 2024
c8030c6
Add code for generated pages
thelegy Feb 11, 2024
e61d3e8
Make major width of the page not dependent on the content
thelegy Feb 11, 2024
945a414
Fix baseUrl
thelegy Feb 11, 2024
61e5536
Fix root page not showing up in menu
thelegy Feb 11, 2024
ccf92a9
Add page title to the html title
thelegy Feb 11, 2024
3665073
Add new address component and integrate it into the Footer
thelegy Feb 27, 2024
9111a22
Import impressum and datenschutz from the old website
thelegy Feb 27, 2024
711e76b
Add nix builder for the astro based homepage
thelegy Feb 28, 2024
88110dd
Fix mutiple issues in build system and add code for external links
thelegy Feb 29, 2024
fe2d1a0
Switch to the new website skeleton using astro
thelegy Feb 29, 2024
803463e
Fix link checker
mmarx Feb 29, 2024
f39ce8c
Use the magic nix cache action
mmarx Feb 29, 2024
499587f
Migrate format of foerderverein for astro
thelegy Feb 29, 2024
c71260e
Migrate format of kommunikation for astro
thelegy Feb 29, 2024
cfe59f7
Migrate format of ueber_die_koma for astro
thelegy Feb 29, 2024
ad1dc7d
Fix missing link target for publications list
thelegy Feb 29, 2024
b4224b2
Fix footnote
mmarx Feb 29, 2024
f346d8c
Show nix version
mmarx Feb 29, 2024
04d8b30
No longer show nix version
mmarx Feb 29, 2024
d01427a
Use nix 2.19 in CI
mmarx Feb 29, 2024
4c20145
Use nix 2.18 in CI
mmarx Feb 29, 2024
cc0aa42
Bump actions to nodejs20
mmarx Mar 1, 2024
e1cf705
Migrate format of publikationen for astro
thelegy Mar 1, 2024
777a47f
Migrate format of archiv for astro
thelegy Mar 1, 2024
51c6eab
Remove obsolete nix builder
thelegy Mar 1, 2024
144e36f
Update README
mmarx Mar 1, 2024
884ac8b
Update README, again
mmarx Mar 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
name: "Build die-koma.org"
name: 'Build die-koma.org'
on:
pull_request:
branches:
- main
push:
branches:
branches:
- main
jobs:

build:
name: "Build the die-koma.org website"
name: 'Build the die-koma.org website'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v18
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v9
with:
nix-installer-tag: v0.15.1
- uses: DeterminateSystems/magic-nix-cache-action@v3
- env:
BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
run: echo "name=BRANCH_NAME::${BRANCH_NAME_OR_REF#refs/heads/}" >> $GITHUB_ENV
- run: echo "name=PR_NUMBER::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" >> $GITHUB_ENV
- run: nix --print-build-logs build .#KoMaHomepageTar -o homepage.tar.xz
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build-artifacts
path: homepage.tar.xz

check-links:
name: "Check for broken links"
name: 'Check for broken links'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v18
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v9
with:
nix-installer-tag: v0.15.1
- uses: DeterminateSystems/magic-nix-cache-action@v3
- env:
BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
run: echo "name=BRANCH_NAME::${BRANCH_NAME_OR_REF#refs/heads/}" >> $GITHUB_ENV
Expand All @@ -38,20 +43,20 @@ jobs:

release:
if: github.repository == 'Die-KoMa/die-koma.org' && github.event_name == 'push' && github.ref == 'refs/heads/main'
name: "Release the website to the release branch"
name: 'Release the website to the release branch'
concurrency:
# Allow one concurrent deployment
group: "release"
group: 'release'
cancel-in-progress: true
permissions:
contents: write
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: release
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-artifacts
- run: rm -rf homepage
Expand Down
34 changes: 24 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
_site/
.sass-cache/
.jekyll-metadata
.jekyll-cache/
vendor/
ruby-packages/
.bundle/
/result
#*#
*~
# build output
dist/
# generated types
.astro/

# dependencies
node_modules/

# logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*


# environment variables
.env
.env.production

# macOS-specific files
.DS_Store

# nix results
result
3 changes: 3 additions & 0 deletions .nvim.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
local nvim_lsp = require("lspconfig")

nvim_lsp.tailwindcss.setup{}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/**
4 changes: 4 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"recommendations": ["astro-build.astro-vscode"],
"unwantedRecommendations": []
}
11 changes: 11 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"version": "0.2.0",
"configurations": [
{
"command": "npm run astro dev -- --host",
"name": "Development server",
"request": "launch",
"type": "node-terminal"
}
]
}
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"headwind.runOnSave": true,
"prettier.requireConfig": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.wordWrap": "bounded",
"editor.tabSize": 2,
"editor.wordWrapColumn": 120,
"prettier.configPath": "package.json"
}
6 changes: 0 additions & 6 deletions Gemfile

This file was deleted.

92 changes: 0 additions & 92 deletions Gemfile.lock

This file was deleted.

11 changes: 0 additions & 11 deletions KoMaPedia/index.html

This file was deleted.

28 changes: 0 additions & 28 deletions Makefile

This file was deleted.

50 changes: 21 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ the pull request is merged, the changes will be deployed
automatically.

# Installation
Short: Use [Jekyll](https://jekyllrb.com/).
Short: Use [Astro](https://astro.build/).

Long: This may be arbitrary hard, depending on your Operating System and how fucked up your ruby installation is, to re-install ruby and install the proper version see following guides:
Long: You will need a working Javascript runtime (e.g., `nodejs`) and
a package manager such as `npm`. Then install the dependencies and run
`npm run dev`.

## Nix (best support)
```sh
Expand All @@ -25,50 +27,40 @@ Long: This may be arbitrary hard, depending on your Operating System and how fuc
# building:
nix build -L .

# install dependencies:
nix run .#install

# development server:
nix run
```


## Debian / Ubuntu
## Debian/Ubuntu
```sh
# ruby installation stuff:
sudo apt remove ruby # um ruby einmal zu deinstallieren, eigentlich nicht nötig im idealfall
sudo apt install ruby # oder sudo apt --upgrade ruby
# read output!
# maybe you'll have to add ruby to some path and reload your bashrc
which gem # should lie in same folder as following:
which ruby
ruby --version # should be the one installed above
# Bundle stuff:
sudo apt install nodejs npm
cd "die-koma.org"
git pull # make sure to be on master, pull latest version :)
gem install bundler # should run successfully then
bundle install # you have to be in the repository
bundle exec jekyll serve # should run now on 127.0.0.1
git pull # make sure to be on main, pull latest version :)
npm install # install dependencies
npm run dev # start development server
```


## Mac
same as above but use homebrew instead of apt.
## MacOS
Likely the same as above, but use `homebrew` instead of `apt`?


## Windows
you're lost anyways, I don't know how to handle that odyssee. WSL2 with Nix should work though.

You've lost the game anyways, perhaps try WSL2 with nix?

## Windows with WSL Ubuntu
```sh
# clone "die-koma.org" to a directory without any spaces!
cd die-koma.org
# start wsl in the directory
# install ruby and packages for gem creation
sudo apt install bundler ruby ruby-dev make gcc g++
# configure to install gems locally (don't clutter wsl and system dirs)
bundle config set --local path './ruby-packages/'
# you might have to add the following to _config.yaml:
# exclude: ['ruby-packages']
bundle install
bundle exec jekyll serve --force-polling # should run now on 127.0.0.1:4000
# the Port is available on Windows, just use your normal browser without wsl
# install nodejs and packages
sudo apt install nodejs npm
cd "die-koma.org"
git pull # make sure to be on main, pull latest version :)
npm install # install dependencies
npm run dev # start development server
```
Loading