marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into homepage

Browse Source
This commit is contained in:
marko
2022-06-06 12:55:28 +02:00
parent 3e3fb6d953 7683785da2
commit 56fe127c81
70 changed files with 383 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
homepage/cwsvJudo/Makefile
View File

@@ -84,7 +84,7 @@ build/.uploadMarker/%.php: build/%.php
mkdir -p build/.uploadMarker
curl \
--upload-file $^ \
--user cwsvjudo:***REMOVED*** \
--user cwsvjudo:kodokan \
ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
@@ -94,11 +94,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php
mkdir -p build/.uploadMarker/amp
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \
--ftp-create-dirs
touch $@
@@ -109,11 +105,7 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
mkdir -p build/.uploadMarker/phpLib/phpcount
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \
--ftp-create-dirs
touch $@
@@ -122,10 +114,14 @@ build/.uploadMarker/css/%.css: build/css/%.css
mkdir -p build/.uploadMarker/css
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
--ftp-create-dirs
@@ -136,10 +132,14 @@ build/.uploadMarker/config/%: config/%
mkdir -p build/.uploadMarker/config
curl \
--upload-file $^ \
<<<<<<< HEAD
--user cwsvjudo:kodokan \
=======
<<<<<<< HEAD
--user cwsvjudo:***REMOVED*** \
=======
--user cwsvjudo:kodokan \
>>>>>>> master
>>>>>>> master
ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
--ftp-create-dirs

2
homepage/cwsvJudo/config/cwsvJudo.config.php
View File

@@ -2,5 +2,5 @@
$cwsvJudoConfig["db"]["host"] = "localhost";
$cwsvJudoConfig["db"]["name"] = "cwsvjudo";
$cwsvJudoConfig["db"]["user"] = "cwsvjudo";
$cwsvJudoConfig["db"]["password"] = "***REMOVED***";
$cwsvJudoConfig["db"]["password"] = "kodokan";
?>

4
homepage/cwsvJudo/config/db.inc
View File

@@ -1,11 +1,11 @@
<?php
$db_server='localhost';
$db_user='cwsvjudo';
$db_password='***REMOVED***';
$db_password='kodokan';
$db_name='cwsvjudo';
$phpcountConfig["db"]["host"] = "localhost";
$phpcountConfig["db"]["name"] = "cwsvjudo";
$phpcountConfig["db"]["user"] = "cwsvjudo";
$phpcountConfig["db"]["password"] = "***REMOVED***";
$phpcountConfig["db"]["password"] = "kodokan";
?>

2
homepage/cwsvJudo/config/phpcount.config.php
View File

@@ -2,7 +2,7 @@
$phpcountConfig["db"]["host"] = "localhost";
$phpcountConfig["db"]["name"] = "cwsvjudo";
$phpcountConfig["db"]["user"] = "cwsvjudo";
$phpcountConfig["db"]["password"] = "***REMOVED***";
$phpcountConfig["db"]["password"] = "kodokan";
$phpcountConfig["db"]["hitsTable"] = "phpcount_hits";
$phpcountConfig["db"]["nodupesTable"] = "phpcount_nodupes";

2
homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.deshakeVp9
View File

@@ -1,12 +1,12 @@
#include Makefile.webmCompress.cfg
getTargetParameter=/home/marko/keeper/cwsvJudo/homepage/cwsvJudo/src/galleryHelper/getFfmpegFlags.py
FFMPEG=ffmpeg
GUETZLI=guetzli
audioBitrate = 32
videoBitrate = $(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< videoBitrate) \
pixelSize=$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)
getTargetParameter = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
ffmpegVideoScaleFilter = scale="if\(gt\(in_w\,in_h\)\,-2\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\)":"if\(gt\(in_w\,in_h\)\,$(shell $(getTargetParameter) --audioBitrate=$(audioBitrate) $< pixelSize)\,-2\)":sws_flags=bicubic
ffmpegVideoFilterDeinterlace = yadif

8
homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.vidGal.cfg
View File

@@ -1,5 +1,5 @@
defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./aufnahmen/videos/*/)))
#targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
# targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
@@ -12,8 +12,8 @@ firstPassLogs = $(addsuffix .firstPassLog-0.log, $(basename $(sourceVideos)))
webmVideos = $(addprefix videos/webm/, $(addsuffix .webm, $(basename $(notdir $(sourceVideos)))))
jpegThumbs = $(addprefix videos/thumbnails/, $(addsuffix .jpg, $(basename $(notdir $(sourceVideos)))))
#makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
makefileDir = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
# makefileDir = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefiles.vidGal.d
makefileDir = home/marko/keeper/cwsvJudo/homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d
FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg
# FFMPEG = /home/marko/Downloads/ffmpeg-4.1.3-amd64-static/ffmpeg

7
homepage/cwsvJudo/src/Makefiles/Makefiles.vidGal.d/Makefile.webmCompress.cfg
View File

@@ -10,11 +10,8 @@ GUETZLI = ~/tmp/guetzli/bin/Release/guetzli
DEFAULT_FFMPEG = ffmpeg
#DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
#GET_VIDEO_DURATION_JSON = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
#getTargetParameter = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
getTargetParameter = ~/keeper/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getFfmpegFlags.py
GET_VIDEO_DURATION_JSON = /home/marko/keeper/cwsvJudo/homepage/cwsvJudo/src/galleryHelper/getVideoDurationJson.py
getTargetParameter = /home/marko/keeper/cwsvJudo/homepage/cwsvJudo/src/galleryHelper/getFfmpegFlags.py
# Für eine schnelle Komprimierung libvpx, sonst vp9

23
homepage/cwsvJudo/src/md/trainingszeiten.md
View File

@@ -27,36 +27,19 @@ Auch wer bereits Mitglied in einem Judoverein ist, aber zum Beispiel
während des Studiums in Chemnitz wohnt, darf gerne mit uns trainieren.
Eine Ummeldung ist dafür nicht nötig.
## Trainingszeiten (aktuelle, während der Pandemie)
Durch die Pandemie sind die Trainingszeiten derzeit angepasst:
- Mittwoch (Kinder/Jugend)
- 16:00--17:45 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
- Freitag (Alle)
- 17:00--18:45 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
## Trainingszeiten (wie sie vor der Pandemie waren und wie sie wieder mal werden sollen)
## Trainingszeiten
- Mittwoch (Kinder/Jugend)
- 16:00--17:45 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
- Freitag (Kinder/Anfänger)
- 16:00--17:15 Uhr
- 16:00--17:45 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
- Zielgruppe: Anfänger und Kinder unter 9 Jahren
- Freitag (Jugend/Fortgeschrittene)
- 17:00--18:30 Uhr
- 17:30--19:10 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
- Zielgruppe: wer die Grundlagen des Judo beherrscht
- Freitag (Jugend/Erwachsene)
- 18:15--19:45 Uhr
- [Dojo Sportplatz Str. Usti nad Labem 42, 09120 Chemnitz][cwsvJudoDojoMap]
- Zielgruppe: Erwachsene und erfahrene Jugend
## Karten der Trainingsstätten

2
homepage/machs/index.php
View File

@@ -23,6 +23,8 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
require_once("./auth.php");
achievementGroup::setDbConnection($dbConnection);
record::setDbConnection($dbConnection);
$achievementGroups = achievementGroup::getAllAchievementGroups();
processPostData($dbConnection, $_POST);

2
homepage/machs/local/dbConf.php
View File

@@ -2,7 +2,7 @@
$db_server='localhost';
$db_user='cwsvjudo';
$db_password='***REMOVED***';
$db_password='kodokan';
$db_name='cwsvjudo';
?>