Compare commits
89 Commits
task/slide
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 60e294338a | |||
| 4da9acde2f | |||
| add5332d64 | |||
| f29aa3e502 | |||
| 7c8cc33d1d | |||
| 663a090b3f | |||
| bfc736749f | |||
| e60acaf273 | |||
| d17135be58 | |||
| cd46a90e32 | |||
| a54748e6a7 | |||
| 8f108f63be | |||
| 4ce7b26b5a | |||
| bc1487f2f1 | |||
| 0d3ac5297a | |||
| 8e8feafd62 | |||
| a35df5f235 | |||
| f414da24f7 | |||
| b8ae799fa1 | |||
| 51979a2d61 | |||
| a7706883fe | |||
| 49930a87a1 | |||
| 9dafffc612 | |||
| f8b9952e79 | |||
| 004deccf84 | |||
| 5388f445f0 | |||
| 2264cd063a | |||
| 84b455ce96 | |||
| 7d12b2fe89 | |||
| f019f28f6e | |||
| edac0b21af | |||
| 68ac3d81d6 | |||
| f4ed7d5f6d | |||
| 5f2ba67022 | |||
| 9cb3ded7e6 | |||
| b1f5ebcf7a | |||
| d58e4a134a | |||
| 7ca3077c68 | |||
| eaf8a67104 | |||
| 279ef3c808 | |||
| f26923af49 | |||
| 75cbc91f48 | |||
| a2c03de653 | |||
| 12cd565e80 | |||
| cba642c120 | |||
| 389b86d24c | |||
| 307632a7df | |||
| d454ee10f3 | |||
| 041fb88d49 | |||
| d8cf60f916 | |||
| e839baa058 | |||
| 74622de82f | |||
| 84db669698 | |||
| 776ae35c61 | |||
| f93401770d | |||
| 37eccc87ba | |||
| 5295331c85 | |||
| df1053a16f | |||
| 3b81a6240b | |||
| 6302b59647 | |||
| d704e97823 | |||
| 7dc3232ce4 | |||
| 4314fd4214 | |||
| a5ee3ace74 | |||
| 28bbcb95cb | |||
| 6be38f3307 | |||
| 4679127f17 | |||
| f9fb397c13 | |||
| a83e77ece8 | |||
| 1625206657 | |||
| 691b12ecff | |||
| de4cd3d414 | |||
| 533468da09 | |||
| 548f861559 | |||
| 587d26f02b | |||
| d9f50ac851 | |||
| 5ae46ac77b | |||
| 75ae0c3168 | |||
| fc0b8b7fb1 | |||
| 231d3b8ed7 | |||
| 357267394e | |||
| e9d33dee5e | |||
| b1b794bebe | |||
| 25b2f9c608 | |||
| 0deefa6b49 | |||
| fae87feaf9 | |||
| f1913a0e3e | |||
| a3760d3f3e | |||
| e3e967ebd6 |
72
.drone.yml
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Restore Cache
|
||||||
|
image: drillster/drone-volume-cache
|
||||||
|
volumes:
|
||||||
|
- name: cache
|
||||||
|
path: /cache
|
||||||
|
settings:
|
||||||
|
restore: true
|
||||||
|
mount:
|
||||||
|
- ./node_modules
|
||||||
|
- ./dist
|
||||||
|
|
||||||
|
- name: Build DockerImage
|
||||||
|
image: docker
|
||||||
|
volumes:
|
||||||
|
- name: docker_sock
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
commands:
|
||||||
|
- docker build --no-cache -t gulp-node:1 -f Scripte/Dockerfile .
|
||||||
|
|
||||||
|
- name: Build Website
|
||||||
|
image: gulp-node:1
|
||||||
|
commands:
|
||||||
|
- npm install
|
||||||
|
- gulp
|
||||||
|
- zip public.zip -r dist/*
|
||||||
|
|
||||||
|
- name: Rebuild Cache
|
||||||
|
image: drillster/drone-volume-cache
|
||||||
|
volumes:
|
||||||
|
- name: cache
|
||||||
|
path: /cache
|
||||||
|
settings:
|
||||||
|
rebuild: true
|
||||||
|
mount:
|
||||||
|
- ./node_modules
|
||||||
|
- ./dist
|
||||||
|
|
||||||
|
- name: Upload To Gitea-Release
|
||||||
|
image: plugins/gitea-release
|
||||||
|
settings:
|
||||||
|
base_url: https://git.chrosey.de
|
||||||
|
api_key:
|
||||||
|
from_secret: gitea_token
|
||||||
|
files:
|
||||||
|
- public.zip
|
||||||
|
when:
|
||||||
|
event: tag
|
||||||
|
|
||||||
|
- name: Upload to Nextcloud
|
||||||
|
image: gam2046/drone-webdav
|
||||||
|
settings:
|
||||||
|
file: public.zip
|
||||||
|
destination: https://nextcloud.chrosey.de/remote.php/dav/files/chrosey/elkes_homepage/
|
||||||
|
username:
|
||||||
|
from_secret: webdav_username
|
||||||
|
password:
|
||||||
|
from_secret: webdav_password
|
||||||
|
when:
|
||||||
|
event: tag
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: docker_sock
|
||||||
|
host:
|
||||||
|
path: /var/run/docker.sock
|
||||||
|
- name: cache
|
||||||
|
host:
|
||||||
|
path: /volume2/docker2/dronecache
|
||||||
4
.gitignore
vendored
@ -1 +1,3 @@
|
|||||||
bilder/*.jpg
|
node_modules
|
||||||
|
dist
|
||||||
|
|
||||||
|
|||||||
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"gitea.repo": "ferienwohnung-wanderlust"
|
||||||
|
}
|
||||||
38
README.md
@ -0,0 +1,38 @@
|
|||||||
|
# Ferienwohnung "Wanderlust"
|
||||||
|
|
||||||
|
Webseite für die Ferienwohnung der Familie Frank
|
||||||
|
|
||||||
|
[Testseite](https://ferienwohnung.chrosey.de)
|
||||||
|
[Zielseite](https://www.ferienwohnung-friedrichroda.de)
|
||||||
|
|
||||||
|
|
||||||
|
## Neue Bilder zum Slider hinzufügen
|
||||||
|
1. das gewünschte Bild in der richtigen Größe hochladen (1500px Breite) und in den Ordner `bilder/1500px` ablegen
|
||||||
|
2. in der index.html nach `div.slider` suchen
|
||||||
|
3. innerhalb des Elements `div.slides` ein komplettes `li`-Element kopieren
|
||||||
|
4. das kopierte Element an die gewünscht Stelle schieben
|
||||||
|
5. in dem eingefügen Element den Dateinamen in `img[src]` ersetzen durch den der hochgeladenen Datei
|
||||||
|
6. die Bildbeschreibung `img[alt]` und die angezeigte Betitelung `div.caption>div.card-panel>h3` anpassen
|
||||||
|
|
||||||
|
## Parallax-Bild ausstauschen
|
||||||
|
1. das gewünschte Bild in der richgtigen Größe hochladen (2400px Breite) und in den Ordner `bilder/2400px` ablegen
|
||||||
|
2. den Parallax-Bereich suchen, der ausgetauscht werden soll
|
||||||
|
3. den Dateinamen in `img[src]` ersetzen durch den der hochgeladenen Datei
|
||||||
|
4. die Bildbeschreibung austauschen `img[alt]`
|
||||||
|
|
||||||
|
## Farben wechseln
|
||||||
|
1. die gewünschte Farbe bei [materialize.css](https://materializecss.com/color.html#palette) suchen
|
||||||
|
2. in der `index.html` nach der der alten Farbe suchen und durch die neue ersetzen (`.old-color.old-color-modifier`)
|
||||||
|
3. in der `style.css` nach `a:not([href^='#'])` suchen und durch den Farbcode der neuen Farbe ersetzen
|
||||||
|
|
||||||
|
## Pakettieren
|
||||||
|
1. Webserver im root-Verzeichnis starten (zB als localhost:5500)
|
||||||
|
2. `wget --recursive http://localhost:5500/ -P dist -nH` ausführen
|
||||||
|
3. `find dist/bilder/ -type f -name *.jpg | cut -c 6- | xargs -I{} cp "{}.webp" "dist/{}.webp"`
|
||||||
|
4. aus der `dist/index.html` den Bereich "code injected by LiveServer" entfernen
|
||||||
|
|
||||||
|
## Deployment
|
||||||
|
nur die Inhalte aus dem Ordner dist sind für die Webseite nötig, der Rest wird auf der Webseite nicht verwendet.
|
||||||
|
1. Verbinung zu Ziel-Server herstellen
|
||||||
|
2. zum DocumentRoot navigieren
|
||||||
|
3. Inhalte aus dem Verzeichnis `dist` in das entfernte DocRoot-Verzeichnis synchronisieren
|
||||||
3
Scripte/Dockerfile
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
FROM node:14-alpine
|
||||||
|
RUN apk --no-cache add python make gcc g++ graphicsmagick autoconf automake libtool zlib file pkgconfig nasm libpng-dev zip
|
||||||
|
RUN npm install -g gulp
|
||||||
39
Scripte/batch-image-resize.sh
Executable file
@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
# Purpose: batch image resizer
|
||||||
|
# Source: https://guides.wp-bullet.com
|
||||||
|
# Author: Mike
|
||||||
|
|
||||||
|
# absolute path to image folder
|
||||||
|
|
||||||
|
declare -A dimensions
|
||||||
|
dimensions["2400"]="1600"
|
||||||
|
dimensions["1500"]="1000"
|
||||||
|
dimensions["150"]="150"
|
||||||
|
dimensions["100"]="100"
|
||||||
|
folders="../bilder"
|
||||||
|
|
||||||
|
for WIDTH in "${!dimensions[@]}"; do
|
||||||
|
|
||||||
|
# max height
|
||||||
|
HEIGHT=${dimensions[$WIDTH]}
|
||||||
|
|
||||||
|
for FOLDER in $folders; do
|
||||||
|
cd $FOLDER
|
||||||
|
mkdir "${WIDTH}px"
|
||||||
|
|
||||||
|
for file in $FOLDER/*.jpg; do
|
||||||
|
#echo $file;
|
||||||
|
filename=$(basename $file)
|
||||||
|
targetname="${WIDTH}px/${filename}"
|
||||||
|
|
||||||
|
echo "erstelle $webpName"
|
||||||
|
convert $file -quality 90 -resize "${WIDTH}x${HEIGHT}" "$targetname";
|
||||||
|
|
||||||
|
webpName="${WIDTH}px/${filename}.webp"
|
||||||
|
echo "erstelle $webpName"
|
||||||
|
convert $targetname -quality 90 -define webp "$webpName"
|
||||||
|
done
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
done
|
||||||
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 649 KiB |
|
Before Width: | Height: | Size: 291 KiB |
|
Before Width: | Height: | Size: 339 KiB |
|
Before Width: | Height: | Size: 105 KiB |
|
Before Width: | Height: | Size: 327 KiB |
|
Before Width: | Height: | Size: 106 KiB |
|
Before Width: | Height: | Size: 237 KiB |
|
Before Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 268 KiB |
|
Before Width: | Height: | Size: 87 KiB |
|
Before Width: | Height: | Size: 302 KiB |
|
Before Width: | Height: | Size: 99 KiB |
|
Before Width: | Height: | Size: 200 KiB |
|
Before Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 130 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 203 KiB |
|
Before Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 219 KiB |
|
Before Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 265 KiB |
|
Before Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 208 KiB |
|
Before Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 263 KiB |
|
Before Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 168 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 238 KiB |
|
Before Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 275 KiB |
|
Before Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 51 KiB |
|
Before Width: | Height: | Size: 47 KiB |
|
Before Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 46 KiB |