Skip to content

Commit

Permalink
Revert "Update Everything"
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasWanke authored Oct 14, 2024
1 parent b987f2c commit 439d3f6
Show file tree
Hide file tree
Showing 85 changed files with 5,369 additions and 4,897 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly

- package-ecosystem: npm
directory: /
schedule:
interval: monthly
13 changes: 7 additions & 6 deletions .github/workflows/cd.yml → .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Continuous Deployment
name: Deploy Astro Project to GitHub Pages

on:
push:
Expand All @@ -13,10 +13,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: withastro/action@v3
with:
node-version: 20
- name: Checkout Repository
uses: actions/checkout@v4
- name: Install, Build, and Upload
uses: withastro/action@v1

deploy:
needs: build
Expand All @@ -27,4 +27,5 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
# Can't upgrade to v4 yet: https://github.com/withastro/action/issues/40
uses: actions/deploy-pages@v3
38 changes: 38 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Pull Request

on:
pull_request_target:
types: [opened]

jobs:
assign-author:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Assign author to PR
uses: technote-space/assign-author@v1

approve-dependabot-pr:
if: github.event.pull_request.user.login == 'dependabot[bot]'
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- name: Enable auto-merge
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
# If we'd use `secrets.GITHUB_TOKEN`, our CI isn't triggered on the
# merge's push event.
# https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
GITHUB_TOKEN: ${{ secrets.PR_AUTOMERGE_TOKEN }}
- uses: dependabot/[email protected]
id: dependabot-metadata
- name: Approve patch and minor updates
if: steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch' || steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr review "$PR_URL" --approve
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13 changes: 4 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.direnv/

# build output
dist/

# generated types
.astro/
.output/

# dependencies
node_modules/
Expand All @@ -13,15 +13,10 @@ yarn-debug.log*
yarn-error.log*
pnpm-debug.log*


# environment variables
.env
.env.production

# macOS-specific files
.DS_Store

# jetbrains setting folder
.idea/

# direnv
.direnv/
4 changes: 0 additions & 4 deletions .prettierignore

This file was deleted.

12 changes: 0 additions & 12 deletions .prettierrc.mjs

This file was deleted.

6 changes: 1 addition & 5 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"recommendations": [
"astro-build.astro-vscode",
"bradlc.vscode-tailwindcss",
"esbenp.prettier-vscode"
],
"recommendations": ["astro-build.astro-vscode", "editorconfig.editorconfig"],
"unwantedRecommendations": []
}
15 changes: 15 additions & 0 deletions astro-i18next.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { AstroI18nextConfig } from "astro-i18next";

const config: AstroI18nextConfig = {
defaultLocale: "de",
locales: ["de", "en"],
load: ["client", "server"],
i18nextClientPlugins: {
"{initReactI18next}": "react-i18next",
},
i18nextServerPlugins: {
"{initReactI18next}": "react-i18next",
},
};

export default config;
12 changes: 2 additions & 10 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
// @ts-check
import react from "@astrojs/react";
import tailwind from "@astrojs/tailwind";
import icon from "astro-icon";
import astroI18next from "astro-i18next";
import { defineConfig } from "astro/config";
import { defaultLang, languages } from "./src/i18n/constants";

// https://astro.build/config
export default defineConfig({
i18n: {
defaultLocale: defaultLang,
locales: Object.keys(languages),
routing: "manual", // see: src/middleware.ts
},
integrations: [tailwind(), react(), icon()],
site: "https://blz-it.de",
integrations: [tailwind(), astroI18next(), react()],
});
47 changes: 24 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
{
"name": "@blz-it/blz-it.de",
"name": "@example/basics",
"type": "module",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"build": "astro build",
"preview": "astro preview",
"astro": "astro"
"astro": "astro",
"gen-i18n": "astro-i18next generate"
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/react": "^3.6.2",
"@astrojs/tailwind": "^5.1.1",
"@fontsource/poppins": "^5.1.0",
"@headlessui/react": "^2.1.10",
"@heroicons/react": "^2.1.5",
"@iconify-json/mdi": "^1.2.1",
"@tailwindcss/typography": "^0.5.15",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"astro": "^4.15.11",
"astro-icon": "^1.1.1",
"clsx": "^2.1.1",
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"prettier-plugin-tailwindcss": "^0.6.8",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2"
"@astrojs/react": "^1.2.2",
"@astrojs/tailwind": "^2.1.3",
"@headlessui/react": "^1.7.19",
"@heroicons/react": "^2.1.3",
"@hookform/resolvers": "^3.3.4",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"@types/react": "^18.2.78",
"@types/react-dom": "^18.2.23",
"astro": "^1.9.2",
"astro-i18next": "^1.0.0-beta.21",
"astro-icon": "^0.8.1",
"classnames": "^2.5.1",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-hook-form": "^7.51.3",
"react-i18next": "^12.1.4",
"tailwindcss": "^3.4.3",
"zod": "^3.23.0"
}
}
2 changes: 1 addition & 1 deletion src/assets/data/history.json → public/data/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"einsteinCup2024": {
"date": "27 Mai – 30 Mai 2024",
"title": "Albert-Einstein-Cup",
"text": "Simon Brebeck (Deutschland), Lukas Hertkorn (Deutschland) und Besart Memeti (Schweiz) sind die Gewinner des Albert-Einstein-Cups. Kornél Stefán (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ wurde das erste Mal durchgeführt und von Nils Jakubzick (Deutschland) gewonnen."
"text": "Jongwon Kim (Südkorea), Daniel Kalisch (Deutschland) und [Schweiz] sind die Gewinner des Albert-Einstein-Cups. Stefan Kornel (Ungarn) gewinnt die zusätzliche Disziplin Speed-Programming. Der “Hungarian Speed Test“ wurde das erste mal durchgeführt und von Nils Jakubzick (Deutschland) gewonnen."
},
"wsc2024": {
"date": "10 – 15 September 2024",
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 439d3f6

Please sign in to comment.