From 6dfe2a3329e97f8e2ea3b2f21f5dbf26320d7945 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 24 Nov 2020 17:11:16 +0100 Subject: [PATCH] updated start site start site has now user and admin login panels added custom css for start page dashboard is now splitted in cateogies implemendet LiveReload added fallback 'falseInput.html' page --- logs/Voting.log | 266 +++++++++++------- pom.xml | 5 + .../controller/VotingController.java | 15 +- src/main/resources/static/styles/start.css | 209 ++++---------- src/main/resources/templates/dashboard.html | 7 +- .../{wrongEmail.html => falseInput.html} | 0 src/main/resources/templates/start.html | 42 ++- 7 files changed, 266 insertions(+), 278 deletions(-) rename src/main/resources/templates/errors/{wrongEmail.html => falseInput.html} (100%) diff --git a/logs/Voting.log b/logs/Voting.log index f748cf2..c21ce64 100644 --- a/logs/Voting.log +++ b/logs/Voting.log @@ -1,106 +1,160 @@ -2020-11-11 15:42:05,011 INFO [main] Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests], using SpringBootContextLoader -2020-11-11 15:42:05,019 INFO [main] Could not detect default resource locations for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}. -2020-11-11 15:42:05,021 INFO [main] Could not detect default configuration classes for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: AbizeitungVotingSystemApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration. -2020-11-11 15:42:05,119 INFO [main] Found @SpringBootConfiguration com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplication for test class com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests -2020-11-11 15:42:05,200 INFO [main] Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener] -2020-11-11 15:42:05,214 INFO [main] Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@33b1c5c5, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@5b202a3a, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@10b9db7b, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@9ef8eb7, org.springframework.test.context.support.DirtiesContextTestExecutionListener@34cdeda2, org.springframework.test.context.transaction.TransactionalTestExecutionListener@6ee660fb, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener@305a0c5f, org.springframework.test.context.event.EventPublishingTestExecutionListener@4535b6d5, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@1ecee32c, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@4372b9b6, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@232a7d73, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@4b41e4dd, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@22ffa91a, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@74960bfa] -2020-11-11 15:42:05,408 INFO [main] Starting AbizeitungVotingSystemApplicationTests on bitecoding-System-Product-Name with PID 34286 (started by bitecoding in /home/bitecoding/Documents/AbizeitungVotingSystem) -2020-11-11 15:42:05,409 INFO [main] No active profile set, falling back to default profiles: default -2020-11-11 15:42:05,861 INFO [main] Bootstrapping Spring Data JPA repositories in DEFAULT mode. -2020-11-11 15:42:05,910 INFO [main] Finished Spring Data repository scanning in 40ms. Found 3 JPA repository interfaces. -2020-11-11 15:42:06,537 INFO [main] HHH000204: Processing PersistenceUnitInfo [name: default] -2020-11-11 15:42:06,597 INFO [main] HHH000412: Hibernate ORM core version 5.4.21.Final -2020-11-11 15:42:06,720 INFO [main] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} -2020-11-11 15:42:06,805 INFO [main] HikariPool-1 - Starting... -2020-11-11 15:42:07,229 INFO [main] HikariPool-1 - Start completed. -2020-11-11 15:42:07,252 INFO [main] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect -2020-11-11 15:42:07,837 INFO [main] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] -2020-11-11 15:42:07,844 INFO [main] Initialized JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 15:42:08,332 WARN [main] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2020-11-11 15:42:08,544 INFO [main] Initializing ExecutorService 'applicationTaskExecutor' -2020-11-11 15:42:08,882 INFO [main] Started AbizeitungVotingSystemApplicationTests in 3.64 seconds (JVM running for 4.479) -2020-11-11 15:42:09,061 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' -2020-11-11 15:42:09,063 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 15:42:09,066 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... -2020-11-11 15:42:09,073 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. -2020-11-11 15:42:20,142 INFO [main] Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests], using SpringBootContextLoader -2020-11-11 15:42:20,148 INFO [main] Could not detect default resource locations for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}. -2020-11-11 15:42:20,149 INFO [main] Could not detect default configuration classes for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: AbizeitungVotingSystemApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration. -2020-11-11 15:42:20,228 INFO [main] Found @SpringBootConfiguration com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplication for test class com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests -2020-11-11 15:42:20,306 INFO [main] Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener] -2020-11-11 15:42:20,319 INFO [main] Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@33b1c5c5, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@5b202a3a, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@10b9db7b, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@9ef8eb7, org.springframework.test.context.support.DirtiesContextTestExecutionListener@34cdeda2, org.springframework.test.context.transaction.TransactionalTestExecutionListener@6ee660fb, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener@305a0c5f, org.springframework.test.context.event.EventPublishingTestExecutionListener@4535b6d5, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@1ecee32c, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@4372b9b6, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@232a7d73, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@4b41e4dd, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@22ffa91a, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@74960bfa] -2020-11-11 15:42:20,506 INFO [main] Starting AbizeitungVotingSystemApplicationTests on bitecoding-System-Product-Name with PID 34413 (started by bitecoding in /home/bitecoding/Documents/AbizeitungVotingSystem) -2020-11-11 15:42:20,507 INFO [main] No active profile set, falling back to default profiles: default -2020-11-11 15:42:20,963 INFO [main] Bootstrapping Spring Data JPA repositories in DEFAULT mode. -2020-11-11 15:42:21,004 INFO [main] Finished Spring Data repository scanning in 35ms. Found 3 JPA repository interfaces. -2020-11-11 15:42:21,603 INFO [main] HHH000204: Processing PersistenceUnitInfo [name: default] -2020-11-11 15:42:21,636 INFO [main] HHH000412: Hibernate ORM core version 5.4.21.Final -2020-11-11 15:42:21,737 INFO [main] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} -2020-11-11 15:42:21,807 INFO [main] HikariPool-1 - Starting... -2020-11-11 15:42:22,149 INFO [main] HikariPool-1 - Start completed. -2020-11-11 15:42:22,167 INFO [main] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect -2020-11-11 15:42:22,733 INFO [main] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] -2020-11-11 15:42:22,741 INFO [main] Initialized JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 15:42:23,215 WARN [main] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2020-11-11 15:42:23,413 INFO [main] Initializing ExecutorService 'applicationTaskExecutor' -2020-11-11 15:42:23,742 INFO [main] Started AbizeitungVotingSystemApplicationTests in 3.399 seconds (JVM running for 4.237) -2020-11-11 15:42:23,905 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' -2020-11-11 15:42:23,907 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 15:42:23,909 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... -2020-11-11 15:42:23,917 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. -2020-11-11 16:24:12,172 INFO [main] Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests], using SpringBootContextLoader -2020-11-11 16:24:12,178 INFO [main] Could not detect default resource locations for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}. -2020-11-11 16:24:12,179 INFO [main] Could not detect default configuration classes for test class [com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests]: AbizeitungVotingSystemApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration. -2020-11-11 16:24:12,255 INFO [main] Found @SpringBootConfiguration com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplication for test class com.github.cato447.AbizeitungVotingSystem.AbizeitungVotingSystemApplicationTests -2020-11-11 16:24:12,325 INFO [main] Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener] -2020-11-11 16:24:12,338 INFO [main] Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@33b1c5c5, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@5b202a3a, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@10b9db7b, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@9ef8eb7, org.springframework.test.context.support.DirtiesContextTestExecutionListener@34cdeda2, org.springframework.test.context.transaction.TransactionalTestExecutionListener@6ee660fb, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener@305a0c5f, org.springframework.test.context.event.EventPublishingTestExecutionListener@4535b6d5, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@1ecee32c, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@4372b9b6, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@232a7d73, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@4b41e4dd, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@22ffa91a, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@74960bfa] -2020-11-11 16:24:12,546 INFO [main] Starting AbizeitungVotingSystemApplicationTests on bitecoding-System-Product-Name with PID 40525 (started by bitecoding in /home/bitecoding/Documents/AbizeitungVotingSystem) -2020-11-11 16:24:12,547 INFO [main] No active profile set, falling back to default profiles: default -2020-11-11 16:24:12,998 INFO [main] Bootstrapping Spring Data JPA repositories in DEFAULT mode. -2020-11-11 16:24:13,045 INFO [main] Finished Spring Data repository scanning in 37ms. Found 3 JPA repository interfaces. -2020-11-11 16:24:13,711 INFO [main] HHH000204: Processing PersistenceUnitInfo [name: default] -2020-11-11 16:24:13,745 INFO [main] HHH000412: Hibernate ORM core version 5.4.21.Final -2020-11-11 16:24:13,830 INFO [main] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} -2020-11-11 16:24:13,903 INFO [main] HikariPool-1 - Starting... -2020-11-11 16:24:14,245 INFO [main] HikariPool-1 - Start completed. -2020-11-11 16:24:14,267 INFO [main] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect -2020-11-11 16:24:14,809 INFO [main] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] -2020-11-11 16:24:14,814 INFO [main] Initialized JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 16:24:15,292 WARN [main] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2020-11-11 16:24:15,479 INFO [main] Initializing ExecutorService 'applicationTaskExecutor' -2020-11-11 16:24:15,809 INFO [main] Started AbizeitungVotingSystemApplicationTests in 3.444 seconds (JVM running for 4.259) -2020-11-11 16:24:16,006 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' -2020-11-11 16:24:16,009 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 16:24:16,011 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... -2020-11-11 16:24:16,023 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. -2020-11-11 16:24:34,881 INFO [main] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 40654 (/home/bitecoding/Documents/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Documents/AbizeitungVotingSystem) -2020-11-11 16:24:34,883 INFO [main] No active profile set, falling back to default profiles: default -2020-11-11 16:24:35,393 INFO [main] Bootstrapping Spring Data JPA repositories in DEFAULT mode. -2020-11-11 16:24:35,451 INFO [main] Finished Spring Data repository scanning in 49ms. Found 3 JPA repository interfaces. -2020-11-11 16:24:36,061 INFO [main] Tomcat initialized with port(s): 8000 (http) -2020-11-11 16:24:36,071 INFO [main] Initializing ProtocolHandler ["http-nio-8000"] -2020-11-11 16:24:36,072 INFO [main] Starting service [Tomcat] -2020-11-11 16:24:36,073 INFO [main] Starting Servlet engine: [Apache Tomcat/9.0.38] -2020-11-11 16:24:36,175 INFO [main] Initializing Spring embedded WebApplicationContext -2020-11-11 16:24:36,176 INFO [main] Root WebApplicationContext: initialization completed in 1226 ms -2020-11-11 16:24:36,373 INFO [main] HHH000204: Processing PersistenceUnitInfo [name: default] -2020-11-11 16:24:36,406 INFO [main] HHH000412: Hibernate ORM core version 5.4.21.Final -2020-11-11 16:24:36,497 INFO [main] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} -2020-11-11 16:24:36,557 INFO [main] HikariPool-1 - Starting... -2020-11-11 16:24:36,916 INFO [main] HikariPool-1 - Start completed. -2020-11-11 16:24:36,935 INFO [main] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect -2020-11-11 16:24:37,431 INFO [main] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] -2020-11-11 16:24:37,436 INFO [main] Initialized JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 16:24:37,761 WARN [main] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning -2020-11-11 16:24:37,873 INFO [main] Initializing ExecutorService 'applicationTaskExecutor' -2020-11-11 16:24:38,052 INFO [main] Starting ProtocolHandler ["http-nio-8000"] -2020-11-11 16:24:38,066 INFO [main] Tomcat started on port(s): 8000 (http) with context path '' -2020-11-11 16:24:38,076 INFO [main] Started AbizeitungVotingSystemApplication in 3.511 seconds (JVM running for 3.96) -2020-11-11 16:24:48,118 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' -2020-11-11 16:24:48,119 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' -2020-11-11 16:24:48,125 INFO [http-nio-8000-exec-1] Completed initialization in 6 ms -2020-11-11 16:24:48,278 INFO [http-nio-8000-exec-1] User IP: 127.0.0.1 -2020-11-11 16:56:49,334 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' -2020-11-11 16:56:49,336 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' -2020-11-11 16:56:49,338 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... -2020-11-11 16:56:49,346 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. +2020-11-24 15:57:46,175 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 7303 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-11-24 15:57:46,183 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-11-24 15:57:46,317 INFO [restartedMain] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +2020-11-24 15:57:46,322 INFO [restartedMain] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +2020-11-24 15:57:46,954 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-11-24 15:57:47,039 INFO [restartedMain] Finished Spring Data repository scanning in 75ms. Found 3 JPA repository interfaces. +2020-11-24 15:57:48,123 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-11-24 15:57:48,136 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-11-24 15:57:48,137 INFO [restartedMain] Starting service [Tomcat] +2020-11-24 15:57:48,137 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-11-24 15:57:48,233 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-11-24 15:57:48,234 INFO [restartedMain] Root WebApplicationContext: initialization completed in 1911 ms +2020-11-24 15:57:48,511 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-11-24 15:57:48,578 INFO [restartedMain] HHH000412: Hibernate ORM core version 5.4.21.Final +2020-11-24 15:57:48,721 INFO [restartedMain] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} +2020-11-24 15:57:48,810 INFO [restartedMain] HikariPool-1 - Starting... +2020-11-24 15:57:49,406 INFO [restartedMain] HikariPool-1 - Start completed. +2020-11-24 15:57:49,441 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-11-24 15:57:50,272 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-11-24 15:57:50,278 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 15:57:50,300 INFO [restartedMain] LiveReload server is running on port 35729 +2020-11-24 15:57:50,764 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-11-24 15:57:50,910 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-11-24 15:57:51,202 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-11-24 15:57:51,229 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-11-24 15:57:51,243 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 5.551 seconds (JVM running for 6.58) +2020-11-24 15:58:06,947 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-11-24 15:58:06,948 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-11-24 15:58:06,959 INFO [http-nio-8000-exec-1] Completed initialization in 11 ms +2020-11-24 15:58:07,117 INFO [http-nio-8000-exec-1] User IP: 127.0.0.1 +2020-11-24 16:04:14,946 INFO [http-nio-8000-exec-4] simon.bussmann@adolfinum.de is voting now +2020-11-24 16:05:33,091 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' +2020-11-24 16:05:33,093 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:05:33,098 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... +2020-11-24 16:05:33,109 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. +2020-11-24 16:05:36,416 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8545 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-11-24 16:05:36,419 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-11-24 16:05:36,488 INFO [restartedMain] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +2020-11-24 16:05:36,489 INFO [restartedMain] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +2020-11-24 16:05:36,969 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-11-24 16:05:37,031 INFO [restartedMain] Finished Spring Data repository scanning in 53ms. Found 3 JPA repository interfaces. +2020-11-24 16:05:37,740 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-11-24 16:05:37,753 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-11-24 16:05:37,753 INFO [restartedMain] Starting service [Tomcat] +2020-11-24 16:05:37,754 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-11-24 16:05:37,822 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-11-24 16:05:37,823 INFO [restartedMain] Root WebApplicationContext: initialization completed in 1332 ms +2020-11-24 16:05:37,983 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-11-24 16:05:38,011 INFO [restartedMain] HHH000412: Hibernate ORM core version 5.4.21.Final +2020-11-24 16:05:38,098 INFO [restartedMain] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} +2020-11-24 16:05:38,162 INFO [restartedMain] HikariPool-1 - Starting... +2020-11-24 16:05:38,533 INFO [restartedMain] HikariPool-1 - Start completed. +2020-11-24 16:05:38,554 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-11-24 16:05:39,101 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-11-24 16:05:39,110 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:05:39,130 INFO [restartedMain] LiveReload server is running on port 35729 +2020-11-24 16:05:39,499 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-11-24 16:05:39,614 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-11-24 16:05:39,801 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-11-24 16:05:39,818 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-11-24 16:05:39,831 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 3.749 seconds (JVM running for 4.28) +2020-11-24 16:05:58,307 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-11-24 16:05:58,308 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-11-24 16:05:58,321 INFO [http-nio-8000-exec-1] Completed initialization in 13 ms +2020-11-24 16:05:58,485 INFO [http-nio-8000-exec-1] User IP: 127.0.0.1 +2020-11-24 16:06:04,643 WARN [http-nio-8000-exec-3] Resolved [org.springframework.web.bind.MissingServletRequestParameterException: Required String parameter 'name' is not present] +2020-11-24 16:06:20,710 INFO [Thread-4] Shutting down ExecutorService 'applicationTaskExecutor' +2020-11-24 16:06:20,712 INFO [Thread-4] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:06:20,715 INFO [Thread-4] HikariPool-1 - Shutdown initiated... +2020-11-24 16:06:20,723 INFO [Thread-4] HikariPool-1 - Shutdown completed. +2020-11-24 16:06:20,798 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8545 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-11-24 16:06:20,799 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-11-24 16:06:20,941 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-11-24 16:06:20,957 INFO [restartedMain] Finished Spring Data repository scanning in 14ms. Found 3 JPA repository interfaces. +2020-11-24 16:06:21,118 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-11-24 16:06:21,119 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-11-24 16:06:21,120 INFO [restartedMain] Starting service [Tomcat] +2020-11-24 16:06:21,120 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-11-24 16:06:21,130 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-11-24 16:06:21,130 INFO [restartedMain] Root WebApplicationContext: initialization completed in 329 ms +2020-11-24 16:06:21,176 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-11-24 16:06:21,180 INFO [restartedMain] HikariPool-2 - Starting... +2020-11-24 16:06:21,212 INFO [restartedMain] HikariPool-2 - Start completed. +2020-11-24 16:06:21,213 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-11-24 16:06:21,290 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-11-24 16:06:21,291 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:06:21,298 INFO [restartedMain] LiveReload server is running on port 35729 +2020-11-24 16:06:21,413 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-11-24 16:06:21,456 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-11-24 16:06:21,525 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-11-24 16:06:21,538 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-11-24 16:06:21,546 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 0.776 seconds (JVM running for 45.995) +2020-11-24 16:06:21,549 INFO [restartedMain] Condition evaluation unchanged +2020-11-24 16:06:24,046 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-11-24 16:06:24,046 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-11-24 16:06:24,048 INFO [http-nio-8000-exec-1] Completed initialization in 1 ms +2020-11-24 16:15:57,443 INFO [Thread-11] Shutting down ExecutorService 'applicationTaskExecutor' +2020-11-24 16:15:57,444 INFO [Thread-11] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:15:57,444 INFO [Thread-11] HikariPool-2 - Shutdown initiated... +2020-11-24 16:15:57,451 INFO [Thread-11] HikariPool-2 - Shutdown completed. +2020-11-24 16:15:57,538 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8545 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-11-24 16:15:57,538 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-11-24 16:15:57,693 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-11-24 16:15:57,706 INFO [restartedMain] Finished Spring Data repository scanning in 10ms. Found 3 JPA repository interfaces. +2020-11-24 16:15:57,833 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-11-24 16:15:57,834 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-11-24 16:15:57,835 INFO [restartedMain] Starting service [Tomcat] +2020-11-24 16:15:57,835 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-11-24 16:15:57,843 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-11-24 16:15:57,843 INFO [restartedMain] Root WebApplicationContext: initialization completed in 301 ms +2020-11-24 16:15:57,872 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-11-24 16:15:57,876 INFO [restartedMain] HikariPool-3 - Starting... +2020-11-24 16:15:57,901 INFO [restartedMain] HikariPool-3 - Start completed. +2020-11-24 16:15:57,901 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-11-24 16:15:57,966 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-11-24 16:15:57,966 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:15:57,973 INFO [restartedMain] LiveReload server is running on port 35729 +2020-11-24 16:15:58,060 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-11-24 16:15:58,094 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-11-24 16:15:58,138 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-11-24 16:15:58,141 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-11-24 16:15:58,148 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 0.64 seconds (JVM running for 622.597) +2020-11-24 16:15:58,150 INFO [restartedMain] Condition evaluation unchanged +2020-11-24 16:15:59,784 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-11-24 16:15:59,784 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-11-24 16:15:59,785 INFO [http-nio-8000-exec-1] Completed initialization in 1 ms +2020-11-24 16:17:20,082 INFO [Thread-17] Shutting down ExecutorService 'applicationTaskExecutor' +2020-11-24 16:17:20,084 INFO [Thread-17] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:17:20,085 INFO [Thread-17] HikariPool-3 - Shutdown initiated... +2020-11-24 16:17:20,090 INFO [Thread-17] HikariPool-3 - Shutdown completed. +2020-11-24 16:17:20,166 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8545 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-11-24 16:17:20,168 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-11-24 16:17:20,286 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-11-24 16:17:20,297 INFO [restartedMain] Finished Spring Data repository scanning in 9ms. Found 3 JPA repository interfaces. +2020-11-24 16:17:20,411 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-11-24 16:17:20,413 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-11-24 16:17:20,413 INFO [restartedMain] Starting service [Tomcat] +2020-11-24 16:17:20,414 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-11-24 16:17:20,427 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-11-24 16:17:20,427 INFO [restartedMain] Root WebApplicationContext: initialization completed in 256 ms +2020-11-24 16:17:20,452 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-11-24 16:17:20,455 INFO [restartedMain] HikariPool-4 - Starting... +2020-11-24 16:17:20,476 INFO [restartedMain] HikariPool-4 - Start completed. +2020-11-24 16:17:20,476 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-11-24 16:17:20,546 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-11-24 16:17:20,547 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 16:17:20,551 INFO [restartedMain] LiveReload server is running on port 35729 +2020-11-24 16:17:20,635 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-11-24 16:17:20,666 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-11-24 16:17:20,717 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-11-24 16:17:20,726 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-11-24 16:17:20,734 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 0.598 seconds (JVM running for 705.183) +2020-11-24 16:17:20,742 INFO [restartedMain] Condition evaluation unchanged +2020-11-24 16:17:22,181 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-11-24 16:17:22,182 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-11-24 16:17:22,185 INFO [http-nio-8000-exec-1] Completed initialization in 3 ms +2020-11-24 17:06:28,369 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' +2020-11-24 17:06:28,370 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-11-24 17:06:28,371 INFO [SpringContextShutdownHook] HikariPool-4 - Shutdown initiated... +2020-11-24 17:06:28,377 INFO [SpringContextShutdownHook] HikariPool-4 - Shutdown completed. diff --git a/pom.xml b/pom.xml index ced58f4..e919f61 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,11 @@ + + org.springframework.boot + spring-boot-devtools + true + diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java index 5e897d2..0a310fd 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -87,9 +87,9 @@ public class VotingController { LOGGER.error(name + " is not allowed to vote"); return "errors/notRegistered.html"; } + } else { + return "errors/falseInput"; } - LOGGER.error("Wrong input format detected: " + name); - return "errors/wrongEmail.html"; } @RequestMapping("/processVote") @@ -99,21 +99,20 @@ public class VotingController { } @RequestMapping("/dashboard") - public String AccessDashboard(@RequestParam String name, @RequestParam String password, Model model){ + public String AccessDashboard(@RequestParam String password, Model model){ try { - if (name.equals("admin")) { if (password.equals("admin")) { List voters = voterRepository.findAll(); List candidates = candidateRepository.findAll(); + List categories = categoryRepository.findAll(); model.addAttribute("voters", voters); - model.addAttribute("candidates", candidates); + model.addAttribute("categories", categories); return "dashboard.html"; - } else{ + } else { LOGGER.error("Wrong Password"); } LOGGER.error("Wrong Username"); - } - } catch (Exception e){ + } catch (Exception e) { LOGGER.fatal("voters table is not existing!"); } return "redirect:/"; diff --git a/src/main/resources/static/styles/start.css b/src/main/resources/static/styles/start.css index a6dffbf..f61ceb2 100644 --- a/src/main/resources/static/styles/start.css +++ b/src/main/resources/static/styles/start.css @@ -1,150 +1,3 @@ -body { - background-color: rgb(44, 49, 54); - font-family: Arial, Helvetica, sans-serif; -} - -input { - position: fixed; - top: 50%; - left: 50%; - transform: translate(-50%, -300%); - display: block; - width: 70vw; - opacity: 0; - pointer-events: none; - transition: all .5s cubic-bezier(.4, .25, .8, .3); -} - -input { - padding: .25rem 0; - border: 0; - border-bottom: 1px solid #bb1515; - outline: 0; - background: transparent; - color: #fff; - font-size: 3rem; - line-height: 4rem; - letter-spacing: .125rem; - transition: all .5s cubic-bezier(.4, .25, .8, .3); -} - -input::selection { - background: rgba(#bb1515, 0.25); -} - -.signup-button { - padding: .25em 0; - border: 0; - border-radius: 12px; - outline: 0; - background: #bb1515; - color: #fff; - font-size: 2rem; - line-height: 3.6rem; - letter-spacing: .0625rem; - box-shadow: 0 3px 5px 1px rgba(#000, 0.25); - text-shadow: 0 -2px 0 rgba(#000, 0.25), 0 1px 0 rgba(#fff, 0.2); -} - -input:focus, -button:focus { - opacity: 1; - transform: translate(-50%, -100%); - pointer-events: auto; - transition: all .4s cubic-bezier(.1, .45, .1, .85) .5s; - z-index: 10; -} - -input:focus~input, -input:focus~button { - transform: translate(-50%, 500%); - transition: all .5s ease-in; -} - -input:focus~label .label-text { - transform: translate(-50%, 300%); - transition: all .5s ease-in; -} - -input:focus~.tip { - opacity: 1; -} - -input:focus~.signup-button, -button:focus~.signup-button { - opacity: 0; -} - -input:focus+label .label-text { - opacity: 1; - transform: translate(-50%, -100%); - transition: all .3s cubic-bezier(.1, .45, .1, .85) .4s; -} - -input:focus+label .nav-dot:before { - background: darken(#bb1515, 5%); - box-shadow: 0 0 0 .15rem #111, 0 0 .05rem .26rem #bb1515; -} - -.tip { - position: fixed; - top: 57%; - left: 50%; - transform: translate(-50%, -50%); - width: 70%; - opacity: 0; - color: #fff; - font-size: .875rem; - font-weight: 300; - letter-spacing: .125rem; - text-transform: uppercase; - text-align: right; - transition: opacity .25s .5s; -} - -.signup-button, -.signup-button-trigger { - position: fixed; - top: 50%; - left: 50%; - transform: translate(-50%, -100%); - width: 70vw; - padding: .25rem 0; - line-height: 3.6rem; - text-align: center; - pointer-events: none; - cursor: pointer; - transition: opacity .4s .3s; -} - -.signup-button-trigger { - opacity: 0; - pointer-events: auto; -} - -.label-text { - position: fixed; - top: calc(50% - 4rem); - left: 50%; - transform: translate(-50%, -300%); - width: 70vw; - padding: 3.125rem 0 1.5rem; - text-transform: uppercase; - color: #fff; - opacity: 0; - font-size: 1.125rem; - font-weight: 300; - letter-spacing: .125rem; - pointer-events: none; - transition: all .4s cubic-bezier(.4, .25, .8, .3) .05s; -} - -* { - margin: 0; - padding: 0; - box-sizing: border-box; -} - html, body { width: 100%; @@ -153,8 +6,62 @@ body { font-family: 'Lato', sans-serif; } -form { - width: 100%; - height: 100%; - overflow: hidden; +div.userLogin { + position: absolute; + left: 50%; + top: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); +} + +div.adminLogin { + position: absolute; + right: 10%; + bottom: 10%; + -webkit-transform: translate(-10%, -10%); + transform: translate(-10%, -10%); +} + +input.email_input { + background-color: transparent; + border: transparent; + border-bottom: 2px solid red; + color: #FFF; + font-size: xx-large; + width: fit-content; +} + +input.password_input { + background-color: transparent; + border: transparent; + color: #FFF; + font-size: medium; + width: fit-content; +} + +label { + color: #FFF; + display: block; +} + +#signup_button { + display: block; + margin: auto; + padding: .25em 0; + border: 0; + outline: 0; + background: #bb1515; + color: rgba(255, 255, 255, 0.85); + font-size: 2rem; + width: 500px; + letter-spacing: .0625rem; + border-radius: 12px; + box-shadow: 0 3px 5px 1px rgba(0, 0, 0, 0.25); + text-shadow: 0 -2px 0 rgba(0, 0, 0, 0.25), 0 1px 0 rgba(255, 255, 255, 0.2); +} + +@media only screen and (max-device-width: 1024px) { + input.email_input { + font-size: large; + } } \ No newline at end of file diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index d01db7b..0c0fa6e 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -36,20 +36,19 @@

Kandidaten Liste

-
+
+

- - + -
Id Name VotesCategory
diff --git a/src/main/resources/templates/errors/wrongEmail.html b/src/main/resources/templates/errors/falseInput.html similarity index 100% rename from src/main/resources/templates/errors/wrongEmail.html rename to src/main/resources/templates/errors/falseInput.html diff --git a/src/main/resources/templates/start.html b/src/main/resources/templates/start.html index 010c105..7c44a62 100644 --- a/src/main/resources/templates/start.html +++ b/src/main/resources/templates/start.html @@ -5,19 +5,43 @@ Abizeitung 2020/2021 Voting + -
- - -

Press Enter

- -
+ + +
+
+ + +

+ +
+
+
+
+ +

+ +
+
\ No newline at end of file