diff --git a/homepage/cwsvJudo/Makefile b/homepage/cwsvJudo/Makefile index 7de4f85..c2a600c 100644 --- a/homepage/cwsvJudo/Makefile +++ b/homepage/cwsvJudo/Makefile @@ -1,5 +1,7 @@ include Makefile.local +PANDOC_TEMPLATE=materialize-parallax.html + CSSO = node_modules/csso-cli/bin/csso RES_LIST = 64 128 256 512 @@ -53,12 +55,12 @@ INSTALL_DEPENDENCIES: build/css/cwsvJudo.css: $(cssFiles) cat $^ | $(CSSO) -o $@ -build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate +build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/$(PANDOC_TEMPLATE) mkdir -p build pandoc \ --standalone \ --css="ressourcen/css/cwsvJudo.css" \ - --template=pandocTemplate/cwsvJudo.html5.pandocTemplate \ + --template=pandocTemplate/$(PANDOC_TEMPLATE) \ --to=html \ --output=$@ \ $< $(word 2,$^) diff --git a/homepage/cwsvJudo/Makefile.heliohost b/homepage/cwsvJudo/Makefile.heliohost index 3832578..7509e70 100644 --- a/homepage/cwsvJudo/Makefile.heliohost +++ b/homepage/cwsvJudo/Makefile.heliohost @@ -12,11 +12,15 @@ configFiles = $(wildcard config/*.php) LN = ln -f .PHONY: all -all: build/css/cwsvJudo.css pages +all: build/css/cwsvJudo.css pages images # @todo This should only be temporary. Better outsource the graphics to it's own Makefile. make -j graphiken make build/css/cwsvJudo.css +.PHONY: images +images: + cp -r graphiken/wallpapers build/graphiken + .PHONY: clean clean: $(RM) -rf build @@ -80,6 +84,9 @@ dist: all # - wappen mkdir -p $(distDir)/httpdocs/ressourcen/graphiken/logos find ./build/graphiken/cwsvJudoLogoWappen -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/graphiken/logos \; +# - wallpapers + mkdir -p $(distDir)/httpdocs/ressourcen/graphiken/wallpapers + find ./build/graphiken/wallpapers -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/graphiken/wallpapers \; # - icons mkdir -p $(distDir)/httpdocs/ressourcen/graphiken/icons find ./graphiken/icons -type f -exec $(LN) {} $(distDir)/httpdocs/ressourcen/graphiken/icons \; @@ -93,8 +100,8 @@ dist: all # - others $(LN) ./res/IntegrationDurchSport2018.250x.png $(distDir)/httpdocs/ressourcen/graphiken/logos # - api - mkdir -p $(distDir)/httpdocs/api - find ./src/api -type f -exec $(LN) {} $(distDir)/httpdocs/api \; +# mkdir -p $(distDir)/httpdocs/api +# find ./src/api -type f -exec $(LN) {} $(distDir)/httpdocs/api \; # css mkdir -p $(distDir)/httpdocs/ressourcen/css $(LN) ./build/css/cwsvJudo.css $(distDir)/httpdocs/ressourcen/css/cwsvJudo.css diff --git a/homepage/cwsvJudo/Makefile.heliohost.config b/homepage/cwsvJudo/Makefile.heliohost.config index 46300f9..509c02b 100644 --- a/homepage/cwsvJudo/Makefile.heliohost.config +++ b/homepage/cwsvJudo/Makefile.heliohost.config @@ -8,7 +8,8 @@ VERSION_GOOGLE_MATERIAL_ICONS = 4.0.0 # where to put the distribution distDir = ./build/dist/heliohost # which pandoc template to use -pandocTemplate = pandocTemplate/materialize-fromScratch.html +pandocTemplate = pandocTemplate/materialize-parallax.html + # css optimizer to use CSSO = node_modules/csso-cli/bin/csso diff --git a/homepage/cwsvJudo/docker-compose.yaml b/homepage/cwsvJudo/docker-compose.yaml index e87fd6d..fcf9da8 100644 --- a/homepage/cwsvJudo/docker-compose.yaml +++ b/homepage/cwsvJudo/docker-compose.yaml @@ -7,7 +7,8 @@ services: context: . dockerfile: PHP.dockerfile ports: - - "8080:80" #this line maps your pc port to the container port + # this line maps your pc port to the container port + - "8080:80" depends_on: # this line links this container to the db container - db diff --git a/homepage/cwsvJudo/graphiken/wallpapers/judo-4454835.jpg b/homepage/cwsvJudo/graphiken/wallpapers/judo-4454835.jpg new file mode 100644 index 0000000..ac5ed25 Binary files /dev/null and b/homepage/cwsvJudo/graphiken/wallpapers/judo-4454835.jpg differ diff --git a/homepage/cwsvJudo/graphiken/wallpapers/judo-4454836.jpg b/homepage/cwsvJudo/graphiken/wallpapers/judo-4454836.jpg new file mode 100644 index 0000000..01e465a Binary files /dev/null and b/homepage/cwsvJudo/graphiken/wallpapers/judo-4454836.jpg differ diff --git a/homepage/cwsvJudo/graphiken/wallpapers/youth-864663.jpg b/homepage/cwsvJudo/graphiken/wallpapers/youth-864663.jpg new file mode 100644 index 0000000..e15407c Binary files /dev/null and b/homepage/cwsvJudo/graphiken/wallpapers/youth-864663.jpg differ diff --git a/homepage/cwsvJudo/pandocTemplate/materialize-parallax.html b/homepage/cwsvJudo/pandocTemplate/materialize-parallax.html new file mode 100644 index 0000000..391765a --- /dev/null +++ b/homepage/cwsvJudo/pandocTemplate/materialize-parallax.html @@ -0,0 +1,50 @@ + + + +
+ + + + + + + + + +

