From ee32bf4e5a68c22baa42923e75af3bd250655deb Mon Sep 17 00:00:00 2001 From: Minik Gaarde Lambrecht Date: Wed, 7 Apr 2021 01:54:42 +0200 Subject: [PATCH] Login finished, Game jam functions next. --- .gitignore | 3 + Backend/test.php | 8 -- Frontend/Html/AdminPage.html | 57 +++++--- Frontend/Html/FirstTimeSetup.html | 6 +- Frontend/Index.html | 51 +++++-- Frontend/Javascript/AddEvent.js | 24 +--- Frontend/Javascript/AddGameJam.js | 32 +++++ Frontend/Javascript/LoginFunctionality.js | 156 ++++++++++++++++++++-- Frontend/Javascript/SetupForm.js | 40 ++---- Frontend/Styles/AdminPage.css | 9 +- Frontend/Styles/Index.css | 10 +- composer.lock | 80 +++++------ config/database.json | 0 13 files changed, 334 insertions(+), 142 deletions(-) delete mode 100644 Backend/test.php create mode 100644 Frontend/Javascript/AddGameJam.js delete mode 100644 config/database.json diff --git a/.gitignore b/.gitignore index de10198..5d8dda3 100755 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ .idea/**/dynamic.xml .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml +config/database.json # Gradle .idea/**/gradle.xml @@ -113,3 +114,5 @@ composer.phar /Test/ /.vs/ *.sqlite + +Backend/test.php diff --git a/Backend/test.php b/Backend/test.php deleted file mode 100644 index a466263..0000000 --- a/Backend/test.php +++ /dev/null @@ -1,8 +0,0 @@ - '', 'password' => password_hash('',PASSWORD_DEFAULT) -]); \ No newline at end of file diff --git a/Frontend/Html/AdminPage.html b/Frontend/Html/AdminPage.html index 3050e1b..2a751e6 100755 --- a/Frontend/Html/AdminPage.html +++ b/Frontend/Html/AdminPage.html @@ -3,7 +3,7 @@ - GameJam Adminpanel + Admin Panel @@ -18,54 +18,76 @@ - - + -
-
- - - -
- Admin panel -
-
+ +
+ +
+

+ Admin Panel +

+
+


+

Administration

Opret Game Jam
+
-
+ - + +
+ +
+ +
+ - + +
+ - + +
+ + + + +
+

Indsæt en beskrivelse af Gam jammet

+
- + + +
@@ -73,6 +95,7 @@ + diff --git a/Frontend/Html/FirstTimeSetup.html b/Frontend/Html/FirstTimeSetup.html index aa364d9..68797d2 100644 --- a/Frontend/Html/FirstTimeSetup.html +++ b/Frontend/Html/FirstTimeSetup.html @@ -86,13 +86,13 @@ Opret admin bruger:

- +

- +

@@ -105,7 +105,7 @@ - + diff --git a/Frontend/Index.html b/Frontend/Index.html index 412ecab..61301cd 100755 --- a/Frontend/Index.html +++ b/Frontend/Index.html @@ -1,5 +1,5 @@  - + @@ -19,7 +19,6 @@ - @@ -73,23 +72,27 @@ - + + + + + + Login - @@ -112,6 +115,11 @@ Registrer +