diff --git a/build.gradle b/build.gradle index b5f07b7..7532e2e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.3.4' +version = '0.3.5' sourceCompatibility = 17 mainClassName = "de.jottyfan.camporganizer.Main" diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/DatenschutzController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/DatenschutzController.java new file mode 100644 index 0000000..776c4ae --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/DatenschutzController.java @@ -0,0 +1,23 @@ +package de.jottyfan.camporganizer.module.staticpages; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * @author jotty + * + */ +@Controller +public class DatenschutzController { + + /** + * load the datenschutz page + * + * @return the datenschutz page + */ + @GetMapping("/datenschutz") + public String getDatenschutz() { + return "/datenschutz"; + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/ImpressumController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/ImpressumController.java new file mode 100644 index 0000000..2d19c8a --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/ImpressumController.java @@ -0,0 +1,23 @@ +package de.jottyfan.camporganizer.module.staticpages; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * @author jotty + * + */ +@Controller +public class ImpressumController { + + /** + * load the impressum page + * + * @return the impresum page + */ + @GetMapping("/impressum") + public String getImpressum() { + return "/impressum"; + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/KontaktController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/KontaktController.java new file mode 100644 index 0000000..d6484f5 --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/KontaktController.java @@ -0,0 +1,23 @@ +package de.jottyfan.camporganizer.module.staticpages; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * @author jotty + * + */ +@Controller +public class KontaktController { + + /** + * load the kontakt page + * + * @return the kontakt page + */ + @GetMapping("/kontakt") + public String getKontakt() { + return "/kontakt"; + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/ReportsController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/ReportsController.java new file mode 100644 index 0000000..0763f31 --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/ReportsController.java @@ -0,0 +1,24 @@ +package de.jottyfan.camporganizer.module.staticpages; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +/** + * + * @author jotty + * + */ +@Controller +public class ReportsController { + + /** + * load the sub page + * + * @return the sub page + */ + @GetMapping("/reports/{subpage}") + public String getSubpage(@PathVariable("subpage") String subpage) { + return "/reports/" + subpage; + } +} diff --git a/src/main/java/de/jottyfan/camporganizer/module/staticpages/VereinController.java b/src/main/java/de/jottyfan/camporganizer/module/staticpages/VereinController.java new file mode 100644 index 0000000..070dd3e --- /dev/null +++ b/src/main/java/de/jottyfan/camporganizer/module/staticpages/VereinController.java @@ -0,0 +1,23 @@ +package de.jottyfan.camporganizer.module.staticpages; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * @author jotty + * + */ +@Controller +public class VereinController { + + /** + * load the verein page + * + * @return the verein page + */ + @GetMapping("/verein") + public String getVerein() { + return "/verein"; + } +} diff --git a/src/main/resources/static/anmeldung.html b/src/main/resources/static/anmeldung.html deleted file mode 100644 index b24aa37..0000000 --- a/src/main/resources/static/anmeldung.html +++ /dev/null @@ -1,10 +0,0 @@ -

- Anmeldung - Anleitung zur Benutzung des Buchungsportals -

- -
- jetzt anmelden -
\ No newline at end of file diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 80ab00c..a611d7c 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -401,4 +401,32 @@ div { max-width: 660px; margin-left: auto; margin-right: auto; -} \ No newline at end of file +} + +.blocktext { + max-width: 1200px; + margin: 0 auto; +} + +.blocktext786 { + max-width: 786px; + margin: 0 auto; +} + +.leftimage { + margin-right: 32px; +} + +.rightimage { + margin-left: 32px; +} + +.center { + text-align: center; +} + +.right { + text-align: right; +} + + diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 10c98bd..74d1f7d 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -31,7 +31,7 @@ - + diff --git a/src/main/resources/templates/camplist.html b/src/main/resources/templates/camplist.html index 0462050..b7cb3f7 100644 --- a/src/main/resources/templates/camplist.html +++ b/src/main/resources/templates/camplist.html @@ -5,15 +5,6 @@ - - - -