Commit Graph
44 Commits
Author SHA1 Message Date
Casually9790 e863d288ee Changed categories 2020-12-13 21:29:33 +01:00
Casually9790 3e69fcf97f Make input field static 2020-12-13 17:25:27 +01:00
Casually9790 97a1313524 Fixed email input bug 2020-12-13 17:20:42 +01:00
Casually9790 3be9c3b665 Css changes to start site 2020-12-13 17:18:56 +01:00
Casually9790 0cffad8ed0 Removed the dashboard because of the existence of phpmyadmin 2020-12-12 00:02:58 +01:00
Casually9790 5cb73a5a1a Regex ignores whitespaces now and added all fallback pages 2020-12-11 23:53:42 +01:00
Casually9790 9b9d754713 Merge remote-tracking branch 'origin/main' into main 2020-12-11 21:21:35 +01:00
Casually9790 7429462f91 added support of controling the behavoir of the program from the cli
Start application with:
-Dmotto for mottoVoting
-Dadding for addingPhase
-Dvoting for votingPhase
2020-12-11 10:57:58 +01:00
Casually9790 d629cec557 added 2020-12-11 00:20:17 +01:00
Casually9790 ec60234d7c added 2020-12-11 00:03:40 +01:00
Casually9790 0a33b55a61 Have to go to bed now need to write 2020-12-10 23:50:44 +01:00
Casually9790 e503b0df61 QOL changes
- Authentication code only gets send now if you don't have one or your code expired
- Added custom error page
- Trying out scalable Interface
2020-12-09 21:38:43 +01:00
Casually9790 aa036fb07b votingPhase can now be toggled from jar
Use -DvotingPhase={boolean} to set value (Defaults to false)
2020-12-08 23:32:20 +01:00
Casually9790 f0ada512ca Added dynamic resource parsing and fixed breaking bug 2020-12-08 23:03:14 +01:00
Casually9790 faa1cea8e2 Merge remote-tracking branch 'origin/main' into main 2020-12-07 23:42:40 +01:00
Casually9790 3186b63f35 Made the transition of data between possibleCandidates and Candidates easier
CHANGED VotingController:
    - changed: candidateRepositorys get now only created if empty and 'candidatesAdded == true'

CHANGED PossibleCandidate:
    - added: new getter getCategoryID

CHANGED PossibleCandidateRepository
    - removed: unnecessary public declaration of methods

CHANGED TableAction:
    - changed: 'setupCandiates' adds the top 5 (votes) of every category in possibleCandidates (Manual preselection necessary)
    - added: helper method 'getLimit
    - removed: 'addCandidate' and 'addPossibleCandidate' due to no usage

CHANGED voting.css:
    - added: font-size to 'h1', 'h2.categoryHeader' and 'button' to enhance readability

CHANGED addingCandidates.html:
    - changed: language used in html tag from 'en' to 'de'

ADDED alreadysubmittedcandidates.html:
    - added: error page if voter already submitted possibleCandidates
2020-12-07 23:42:35 +01:00
Casually9790 301ffc60f0 Fixed copying mechanism 2020-12-06 23:31:44 +01:00
Casually9790 7e39d2dab9 You know the drill 2020-12-06 01:19:39 +01:00
Casually9790 9531dadd69 Massive changes but I have to go to sleep now 2020-12-05 06:05:56 +01:00
Casually9790 56d3f9875c PossibleCandidates get saved to their own database now
CHANGED VotingController:
    - changed 'candidateSaving' possibleCandidates get Located by name and category and get saved now

CHANGED PossibleCandidateRepository:
    - removed 'findByNameAndCategoryID'
    - added 'findByNameAndCategory'

ADDED addingCandidates.css:
    - added basic styling

CHANGED voting.css:
    - bug that div gets cut off resolved

CHANGED addingCandidates.html:
    - changed display method from table to div

CHANGED: voting.html:
    - added div to style the site (bugfix)
2020-12-02 14:08:28 +01:00
Casually9790 0b138d647d Devided Candidates in PossibleCandidates and Candidates
CHANGED: VotingController:
    - added implementation of PossibleCandidateRepository 'possibleCandidateRepository'
    - 'VerifyName' added checking for candidatesubmit_status
    - 'VerifyName' changed Candidate to PossibleCandidate
    - 'VerifyName' changed CandidateWrapper to PossibleCandidateWrapper
    - added method 'candidateSaving'

ADDED: PossibleCandidate:
    - added entity PossibleCandidate

CHANGED: Voter
    - removed 'vote_status' from parameterized constructor
    - added candidatesubmit_status
    - added getter for candidatesubmit_status

CHANGED: Candidate
    - added 'Category category' to parameterized constructor

ADDED: PossibleCandidateWrapper
    - added method 'addPossibleCandidate'
    - added getters/setters

REMOVED: CandidateWrapper
ADDED: PossibleCandidateRepository:
    - added method 'findByNameAndCategoryID' (!!! Not working)
    - added method 'findById'

CHANGED: TableAction:
    - added needed elements to parameter lists because of changes in the entitys voter, candidate and possibleCandidate
    - added method 'logPossibleCandidates'

CHANGED: addingCandidates.html:
    - changed the pointer to list according to the changes in 'VotingController.VerifyName'
2020-12-02 14:07:58 +01:00
Casually9790 20df7cc38c Added candidate suggestion
- CHANGES: VotingControler:
    -- added: switch to toogle between candidate suggestion and voting
    -- added: suport for adding candidate names
    -- added: method to save given candidate names
- ADDED: addingCandidates:
    -- added: site to enter candidate suggestions
- ADDED: CandidateWrapper:
    -- added: complete class to help with data transferation through th:object
- CHANGES: Category:
    -- added: constructor with name parameter for logging purposes
- CHANGES: Candidate:
    -- added: setters for class variables
- CHANGES: TableAction:
    -- refactoring: moved method to vote and update vote status from VotingController to TableActions class
- CHANGES: Resources:
    -- added: Files with data to feed to the tables
- ADDED: voteSuccessful:
    -- added fallback html page
- REFACTORING: candidateAddingSuccessful:
    -- renamed file
2020-11-29 17:13:17 +01:00
Casually9790 910a110921 Change vote status of voter if voter voted
Through that voters can only vote once
2020-11-28 00:17:16 +01:00
Casually9790 16f947aaab Created a success.html page 2020-11-28 00:03:56 +01:00
Casually9790 38ee5d4178 Added the voting system 2020-11-28 00:03:36 +01:00
Casually9790 8b2d1f89f6 Dashboard gets displayed horizontally 2020-11-28 00:02:09 +01:00
Casually9790 423b307c66 Candidates get sorted descending by their votes within their categories 2020-11-27 23:59:14 +01:00
Casually9790 1b49a241cc Merge branch 'MailSystem' into main 2020-11-27 23:56:55 +01:00
Casually9790 c0e3ed1f3f Added basics for the mail system 2020-11-25 18:36:28 +01:00
Casually9790 71ac8d2feb Reset voting site to the basic 2020-11-25 18:35:05 +01:00
Casually9790 d265677b55 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
2020-11-24 17:11:16 +01:00
Casually9790 d8db603ab6 Merge branch 'frontend' into main 2020-11-14 17:12:33 +01:00
Casually9790 51d464f0e0 Fixed damage done by false git usage 2020-11-14 17:08:10 +01:00
Casually9790 25484250d6 Updated the .gitignore file
Hopefully this will fix the including of all log files in the repo
2020-11-14 15:15:14 +01:00
Casually9790 72f1ff6c70 Merge branch 'backend' into main 2020-11-14 15:07:52 +01:00
Casually9790 a746110991 .gitignore expanded, Votingsite expanded
.gitignore:
    - All logs are now going to be ignored by git

VotingController.java:
    - added the categoryRepository to the model

voting.html:
     - showing data out of categoryRepository now
2020-11-14 13:03:43 +01:00
Casually9790 c8f5b32879 Skin changes
start.css:
    - added temporarily design

voting.css:
    - created the file
2020-11-14 01:18:21 +01:00
Casually9790 0887b54b23 Basic sytling für die Startseite erstellt
- Startseite arbeitet nun mit einem Flow-Design
- Weiterleitende Links angepasst
2020-11-14 01:18:21 +01:00
Casually9790 40655b2130 All fallbacks added to the login site. Edited voting.html
.gitignore:
    - added the /logs folder to the gitignore

VotingController.java:
    - added log message logging false entry format

Candidate.java:
    - return type changed from 'String' to 'Candidate'

wrongEmail.html:
    - added html file to avoid error

voting.html:
    - changed the way of output
2020-11-14 01:11:17 +01:00
Casually9790 ccc6190344 [FATAL ] SQL-Injektions werden verhindert
-Es werden  nur Eingaben des Typs '[a-z]+\\.[a- z]+@adolfinum+\\.de$' an die mySQL Tabelle weiter gebeben.
2020-11-12 22:54:10 +01:00
Casually9790 40d931ec0c Got a server set up to host the VotingSystem.
---------------------------------------------------
Internet address: http://***REMOVED***
Server IP address: ***REMOVED***
Port: 8000
--------------------------------------------------
Try to port the database to be hosted on the server rather
than on be hosted on localhost
2020-11-11 23:36:53 +01:00
Casually9790 8649301613 changed username of sql database 2020-11-10 23:30:43 +01:00
Casually9790 ab38911327 initial commit 2020-11-09 23:51:28 +01:00
Casually9790 13ffe47bfc first commit 2020-11-09 23:48:41 +01:00