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

Compare commits

base: JasTobi:c1898cfe7103c8f173254ae41f686b7c600b0a70
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

5 Commits
c1898cfe71 ... 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
11 changed files with 247 additions and 11313 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/_nav2.sass
View File

@@ -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
@@ -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

33
src/sass/_tueren.sass
View File

@@ -38,44 +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
position: relative @include personen-txt(#676668)
display: flex //text-decoration: underline
flex-direction: column
align-items: center
#SRechts
margin: -5px 8px 0 0
z-index: 5
width: 7rem
right: -13.5rem
padding: 0
//border: 1px solid red
position: relative
#txt
clip-path: polygon(375px 0%, 100% 140px, 100% 100%, 0% 100%, 0% 0%)
margin-top: -9rem
z-index: 3
#schneiiW #schneiiW
display: inline-block display: inline-block

3
src/sass/main.sass
View File

@@ -1,5 +1,5 @@
//cwebp <Datei> -q 80 -o <name>.webp //cwebp <Datei> -q 80 -o <name>.webp
//Import teet //Import
//#################### //####################
@use 'base' as * @use 'base' as *
@use 'nav2' @use 'nav2'
@@ -27,6 +27,7 @@ body
background-position: top center background-position: top center
position: relative position: relative
article article
position: relative position: relative
z-index: 1 z-index: 1

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