From b48453c3006494e6610104424e0725912b850c50 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 16 Dec 2020 23:41:53 +0100 Subject: [PATCH] test --- .../controller/VotingController.java | 18 ++--------- .../entities/AuthCode.java | 2 +- .../styles/alreadysubmittedcandidates.css | 18 ----------- .../errors/alreadysubmittedcandidates.html | 30 +++++++++++++++++-- 4 files changed, 31 insertions(+), 37 deletions(-) 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 7dc6779..dad5b36 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -65,21 +65,9 @@ public class VotingController { @PostConstruct public void init() { - if (motto != null){ - mottoPhase = false; - addingPhase = true; - votingPhase = false; - } else if (adding != null){ - addingPhase = true; - } else if (voting != null){ - votingPhase = true; - } - - -// //TODO: TESTING REMOVE ON SHIPPING -// votingPhase = false; -// mottoPhase = true; -// addingPhase = false; + mottoPhase = false; + votingPhase = false; + addingPhase = true; LOGGER.info("Program started with arguments: votingPhase="+ votingPhase + " mottoPhase=" + mottoPhase + " addingPhase=" + addingPhase); diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java index 84ab6ce..1e1db47 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java @@ -38,7 +38,7 @@ public class AuthCode { } public boolean isExpired(){ - return System.currentTimeMillis() >= (time + 600*1000); + return System.currentTimeMillis() >= (time + 1800*1000); } public void setTime(long time) { diff --git a/src/main/resources/static/styles/alreadysubmittedcandidates.css b/src/main/resources/static/styles/alreadysubmittedcandidates.css index e0ff00c..9e57561 100644 --- a/src/main/resources/static/styles/alreadysubmittedcandidates.css +++ b/src/main/resources/static/styles/alreadysubmittedcandidates.css @@ -24,25 +24,7 @@ h1 { font-size: 75px; } -h2.categoryHeader { - color: #FFF; - font-size: 50px; -} - -button { - background: transparent; - border: none; - color: #FFF; - font-size: 35px; - font-weight: normal; - letter-spacing: .125rem; - text-transform: uppercase; - text-align: center; - transition: opacity .25s .5s; -} - .submitButton { - margin-top: 5%; padding: .25em 0; border: 0; outline: 0; diff --git a/src/main/resources/templates/errors/alreadysubmittedcandidates.html b/src/main/resources/templates/errors/alreadysubmittedcandidates.html index 0a30965..c7749b8 100644 --- a/src/main/resources/templates/errors/alreadysubmittedcandidates.html +++ b/src/main/resources/templates/errors/alreadysubmittedcandidates.html @@ -9,10 +9,34 @@
-

Du hast deine Kandidaten schon vorgeschlagen!

- Return to Login-Site - +

Du hast schon abgestimmt!

+

Nächste Abstimmung in:

+
+ + \ No newline at end of file