Compare commits

..

89 Commits

Author SHA1 Message Date
60e294338a [FIX] spaces 2020-05-09 01:13:20 +02:00
4da9acde2f „.drone.yml“ ändern 2020-05-09 01:06:51 +02:00
add5332d64 „.drone.yml“ ändern 2020-05-09 00:53:05 +02:00
f29aa3e502 [TASK] change image for netcloud upload 2020-05-09 00:30:47 +02:00
7c8cc33d1d [TASK] add cache to drone 2020-05-09 00:17:10 +02:00
663a090b3f [TASK] update drone.yml 2020-05-09 00:01:18 +02:00
bfc736749f [TASK] cleanup 2020-05-08 23:45:24 +02:00
e60acaf273 [FIX] some bugs 2020-05-08 23:45:08 +02:00
d17135be58 [TASK] remove masonry 2020-05-08 22:42:23 +02:00
cd46a90e32 [TASK] watch js 2020-05-08 22:41:20 +02:00
a54748e6a7 [TASK] thumbnail-task 2020-05-08 21:02:03 +02:00
8f108f63be [TASK] less favicons 2020-05-08 20:48:20 +02:00
4ce7b26b5a Dockerfile updated 2020-05-08 19:11:22 +02:00
bc1487f2f1 Dockerfile updated 2020-05-08 18:55:29 +02:00
0d3ac5297a Dockerfile updated 2020-05-08 18:38:46 +02:00
8e8feafd62 Dockerfile updated 2020-05-08 18:29:28 +02:00
a35df5f235 Dockerfile updated 2020-05-08 18:20:38 +02:00
f414da24f7 Dockerfile updated 2020-05-08 18:13:10 +02:00
b8ae799fa1 add packagelock and style.css 2020-05-08 18:01:49 +02:00
51979a2d61 Dockerfile updated 2020-05-08 17:31:47 +02:00
a7706883fe Dockerfile updated 2020-05-08 17:25:04 +02:00
49930a87a1 Dockerfile updated 2020-05-08 17:17:22 +02:00
9dafffc612 update Dockerfile 2020-05-08 17:10:44 +02:00
f8b9952e79 „Scripte/Dockerfile“ ändern 2020-05-08 09:38:19 +02:00
004deccf84 „package-lock.json“ löschen 2020-05-08 09:28:07 +02:00
5388f445f0 „package.json“ ändern 2020-05-08 09:27:51 +02:00
2264cd063a „gulpfile.js“ ändern 2020-05-08 08:59:29 +02:00
84b455ce96 „src/index.html“ ändern 2020-05-08 08:55:35 +02:00
7d12b2fe89 „Scripte/Dockerfile“ ändern 2020-05-08 07:11:08 +02:00
f019f28f6e „Scripte/Dockerfile“ ändern 2020-05-08 07:01:21 +02:00
edac0b21af [FIX] typo 2020-05-07 21:53:17 +02:00
68ac3d81d6 [FIX] missing version 2020-05-07 21:50:56 +02:00
f4ed7d5f6d [TASK] add python to image 2020-05-07 21:47:50 +02:00
5f2ba67022 [TASK] switch to node 14 2020-05-07 21:42:59 +02:00
9cb3ded7e6 [FIX] dockerfile 2020-05-07 21:35:12 +02:00
b1f5ebcf7a [TASK] update Dockerfile 2020-05-07 21:23:46 +02:00
d58e4a134a [STYLE] refactor variable to sass 2020-05-07 21:22:12 +02:00
7ca3077c68 Merge branch 'master' of https://git.chrosey.de/chrosey/ferienwohnung-wanderlust 2020-05-07 21:02:33 +02:00
eaf8a67104 [TASK] inject favicon into html 2020-05-07 20:58:36 +02:00
279ef3c808 „.drone.yml“ ändern 2020-05-07 10:27:46 +02:00
f26923af49 „.drone.yml“ ändern 2020-05-07 10:21:51 +02:00
75cbc91f48 „.drone.yml“ ändern
Fehlender Pfad
2020-05-07 10:18:11 +02:00
a2c03de653 „.drone.yml“ ändern 2020-05-07 10:16:18 +02:00
12cd565e80 „.drone.yml“ ändern 2020-05-07 09:48:35 +02:00
cba642c120 „Scripte/Dockerfile“ ändern 2020-05-07 09:47:00 +02:00
389b86d24c „.drone.yml“ ändern
Docker image bauen und nutzen
2020-05-07 09:46:18 +02:00
307632a7df „Scripte/Dockerfile“ hinzufügen 2020-05-07 09:37:25 +02:00
d454ee10f3 „.drone.yml“ ändern 2020-05-07 09:23:23 +02:00
041fb88d49 „.drone.yml“ ändern 2020-05-07 09:21:47 +02:00
d8cf60f916 Erstelle drone. Yml 2020-05-07 00:52:29 +02:00
e839baa058 „index.html“ ändern 2020-05-06 17:07:11 +02:00
74622de82f „index.html“ ändern 2020-05-06 16:45:25 +02:00
84db669698 [TASK] Überschriften und Startbild angepasst
fixes #11
 fixes #7
2020-04-26 17:17:20 +02:00
776ae35c61 [TASK] gulp update 2020-04-26 17:06:09 +02:00
f93401770d [TASK] neues Einstiegsbild 2020-04-26 17:06:00 +02:00
37eccc87ba [TASK] Dateien aus dist entfernen 2020-04-26 17:05:26 +02:00
5295331c85 [TASK] umzug zu gulp-management 2020-04-26 15:41:03 +02:00
df1053a16f [TASK] gulp-managed 2020-04-26 15:40:43 +02:00
3b81a6240b [TASK] refactor queryselector
- ignore only #-hrefs
2020-04-22 22:33:29 +02:00
6302b59647 [TASK] Build 2020-04-22 22:25:42 +02:00
d704e97823 [FIX] falscher Pfad zur Datenschutzerklärung 2020-04-22 22:25:11 +02:00
7dc3232ce4 [TASK] Navigation auf kleinen Displays
fixes #6
2020-04-22 22:21:43 +02:00
4314fd4214 [FIX] Seite im IE falsch dargestellt 2020-04-22 22:04:52 +02:00
a5ee3ace74 [TASK] Dokumente hinzugefügt
fixes #8
fixes #9
2020-04-22 22:01:46 +02:00
28bbcb95cb [TASK] verbesserte WebP im dist 2020-04-11 00:09:34 +02:00
6be38f3307 [DOC] Pakettieranleitung ergänzt 2020-04-11 00:09:07 +02:00
4679127f17 [TASK] Bildqualität beim umwandeln verbessern 2020-04-11 00:08:47 +02:00
f9fb397c13 [TASK] Bildqualität verbessert 2020-04-11 00:08:25 +02:00
a83e77ece8 [DOC] Pakkettier-Anleitung ergänzt 2020-04-11 00:01:16 +02:00
1625206657 [FIX] wget unvollständig
- kein webp/srcset support
2020-04-10 23:58:43 +02:00
691b12ecff [DOC] Paketierung und Deployment 2020-04-10 23:32:16 +02:00
de4cd3d414 [TASK] Paketierung in Ordner dist abgelegt 2020-04-10 23:28:18 +02:00
533468da09 [TASK] Script zur Bildgrößenanpassung hinzugefügt 2020-04-10 23:16:11 +02:00
548f861559 [DOC] Fehlernden Zeilenumbruch hinzugefügt 2020-04-10 23:11:01 +02:00
587d26f02b [DOC] Ein paar Anleitungen hinzugefügt 2020-04-10 23:07:53 +02:00
d9f50ac851 [TASK] Title zu Iframe hinzugefügt 2020-04-10 23:05:56 +02:00
5ae46ac77b [TASK] überschriften richtig gesetzt 2020-04-10 22:59:45 +02:00
75ae0c3168 [TASK] Manifest korrigiert 2020-04-10 22:36:40 +02:00
fc0b8b7fb1 [TASK] kleine Korrekturen 2020-04-10 22:34:39 +02:00
231d3b8ed7 [TASK] WebP-Format verwenden, wo möglich 2020-04-10 22:17:34 +02:00
357267394e [TASK] Footer wieder breiter gemacht 2020-04-10 21:40:09 +02:00
e9d33dee5e [TASK] Abschnittlinks richtig benannt 2020-04-10 21:38:26 +02:00
b1b794bebe [TASK] für große Bildschirme optimiert 2020-04-10 21:35:40 +02:00
25b2f9c608 [TASK] Slider zentrieren 2020-04-10 21:27:22 +02:00
0deefa6b49 [TASK] Anpassungen Slider
- Schrift ist nun lesbar
2020-04-10 21:22:11 +02:00
fae87feaf9 [TASK] verschiedene Änderungen
- footer-banner  Höhe angepasst
- nicht Sprunglinks eingefärbt
- Logo-Größe angepasst
- Viewport-Anpassung
2020-04-10 21:05:46 +02:00
f1913a0e3e [TASK] feste höhe des Sliders entfernt 2020-04-10 21:04:31 +02:00
a3760d3f3e [TASK] verschiedene Anpassungen
- Überschriften einfärben
- Links mit Titeln hinterlegen
- Rechtschreibkorrekturen
- Link zum Google Reiseführer
- Footer neu angepasst
2020-04-10 21:04:02 +02:00
e3e967ebd6 Merge pull request 'task/slider' (#1) from task/slider into master
Reviewed-on: chrosey/ferienwohnung-wanderlust#1
2020-04-10 20:12:58 +02:00
178 changed files with 10263 additions and 186 deletions

72
.drone.yml Normal file
View 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
View File

@ -1 +1,3 @@
bilder/*.jpg node_modules
dist

3
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"gitea.repo": "ferienwohnung-wanderlust"
}

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 649 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 339 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 263 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Some files were not shown because too many files have changed in this diff Show More