Merge branch 'dev' of https://git.ftecke.de/fte/FTE-Homepage into dev

.gitea/workflows/dev-2-0.yaml

@@ -1,38 +0,0 @@
-name: Website
-
-on:
-  push:
-    branches: [dev]
-  workflow_dispatch:
-
-defaults:
-  run:
-    working-directory: /opt/runner/workdir/fte-homepage-dev
-
-jobs:
-  publish:
-    name: Website veröffentlichen
-    if: gitea.repository == 'fte/FTE-Homepage'
-    runs-on: act-runnerV2
-    steps:
-      - name: Pull
-        run: |
-          git fetch --all
-          git reset --hard origin/dev
-      - name: NPM install
-        run: |
-          npm i          
-      - name: Build
-        run: |
-          rm -rf public
-          hugo --minify --gc --baseURL="https://dev.ftecke.de"      
-      - name: Deploy
-        run: |
-          cd public
-          rsync -azr --delete ./ /var/www/html/dev.ftecke.de/
- #     - name: Notification
- #       uses: actions/telegram-action@main
- #       if: always()
- #       with:
- #         chat_id: ${{ secrets.TG_CHAT_ID }}
- #         token: ${{ secrets.TG_TOKEN }}         

.gitea/workflows/publish-2-0.yaml

@@ -1,37 +0,0 @@
-name: Website
-
-on:
-  push:
-    branches: [main]
-
-defaults:
-  run:
-    working-directory: /opt/runner/workdir/FTE-Homepage
-
-jobs:
-  publish:
-    name: Website veröffentlichen
-    if: gitea.repository == 'fte/FTE-Homepage'
-    runs-on: act-runnerV2
-    steps:
-      - name: Pull
-        run: |
-          git fetch --all
-          git reset --hard origin/main
-      - name: NPM install
-        run: |
-          npm i          
-      - name: Build
-        run: |
-          rm -rf public
-          hugo --minify --gc        
-      - name: Deploy
-        run: |
-          cd public
-          rsync -azr --delete ./ /var/www/html/www.ftecke.de/
- #     - name: Notification
- #       uses: actions/telegram-action@main
- #       if: always()
- #       with:
- #         chat_id: ${{ secrets.TG_CHAT_ID }}
- #         token: ${{ secrets.TG_TOKEN }}    

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "workbench.startupEditor": "none"
+}

README.md

@@ -1 +0,0 @@
-just testing

config.toml

@@ -1,64 +1,56 @@
 baseURL = "https://www.ftecke.de"
-title = "Event & DJ Service Fabian Ecke"
+title = "FTE-Tech"
 author = "Fabian Ecke"
-locale = "de-de"                 # BEHOBEN: "languageCode" zu "locale" geändert
+languageCode = "de-de"
 DefaultContentLanguage = "de"
 enableInlineShortcodes = true
 theme = "tella"
 enableRobotsTXT = true
-timeout = 30000                  # AUS CONFIGTAXO: Hierher verschoben
 
-# --- NEU: FIX FÜR DEN POSTCSS SANDBOX-ABSTURZ ---
-[security]
-  [security.exec]
-    allow = ['^node$', '^npm$', '^postcss$']
+# Please enable this feature if the site is available in Japanese, Chinese or Korean.
+#hasCJKLanguage = true
 
-  [security.node]
-    [security.node.permissions]
-      disable = true
+# If you're using Google Analytics, you can enable this feature.
+#googleAnalytics = "UA-12345678-1"
 
-# --- AUS CONFIGTAXO: Taxonomien hierher verschoben ---
-[taxonomies]
-  category = "categories"
-  tag = "tags"
-  series = "series"
-
-# --- AUS CONFIGTAXO: Privatsphäre-Einstellungen hierher verschoben ---
-[privacy]
-  [privacy.vimeo]
-    disabled = false
-    simple = true
-  [privacy.instagram]
-    disabled = false
-    simple = true
-  [privacy.youtube]
-    disabled = false
-    privacyEnhanced = true
+# Disqus Comment System
+#disqusShortname = ""
 
 [params]
+
   showBlog = true
   mainSections = ['blog']
+
   googleFonts = false
 
   [params.logo]
     main = "img/logo/fte-logo.png"
     alt = "FTE Logo"
+
+    # The size parameter is the class name of tailwindcss
+    # https://tailwindcss.com/
     size = "h-14"
 
   [params.site]
-    name = "Event & DJ Service Fabian Ecke"
+    name = "FTE-Tech - Sonderlösungen"
 
   [params.icon]
+    #If you want to use FontAwesome, set this parameter to true.
     fontawesome = true
 
   [params.homepage_meta_tags]
-    meta_description = "Veranstaltungsservice in Eisleben, Jena und Umgebung"
-    meta_og_title = "Event & DJ Service Fabian Ecke"
+    meta_description = "Sonderlösungen in den Bereichen 3D-Druck und Elektronik"
+    meta_og_title = "FTE-Tech - Sonderlösungen"
     meta_og_type = "website"
     meta_og_url = "https://www.ftecke.de"
-    meta_og_description = "Veranstaltungsservice in Eisleben, Jena und Umgebung"
+    # meta_og_image = "https://raw.githubusercontent.com/opera7133/tella/master/images/tn.png"
+    meta_og_description = "Sonderlösungen in den Bereichen 3D-Druck und Elektronik"
+    meta_twitter_card = "summary_large_image"
+    meta_twitter_site = "@username"
+    meta_twitter_creator = "@username"
 
 [menu]
+
   [[menu.main]]
     identifier = "homepage"
     name = "Startseite"
@@ -66,15 +58,15 @@ timeout = 30000                  # AUS CONFIGTAXO: Hierher verschoben
     weight = 1
 
   [[menu.main]]
-    identifier = "blog"
-    name = "Blog"
-    url = "/blog/"
+    identifier = "products"
+    name = "Lösungen & Produkte"
+    url = "/products/"
     weight = 2
 
   [[menu.main]]
-    identifier = "rental"
-    name = "Verleih"
-    url = "/products/"
+    identifier = "blog"
+    name = "Neuheiten"
+    url = "/blog/"
     weight = 3
 
   [[menu.main]]
@@ -89,10 +81,14 @@ timeout = 30000                  # AUS CONFIGTAXO: Hierher verschoben
     url = "/contact/"
     weight = 5
 
+  # Footer Menu
   [[menu.footer]]
     name = "Impressum & Datenschutzerklärung"
     url = "/impressum-datenschutzerklaerung"
       weight = 1
 
-[markup.goldmark.renderer]
-unsafe = true
+  # [[menu.footer]]
+  #   name = "Github"
+  #   url = "https://git.ftecke.de/fte"
+  #   pre = "<i class='icon-github text-2xl'></i>"
+  #     weight = 2

configTaxo.toml

@@ -0,0 +1,27 @@
+timeout = 30000
+enableInlineShortcodes = true
+
+[taxonomies]
+category = "categories"
+tag = "tags"
+series = "series"
+
+[privacy]
+
+  [privacy.vimeo]
+    disabled = false
+    simple = true
+
+  [privacy.twitter]
+    disabled = false
+    enableDNT = true
+    simple = true
+    disableInlineCSS = true
+
+  [privacy.instagram]
+    disabled = false
+    simple = true
+
+  [privacy.youtube]
+    disabled = false
+    privacyEnhanced = true

content/_index.md

@@ -1,3 +1,3 @@
 +++
-author = "Fabian Ecke"
+author = "Hugo Authors"
 +++

content/impressum-datenschutzerklaerung.md

@@ -2,4 +2,4 @@
 title = "Impressum und Datenschutzerklärung"
 +++
 
-Derzeit nicht verfügbar.
+jooo

content/products/example2.md

@@ -5,7 +5,7 @@ draft: false
 featured: true
 weight: 1
 description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec accumsan dapibus purus, vel maximus erat facilisis vel.
-image: "img/products/test2/main.webp"
+image: "img/products/test2/main.jpg"
 ---
 
-Hello, World! Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec accumsan dapibus purus, vel maximus erat facilisis vel. Suspendisse eu ipsum consequat, sodales nulla vel, faucibus velit. Fusce imperdiet lacus nec cursus auctor. In vulputate arcu et nulla placerat, nec pulvinar quam rhoncus. Praesent vel placerat nunc. Mauris elit felis, pulvinar egestas risus ut, fermentum ullamcorper orci. Integer tempor, neque sed fermentum eleifend, ligula est tincidunt purus, sodales semper elit enim ut mi. Vestibulum commodo tristique hendrerit. Duis interdum tristique augue id aliquam. Sed et tellus aliquam, accumsan erat at, facilisis tortor. Donec ac sapien sed lectus ullamcorper ultrices. Nullam placerat mauris nec urna rhoncus, vitae faucibus nulla venenatis. Donec vestibulum justo auctor, vestibulum diam quis, egestas erat. Vivamus volutpat et metus ut fermentum. Donec volutpat neque nec quam lacinia, nec faucibus felis ullamcorper.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec accumsan dapibus purus, vel maximus erat facilisis vel. Suspendisse eu ipsum consequat, sodales nulla vel, faucibus velit. Fusce imperdiet lacus nec cursus auctor. In vulputate arcu et nulla placerat, nec pulvinar quam rhoncus. Praesent vel placerat nunc. Mauris elit felis, pulvinar egestas risus ut, fermentum ullamcorper orci. Integer tempor, neque sed fermentum eleifend, ligula est tincidunt purus, sodales semper elit enim ut mi. Vestibulum commodo tristique hendrerit. Duis interdum tristique augue id aliquam. Sed et tellus aliquam, accumsan erat at, facilisis tortor. Donec ac sapien sed lectus ullamcorper ultrices. Nullam placerat mauris nec urna rhoncus, vitae faucibus nulla venenatis. Donec vestibulum justo auctor, vestibulum diam quis, egestas erat. Vivamus volutpat et metus ut fermentum. Donec volutpat neque nec quam lacinia, nec faucibus felis ullamcorper.

data/slide.json

@@ -1,7 +1,7 @@
 [
   {
     "title": "3D-Druck",
-    "video": "img/slide/vid01.mp4"
+    "video": "img/slide/vid-3d-01.webm"
   },
   {
     "title": "Individuelle Lichtausstattung",

netlify.toml

@@ -0,0 +1,30 @@
+[build]
+publish = "public"
+command = "git submodule update --remote --merge && npm run build"
+
+[context.production.environment]
+HUGO_VERSION = "0.90.0"
+HUGO_ENV = "production"
+HUGO_ENABLEGITINFO = "true"
+
+[context.split1]
+command = "npm run build"
+
+[context.split1.environment]
+HUGO_VERSION = "0.90.0"
+HUGO_ENV = "production"
+
+[context.deploy-preview]
+command = "npm run build"
+
+[context.deploy-preview.environment]
+HUGO_VERSION = "0.90.0"
+
+[context.branch-deploy]
+command = "npm run build"
+
+[context.branch-deploy.environment]
+HUGO_VERSION = "0.90.0"
+
+[context.next.environment]
+HUGO_ENABLEGITINFO = "true"

themes/tella/layouts/index.html

@@ -8,37 +8,27 @@
     <meta property="og:type" content="{{ .Site.Params.homepage_meta_tags.meta_og_type }}" />
     <meta property="og:url" content="{{ .Site.Params.homepage_meta_tags.meta_og_url }}" />
     <meta property="og:image" content="{{ .Site.Params.homepage_meta_tags.meta_og_image }}" />
-    <meta name="google-site-verification" content="Eyh84rhN3VYT7gtjWOz5MSd67Cm2O1QwIoIl3HN_pi0" />
     <meta property="og:description" content="{{ .Site.Params.homepage_meta_tags.meta_og_description }}" />
+    <meta name="twitter:card" content="{{ .Site.Params.homepage_meta_tags.meta_twitter_card }}" />
+    <meta name="twitter:site" content="{{ .Site.Params.homepage_meta_tags.meta_twitter_site }}" />
+    <meta name="twitter:creator" content="{{ .Site.Params.homepage_meta_tags.meta_twitter_creator }}" />
 </head>
 
 <body>
     {{- partial "alert.html" . -}}
-    <!-- {{- partial "header.html" . -}} -->
+    {{- partial "header.html" . -}}
     <div class="scroll-top rounded-full">
         <span class="icon-keyboard_arrow_up text-2xl"></span>
     </div>
-    <!-- {{- partial "slide.html" . -}} -->
+    {{- partial "slide.html" . -}}
     <!-- {{- partial "strip.html" . -}} -->
     {{ if ne .Site.Params.showBlog false }}
     <div class="mx-auto my-10 max-w-6xl">
-        <h1 class="text-4xl font-bold">Ups! Diese Website wird gerade noch entwickelt.</h1>
-        <hr>
-        <br>
-        <p class="text-2xl font-bold">Trotzdem Interesse an Veranstaltungsservice in Eisleben, Mansfeld-Südharz und Umgebung?
-            <br>
-            Hier meine Kontaktdaten:
-        </p>
-        <ul>
-            <li>Email: <a class="text-white-custom" href="mailto:kontakt@ftecke.de">kontakt@ftecke.de</a></li>
-            <li>Telefon: <span class="text-white-custom">+49 3475 2028989</span></li>
-            <li>WhatsApp: <span class="text-white-custom">+49 176 45960424</span></li>
-            <li>Facebook: <a class="text-white-custom" href="https://www.facebook.com/p/Dj-Ecke-100069638587825/">www.facebook.com</a></li>
-        </ul>
-        <!-- {{- partial "recent.html" . -}} -->
+        <h2 class="text-4xl ml-2">Blog</h2>
+        {{- partial "recent.html" . -}}
     </div>
     {{ end }}
-    <!-- {{- partial "footer.html" . -}} -->
+    {{- partial "footer.html" . -}}
     <script src="{{ "/js/swiper-bundle.min.js" | relURL }}"></script>
     <script>
         var mySwiper = new Swiper(".swiper-container", {

themes/tella/layouts/partials/analytics.html

@@ -1,5 +1,5 @@
-{{ if not hugo.IsServer }}
-{{ with .Site.Config.Services.GoogleAnalytics.ID }}
+{{ if not .Site.IsServer }}
+{{ with .Site.GoogleAnalytics }}
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
 <script>

themes/tella/layouts/partials/head.html

@@ -10,7 +10,7 @@
 <link href='{{ "/css/fa6.min.css" | relURL }}' rel="stylesheet" type="text/css">
 {{ end }}
 {{ $styles := resources.Get "css/style.css" | postCSS }}
-{{ if hugo.IsServer }}
+{{ if .Site.IsServer }}
 <link rel="stylesheet" href="{{ $styles.RelPermalink }}">
 {{ else }}
 {{ $styles := $styles | minify | fingerprint | resources.PostProcess }}

themes/tella/layouts/partials/header.html

@@ -1,5 +1,4 @@
 <header>
-    <meta http-equiv="refresh" content="0;url=https://www.ftecke.de">
     <div id="overlay">
         <ul class="text-center list-none text-white text-3xl">
             {{ range .Site.Menus.main }}

themes/tella/layouts/partials/seo/print.html

@@ -42,7 +42,7 @@
 {{- $.Scratch.SetInMap "seo" "twitter_card" "summary_large_image" -}}
 
 {{/* We check the site config sports a Social.twitter and use as handle */}}
-{{- with .Site.Params.social.twitter -}}
+{{- with .Site.Social.twitter -}}
 	{{- $.Scratch.SetInMap "seo" "twitter_handle" (printf "@%s" .) -}}
 {{- end -}}
 

themes/tella/layouts/products/single.html

@@ -8,7 +8,7 @@
     {{ end }}
     {{ else }}
     {{ end }}
-    <div class="content md:prose-lg lg:prose-xl max-w-none py-1 text-white-custom">{{.Content}}</div>
+    <div class="content prose md:prose-lg lg:prose-xl max-w-none py-1">{{.Content}}</div>
   </div>
 </div>
 {{ end }}