From f6155f9510d25c0838749dba4465543be19b9433 Mon Sep 17 00:00:00 2001 From: jbb01 <32650546+jbb01@users.noreply.github.com> Date: Fri, 10 Mar 2023 20:43:49 +0100 Subject: [PATCH] add existing code --- build.gradle.kts | 47 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 ++++ gradlew.bat | 91 ++ settings.gradle.kts | 1 + .../jonahbauer/survey/ServletInitializer.java | 13 + .../jonahbauer/survey/SurveyApplication.java | 11 + .../survey/controller/ErrorController.java | 20 + .../survey/controller/IndexController.java | 44 + .../survey/controller/LoginController.java | 24 + .../survey/controller/RegisterController.java | 53 + .../survey/SurveyCreateController.java | 98 ++ .../survey/SurveyEvaluationController.java | 42 + .../survey/SurveyListController.java | 70 + .../survey/SurveyParticipationController.java | 121 ++ .../survey/model/RegistrationForm.java | 20 + .../survey/model/SurveyCreateForm.java | 102 ++ .../survey/model/SurveyParticipationForm.java | 12 + .../survey/persistence/entity/Answer.java | 60 + .../persistence/entity/AnswerEvaluation.java | 29 + .../survey/persistence/entity/Question.java | 84 ++ .../survey/persistence/entity/Submission.java | 63 + .../survey/persistence/entity/Survey.java | 82 ++ .../survey/persistence/entity/User.java | 59 + .../repository/SubmissionRepository.java | 7 + .../repository/SurveyRepository.java | 29 + .../repository/UserRepository.java | 8 + .../survey/spring/MimeTypeConfig.java | 21 + .../survey/spring/SecurityConfig.java | 57 + .../survey/spring/ThymeleafConfig.java | 79 ++ .../survey/spring/WebMvcConfig.java | 54 + .../survey/validation/PasswordValidator.java | 32 + .../validation/constraints/Password.java | 20 + src/main/resources/application-dev.properties | 8 + .../resources/application-prod.properties | 6 + src/main/resources/application.properties | 12 + src/main/resources/db/migration/V1__init.sql | 75 + .../db/migration/V2__add_sample_data.sql | 104 ++ src/main/resources/log4j2.xml | 16 + src/main/resources/messages.properties | 112 ++ src/main/resources/static/css/main.css | 1229 +++++++++++++++++ src/main/resources/static/css/normalize.css | 349 +++++ src/main/resources/static/css/slider.css | 28 + src/main/resources/static/img/favicon.png | Bin 0 -> 355 bytes src/main/resources/static/img/icon.svg | 22 + src/main/resources/static/js/entertab.js | 8 + src/main/resources/static/js/slider.js | 162 +++ src/main/resources/static/js/survey.js | 134 ++ src/main/resources/templates/error.html | 26 + .../templates/fragments/generic.html | 56 + .../resources/templates/fragments/survey.html | 37 + src/main/resources/templates/index.html | 34 + src/main/resources/templates/login.html | 58 + src/main/resources/templates/register.html | 58 + .../resources/templates/survey/create.html | 119 ++ .../templates/survey/evaluation.html | 65 + src/main/resources/templates/survey/list.html | 18 + .../templates/survey/participate.html | 84 ++ 59 files changed, 4518 insertions(+) create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/eu/jonahbauer/survey/ServletInitializer.java create mode 100644 src/main/java/eu/jonahbauer/survey/SurveyApplication.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/ErrorController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/IndexController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/LoginController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/RegisterController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/survey/SurveyCreateController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/survey/SurveyEvaluationController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/survey/SurveyListController.java create mode 100644 src/main/java/eu/jonahbauer/survey/controller/survey/SurveyParticipationController.java create mode 100644 src/main/java/eu/jonahbauer/survey/model/RegistrationForm.java create mode 100644 src/main/java/eu/jonahbauer/survey/model/SurveyCreateForm.java create mode 100644 src/main/java/eu/jonahbauer/survey/model/SurveyParticipationForm.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/Answer.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/AnswerEvaluation.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/Question.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/Submission.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/Survey.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/entity/User.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/repository/SubmissionRepository.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/repository/SurveyRepository.java create mode 100644 src/main/java/eu/jonahbauer/survey/persistence/repository/UserRepository.java create mode 100644 src/main/java/eu/jonahbauer/survey/spring/MimeTypeConfig.java create mode 100644 src/main/java/eu/jonahbauer/survey/spring/SecurityConfig.java create mode 100644 src/main/java/eu/jonahbauer/survey/spring/ThymeleafConfig.java create mode 100644 src/main/java/eu/jonahbauer/survey/spring/WebMvcConfig.java create mode 100644 src/main/java/eu/jonahbauer/survey/validation/PasswordValidator.java create mode 100644 src/main/java/eu/jonahbauer/survey/validation/constraints/Password.java create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application-prod.properties create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/db/migration/V1__init.sql create mode 100644 src/main/resources/db/migration/V2__add_sample_data.sql create mode 100644 src/main/resources/log4j2.xml create mode 100644 src/main/resources/messages.properties create mode 100644 src/main/resources/static/css/main.css create mode 100644 src/main/resources/static/css/normalize.css create mode 100644 src/main/resources/static/css/slider.css create mode 100644 src/main/resources/static/img/favicon.png create mode 100644 src/main/resources/static/img/icon.svg create mode 100644 src/main/resources/static/js/entertab.js create mode 100644 src/main/resources/static/js/slider.js create mode 100644 src/main/resources/static/js/survey.js create mode 100644 src/main/resources/templates/error.html create mode 100644 src/main/resources/templates/fragments/generic.html create mode 100644 src/main/resources/templates/fragments/survey.html create mode 100644 src/main/resources/templates/index.html create mode 100644 src/main/resources/templates/login.html create mode 100644 src/main/resources/templates/register.html create mode 100644 src/main/resources/templates/survey/create.html create mode 100644 src/main/resources/templates/survey/evaluation.html create mode 100644 src/main/resources/templates/survey/list.html create mode 100644 src/main/resources/templates/survey/participate.html diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..fad944a --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,47 @@ +plugins { + java + war + id("org.springframework.boot") version "3.0.4" + id("io.spring.dependency-management") version "1.1.0" +} + +group = "eu.jonahbauer" +version = "0.0.1-SNAPSHOT" + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +repositories { + mavenCentral() +} + +configurations { + all { + exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging") + } +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter") + implementation("org.springframework.boot:spring-boot-starter-log4j2") + implementation("org.springframework.boot:spring-boot-starter-validation") + compileOnly("org.springframework.boot:spring-boot-devtools") + + // Web + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-thymeleaf") + implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6") + providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") + + // Database + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.flywaydb:flyway-core") + implementation("org.mariadb.jdbc:mariadb-java-client:3.1.2") + implementation("com.h2database:h2") + + compileOnly("org.projectlombok:lombok:1.18.26") + annotationProcessor("org.projectlombok:lombok:1.18.26") +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..8eb4158 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "survey" diff --git a/src/main/java/eu/jonahbauer/survey/ServletInitializer.java b/src/main/java/eu/jonahbauer/survey/ServletInitializer.java new file mode 100644 index 0000000..c375a31 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/ServletInitializer.java @@ -0,0 +1,13 @@ +package eu.jonahbauer.survey; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(SurveyApplication.class); + } + +} diff --git a/src/main/java/eu/jonahbauer/survey/SurveyApplication.java b/src/main/java/eu/jonahbauer/survey/SurveyApplication.java new file mode 100644 index 0000000..43779c7 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/SurveyApplication.java @@ -0,0 +1,11 @@ +package eu.jonahbauer.survey; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SurveyApplication { + public static void main(String[] args) { + SpringApplication.run(SurveyApplication.class, args); + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/ErrorController.java b/src/main/java/eu/jonahbauer/survey/controller/ErrorController.java new file mode 100644 index 0000000..a7c64e0 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/ErrorController.java @@ -0,0 +1,20 @@ +package eu.jonahbauer.survey.controller; + +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +public class ErrorController implements org.springframework.boot.web.servlet.error.ErrorController { + + @RequestMapping("/error") + public String handleError(HttpServletRequest request, Model model) { + int statusCode = (Integer) request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE); + + model.addAttribute("code", statusCode); + + return "error"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/IndexController.java b/src/main/java/eu/jonahbauer/survey/controller/IndexController.java new file mode 100644 index 0000000..a736426 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/IndexController.java @@ -0,0 +1,44 @@ +package eu.jonahbauer.survey.controller; + +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.entity.User; +import eu.jonahbauer.survey.persistence.repository.SurveyRepository; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class IndexController { + private final SurveyRepository surveyRepository; + + @GetMapping({"/index", "/", "/index.html"}) + public String index(Authentication authentication, Model model) { + Pageable pageableRecent = PageRequest.of(0, 8, Sort.by(Sort.Direction.DESC, "created")); + Page recentSurveys = getSurveyRepository().findAll(pageableRecent); + + Pageable pageableHot = PageRequest.of(0, 8); + Page hotSurveys = getSurveyRepository().findAllSortedBySubmissionCountDesc(pageableHot); + + model.addAttribute("recent", recentSurveys); + model.addAttribute("hot", hotSurveys); + + if (authentication != null) { + User user = (User) authentication.getPrincipal(); + Pageable pageableOwn = PageRequest.of(0, 8, Sort.by(Sort.Direction.DESC, "created")); + Page ownSurveys = getSurveyRepository().findAllByOwner(user, pageableOwn); + model.addAttribute("own", ownSurveys); + } + + return "index"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/LoginController.java b/src/main/java/eu/jonahbauer/survey/controller/LoginController.java new file mode 100644 index 0000000..a8e6c09 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/LoginController.java @@ -0,0 +1,24 @@ +package eu.jonahbauer.survey.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +public class LoginController { + + @GetMapping("/login") + public String get(@RequestParam(required = false) String error, @RequestParam(required = false) String success, Model model) { + model.addAttribute("error", error != null); + model.addAttribute("success", success != null); + + return "login"; + } + + @PostMapping(value = "/login", params = "register") + public String register() { + return "redirect:/register"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/RegisterController.java b/src/main/java/eu/jonahbauer/survey/controller/RegisterController.java new file mode 100644 index 0000000..1ba01a4 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/RegisterController.java @@ -0,0 +1,53 @@ +package eu.jonahbauer.survey.controller; + +import eu.jonahbauer.survey.model.RegistrationForm; +import eu.jonahbauer.survey.persistence.entity.User; +import eu.jonahbauer.survey.persistence.repository.UserRepository; +import jakarta.validation.Valid; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.ObjectError; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class RegisterController { + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @GetMapping("/register") + public String get(Model model) { + model.addAttribute("form", new RegistrationForm()); + return "register"; + } + + @PostMapping("/register") + public String post(@Valid @ModelAttribute("form") RegistrationForm form, BindingResult bindingResult) { + User user = getUserRepository().findByUsername(form.getUsername()); + + if (user != null) { + bindingResult.addError(new ObjectError("form", new String[] {"registration.username.unique"}, null, null)); + } + + if (bindingResult.hasErrors()) { + return "register"; + } else { + user = new User(); + user.setUsername(form.getUsername()); + user.setPassword(getPasswordEncoder().encode(form.getPassword())); + form.setPassword(null); + + getUserRepository().save(user); + + return "redirect:/login?success"; + } + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyCreateController.java b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyCreateController.java new file mode 100644 index 0000000..189c89b --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyCreateController.java @@ -0,0 +1,98 @@ +package eu.jonahbauer.survey.controller.survey; + +import eu.jonahbauer.survey.model.SurveyCreateForm; +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.entity.User; +import eu.jonahbauer.survey.persistence.repository.SurveyRepository; +import jakarta.validation.Valid; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.validation.ObjectError; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import java.util.HashSet; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class SurveyCreateController { + private final SurveyRepository surveyRepository; + + @GetMapping("/survey/create") + public String get(Model model) { + model.addAttribute("survey", new SurveyCreateForm()); + + return "survey/create"; + } + + @PostMapping("/survey/create") + public String post( + @Valid @ModelAttribute("survey") SurveyCreateForm surveyForm, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes, + Authentication authentication + ) { + validateSurveyForm(surveyForm, bindingResult); + + if (bindingResult.hasErrors()) { + model.addAttribute("survey", surveyForm); + return "survey/create"; + } else { + Survey survey = surveyForm.toSurvey(); + survey.setOwner((User) authentication.getPrincipal()); + + survey = getSurveyRepository().save(survey); + redirectAttributes.addAttribute("id", survey.getId()); + return "redirect:/survey/{id}/evaluate"; + } + } + + private void validateSurveyForm(SurveyCreateForm surveyForm, BindingResult bindingResult) { + HashSet questions = new HashSet<>(); + HashSet answers = new HashSet<>(); + boolean uniqueQuestions = true; + + if (surveyForm.getQuestions() != null) { + int qIndex = -1; + for (SurveyCreateForm.QuestionForm question : surveyForm.getQuestions()) { + qIndex++; + + uniqueQuestions &= questions.add(question.getText()); + + boolean uniqueAnswers = true; + + if (question.getAnswers() != null) { + answers.clear(); + for (String answer : question.getAnswers()) { + uniqueAnswers &= answers.add(answer); + } + } + + if (!uniqueAnswers) { + bindingResult.addError(new FieldError( + "survey", "questions[" + qIndex + "]", + question, false, + new String[] {"survey.questions.answers.unique"}, null, null + )); + } + } + } + + if (!uniqueQuestions) { + bindingResult.addError(new ObjectError( + "survey", + new String[] {"survey.questions.unique"}, null, null + )); + } + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyEvaluationController.java b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyEvaluationController.java new file mode 100644 index 0000000..c9a3c4b --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyEvaluationController.java @@ -0,0 +1,42 @@ +package eu.jonahbauer.survey.controller.survey; + +import eu.jonahbauer.survey.persistence.entity.Answer; +import eu.jonahbauer.survey.persistence.entity.AnswerEvaluation; +import eu.jonahbauer.survey.persistence.entity.Question; +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.repository.SurveyRepository; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class SurveyEvaluationController { + private final SurveyRepository surveyRepository; + + @GetMapping("/survey/{id}/evaluate") + public String get(@PathVariable int id, Model model) { + Survey survey = getSurveyRepository().findEvaluationById(id); + + long sub = getSurveyRepository().getSubmissionCountById(survey.getId()); + + for (Question question : survey.getQuestions()) { + for (Answer answer : question.getAnswers()) { + AnswerEvaluation evaluation = answer.getEvaluation(); + long count = evaluation.getCount(); + + var percentage = sub > 0 ? count * 100d / sub : 0; + evaluation.setPercentage(percentage); + evaluation.setBarPercentage(percentage); + } + } + + model.addAttribute("survey", survey); + return "survey/evaluation"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyListController.java b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyListController.java new file mode 100644 index 0000000..13260eb --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyListController.java @@ -0,0 +1,70 @@ +package eu.jonahbauer.survey.controller.survey; + +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.repository.SurveyRepository; +import eu.jonahbauer.survey.persistence.entity.User; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.context.MessageSource; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.server.ResponseStatusException; + +import java.util.Locale; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class SurveyListController { + private final SurveyRepository surveyRepository; + private final MessageSource messageSource; + + @GetMapping("/survey/recent") + public String recent(Model model, Locale locale) { + Pageable pageable = PageRequest.of(0, 20, Sort.by(Sort.Direction.DESC, "created")); + Page surveys = getSurveyRepository().findAll(pageable); + + model.addAttribute("surveys", surveys); + model.addAttribute("title", getMessageSource().getMessage("index.heading.recent", null, locale)); + model.addAttribute("pattern", "list.data_pattern.recent"); + + return "survey/list"; + } + + @GetMapping("/survey/own") + public String own(@NotNull Authentication authentication, Model model, Locale locale) { + if (authentication == null) { + throw new ResponseStatusException(HttpStatus.UNAUTHORIZED); + } + + Pageable pageable = PageRequest.of(0, 20, Sort.by(Sort.Direction.DESC, "created")); + Page surveys = getSurveyRepository().findAllByOwner((User) authentication.getPrincipal(), pageable); + + model.addAttribute("surveys", surveys); + model.addAttribute("title", getMessageSource().getMessage("index.heading.own", null, locale)); + model.addAttribute("pattern", "list.data_pattern.recent"); + + return "survey/list"; + } + + @GetMapping("/survey/hot") + public String hot(Model model, Locale locale) { + Pageable pageable = PageRequest.of(0, 20); + Page surveys = getSurveyRepository().findAllSortedBySubmissionCountDesc(pageable); + + model.addAttribute("surveys", surveys); + model.addAttribute("title", getMessageSource().getMessage("index.heading.hot", null, locale)); + model.addAttribute("pattern", "list.data_pattern.hot"); + + return "survey/list"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyParticipationController.java b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyParticipationController.java new file mode 100644 index 0000000..b45ffea --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/controller/survey/SurveyParticipationController.java @@ -0,0 +1,121 @@ +package eu.jonahbauer.survey.controller.survey; + +import eu.jonahbauer.survey.persistence.entity.Answer; +import eu.jonahbauer.survey.persistence.entity.Question; +import eu.jonahbauer.survey.persistence.entity.Submission; +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.repository.SubmissionRepository; +import eu.jonahbauer.survey.persistence.repository.SurveyRepository; +import eu.jonahbauer.survey.model.SurveyParticipationForm; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.validation.ObjectError; +import org.springframework.web.bind.annotation.*; + +import java.util.*; +import java.util.stream.Collectors; + +@Controller +@Getter(AccessLevel.PRIVATE) +@RequiredArgsConstructor +public class SurveyParticipationController { + private final SurveyRepository surveyRepository; + private final SubmissionRepository submissionRepository; + + @GetMapping("/survey/{id}/participate") + public String get(@PathVariable int id, Model model) { + Survey survey = getSurveyRepository().findDetailedById(id); + model.addAttribute("survey", survey); + model.addAttribute("form", new SurveyParticipationForm()); + return "survey/participate"; + } + + @PostMapping("/survey/{id}/participate") + public String post( + @PathVariable int id, + @ModelAttribute("form") SurveyParticipationForm form, + BindingResult bindingResult, + Model model + ) { + Survey survey = getSurveyRepository().findDetailedById(id); + + validateParticipation(survey, form, bindingResult); + + if (bindingResult.hasErrors()) { + model.addAttribute("survey", survey); + return "survey/participate"; + } else { + persistParticipation(survey, form); + + return "redirect:/survey/{id}/evaluate"; + } + } + + private void validateParticipation(Survey survey, SurveyParticipationForm form, BindingResult bindingResult) { + // validate all question ids are existent + Set questionIds = survey.getQuestions().stream().map(Question::getId).collect(Collectors.toSet()); + if (!questionIds.containsAll(form.getSelectedAnswers().keySet())) { + bindingResult.addError(new ObjectError( + "form", + new String[] {"participation.survey.unknown_question"}, null, null + )); + } + + for (Question question : survey.getQuestions()) { + Set answerIds = question.getAnswers().stream().map(Answer::getId).collect(Collectors.toSet()); + Set selectedAnswers = form.getSelectedAnswers().getOrDefault(question.getId(), Collections.emptySet()); + if (selectedAnswers == null) selectedAnswers = Collections.emptySet(); + + // validate all answer ids are existent + if (!answerIds.containsAll(selectedAnswers)) { + bindingResult.addError(new FieldError( + "form", "selectedAnswers[" + question.getId() + "]", + null, false, + new String[] {"participation.question.unknown_answer"}, null, null + )); + } else { + // validate min answer count + if (selectedAnswers.size() < question.getMinAnswers()) { + bindingResult.addError(new FieldError( + "form", "selectedAnswers[" + question.getId() + "]", + null, false, + new String[] {"participation.question.not_enough_answers"}, new Object[] { question.getMinAnswers() }, null + )); + } + + // validate max answer count + if (selectedAnswers.size() > question.getMaxAnswers()) { + bindingResult.addError(new FieldError( + "form", "selectedAnswers[" + question.getId() + "]", + null, false, + new String[] {"participation.question.too_many_answers"}, new Object[] { question.getMaxAnswers() }, null + )); + } + } + } + } + + private void persistParticipation(Survey survey, SurveyParticipationForm form) { + Submission submission = new Submission(); + submission.setSurvey(survey); + submission.setAnswers(new HashSet<>()); + + Map answersById = survey.getQuestions().stream() + .flatMap(q -> q.getAnswers().stream()) + .collect(Collectors.toMap(Answer::getId, a -> a)); + + + form.getSelectedAnswers().values().stream() + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(answersById::get) + .forEach(submission.getAnswers()::add); + + getSubmissionRepository().save(submission); + } +} diff --git a/src/main/java/eu/jonahbauer/survey/model/RegistrationForm.java b/src/main/java/eu/jonahbauer/survey/model/RegistrationForm.java new file mode 100644 index 0000000..e7b81d3 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/model/RegistrationForm.java @@ -0,0 +1,20 @@ +package eu.jonahbauer.survey.model; + +import eu.jonahbauer.survey.validation.constraints.Password; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +@Data +public final class RegistrationForm { + @NotNull(message = "{registration.username.not_null}") + @Length(min = 4, max = 255, message = "{registration.username.length}") + @Pattern(regexp = "[a-zA-Z0-9_]*", message = "{registration.username.pattern}") + private String username; + + @NotNull(message = "{registration.password.not_null}") + @Length(min = 8, max = 255, message = "{registration.password.length}") + @Password(message = "{registration.password.password}") + private String password; +} diff --git a/src/main/java/eu/jonahbauer/survey/model/SurveyCreateForm.java b/src/main/java/eu/jonahbauer/survey/model/SurveyCreateForm.java new file mode 100644 index 0000000..0b65145 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/model/SurveyCreateForm.java @@ -0,0 +1,102 @@ +package eu.jonahbauer.survey.model; + +import eu.jonahbauer.survey.persistence.entity.Answer; +import eu.jonahbauer.survey.persistence.entity.Question; +import eu.jonahbauer.survey.persistence.entity.Survey; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import java.util.List; +import java.util.TreeSet; + +@Data +public final class SurveyCreateForm { + public static final QuestionForm EMPTY_QUESTION = new QuestionForm(); + + @NotBlank(message = "{survey.title.not_blank}") + @Length(min = 8, max = 255, message = "{survey.title.length}") + private String title; + + @NotBlank(message = "{survey.summary.not_blank}") + @Length(min = 8, max = 255, message = "{survey.summary.length}") + private String summary; + + @Size(min = 1, max = 20, message = "{survey.questions.size}") + @NotNull(message = "{survey.questions.not_null}") + @Valid + private QuestionForm[] questions; + + public QuestionForm[] getQuestions() { + return questions; + } + + public SurveyCreateForm() { + questions = new QuestionForm[] {new QuestionForm()}; + } + + public Survey toSurvey() { + Survey survey = new Survey(); + survey.setTitle(title); + survey.setSummary(summary); + survey.setQuestions(new TreeSet<>()); + + for (int i = 0; i < questions.length; i++) { + Question question = questions[i].toQuestion(); + question.setNumber(i + 1); + question.setSurvey(survey); + survey.getQuestions().add(question); + } + + return survey; + } + + @Data + public final static class QuestionForm { + @NotNull(message = "{survey.questions.text.not_null}") + @Length(min = 1, max = 255, message = "{survey.questions.text.length}") + private String text; + + @Min(value = 0) + private int minAnswers = 0; + + @Min(1) + private int maxAnswers = 1; + + @NotNull(message = "{survey.questions.answers.not_null}") + @Size(min = 1, max = 20, message = "{survey.questions.answers.size}") + private List<@NotBlank(message = "{survey.questions.answers.not_blank}") String> answers; + + public Question toQuestion() { + Question question = new Question(); + question.setText(text); + + int min = Math.min(minAnswers, maxAnswers); + int max = Math.max(minAnswers, maxAnswers); + min = clamp(0, answers.size(), min); + max = clamp(1, answers.size(), max); + + question.setMinAnswers(min); + question.setMaxAnswers(max); + question.setAnswers(new TreeSet<>()); + + for (int i = 0; i < answers.size(); i++) { + Answer answer = new Answer(); + answer.setText(answers.get(i)); + answer.setNumber(i + 1); + answer.setQuestion(question); + question.getAnswers().add(answer); + } + + return question; + } + + private int clamp(int min, int max, int value) { + return Math.max(min, Math.min(max, value)); + } + } +} diff --git a/src/main/java/eu/jonahbauer/survey/model/SurveyParticipationForm.java b/src/main/java/eu/jonahbauer/survey/model/SurveyParticipationForm.java new file mode 100644 index 0000000..e90f6ee --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/model/SurveyParticipationForm.java @@ -0,0 +1,12 @@ +package eu.jonahbauer.survey.model; + +import lombok.Data; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +@Data +public final class SurveyParticipationForm { + private final Map> selectedAnswers = new HashMap<>(); +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/Answer.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/Answer.java new file mode 100644 index 0000000..6dd95e8 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/Answer.java @@ -0,0 +1,60 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.Hibernate; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; + +@Entity +@Data +@Table(name = "answer", uniqueConstraints = { + @UniqueConstraint(name = "uq_answer_question_number", columnNames = {"question", "number"}) +}) +@EqualsAndHashCode(of = "id") +public class Answer implements Comparable { + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * The answer text. + */ + @Column(name = "text", nullable = false) + @NotBlank + private String text; + + /** + * The consecutive number of this answer as part of a question. + */ + @Column(name = "number", nullable = false) + @NotNull + private Integer number; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "question", nullable = false, foreignKey = @ForeignKey(name = "fk_answer_question")) + @OnDelete(action = OnDeleteAction.CASCADE) + @NotNull + private Question question; + + @OneToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "id") + private AnswerEvaluation evaluation; + + @Override + public int compareTo(Answer o) { + return this.getNumber().compareTo(o.getNumber()); + } + + public String toString() { + return "Answer(id=" + this.getId() + + ", text=" + this.getText() + + ", number=" + this.getNumber() + + (Hibernate.isInitialized(getEvaluation()) ? ", evaluation=" + this.getEvaluation() : "") + + ")"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/AnswerEvaluation.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/AnswerEvaluation.java new file mode 100644 index 0000000..a10e54e --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/AnswerEvaluation.java @@ -0,0 +1,29 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.hibernate.annotations.Immutable; + +/** + * A database view showing how often an {@link Answer} has been selected. + */ +@Entity +@Data +@Table(name = "answer_evaluation") +@Immutable +public class AnswerEvaluation { + @Id + @Column(name = "answer", nullable = false) + private Integer answer; + + @Column(name = "count", nullable = false) + @NotNull + private Long count; + + @Transient + private transient Double percentage; + + @Transient + private transient Double barPercentage; +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/Question.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/Question.java new file mode 100644 index 0000000..3b64781 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/Question.java @@ -0,0 +1,84 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.Hibernate; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.SortNatural; + +import java.util.Set; + +@Entity +@Data +@Table(name = "question", uniqueConstraints = { + @UniqueConstraint(name = "uq_question_survey_number", columnNames = {"survey", "number"}) +}) +@EqualsAndHashCode(of = "id") +public class Question implements Comparable { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * The question text. + */ + @Column(name = "text", nullable = false) + @NotBlank + private String text; + + /** + * The consecutive number of this question as part of a survey. + */ + @Column(name = "number", nullable = false) + @NotNull @Min(0) + private Integer number; + + /** + * The minimum number of answers that have to be selected. + */ + @Column(name = "min_answers", nullable = false) + @NotNull @Min(0) + private Integer minAnswers; + + /** + * The maximum number of answers that can be selected. + */ + @Column(name = "max_answers", nullable = false) + @NotNull @Min(1) + private Integer maxAnswers; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "survey", nullable = false, foreignKey = @ForeignKey(name = "fk_question_survey")) + @OnDelete(action = OnDeleteAction.CASCADE) + @NotNull + private Survey survey; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "question") + @SortNatural + private Set answers; + + @Override + public int compareTo(Question o) { + return this.getNumber().compareTo(o.getNumber()); + } + + public boolean isRadio() { + return minAnswers == 1 && maxAnswers == 1; + } + + public String toString() { + return "Question(id=" + this.getId() + + ", text=" + this.getText() + + ", number=" + this.getNumber() + + ", minAnswers=" + this.getMinAnswers() + + ", maxAnswers=" + this.getMaxAnswers() + + (Hibernate.isInitialized(getAnswers()) ? ", answers=" + this.getAnswers() : "") + + ")"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/Submission.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/Submission.java new file mode 100644 index 0000000..08835fe --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/Submission.java @@ -0,0 +1,63 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.Hibernate; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; + + +import java.time.Instant; +import java.util.Set; + +/** + * A submission to a survey modelled as a set of selected answers. + */ +@Entity +@Data +@Table(name = "submission") +@EqualsAndHashCode(of = "id") +public class Submission { + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @Column(name = "created", nullable = false, insertable = false, updatable = false) + private Instant created; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "survey", nullable = false, foreignKey = @ForeignKey(name = "fk_submission_survey")) + @OnDelete(action = OnDeleteAction.CASCADE) + @NotNull + private Survey survey; + + /** + * The set of selected answers. The answers must all belong to the same survey as this submission and the number + * of answers per question must be within the bounds set by {@link Question#getMinAnswers()} and + * {@link Question#getMaxAnswers()}. + */ + @ManyToMany(fetch = FetchType.LAZY) + @JoinTable( + name = "submission_answer", + joinColumns = @JoinColumn( + name = "submission", referencedColumnName = "id", nullable = false, + foreignKey = @ForeignKey(name = "fk_submission_answer_submission") + ), + inverseJoinColumns = @JoinColumn( + name = "answer", referencedColumnName = "id", nullable = false, + foreignKey = @ForeignKey(name = "fk_submission_answer_answer") + ) + ) + private Set answers; + + public String toString() { + return "Submission(id=" + this.getId() + + ", created=" + this.getCreated() + + ", survey=" + this.getSurvey() + + (Hibernate.isInitialized(getAnswers()) ? ", answers=" + this.getAnswers() : "") + + ")"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/Survey.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/Survey.java new file mode 100644 index 0000000..605474d --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/Survey.java @@ -0,0 +1,82 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.Hibernate; +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.annotations.SortNatural; + +import java.time.Instant; +import java.util.Set; + +/** + * A survey is a collection of multiple {@linkplain Question questions} each having multiple possible + * {@linkplain Answer answers}. A {@linkplain Submission submission} is a set of selected answers. + */ +@Entity +@Data +@Table(name = "survey") +@EqualsAndHashCode(of = "id") +@NoArgsConstructor +public class Survey { + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * The survey title. + */ + @Column(name = "title", nullable = false) + @NotBlank + private String title; + + /** + * A short, descriptive summary of the survey. + */ + @Column(name = "summary", nullable = false) + @NotBlank + private String summary; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "owner", nullable = false, foreignKey = @ForeignKey(name = "fk_survey_owner")) + @OnDelete(action = OnDeleteAction.CASCADE) + @NotNull + private User owner; + + @Column(name = "created", insertable = false, updatable = false, nullable = false) + private Instant created; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "survey", fetch = FetchType.LAZY) + @SortNatural + private Set questions; + + @OneToMany(mappedBy = "survey", fetch = FetchType.LAZY) + private Set submissions; + + @Transient + private transient Long submissionCount; + + public Survey(Integer id, String title, String summary, Instant created, long submissionCount) { + this.id = id; + this.title = title; + this.summary = summary; + this.created = created; + this.submissionCount = submissionCount; + } + + public String toString() { + return "Survey(id=" + this.getId() + + ", title=" + this.getTitle() + + ", summary=" + this.getSummary() + + ", created=" + this.getCreated() + + (Hibernate.isInitialized(getQuestions()) ? ", questions=" + this.getQuestions() : "") + + (Hibernate.isInitialized(getSubmissions()) ? ", submissions=" + this.getSubmissions() : "") + + ")"; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/entity/User.java b/src/main/java/eu/jonahbauer/survey/persistence/entity/User.java new file mode 100644 index 0000000..83fc67d --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/entity/User.java @@ -0,0 +1,59 @@ +package eu.jonahbauer.survey.persistence.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.Set; + +@Entity +@Data +@Table(name = "\"user\"", uniqueConstraints = { + @UniqueConstraint(name = "uq_user_username", columnNames = "username") +}) +@EqualsAndHashCode(of = "id") +public class User implements UserDetails { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @Column(name = "username", nullable = false) + @NotBlank @Size(min = 4, max = 255) + private String username; + + @Column(name = "password", nullable = false) + @NotBlank @Size(max = 255) + private String password; + + @Override + public Collection getAuthorities() { + return Set.of(new SimpleGrantedAuthority("USER")); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/repository/SubmissionRepository.java b/src/main/java/eu/jonahbauer/survey/persistence/repository/SubmissionRepository.java new file mode 100644 index 0000000..a598606 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/repository/SubmissionRepository.java @@ -0,0 +1,7 @@ +package eu.jonahbauer.survey.persistence.repository; + +import eu.jonahbauer.survey.persistence.entity.Submission; +import org.springframework.data.repository.CrudRepository; + +public interface SubmissionRepository extends CrudRepository { +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/repository/SurveyRepository.java b/src/main/java/eu/jonahbauer/survey/persistence/repository/SurveyRepository.java new file mode 100644 index 0000000..971687d --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/repository/SurveyRepository.java @@ -0,0 +1,29 @@ +package eu.jonahbauer.survey.persistence.repository; + +import eu.jonahbauer.survey.persistence.entity.Survey; +import eu.jonahbauer.survey.persistence.entity.User; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface SurveyRepository extends JpaRepository { + @EntityGraph(attributePaths = {"questions.answers"}) + Survey findDetailedById(Integer id); + + @EntityGraph(attributePaths = {"questions.answers.evaluation", "owner", "submissions"}) + Survey findEvaluationById(Integer id); + + @Query( + value = "select new Survey(s.id, s.title, s.summary, s.created, count(sub.id)) from Survey s left join s.submissions sub group by s order by count(sub.id) desc", + countQuery = "select count(Survey) from Survey" + ) + Page findAllSortedBySubmissionCountDesc(Pageable pageable); + + Page findAllByOwner(User owner, Pageable pageable); + + @Query("select count(sub.id) from Survey s left join s.submissions sub where s.id = :id") + long getSubmissionCountById(@Param("id") Integer id); +} diff --git a/src/main/java/eu/jonahbauer/survey/persistence/repository/UserRepository.java b/src/main/java/eu/jonahbauer/survey/persistence/repository/UserRepository.java new file mode 100644 index 0000000..ac554a8 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/persistence/repository/UserRepository.java @@ -0,0 +1,8 @@ +package eu.jonahbauer.survey.persistence.repository; + +import eu.jonahbauer.survey.persistence.entity.User; +import org.springframework.data.repository.CrudRepository; + +public interface UserRepository extends CrudRepository { + User findByUsername(String username); +} diff --git a/src/main/java/eu/jonahbauer/survey/spring/MimeTypeConfig.java b/src/main/java/eu/jonahbauer/survey/spring/MimeTypeConfig.java new file mode 100644 index 0000000..16aab2e --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/spring/MimeTypeConfig.java @@ -0,0 +1,21 @@ +package eu.jonahbauer.survey.spring; + +import org.springframework.boot.web.server.MimeMappings; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MimeTypeConfig implements WebServerFactoryCustomizer { + @Override + public void customize(ConfigurableServletWebServerFactory factory) { + MimeMappings mappings = new MimeMappings(MimeMappings.DEFAULT); + mappings.add("woff", "application/font-woff"); + mappings.add("woff2", "application/font-woff2"); + mappings.add("ttf", "application/x-font-truetype"); + mappings.add("eot", "application/vnd.ms-fontobject"); + mappings.add("svg", "image/svg+xml"); + mappings.add("otf", "application/x-font-opentype"); + factory.setMimeMappings(mappings); + } +} diff --git a/src/main/java/eu/jonahbauer/survey/spring/SecurityConfig.java b/src/main/java/eu/jonahbauer/survey/spring/SecurityConfig.java new file mode 100644 index 0000000..f93d439 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/spring/SecurityConfig.java @@ -0,0 +1,57 @@ +package eu.jonahbauer.survey.spring; + +import eu.jonahbauer.survey.persistence.repository.UserRepository; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.csrf(); + + http.exceptionHandling() + .accessDeniedPage("/error"); + + http.formLogin() + .loginPage("/login") + .loginProcessingUrl("/login") + .usernameParameter("username") + .passwordParameter("password") + .failureUrl("/login?error") + .defaultSuccessUrl("/index") + .permitAll(); + + http.logout() + .logoutUrl("/logout") + .logoutSuccessUrl("/index") + .deleteCookies("JSESSIONID") + .permitAll(); + + http.authorizeHttpRequests() + .requestMatchers("/css/**", "/js/**", "/img/**", "/fonts/**").permitAll() + .requestMatchers("/survey/create").authenticated() + .requestMatchers("/survey/own").authenticated() + .anyRequest().permitAll(); + + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public UserDetailsService userDetailsService(UserRepository userRepository) { + return userRepository::findByUsername; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/spring/ThymeleafConfig.java b/src/main/java/eu/jonahbauer/survey/spring/ThymeleafConfig.java new file mode 100644 index 0000000..5ff8a08 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/spring/ThymeleafConfig.java @@ -0,0 +1,79 @@ +package eu.jonahbauer.survey.spring; + +import jakarta.validation.constraints.NotNull; +import lombok.experimental.Delegate; +import org.springframework.context.annotation.Configuration; +import org.thymeleaf.context.IExpressionContext; +import org.thymeleaf.dialect.AbstractDialect; +import org.thymeleaf.dialect.IExpressionObjectDialect; +import org.thymeleaf.expression.IExpressionObjectFactory; +import org.thymeleaf.expression.Temporals; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.standard.expression.StandardExpressionObjectFactory; + +import java.time.Instant; +import java.time.ZoneId; +import java.util.Date; +import java.util.Locale; +import java.util.Set; + +@Configuration +public class ThymeleafConfig { + public ThymeleafConfig(SpringTemplateEngine templateEngine) { + templateEngine.setRenderHiddenMarkersBeforeCheckboxes(true); + templateEngine.addDialect(new CustomDialect()); + } + + public static final class CustomDialect extends AbstractDialect implements IExpressionObjectDialect { + private final IExpressionObjectFactory CUSTOM_EXPRESSION_OBJECT_FACTORY = new CustomExpressionObjectFactory(); + + private CustomDialect() { + super("custom"); + } + + @Override + public IExpressionObjectFactory getExpressionObjectFactory() { + return CUSTOM_EXPRESSION_OBJECT_FACTORY; + } + } + + public static final class CustomExpressionObjectFactory implements IExpressionObjectFactory { + private static final Set ALL_EXPRESSION_OBJECT_NAMES = Set.of(StandardExpressionObjectFactory.TEMPORALS_EXPRESSION_OBJECT_NAME); + + @Override + public Set getAllExpressionObjectNames() { + return ALL_EXPRESSION_OBJECT_NAMES; + } + + @Override + public Object buildObject(IExpressionContext context, String expressionObjectName) { + if (StandardExpressionObjectFactory.TEMPORALS_EXPRESSION_OBJECT_NAME.equals(expressionObjectName)) { + return new CustomTemporals(context.getLocale()); + } else { + return null; + } + } + + @Override + public boolean isCacheable(String expressionObjectName) { + return true; + } + } + + public static final class CustomTemporals { + @Delegate + private final Temporals temporals; + + public CustomTemporals(@NotNull Locale locale) { + this(locale, ZoneId.systemDefault()); + } + + public CustomTemporals(@NotNull Locale locale, ZoneId zoneId) { + this.temporals = new Temporals(locale, zoneId); + } + + public Date asDate(Instant instant) { + return Date.from(instant); + } + } +} diff --git a/src/main/java/eu/jonahbauer/survey/spring/WebMvcConfig.java b/src/main/java/eu/jonahbauer/survey/spring/WebMvcConfig.java new file mode 100644 index 0000000..1cd5624 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/spring/WebMvcConfig.java @@ -0,0 +1,54 @@ +package eu.jonahbauer.survey.spring; + +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; +import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; +import org.springframework.web.servlet.LocaleResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.i18n.SessionLocaleResolver; +import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; + +import java.util.Locale; + +@EnableWebMvc +@Configuration +@ComponentScan("eu.jonahbauer.survey") +public class WebMvcConfig implements WebMvcConfigurer { + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/**").addResourceLocations("classpath:/static/"); + } + + @Bean + public SpringSecurityDialect securityDialect() { + return new SpringSecurityDialect(); + } + + @Bean + @Override + public LocalValidatorFactoryBean getValidator() { + LocalValidatorFactoryBean bean = new LocalValidatorFactoryBean(); + bean.setValidationMessageSource(messageSource()); + return bean; + } + + @Bean + public MessageSource messageSource() { + ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); + messageSource.setBasename("classpath:messages"); + messageSource.setDefaultEncoding("UTF-8"); + return messageSource; + } + + @Bean + public LocaleResolver localeResolver() { + SessionLocaleResolver slr = new SessionLocaleResolver(); + slr.setDefaultLocale(Locale.GERMANY); + return slr; + } +} \ No newline at end of file diff --git a/src/main/java/eu/jonahbauer/survey/validation/PasswordValidator.java b/src/main/java/eu/jonahbauer/survey/validation/PasswordValidator.java new file mode 100644 index 0000000..c96d0e4 --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/validation/PasswordValidator.java @@ -0,0 +1,32 @@ +package eu.jonahbauer.survey.validation; + +import eu.jonahbauer.survey.validation.constraints.Password; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class PasswordValidator implements ConstraintValidator { + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + if (value == null) return true; + + boolean lowercase = false; + boolean uppercase = false; + boolean digit = false; + boolean special = false; + + for (char c : value.toCharArray()) { + if (Character.isLowerCase(c)) { + lowercase = true; + } else if (Character.isUpperCase(c)) { + uppercase = true; + } else if (Character.isDigit(c)) { + digit = true; + } else { + special = true; + } + } + + return lowercase && uppercase && digit && special; + } +} diff --git a/src/main/java/eu/jonahbauer/survey/validation/constraints/Password.java b/src/main/java/eu/jonahbauer/survey/validation/constraints/Password.java new file mode 100644 index 0000000..e29cd2f --- /dev/null +++ b/src/main/java/eu/jonahbauer/survey/validation/constraints/Password.java @@ -0,0 +1,20 @@ +package eu.jonahbauer.survey.validation.constraints; + +import eu.jonahbauer.survey.validation.PasswordValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = PasswordValidator.class) +public @interface Password { + String message() default "{eu.jonahbauer.survey.validation.constraints.Password.message}"; + + Class[] groups() default { }; + + Class[] payload() default { }; +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 0000000..0b43103 --- /dev/null +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,8 @@ +# Datasource +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;MODE=MySQL;TIME ZONE=0:00 +spring.datasource.username=sa +spring.datasource.password=sa + +# Thymeleaf +spring.thymeleaf.cache=false diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..dd40a78 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,6 @@ +# Datasource +spring.datasource.url=jdbc:mariadb://jonahbauer.eu:3306/webdev?sslMode=verify-full +spring.datasource.username=webdev +spring.datasource.password=webdev! +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..e2b3529 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,12 @@ +spring.profiles.active=@activatedProperties@ + +# Context Path +server.servlet.context-path=/survey + +# Hibernate / JPA +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect +spring.jpa.properties.hibernate.jdbc.time_zone=UTC + +# Main +spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/src/main/resources/db/migration/V1__init.sql b/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..900b015 --- /dev/null +++ b/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,75 @@ +CREATE TABLE `user` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `password` VARCHAR(255) NOT NULL, + `username` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `uq_user_username` UNIQUE (`username`) +); + +CREATE TABLE `survey` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `summary` VARCHAR(255) NOT NULL, + `title` VARCHAR(255) NOT NULL, + `owner` INTEGER NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_survey_owner` FOREIGN KEY (`owner`) REFERENCES `user` (`id`) + ON DELETE CASCADE +); + +CREATE TABLE `question` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `max_answers` INTEGER NOT NULL CHECK (`max_answers` >= 1), + `min_answers` INTEGER NOT NULL CHECK (`min_answers` >= 0), + `number` INTEGER NOT NULL CHECK (`number` >= 0), + `text` VARCHAR(255) NOT NULL, + `survey` INTEGER NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `uq_question_survey_number` UNIQUE (`survey`, `number`), + CONSTRAINT `fk_question_survey` FOREIGN KEY (`survey`) REFERENCES `survey` (`id`) + ON DELETE CASCADE +); + +CREATE TABLE `answer` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `number` INTEGER NOT NULL, + `text` VARCHAR(255) NOT NULL, + `question` INTEGER NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `uq_answer_question_number` UNIQUE (`question`, `number`), + CONSTRAINT `fk_answer_question` FOREIGN KEY (`question`) REFERENCES `question` (`id`) + ON DELETE CASCADE +); + +CREATE TABLE `submission` +( + `id` INTEGER NOT NULL AUTO_INCREMENT, + `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `survey` INTEGER NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_submission_survey` FOREIGN KEY (`survey`) REFERENCES `survey` (`id`) + ON DELETE CASCADE +); + +CREATE TABLE `submission_answer` +( + `submission` INTEGER NOT NULL, + `answer` INTEGER NOT NULL, + PRIMARY KEY (`submission`, `answer`), + CONSTRAINT `fk_submission_answer_answer` FOREIGN KEY (`answer`) REFERENCES `answer` (`id`) + ON DELETE CASCADE, + CONSTRAINT `fk_submission_answer_submission` FOREIGN KEY (`submission`) REFERENCES `submission` (`id`) + ON DELETE CASCADE +); + +CREATE VIEW `answer_evaluation` AS +( + SELECT `a`.`id` AS `answer`, COUNT(`sa`.`answer`) AS `count` + FROM `answer` `a` + LEFT JOIN `submission_answer` `sa` ON `a`.`id` = `sa`.`answer` + GROUP BY `a`.`id` +); \ No newline at end of file diff --git a/src/main/resources/db/migration/V2__add_sample_data.sql b/src/main/resources/db/migration/V2__add_sample_data.sql new file mode 100644 index 0000000..1e1c47a --- /dev/null +++ b/src/main/resources/db/migration/V2__add_sample_data.sql @@ -0,0 +1,104 @@ +INSERT INTO `user`(`username`, `password`) +VALUES ('Mark-Uwe Kling', 'nologon'); + +SET @`user_id` = LAST_INSERT_ID(); + +INSERT INTO `survey`(`owner`, `title`, `summary`) +VALUES (@`user_id`, 'Angriff der Killer-Soziologen', 'Hallo? Haben Sie einen Moment Zeit? Bleiben Sie doch hier! Ich habe nur ein paar Fragen an Sie!'); + +SET @`survey_id` = LAST_INSERT_ID(); + +-- Question 0 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 0, 'Wer ist besser? Bud Spencer oder Terrence Hill?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'Bud Spencer'), + (@`question_id`, 1, 'Terrence Hill'); + +-- Question 1 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 1, 'Wenn am Sonntag Wahl wäre, würden Sie dann am Montag eine Digitalkamera kaufen?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'ja'), + (@`question_id`, 1, 'nein'); + +-- Question 2 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 2, 'Haben Sie sich vor kurzem ein neues Mobilphone gekauft? Wenn ja, when do you normalerweise buy das Nächste?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'nein'), + (@`question_id`, 1, '28 days later'), + (@`question_id`, 2, '28 weeks later'), + (@`question_id`, 3, '28 months later'); + +-- Question 3 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 3, 'Wie bewerten Sie die gegenwärtige wirtschaftliche Lage?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'ja'), + (@`question_id`, 1, 'nein'), + (@`question_id`, 2, 'vielleicht'), + (@`question_id`, 3, 'nur f*****'); + +-- Question 4 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 4, 'Arbeiten Sie gern für Ihren Konzern?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'ja'), + (@`question_id`, 1, 'natürlich'); + +-- Question 5 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 5, 'Was essen Sie am liebsten? Die Tütensuppen von Maggi oder die Tütensuppen von Knorr?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'Maggi'), + (@`question_id`, 1, 'Knorr'); + +-- Question 6 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 6, 'Wie beurteilen Sie die Arbeit der Bundesregierung?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'sehr positiv'), + (@`question_id`, 1, 'positiv'), + (@`question_id`, 2, 'eher positiv'); + +-- Question 7 + +INSERT INTO `question`(`survey`, `number`, `text`, `max_answers`, `min_answers`) +VALUES (@`survey_id`, 7, 'Wie oft laufen Sie Amok?', 1, 1); + +SET @`question_id` = LAST_INSERT_ID(); + +INSERT INTO `answer`(`question`, `number`, `text`) +VALUES (@`question_id`, 0, 'ein Mal im Monat'), + (@`question_id`, 1, 'ein Mal pro Woche'), + (@`question_id`, 2, 'häufiger als ein Mal pro Woche'); + diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..619b458 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties new file mode 100644 index 0000000..2ccbeff --- /dev/null +++ b/src/main/resources/messages.properties @@ -0,0 +1,112 @@ +# participation +participation.question.too_many_answers=Bitte wählen Sie nicht mehr als {0,choice,1#eine Antwort|1<{0,number} Antworten} aus. +participation.question.not_enough_answers=Bitte wählen Sie mindestens {0,choice,1#eine Antwort|1<{0,number} Antworten} aus. +participation.question.unknown_answer=Bitte denken Sie sich keine Antworten aus. +participation.survey.unknown_question=Bitte denken Sie sich keine Fragen aus. + +# creation +survey.title.length=Der Titel muss zwischen {min} und {max} Zeichen lang sein. +survey.title.not_blank=Der Titel darf nicht leer sein. +survey.summary.length=Die Beschreibung muss zwischen {min} und {max} Zeichen lang sein. +survey.summary.not_blank=Die Beschreibung darf nicht leer sein. +survey.questions.unique=Die Fragen müssen unterschiedlich sein. +survey.questions.size=Die Umfrage muss zwischen {min} und {max} Fragen enthalten. +survey.questions.not_null=Die Umfrage muss mindestens eine Frage enthalten. +survey.questions.text.length=Die Frage muss zwischen {min} und {max} Zeichen lang sein. +survey.questions.text.not_blank=Die Frage darf nicht leer sein. +survey.questions.answers.size=Die Frage muss zwischen {min} und {max} Antwortmöglichkeiten haben. +survey.questions.answers.not_null=Die Frage muss mindestens eine Antwortmöglichkeiten haben. +survey.questions.answers.not_blank=Die Antwortmöglichkeiten dürfen nicht leer sein. +survey.questions.answers.unique=Die Antwortmöglichkeiten müssen unterschiedlich sein. + +# list +list.data_pattern.hot={0} Teilnehmer +list.data_pattern.recent={1,date} {1,time} + +# error +error.default.short={0} \u2013 Unbekannter Fehler +error.400.short=400 \u2013 Ungültige Anfrage +error.401.short=401 \u2013 Unauthorisiert +error.403.short=403 \u2013 Zugriff verweigert +error.404.short=404 \u2013 Seite nicht gefunden +error.405.short=405 \u2013 Methode nicht erlaubt +error.500.short=500 \u2013 Interner Server Fehler + +error.default.long=Es ist ein unbekannter Fehler aufgetreten. Bitte versuchen Sie es später erneut.
Wenn der Fehler bestehen bleibt, wenden Sie sich bitte an die Betreiber der Website. +error.400.long=Anfrage kann nicht verarbeitet werden. Bitte neu formulieren. +error.401.long=Um auf diese Ressource zuzugreifen, müssen Sie sich authorisieren. +error.403.long=Sie haben nicht die nötigen Berechtigungen, um auf die angeforderte Ressource zuzugreifen. +error.404.long=Die von Ihnen gesuchte Seite konnte leider nicht gefunden werden. Das tut uns leid. +error.500.long=Es ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.
Wenn der Fehler bestehen bleibt, wenden Sie sich bitte an die Betreiber der Website. + +# Login +login.error=Benutzername oder Passwort falsch +login.username.label=Benutzername +login.username.hint=benutzername +login.password.label=Passwort +login.password.hint=passwort +login.button.submit=Login +login.button.register=Registrieren + +# Registration +registration.username.label=Benutzername +registration.username.hint=benutzername +registration.password.label=Passwort +registration.password.hint=passwort +registration.button.submit=Registrieren +registration.success=Registrierung erfolgreich +registration.username.not_null=Der Benutzername darf nicht leer sein. +registration.username.length=Der Benutzername muss zwischen {min} und {max} Zeichen lang sein. +registration.username.pattern=Der Benutzername darf nur aus Klein- und Großbuchstaben, Zahlen und Unterstrichen bestehen. +registration.username.unique=Der Benutzername existiert bereits. +registration.password.not_null=Das Passwort darf nicht leer sein. +registration.password.length=Das Passwort muss zwischen {min} und {max} Zeichen lang sein. +registration.password.password=Das Passwort muss mindestens einen Klein- und einen Großbuchstaben, eine Zahl und ein Sonderzeichen enthalten. + +# Evaluation +evaluation.title={0} - Auswertung +evaluation.heading={0} \u2013 Auswertung +evaluation.button.to_participation=Zur Teilnahme +evaluation.participants={0,number} Teilnehmer +evaluation.created={0,date} {0,time} +evaluation.owner={0} +evaluation.number_of_answers=(zwischen {0,number,integer} und {1,number,integer} Antworten) +evaluation.percent_of_total=({0,number,#.##}% der Stimmen) + +# Participation +participation.title={0} +participation.heading={0} +participation.button.to_evaluation=Zur Auswertung +participation.number_of_answers=(zwischen {0,number,integer} und {1,number,integer} Antworten auswählen) +participation.button.reset=Eingabe löschen +participation.button.submit=Teilnehmen + +# Creation +creation.title=Umfrage erstellen +creation.heading=Umfrage erstellen +creation.title.label=Titel +creation.title.hint=geben sie ihrer umfrage einen prägnanten titel +creation.summary.label=Beschreibung +creation.summary.hint=beschreiben sie den zweck ihrer umfrage +creation.question.label=Frage +creation.question.hint=was wollen sie wissen? +creation.answer.hint=antwortmöglichkeit +creation.answer.new.hint=tippen um antwortmöglichkeit hinzuzufügen +creation.answer_count.label=Zwischen {0,number,integer} und {1,number,integer} Antworten müssen ausgewählt werden. +creation.answer_count.label.js=Zwischen {min} und {max} Antworten müssen ausgewählt werden. +creation.button.add_question=Frage hinzufügen +creation.button.submit=Umfrage erstellen + +# Index +index.heading.own=Eigene Umfragen +index.heading.hot=Beliebte Umfragen +index.heading.recent=Neuste Umfragen + +# Menu +menu.title=Survelopment +menu.recent=Neuste Umfragen +menu.hot=Beliebte Umfragen +menu.own=Eigene Umfragen +menu.new=Umfrage erstellen +menu.login=Login +menu.logout=Logout diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css new file mode 100644 index 0000000..82c1039 --- /dev/null +++ b/src/main/resources/static/css/main.css @@ -0,0 +1,1229 @@ +@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,700,900"); + +*:focus { + outline: none; +} + +/* Disable Chrome on Android 'Font Boosting' */ +* { + max-height: 999999px; +} + +html { + min-height: 100vh; +} + +body { + min-height: 100vh; + color: #585858; + font-family: "Source Sans Pro", Helvetica, sans-serif; + font-size: 12pt; + font-weight: 300; + line-height: 1.75; + display: flex; + flex-direction: column; +} + +main { + flex-grow: 1; + padding-bottom: 2em; +} + +/**/ +#header { + position: sticky; + top: 0; + background: white; + z-index: 100; + margin-bottom: 2em; + white-space: nowrap; +} + +#header > hr { + margin: 0; + width: 100%; +} + +#nav-bar { + display: flex; + overflow-x: auto; +} + +#nav-bar > .spacer { + flex-shrink: 1; + flex-basis: 3em; +} + +#nav-bar * { + vertical-align: middle; + display: inline-block; +} + +#nav-bar > ul { + list-style: none; + margin: 1em 0; + padding: 0; +} + +#nav-bar > ul > li { + padding: 0 1em; + display: inline-block; + height: 2em; +} + +#nav-bar > ul > li a { + text-transform: uppercase; + border-bottom: none; +} + +#nav-bar > ul > li:not(:first-child) { + border-left: solid 1px #c9c9c9; +} + +#nav-bar .logo { + transform: translateY(calc(1em - 50%)); +} + +.logo { + border-bottom: none; + display: inline-block; +} + +.logo > * { + vertical-align: middle; + display: inline-block; +} + +.logo .title { + margin-left: 0.25em; +} +/**/ + +/**/ +.title { + font-weight: 900; +} + +.title > .button-wrapper { + display: flex; + align-items: center; + height: 3.575em; +} +/**/ + +.inner { + margin: 0 auto; + padding: 0 4em; +} + +@media screen and (max-width: 980px) { + .inner { + padding: 0 2em; + } +} + +#footer { + padding: 5em 0 3em 0; + background-color: #f6f6f6; +} + +/**/ +.error { + color: red; + background: #ffc0c0; +} + +.error > ul { + margin: 0; +} + +.error > ul > li:first-child { + padding-top: 1em; +} + +.error > ul > li:last-child { + padding-bottom: 1em; +} + +.success { + color: green; + background: #c0ffc0; +} + +.success { + color: green; +} +/**/ + +/**/ +summary > h1, +summary > h2, +summary > h3, +summary > h4, +summary > h5, +summary > h6 { + display: inline; +} + +h1 { + font-size: 2.75em; + font-weight: 700; + line-height: 1.3; + letter-spacing: -0.035em; + margin: 0 0 1em 0; +} + +h2, h3, h4, h5, h6 { + font-weight: 900; + line-height: 1.5; + margin: 0 0 1em 0; + text-transform: uppercase; + letter-spacing: 0.35em; +} + +h2 { + font-size: 1.1em; +} + +h3 { + font-size: 1.0em; +} + +h4, h5, h6 { + font-size: 0.8em; +} + +hgroup h1:not(:last-child), +hgroup h2:not(:last-child), +hgroup h3:not(:last-child), +hgroup h4:not(:last-child), +hgroup h5:not(:last-child), +hgroup h6:not(:last-child), +h1.no-margin, +h2.no-margin, +h3.no-margin, +h4.no-margin, +h5.no-margin, +h6.no-margin { + margin-bottom: 0; +} + +h1 ~ hr, +h2 ~ hr, +h3 ~ hr, +h4 ~ hr, +h5 ~ hr, +h6 ~ hr { + margin-top: 1em; +} +/**/ + +/**/ +table { + margin: 0 0 2em 0; + width: 100%; + border-collapse: collapse; +} + +table tbody tr { + border: solid 1px #c9c9c9; + border-left: 0; + border-right: 0; +} + +table tbody tr:nth-child(2n + 1) { + background-color: rgba(144, 144, 144, 0.075); +} + +table td { + padding: 0.75em 0.75em; +} + +table th { + font-size: 0.9em; + font-weight: 900; + padding: 0 0.75em 0.75em 0.75em; + text-align: left; +} + +table thead { + border-bottom: solid 2px #c9c9c9; +} + +table tfoot { + border-top: solid 2px #c9c9c9; +} + +table .highlight { + background-color: rgba(255, 255, 0, 0.2); +} +/**/ + +/**/ +label { + display: block; + font-size: 0.9em; + font-weight: 900; + margin: 0; +} + +/**/ +input[type="radio"], +input[type="checkbox"] { + width: 0; + appearance: none; + -moz-appearance: none; +} + +input[type="radio"] + label, +input[type="checkbox"] + label { + display: inline-block; + vertical-align: middle; + margin-bottom: 0; + font-weight: 300; + margin-left: 0; + line-height: 3em; + font-size: 1em; + width: 100%; + cursor: pointer; +} + +input[type="checkbox"] + label::before, +input[type="radio"] + label::before { + font-family: "Font Awesome 5 Free" !important; + font-weight: 900 !important; + content: '\f00c'; + background: #ffffff; + border: #c9c9c9 1px solid; + color: transparent; + font-style: normal !important; + width: 2em; + height: 2em; + line-height: 2em; + display: inline-block; + border-radius: 100%; + text-align: center; + margin-right: 1em; +} + +input[type="checkbox"]:checked + label::before, +input[type="radio"]:checked + label::before { + background: #585858; + border-color: #585858; + color: #ffffff; +} + +input[type="checkbox"] + label::before { + border-radius: 5px; +} +/**/ + +/**/ +input[type="submit"], +input[type="reset"], +input[type="button"], +button, +.button { + appearance: none; + background-color: transparent; + border-radius: 4px; + border: 0; + box-shadow: inset 0 0 0 2px #585858; + color: #585858; + cursor: pointer; + display: inline-block; + font-size: 0.8em; + font-weight: 900; + height: 3.5em; + letter-spacing: 0.35em; + line-height: 3.45em; + overflow: hidden; + padding: 0 1.25em 0 1.6em; + text-align: center; + text-decoration: none; + text-overflow: ellipsis; + text-transform: uppercase; + white-space: nowrap; +} + +input[type="submit"]:hover, +input[type="reset"]:hover, +input[type="button"]:hover, +button:hover, +.button:hover { + color: #5bb0fd; + box-shadow: inset 0 0 0 2px #5bb0fd; + transition: color 0.15s, box-shadow 0.15s; +} + +input[type="submit"].default, +input[type="reset"].default, +input[type="button"].default, +button.default, +.button.default { + color: white; + background-color: #585858; +} + +input[type="submit"].default:hover, +input[type="reset"].default:hover, +input[type="button"].default:hover, +button.default:hover, +.button.default:hover { + background-color: #5bb0fd; + transition: background-color 0.15s, box-shadow 0.15s; +} +/**/ + +/**/ +input[type="text"], +input[type="password"], +input[type="email"], +select { + height: 3em; +} + + +input[type="text"], +input[type="password"], +input[type="email"], +input[type="tel"], +select, +textarea { + appearance: none; + background-color: transparent; + border: none; + border-radius: 0; + border-bottom: solid 1px #c9c9c9; + color: inherit; + display: block; + outline: 0; + padding: 0; + text-decoration: none; + width: 100%; +} + +input[type="text"]:focus, +input[type="password"]:focus, +input[type="email"]:focus, +input[type="tel"]:focus, +select:focus, +textarea:focus { + border-bottom: solid 1px #5bb0fd; +} + +textarea { + min-height: 2em; + resize: vertical; +} +/**/ + +select { + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40' preserveAspectRatio='none' viewBox='0 0 40 40'%3E%3Cpath d='M9.4,12.3l10.4,10.4l10.4-10.4c0.2-0.2,0.5-0.4,0.9-0.4c0.3,0,0.6,0.1,0.9,0.4l3.3,3.3c0.2,0.2,0.4,0.5,0.4,0.9 c0,0.4-0.1,0.6-0.4,0.9L20.7,31.9c-0.2,0.2-0.5,0.4-0.9,0.4c-0.3,0-0.6-0.1-0.9-0.4L4.3,17.3c-0.2-0.2-0.4-0.5-0.4-0.9 c0-0.4,0.1-0.6,0.4-0.9l3.3-3.3c0.2-0.2,0.5-0.4,0.9-0.4S9.1,12.1,9.4,12.3z' fill='%23c9c9c9' /%3E%3C/svg%3E"); + background-size: 1.25rem; + background-repeat: no-repeat; + background-position: calc(100% - 1rem) center; + height: 3em; + padding-right: 3em; + text-overflow: ellipsis; +} + +fieldset { + border: solid 1px #c9c9c9; +} + +fieldset > legend { + padding: 0 0.25em; +} +/**/ + +/**/ +kbd { + padding: 0.1em 0.4em; +} + +a { + color: #585858; + border-bottom: dotted 1px rgba(88,88,88,0.5); + text-decoration: none; + cursor: pointer; +} + +a:hover { + color: #5bb0fd; +} + +strong, b { + font-weight: 900; +} + +blockquote { + border-left: solid 4px #c9c9c9; + font-style: italic; + margin: 0 0 2em 0; + padding: 0.5em 0 0.5em 2em; +} + +code, kbd, samp { + background: rgba(144, 144, 144, 0.075); + border-radius: 4px; + border: solid 1px #c9c9c9; + font-family: "Courier New", monospace; + font-size: 0.9em; + margin: 0 0.25em; + padding: 0.25em 0.65em; +} + +code del { + background: rgba(255, 0, 0, 0.2); + text-decoration: line-through; +} + +code ins { + background: rgba(0, 255, 0, 0.2); + text-decoration: none; +} + +pre { + -webkit-overflow-scrolling: touch; + font-family: "Courier New", monospace; + font-size: 0.9em; + margin: 0 0 2em 0; +} + +pre code { + display: block; + line-height: 1.75; + padding: 1em 1.5em; + overflow-x: auto; +} +/**/ + +hr { + border: 0; + border-bottom: solid 1px #c9c9c9; + margin: 2em 0; +} + +meter { + width: 100% +} + +.meter { + width: 100%; + height: 1em; + border: #c9c9c9 solid 1px; + line-height: 1em; +} + +.meter .bar { + background: #5bb0fd; + height: 100%; + display: inline-block; +} + +.panel { + box-shadow: 0 0 5px #c9c9c9; + padding: 1em; + border-radius: 5px; + background-color: white; +} + +.invisible { + display: none !important; +} + +/**/ +article, section, blockquote, .panel { + margin-bottom: 2em; +} + +/**/ +.align-left { + text-align: left; +} + +.align-center { + text-align: center; +} + +.align-right { + text-align: right; +} + +.float-right { + float: right; +} + +.float-left { + float: left; +} +/**/ + +/**/ +.row { + display: flex; + flex-wrap: wrap; + box-sizing: border-box; + align-items: stretch; +} + +.row > * { + box-sizing: border-box; +} + +.row.gtr-uniform > * > :last-child { + margin-bottom: 0; +} + +/**/ +.row.aln-left { + justify-content: flex-start; +} + +.row.aln-center { + justify-content: center; +} + +.row.aln-right { + justify-content: flex-end; +} + +.row.aln-top { + align-items: flex-start; +} + +.row.aln-middle { + align-items: center; +} + +.row.aln-bottom { + align-items: flex-end; +} +/**/ + +/**/ +.row > .col-12 { + width: 100%; +} + +.row > .col-11 { + width: 91.66% +} + +.row > .col-10 { + width: 83.33% +} + +.row > .col-9 { + width: 75% +} + +.row > .col-8 { + width: 66.66% +} + +.row > .col-7 { + width: 58.33% +} + +.row > .col-6 { + width: 50%; +} + +.row > .col-5 { + width: 41.66% +} + +.row > .col-4 { + width: 33.33% +} + +.row > .col-3 { + width: 25% +} + +.row > .col-2 { + width: 16.66% +} + +.row > .col-1 { + width: 8.33% +} +/**/ + +/**/ +@media screen and (max-width: 1680px) { + .row > .col-12-xlarge { + width: 100%; + } + + .row > .col-11-xlarge { + width: 91.66% + } + + .row > .col-10-xlarge { + width: 83.33% + } + + .row > .col-9-xlarge { + width: 75% + } + + .row > .col-8-xlarge { + width: 66.66% + } + + .row > .col-7-xlarge { + width: 58.33% + } + + .row > .col-6-xlarge { + width: 50%; + } + + .row > .col-5-xlarge { + width: 41.66% + } + + .row > .col-4-xlarge { + width: 33.33% + } + + .row > .col-3-xlarge { + width: 25% + } + + .row > .col-2-xlarge { + width: 16.66% + } + + .row > .col-1-xlarge { + width: 8.33% + } +} +/**/ + +/**/ +@media screen and (max-width: 1280px) { + .row > .col-12-large { + width: 100%; + } + + .row > .col-11-large { + width: 91.66% + } + + .row > .col-10-large { + width: 83.33% + } + + .row > .col-9-large { + width: 75% + } + + .row > .col-8-large { + width: 66.66% + } + + .row > .col-7-large { + width: 58.33% + } + + .row > .col-6-large { + width: 50%; + } + + .row > .col-5-large { + width: 41.66% + } + + .row > .col-4-large { + width: 33.33% + } + + .row > .col-3-large { + width: 25% + } + + .row > .col-2-large { + width: 16.66% + } + + .row > .col-1-large { + width: 8.33% + } +} +/**/ + +/**/ +@media screen and (max-width: 980px) { + .row > .col-12-medium { + width: 100%; + } + + .row > .col-11-medium { + width: 91.66% + } + + .row > .col-10-medium { + width: 83.33% + } + + .row > .col-9-medium { + width: 75% + } + + .row > .col-8-medium { + width: 66.66% + } + + .row > .col-7-medium { + width: 58.33% + } + + .row > .col-6-medium { + width: 50%; + } + + .row > .col-5-medium { + width: 41.66% + } + + .row > .col-4-medium { + width: 33.33% + } + + .row > .col-3-medium { + width: 25% + } + + .row > .col-2-medium { + width: 16.66% + } + + .row > .col-1-medium { + width: 8.33% + } +} +/**/ + +/**/ +@media screen and (max-width: 736px) { + /* Small */ + .row > .col-12-small { + width: 100%; + } + + .row > .col-11-small { + width: 91.66% + } + + .row > .col-10-small { + width: 83.33% + } + + .row > .col-9-small { + width: 75% + } + + .row > .col-8-small { + width: 66.66% + } + + .row > .col-7-small { + width: 58.33% + } + + .row > .col-6-small { + width: 50%; + } + + .row > .col-5-small { + width: 41.66% + } + + .row > .col-4-small { + width: 33.33% + } + + .row > .col-3-small { + width: 25% + } + + .row > .col-2-small { + width: 16.66% + } + + .row > .col-1-small { + width: 8.33% + } +} +/**/ + +/**/ +@media screen and (max-width: 480px) { + /* XSmall */ + .row > .col-12-xsmall { + width: 100%; + } + + .row > .col-11-xsmall { + width: 91.66% + } + + .row > .col-10-xsmall { + width: 83.33% + } + + .row > .col-9-xsmall { + width: 75% + } + + .row > .col-8-xsmall { + width: 66.66% + } + + .row > .col-7-xsmall { + width: 58.33% + } + + .row > .col-6-xsmall { + width: 50%; + } + + .row > .col-5-xsmall { + width: 41.66% + } + + .row > .col-4-xsmall { + width: 33.33% + } + + .row > .col-3-xsmall { + width: 25% + } + + .row > .col-2-xsmall { + width: 16.66% + } + + .row > .col-1-xsmall { + width: 8.33% + } +} +/**/ + +.row { + margin-top: 0; + margin-left: -1em; +} + +.row > * { + padding: 0 0 0 1em; +} + +.row.gtr-uniform { + margin-top: -1em; +} + +.row.gtr-uniform > * { + padding-top: 1em; +} +/**/ + +/**/ +ul, ol { + margin: 0 0 1em 0; +} + +ul.actions { + display: flex; + cursor: default; + list-style: none; + margin-left: -1em; + padding-left: 0; +} + +ul.actions.aln-left { + justify-content: flex-start; +} + +ul.actions.aln-center { + justify-content: center; +} + +ul.actions.aln-right { + justify-content: flex-end; +} + +ul.actions.aln-top { + align-items: flex-start; +} + +ul.actions.aln-middle { + align-items: center; +} + +ul.actions li { + padding: 0 0 0 1em; + vertical-align: middle; +} +/**/ +/**/ + +/**/ +.survey { + margin-bottom: 1em; +} + +.survey > .summary { + margin-bottom: 1em; +} + +.survey .title h1, +.survey .title h2 { + margin-bottom: 0; +} + +.survey label { + margin: 0; + display: inline-block; +} + +.survey label ~ span { + font-size: 0.9em; +} + +/**/ +.question { + border: solid 1px #c9c9c9; + border-radius: 5px; + margin-bottom: 1em; +} + +.question > .title { + text-transform: none; +} + +.question > .title > h2 { + letter-spacing: 0; + text-transform: none; + display: inline-block; +} + +.question > .title > span { + font-weight: 400; +} + +.question > header { + border-bottom: solid 1px #c9c9c9; +} + +.question > footer { + border-top: solid 1px #c9c9c9; +} + +.question > header, +.question > footer { + background: #f2f2f2; + padding: 1em; +} + +.question > .title > input { + width: calc(100% - 2.2em); + display: inline-block; +} + +.question:only-of-type > .title > input { + width: 100%; +} +/**/ + +/**/ +.answers { + padding: 1.5em; +} + +.answers > ol { + padding-left: 0; + margin: 0; +} + +.answers > ol > li:last-child { + margin-bottom: 0; +} + +.answer { + margin-bottom: 1em; + display: flex; +} + +.answer::marker { + content: ""; +} + +.answer.new { + opacity: 50%; +} +/**/ + +.question > .title > .close, +.answer > .close { + font-family: "Font Awesome 5 Free" !important; + font-weight: 900 !important; + font-style: normal !important; + width: 2em; + height: 2em; + line-height: 2em; + display: inline-block; + text-align: center; + border-bottom: none; +} + +.question:only-of-type > .title > .close, +.answer.new > .close { + display: none; +} + +/**/ +.survey.participation .answer > input { + width: 0; +} +/**/ + +/**/ +.survey.evaluation .answer { + display: block; +} + +.survey.evaluation header > div > span:nth-child(2n) { + padding: 0 0.25em; +} +/**/ + +/**/ +.survey.draft > .title { + margin-top: 2em; +} + +.survey.draft .title h1, +.survey.draft .title h2 { + margin-bottom: 0; +} + +.survey.draft .answers > ol { + margin: 1em 0; +} + +.survey.draft .answer { + display: list-item; +} + +.survey.draft .answer::before { + background: #585858; + border-color: #585858; + color: #ffffff; + content: '\f00c'; + font-family: "Font Awesome 5 Free" !important; + font-weight: 900 !important; + font-style: normal !important; + width: 2em; + height: 2em; + line-height: 2em; + display: inline-block; + border-radius: 100%; + text-align: center; + margin-right: 1em; +} + +.survey.draft .answers.multiple .answer::before { + border-radius: 5px; +} + +.survey.draft .answer > input { + display: inline-block; + width: calc(100% - 5.4em); +} +/**/ +/**/ + +/**/ +.survey-panel { + border: solid 1px #c9c9c9; + border-radius: 5px; + margin-bottom: 1em; +} + +.survey-panel > * { + padding: 1em; +} + +.survey-panel > header { + background: #f2f2f2; +} + +.survey-panel > header > h2 { + margin-bottom: 0; + display: inline-block; +} +/**/ + +/**/ +.login .logo, +.register .logo { + white-space: nowrap; + margin: 0 2em 2em 2em; +} + +.login .logo > img, +.register .logo > img { + width: 5em; +} + +.login .logo > h1, +.register .logo > h1 { + margin: 0 0 0 0.5em; +} + +.login .panel .error, +.login .panel .success { + margin: -1em -1em 1em -1em; + padding: 1em; +} + +.login .panel .error:first-of-type, +.login .panel .success:first-of-type { + border-radius: 5px 5px 0 0; +} + +.register .panel .error { + margin: -1em -1em 1em -1em; + padding: 0 1em; + border-radius: 5px 5px 0 0; + white-space: normal; +} + +.login ~ .spacer, +.register ~ .spacer { + flex-basis: 4em; + flex-shrink: 1; +} +/**/ + +#index-header > header { + display: flex; + justify-content: center; + align-items: center; + margin: 2em 0; +} + +#index-header > header > img { + width: 8em; + height: 8em; +} + +#index-header > header > h1 { + text-transform: uppercase; + margin: 0 0 0 0.5em; +} \ No newline at end of file diff --git a/src/main/resources/static/css/normalize.css b/src/main/resources/static/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/src/main/resources/static/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/src/main/resources/static/css/slider.css b/src/main/resources/static/css/slider.css new file mode 100644 index 0000000..744a4c0 --- /dev/null +++ b/src/main/resources/static/css/slider.css @@ -0,0 +1,28 @@ +.double-slider { + width: 100%; + height: 0.5em; + position: relative; + background: #c9c9c9; + border-radius: 0.25em; + margin: 0.25em; +} + +.double-slider .bar { + position: absolute; + top: 0; + bottom: 0; + background: #585858; + transform: translateX(0.5em); +} + +.double-slider .left-thumb, +.double-slider .right-thumb { + position: absolute; + top: -0.25em; + bottom: 0.25em; + width: 1em; + height: 1em; + border-radius: 0.5em; + background: #585858; + cursor: pointer; +} \ No newline at end of file diff --git a/src/main/resources/static/img/favicon.png b/src/main/resources/static/img/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4ad0b146cbe425632e49c1600caa18b41f04f9 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS0%1l`4X*~E;15q1#}E(i); zZaY@02ybY<<5Bm!^76*$W3PhLvL*#68qC=E{$zcerUpCDia9=#`}d{%`NMOHky$I6 zfhD6X;69Ur!#3t_)|tzEPMiq&A$<7$d>)?v3oadD+#&1o4*h(QwMV5p;Yj+#bgx+)%c)cpU>ql{E5RfcMTz>9oy r3LSK^>bP0l+XkK=&*^t literal 0 HcmV?d00001 diff --git a/src/main/resources/static/img/icon.svg b/src/main/resources/static/img/icon.svg new file mode 100644 index 0000000..3c2eed1 --- /dev/null +++ b/src/main/resources/static/img/icon.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/static/js/entertab.js b/src/main/resources/static/js/entertab.js new file mode 100644 index 0000000..baf25e5 --- /dev/null +++ b/src/main/resources/static/js/entertab.js @@ -0,0 +1,8 @@ +document.addEventListener('keydown', function (event) { + if (event.keyCode === 13 && event.target.nodeName === 'INPUT') { + var form = event.target.form; + var index = Array.prototype.indexOf.call(form, event.target); + form.elements[index + 1].focus(); + event.preventDefault(); + } +}); \ No newline at end of file diff --git a/src/main/resources/static/js/slider.js b/src/main/resources/static/js/slider.js new file mode 100644 index 0000000..67d29fa --- /dev/null +++ b/src/main/resources/static/js/slider.js @@ -0,0 +1,162 @@ +function initSliders() { + document.querySelectorAll('.double-slider').forEach(setupSlider); +} + +function setupSlider(slider) { + const left_input = slider.querySelector('input.left'); + const right_input = slider.querySelector('input.right'); + + const left_thumb = slider.querySelector('.left-thumb'); + const right_thumb = slider.querySelector('.right-thumb'); + + left_thumb.onmousedown = event => { + selectLeft(); + startDrag(event, left_thumb); + } + + right_thumb.onmousedown = event => { + selectRight() + startDrag(event, right_thumb); + } + + updateSlider(slider); + + let x0 = 0; + let clientX0 = 0; + let input = null; + let effective_width = 0; + let slider_min_value = 0; + let slider_max_value = 0; + let slider_range = 0; + let thumb_min_value = 0; + let thumb_max_value = 0; + + function selectRight() { + input = right_input; + thumb_min_value = Math.max(right_input.min, parseInt(left_input.value)); + thumb_max_value = right_input.max; + } + + function selectLeft() { + input = left_input; + thumb_min_value = left_input.min; + thumb_max_value = Math.min(left_input.max, parseInt(right_input.value)); + } + + function startDrag(event, thumb) { + event = event || window.event; + event.preventDefault(); + + clientX0 = event.clientX; + x0 = event.clientX - thumb.getBoundingClientRect().left + slider.getBoundingClientRect().left; + effective_width = slider.getBoundingClientRect().width - thumb.getBoundingClientRect().width; + slider_min_value = left_input.min; + slider_max_value = right_input.max; + slider_range = slider_max_value - slider_min_value; + + document.onmouseup = endDrag; + document.onmousemove = drag; + } + + function drag(event) { + event = event || window.event; + event.preventDefault(); + + let forceUpdate = false; + + // calculate mouse position relative to slider + let new_thumb_x = event.clientX - x0; + new_thumb_x = Math.max(0, Math.min(effective_width, new_thumb_x)); + + // convert position into value + let progress = new_thumb_x / parseFloat(effective_width); + let value = Math.round(slider_min_value + (progress * slider_range)); + + // switch selected thumb if outside thumb value range + if (value < parseInt(left_input.value) && input === right_input) { + input.value = thumb_min_value; + selectLeft(); + forceUpdate = true; + } else if (value > parseInt(right_input.value) && input === left_input) { + input.value = thumb_max_value; + selectRight(); + forceUpdate = true; + } + + // clamp value + value = Math.max(thumb_min_value, Math.min(thumb_max_value, value)); + + // apply changes + if (value !== parseInt(input.value)) { + changeValue(input, value); + forceUpdate = true; + } + + // update gui if necessary + if (forceUpdate) { + updateSlider(slider); + } + } + + function endDrag() { + document.onmouseup = null; + document.onmousemove = null; + } +} + +function updateSlider(slider) { + const left_input = slider.querySelector('input.left'); + const right_input = slider.querySelector('input.right'); + + const slider_min_value = left_input.min; + const slider_max_value = right_input.max; + const slider_range = slider_max_value - slider_min_value; + + const left_max_value = left_input.max; + const right_min_value = right_input.min; + + const left_thumb = slider.querySelector('.left-thumb'); + const right_thumb = slider.querySelector('.right-thumb'); + + const bar = slider.querySelector('.bar'); + + const clampedLeft = Math.max(slider_min_value, Math.min(left_max_value, parseInt(left_input.value))); + const clampedRight = Math.max(Math.max(clampedLeft, right_min_value), Math.min(slider_max_value, parseInt(right_input.value))); + + if (parseInt(left_input.value) !== clampedLeft) { + changeValue(left_input, clampedLeft); + } + + if (parseInt(right_input.value) !== clampedRight) { + changeValue(right_input, clampedRight); + } + + positionThumbInSlider(left_thumb, left_input.value - slider_min_value, slider_range); + positionThumbInSlider(right_thumb, right_input.value - slider_min_value, slider_range); + positionBarInSlider(bar, left_input.value - slider_min_value, right_input.value - slider_min_value, slider_range); +} + +function positionThumbInSlider(thumb, position, range) { + let progress = position / parseFloat(range); + progress = Math.max(0, Math.min(1, progress)); + thumb.style.left = 'calc(' + (100 * progress) + '% - ' + (progress) + 'em)'; +} + +function positionBarInSlider(bar, left, right, range) { + let leftProgress = left / parseFloat(range); + leftProgress = Math.max(0, Math.min(1, leftProgress)); + + let rightProgress = right / parseFloat(range); + rightProgress = Math.max(0, Math.min(1, rightProgress)); + + bar.style.left = 'calc(' + (100 * leftProgress) + '% - ' + (leftProgress) + 'em)'; + bar.style.width = 'calc(' + (100 * (rightProgress - leftProgress)) + '% - ' + (rightProgress - leftProgress) + 'em)'; +} + +function changeValue(input, value) { + input.value = value; + + let evt = document.createEvent('HTMLEvents'); + evt.initEvent('change', false, true); + input.dispatchEvent(evt); +} \ No newline at end of file diff --git a/src/main/resources/static/js/survey.js b/src/main/resources/static/js/survey.js new file mode 100644 index 0000000..19ce51d --- /dev/null +++ b/src/main/resources/static/js/survey.js @@ -0,0 +1,134 @@ +const max_questions_per_survey = 20; +const max_answers_per_question = 20; +const answer_count_pattern = document.getElementById('answer-count-text').innerText; + +function addQuestion(survey) { + if (survey.querySelectorAll(".question").length >= max_questions_per_survey) return; + + // load question from template + let template = document.getElementById('question-template'); + let questionNode = template.content.cloneNode(true); + + setupSlider(questionNode.querySelector('.double-slider')); + + // add answer + addAnswer(questionNode); + + // append to dom + survey.insertBefore(questionNode, survey.querySelector('.survey > footer')); + + // set visibility of "add question" button + if (survey.children.length >= max_questions_per_survey) { + document.getElementById('add-question').style.display = 'none'; + } else { + document.getElementById('add-question').style.display = null; + } + + return questionNode; +} + +function removeQuestion(question) { + if (!question.matches(':only-of-type')) { + let survey = question.closest('.survey'); + + survey.removeChild(question); + + if (survey.children.length >= max_questions_per_survey) { + document.getElementById('add-question').style.display = 'none'; + } else { + document.getElementById('add-question').style.display = null; + } + } +} + +function addAnswer(question) { + if (question.querySelectorAll(".answer").length >= max_answers_per_question) return; + + // load template + let template = document.getElementById('answer-template'); + let answerNode = template.content.cloneNode(true); + + // add to dom + question.querySelector('.answers ol').appendChild(answerNode); + + updateAnswerCount(question); + + return answerNode; +} + +function addAnswerOnInput(question, answer) { + if (answer.matches(".new")) { + answer.children[0].placeholder = 'antwortmöglichkeit'; + answer.children[0].oninput = ''; + answer.classList.toggle('new', false); + + let question = answer.closest('.question'); + + if (addAnswer(question) === undefined) { + updateAnswerCount(question); + } + } else { + answer.children[0].oninput = ''; + } +} + +function removeAnswer(answer) { + if (!answer.matches(".new")) { + let ol = answer.parentElement; + + ol.removeChild(answer); + + updateAnswerCount(ol.closest('.question')); + } +} + +function updateAnswerCount(question) { + let slider = question.querySelector('.double-slider'); + + let answerCount = question.querySelectorAll('.answer:not(.new)').length; + + if (answerCount < max_answers_per_question && question.querySelector('.answer.new') == null) { + addAnswer(question); + } + + slider.querySelector('input.left').max = answerCount; + slider.querySelector('input.right').max = answerCount; + updateSlider(slider); + + updateAnswerCountText(question); +} + +function updateAnswerCountText(question) { + let text = question.querySelector('.answer-count-text'); + + let slider = question.querySelector('.double-slider'); + let left = slider.querySelector('.left').value; + let right = slider.querySelector('.right').value; + + question.querySelector('.answers').classList.toggle('multiple', right !== '1' || left !== '1'); + + text.innerText = answer_count_pattern.replace('{min}', left).replace('{max}', right); +} + +function prepareNames(survey) { + let questions = survey.querySelectorAll('.question'); + + questions.forEach((question, qindex) => { + let qBaseName = `questions[${qindex}]`; + + question.querySelector('header > input').name = qBaseName + '.text'; + question.querySelector('footer > .double-slider > .left').name = qBaseName + '.minAnswers'; + question.querySelector('footer > .double-slider > .right').name = qBaseName + '.maxAnswers'; + + question.querySelectorAll('.answers .answer:not(.new)').forEach((answer, aindex) => { + answer.querySelector('input').name = qBaseName + `.answers[${aindex}]`; + }) + }) +} + +window.addEventListener('load', () => { + document.getElementById('survey-form') + .addEventListener('submit', () => { + prepareNames(document.getElementById('survey-form')); + }); +}); \ No newline at end of file diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 0000000..d8ec162 --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,26 @@ + + + + Fehler + + + +

+
+
+
+

+ 404 – Seite nicht gefunden +

+

+ Die von Ihnen gesuchte Seite konnte leider nicht gefunden werden. Das tut uns leid. +

+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/generic.html b/src/main/resources/templates/fragments/generic.html new file mode 100644 index 0000000..a6432ca --- /dev/null +++ b/src/main/resources/templates/fragments/generic.html @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fragments/survey.html b/src/main/resources/templates/fragments/survey.html new file mode 100644 index 0000000..8311ba4 --- /dev/null +++ b/src/main/resources/templates/fragments/survey.html @@ -0,0 +1,37 @@ + + + +
+
+
+
+
+ Mehr +
+

Liste aller Umfragen

+
+
+
+ + +
+
+

Titel

+ 30 Teilnehmer +
+
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor + invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam + et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. +
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..341773b --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,34 @@ + + + + Survelopment + + + +
+
+
+
+
+ +

Survelopment

+
+
+ You can think of each survey (or group of surveys) as having a baseline and with each repetition, keep adding + one more survey. Simple, huh? After X surveys, X stations. Best of all, data points are average and consistency + is guaranteed via satellite sitting almost off the moon. It'll make your wife more productive. + While the most current version of the data is available for local travel, the core demographic will never complain. + - GPT-2 +
+
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 0000000..58fdaa1 --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,58 @@ + + + + Login + + + +
+
+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html new file mode 100644 index 0000000..e6756d4 --- /dev/null +++ b/src/main/resources/templates/register.html @@ -0,0 +1,58 @@ + + + + Login + + + +
+
+
+
+ +
+
+
+
+
+
+
    +
  • +
+
+ +
+
+ + +
+
+ + +
+
+
    +
  • + +
    • +
+
+
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/survey/create.html b/src/main/resources/templates/survey/create.html new file mode 100644 index 0000000..c1bf039 --- /dev/null +++ b/src/main/resources/templates/survey/create.html @@ -0,0 +1,119 @@ + + + + + Umfrage erstellen + + + + + + + + + +
+
+
+

Umfrage erstellen

+
+ +
+
+
    +
  • Fehler
    • +
  • Fehler
    • +
  • Fehler
    • +
+
+
+ + +
+
+ + +
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/survey/evaluation.html b/src/main/resources/templates/survey/evaluation.html new file mode 100644 index 0000000..3ed55db --- /dev/null +++ b/src/main/resources/templates/survey/evaluation.html @@ -0,0 +1,65 @@ + + + + Umfragetitel - Auswertung + + + +
+
+
+
+
+
+ + Zur Teilnahme + +
+

Umfragetitel - Auswertung

+
+ 0 Teilnehmer + – + 00.00.0000 + – + Owner +
+
+
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor + invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam + et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. +
+
+
+

Frage

+ + (zwischen 1 und 1 Antworten) + +
+
+
    +
  1. + + + xx% der Stimmen + +
    + + +
    +
    2. +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/survey/list.html b/src/main/resources/templates/survey/list.html new file mode 100644 index 0000000..a9d3e64 --- /dev/null +++ b/src/main/resources/templates/survey/list.html @@ -0,0 +1,18 @@ + + + + Titel + + + +
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/survey/participate.html b/src/main/resources/templates/survey/participate.html new file mode 100644 index 0000000..ee6b871 --- /dev/null +++ b/src/main/resources/templates/survey/participate.html @@ -0,0 +1,84 @@ + + + + Titel + + + +
+
+
+
+
+
+
+ + Zur Auswertung + +
+

Umfragetitel

+
+
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor + invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam + et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. +
+
+
+

Frage

+ + (zwischen 1 und 3 Antworten auswählen) + +
+
+
    +
  • Fehler
    • +
+
+
+
    +
  1. + + +
    2. +
+
+
+
+
    +
  • + +
    • +
  • + +
    • +
+
+
+ +
+
+
+ + \ No newline at end of file