diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0f84f92..05e2172 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -11,48 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Install dependencies run: npm ci - - name: Lint + - name: Lint code run: npm run lint -# build: -# runs-on: ubuntu-latest -# needs: lint -# if : ${{ github.ref == 'refs/heads/main' }} -# steps: -# - -# name: Checkout -# uses: actions/checkout@v2 -# - -# name: Docker Metadata -# id: meta -# uses: docker/metadata-action@v3 -# with: -# images: ${{ secrets.DOCKER_REPOSITORY }} -# tags: | -# type=sha,enable=true,priority=100,prefix=,suffix=,format=short -# - -# name: Set up QEMU -# uses: docker/setup-qemu-action@v1 -# - -# name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v1 -# - -# name: Login to DockerHub -# if: github.event_name != 'pull_request' -# uses: docker/login-action@v1 -# with: -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# - -# name: Build and push -# id: docker_build -# uses: docker/build-push-action@v2 -# with: -# push: ${{ github.event_name != 'pull_request' }} -# tags: | -# ${{ steps.meta.outputs.tags }} -# ${{ secrets.DOCKER_REPOSITORY }}:latest -# build-args: | -# GIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} -# PAYLOAD_URL=${{ vars.PAYLOAD_URL }} -# FRONTEND_URL=${{ vars.FRONTEND_URL }} -# TURNSTILE_SITE_KEY=${{ vars.TURNSTILE_SITE_KEY }} + - name: Check code style + run: npm run prettier diff --git a/README.md b/README.md index 9b6de76..392ecdb 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,6 @@ This project uses **Docker Hub Automated Builds** for continuous deployment: - `main` branch → Production environment variables (`latest` tag) - `dev` branch → Development environment variables (`latest-test` tag) 4. **Image Tagging**: The built image is tagged with the git commit hash and branch-specific tags: - - `main` → `seebruecke/bside-website:a1b2c3d` + `seebruecke/bside-website:latest` - - `dev` → `seebruecke/bside-website:b2c3d4e` + `seebruecke/bside-website:latest-test` + - `main` → `seebruecke/bside-website:a1b2c3d` + `seebruecke/bside-website:latest` + - `dev` → `seebruecke/bside-website:b2c3d4e` + `seebruecke/bside-website:latest-test` 5. **Registry Push**: The image is automatically pushed to Docker Hub diff --git a/components/blocks/buttonBlock/Button.tsx b/components/blocks/buttonBlock/Button.tsx index bdc8a4d..b3d47cb 100644 --- a/components/blocks/buttonBlock/Button.tsx +++ b/components/blocks/buttonBlock/Button.tsx @@ -14,13 +14,8 @@ interface Props { const Button = ({ title, href, text, target = '_self', inverse = false }: Props): ReactElement => { return ( -
{circle.name}
- {!isEmptyString(circle.description) && ( -- {circle.description} -
- )} + {!isEmptyString(circle.description) &&{circle.description}
}- {item.description} -
+{item.description}
)} ))} diff --git a/components/blocks/teaserBlock/Teaser.tsx b/components/blocks/teaserBlock/Teaser.tsx index f53f7bd..1b08393 100644 --- a/components/blocks/teaserBlock/Teaser.tsx +++ b/components/blocks/teaserBlock/Teaser.tsx @@ -6,15 +6,7 @@ import Headline from '@blocks/headlineBlock/Headline'; import RichText from '@blocks/richTextBlock/RichText'; import type { TeaserBlockProps } from '@blocks/teaserBlock/TeaserBlock'; -const Teaser = ({ - headlineTitle, - headlineTeaser, - text, - image, - reversed, - linkText, - linkHref, -}: TeaserBlockProps): ReactElement => { +const Teaser = ({ headlineTitle, headlineTeaser, text, image, reversed, linkText, linkHref }: TeaserBlockProps): ReactElement => { return (B-Side GmbH
-- {locale !== 'en' - ? 'Zentrale Teile des Zentrums' - : 'Other Central Parts'} + {locale !== 'en' ? 'Zentrale Teile des Zentrums' : 'Other Central Parts'}
- {locale !== 'en' ? 'Andere Plattformen' : 'Other platforms'} -
+{locale !== 'en' ? 'Andere Plattformen' : 'Other platforms'}
+
Mehr Informationen zum Café
-