JasTobi/WeihnachtsKalenderMelly
3
0
Fork 0
Code Issues 3 Pull Requests Releases 4 Activity

Compare commits

base: JasTobi:eed8a4ddcfb72ca0cc818088fc088d11a53c247e
Branches Tags
JasTobi:master JasTobi:Develop JasTobi:TinaBibiMellyOrginal
JasTobi:1.3.0 JasTobi:1.2.0 JasTobi:1.1.0 JasTobi:1.0.0
..
compare: JasTobi:TinaBibiMellyOrginal
Branches Tags
JasTobi:Develop JasTobi:TinaBibiMellyOrginal JasTobi:master
JasTobi:1.3.0 JasTobi:1.2.0 JasTobi:1.1.0 JasTobi:1.0.0

7 Commits
eed8a4ddcf ... TinaBibiMe

Author SHA1 Message Date
root
88b6e35593 Merge-Konflikte gelöst: Remote-Version übernommen 2025-11-05 11:40:16 +01:00
Jason
1e30dac000 neue Fassaung 2025-11-05 09:21:47 +01:00
Jason
496ce6691c nav repariert 2025-11-03 21:11:54 +01:00
Jason
6a1455a192 test 2025-11-03 12:34:40 +01:00
Jason
966b2080f4 test 2025-11-03 11:41:30 +01:00
Jason
c1898cfe71 test 2025-11-03 08:01:49 +01:00
Jason
caca5ddb7b sass tür 25 reponses 2025-11-03 07:57:06 +01:00
13 changed files with 258 additions and 11322 deletions
Expand all files Collapse all files

51
gittea.sh Executable file
View File

@@ -0,0 +1,51 @@
#!/bin/bash
# ============================================================
# 🧰 Gitea SSH Fix Script (Version 3)
# Führt vollständige Reparatur von SSH-Keys, Hooks & Rechten durch
# ============================================================
set -euo pipefail
grn='\e[32m'; red='\e[31m'; yel='\e[33m'; nc='\e[0m'
echo -e "${grn}🔧 Starte Gitea SSH-Reparatur...${nc}"
# 1️⃣ Gitea-Binary prüfen
GITEA_BIN=$(command -v gitea || echo "/usr/local/bin/gitea")
echo -e "${grn}➡ Verwende Gitea-Binary:${nc} $GITEA_BIN"
# 2️⃣ Gitea stoppen
echo -e "${yel}⏹ Stoppe Gitea-Service...${nc}"
systemctl stop gitea || echo -e "${red}⚠️ Konnte Gitea nicht stoppen (evtl. nicht aktiv).${nc}"
# 3️⃣ Hooks & Keys regenerieren (richtig: als Benutzer 'git')
echo -e "${grn}♻️ Regeneriere Hooks und Keys...${nc}"
sudo -u git "$GITEA_BIN" --config /etc/gitea/app.ini --work-path /var/lib/gitea admin regenerate hooks
sudo -u git "$GITEA_BIN" --config /etc/gitea/app.ini --work-path /var/lib/gitea admin regenerate keys
# 4️⃣ Berechtigungen für .ssh korrigieren
echo -e "${grn}🧱 Setze Berechtigungen für .ssh...${nc}"
chown -R git:git /home/git/.ssh
chmod 700 /home/git/.ssh
chmod 600 /home/git/.ssh/authorized_keys
# 5️⃣ authorized_keys prüfen
if ! grep -q "command=" /home/git/.ssh/authorized_keys; then
echo -e "${yel}⚠️ Kein 'command='-Eintrag gefunden – ergänze Gitea-Zeile...${nc}"
FIRST_KEY=$(head -n 1 /home/git/.ssh/authorized_keys | awk '{print $NF}')
echo "command=\"$GITEA_BIN --config=/etc/gitea/app.ini serv key-1\",no-port-forwarding,no-agent-forwarding,no-pty ssh-ed25519 $FIRST_KEY" > /home/git/.ssh/authorized_keys
chown git:git /home/git/.ssh/authorized_keys
chmod 600 /home/git/.ssh/authorized_keys
else
echo -e "${grn}✅ authorized_keys sieht gut aus.${nc}"
fi
# 6️⃣ Gitea starten
echo -e "${grn}🚀 Starte Gitea neu...${nc}"
systemctl start gitea
# 7️⃣ SSH-Test lokal
echo -e "${yel}🔍 Kurzer SSH-Test (lokal)...${nc}"
sudo -u git ssh -T git@localhost || true
echo -e "\n${grn}✅ Gitea SSH-Fix abgeschlossen.${nc}"
echo -e "Teste jetzt bitte extern mit:\n ssh -T git@illg.me\noder\n git push"

19
index.php
View File

@@ -25,17 +25,15 @@ if ($tab == "") {$tab = "home";}
<link rel="stylesheet" type="text/css" href="main/min-style.css"> <link rel="stylesheet" type="text/css" href="main/min-style.css">
<script src="main/lightbox-plus-jquery.min.js"></script> <script src="main/lightbox-plus-jquery.min.js"></script>
<link rel="stylesheet" type="text/css" href="main/lightbox.min.css"> <link rel="stylesheet" type="text/css" href="main/lightbox.min.css">
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;700&display=swap" rel="stylesheet">
<script src="main/nav2.js"></script> <script src="main/nav2.js"></script>
<script src="main/.js"></script> <script src="main/.js"></script>
<script src="main/schnee.js"></script> <script src="main/schnee.js"></script>
<!--script src="main/schneeTeet.js"></script--> <!--script src="main/schneeTeet.js"></script-->
<link rel="preload" as="image" href="inc/bg/hufeisen_pattern_1024.webp">
</head> </head>
<!--?php include('main/overlayDebug.js');?-->
<!--header in tap/nav2.php --> <!--header in tap/nav2.php -->
@@ -45,11 +43,9 @@ if ($tab == "") {$tab = "home";}
<body> <body>
<div class="develop">
<div class="bg-layer"></div>
<!--div class="develop">
<h1>!!! Develop !!!</h1> <h1>!!! Develop !!!</h1>
</div--> </div>
<article> <article>
@@ -58,15 +54,8 @@ if ($tab == "") {$tab = "home";}
</article> </article>
<div id="snowman">
<img src="./inc/bg/1605110464788.png" alt="Schneemann" />
</div>
<footer> <footer>
<!--img class="bgTree" src="./inc/bg/golden_christmas_tree.png"></img--> <img src="./inc/bg/1605110464788.png"></img>
<!--img src="./inc/bg/1605110464788.png"></img-->
<a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span> <a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span>
<a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span> <a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span>
<!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span--> <!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span-->

2
main/min-style.css
View File

File diff suppressed because one or more lines are too long

2
main/min-style.css.map
View File

File diff suppressed because one or more lines are too long

8707
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
src/sass/_base.sass
View File

@@ -7,7 +7,8 @@
// 🎨 Farben // 🎨 Farben
// ------------------------------ // ------------------------------
$siteColor: #A0522D $siteColor: #A0522D
$backgroundTxt: hsla(0, 0%, 100%, 0.7) url("../inc/bg/1667917199713.png") -1px -5px no-repeat $backgroundTxt: hsla(0, 0%, 100%, 0.7)
$bgTür: hsla(0, 0%, 100%, 0.3)
$galeryBackgraund: hsla(326, 78.8%, 59.2%, 0.2) $galeryBackgraund: hsla(326, 78.8%, 59.2%, 0.2)
$headerFontColor: #CD853F $headerFontColor: #CD853F
$txtColor: darkred $txtColor: darkred
@@ -24,7 +25,6 @@ $imageGweight: 8rem
// ------------------------------ // ------------------------------
@mixin txt-base($size) @mixin txt-base($size)
font-size: $size font-size: $size
//font-size: calc(#{$size} / 0.7) // kompensiert initial-scale=0.7
font-weight: bold font-weight: bold
color: $txtColor color: $txtColor
font-family: Verdana, Arial, Helvetica, sans-serif font-family: Verdana, Arial, Helvetica, sans-serif

8
src/sass/_kalender.sass
View File

@@ -32,13 +32,13 @@ $doorWidth: math.div($kalenderWidth - 3.5 * $marginLeftRight - 3 * $marginBetwee
width: $doorWidth width: $doorWidth
height: $doorWidth height: $doorWidth
overflow: hidden overflow: hidden
background: hsla(0, 0%, 100%, 0.3) background: $bgTür
h3 h3
padding-top: 1.5rem padding-top: 1.5rem
//font-weight: bold font-weight: bold
padding: 1rem padding: 1.5rem
color: #E8690F color: $siteColor
a a
text-decoration: none text-decoration: none

8
src/sass/_nav2.sass
View File

@@ -4,7 +4,7 @@
$content-width: 1000px $content-width: 1000px
$breakpoint: 799px $breakpoint: 799px
$nav-height: 70px $nav-height: 70px
$nav-background: hsl(0,0%,100%,0.5) $nav-background: $backgroundTxt
$link-hover-color: Lightgrey $link-hover-color: Lightgrey
$nav-background2: url("../inc/bg/christmas-banner-6739203.jpg") 0 86% no-repeat $nav-background2: url("../inc/bg/christmas-banner-6739203.jpg") 0 86% no-repeat
@@ -27,6 +27,8 @@ $nav-background2: url("../inc/bg/christmas-banner-6739203.jpg") 0 86% no-repeat
background-size: 100% background-size: 100%
border-bottom: 4px ridge $siteColor border-bottom: 4px ridge $siteColor
background-size: 100% background-size: 100%
position: relative
z-index: 10000
// Logo and branding // Logo and branding
.brand .brand
@@ -35,7 +37,7 @@ $nav-background2: url("../inc/bg/christmas-banner-6739203.jpg") 0 86% no-repeat
padding-left: 20px padding-left: 20px
float: left float: left
/*line-height: $nav-height /*line-height: $nav-height
/*text-transform: uppercase text-transform: uppercase
font-size: 1.2em font-size: 1.2em
font-weight: bold font-weight: bold
text-shadow: 1px 0 #fff, 0 1px #fff, -1px 0 #fff, 0 -1px #fff text-shadow: 1px 0 #fff, 0 1px #fff, -1px 0 #fff, 0 -1px #fff
@@ -162,6 +164,8 @@ nav
@media screen and (min-width: $breakpoint) @media screen and (min-width: $breakpoint)
.nav-list .nav-list
display: block !important display: block !important
position: relative
z-index: 10001
#nav-toggle #nav-toggle
position: absolute position: absolute

34
src/sass/_tueren.sass
View File

@@ -12,12 +12,12 @@
display: inline-block display: inline-block
@include txt-Absatz @include txt-Absatz
border: 4px ridge $siteColor border: 4px ridge $siteColor
background: $backgroundTxt background: $backgroundTxt url("../inc/bg/1667917199713.png") -1px -5px no-repeat
background-size: 100% background-size: 100%
//background: hsla(0, 0%, 100%, 0.5) //background: hsla(0, 0%, 100%, 0.5)
padding: 0 1.5rem 0 1.5rem padding: 0 1.5rem 0 1.5rem
width: clamp(25rem, 40vw, 50rem) width: clamp(25rem, 40vw, 50rem)
font-weight: 500 margin-bottom: clamp(0.1rem, 2vh, 3rem)
u u
@include txt-Absatz @include txt-Absatz
@@ -38,41 +38,29 @@
width: clamp(100px, 18vw, 150px) width: clamp(100px, 18vw, 150px)
#bibi #bibi
@include personen-txt(darkgreen) @include personen-txt(#007a4e)
#melly #melly
@include personen-txt($melly) @include personen-txt(#6D1F74)
#packa #packa
@include personen-txt(darkgreen) @include personen-txt(#125035)
#tina #tina
@include personen-txt(#8b7500) @include personen-txt(#8b7500)
#alex #alex
@include personen-txt(#36648b) @include personen-txt(#343992)
#otherPerson #otherPerson
@include personen-txt(black) @include personen-txt(black)
#txtGedanken
@include personen-txt(#11486D)
.schneei #txtLesung
@include personen-txt(#676668)
#SRechts //text-decoration: underline
display: inline-block
margin: -5px 8px 0 0
z-index: 5
width: 7rem
float: right
padding: 0
//border: 1px solid red
position: relative
#txt
clip-path: polygon(381px 0%, 100% 150px, 100% 100%, 0% 100%, 0% 0%)
margin-top: -140px
z-index: 0
#schneiiW #schneiiW
display: inline-block display: inline-block

4
src/sass/main.sass
View File

@@ -22,11 +22,12 @@ body
background-color: #fefefe background-color: #fefefe
background-image: url("../inc/bg/hufeisen_pattern_1024.webp") background-image: url("../inc/bg/hufeisen_pattern_1024.webp")
background-repeat: repeat background-repeat: repeat
background-size: 60% background-size: 23rem
background-attachment: scroll background-attachment: scroll
background-position: top center background-position: top center
position: relative position: relative
article article
position: relative position: relative
z-index: 1 z-index: 1
@@ -73,7 +74,6 @@ body::after
width: 100% width: 100%
height: auto height: auto
// ============================= // =============================
// 📄 FOOTER (unter Schneemann) // 📄 FOOTER (unter Schneemann)
// ============================= // =============================

10
tab/home.php
View File

@@ -14,8 +14,6 @@
</div> </div>
<div class="TimeContainer"> <div class="TimeContainer">
<div id="clockdiv"> <div id="clockdiv">
<div> <div>
@@ -64,10 +62,10 @@
console.log(images); console.log(images);
var deadline = new Date("Dec1, 2025 00:00").getTime(); var deadline = new Date("Dec1, 2025 00:00").getTime();
var advent1 = new Date("2025-11-30"); var advent1 = new Date("2024-12-01");
var advent2 = new Date("2025-12-07"); var advent2 = new Date("2024-12-08");
var advent3 = new Date("2025-12-14"); var advent3 = new Date("2024-12-15");
var advent4 = new Date("2025-12-21"); var advent4 = new Date("2024-12-22");
if(advent1.getTime()<=getNow().getTime()) { if(advent1.getTime()<=getNow().getTime()) {
$("#kerze1").show(); $("#kerze1").show();
} }

8
tab/nav2.php
View File

@@ -12,9 +12,9 @@
<!--li> <!--li>
<a href="#!">Galerie</a> <a href="#!">Galerie</a>
<ul class="nav-dropdown"--> <ul class="nav-dropdown"-->
<li> <!--li>
<a href="?tab=galerie">Bilder</a> <a href="?tab=galerie">Bilder</a>
</li> </li-->
<!--li> <!--li>
<a href="?tab=video">Video</a> <a href="?tab=video">Video</a>
</li> </li>
@@ -26,9 +26,9 @@
<!--li> <!--li>
<a href="?tab=filme">Filme</a> <a href="?tab=filme">Filme</a>
</li--> </li-->
<li> <!--li>
<a href="?tab=rezepte">Rezepte</a> <a href="?tab=rezepte">Rezepte</a>
</li> </li-'>
<!--li> <!--li>
<a href="#!">Services</a> <a href="#!">Services</a>
<ul class="nav-dropdown"> <ul class="nav-dropdown">

2717
tab/tuer.php
View File

File diff suppressed because it is too large Load Diff