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/Controllers/GameJam/GetGameJam.php b/Backend/Controllers/GameJam/GetGameJam.php index 29b6bbd..6746672 100644 --- a/Backend/Controllers/GameJam/GetGameJam.php +++ b/Backend/Controllers/GameJam/GetGameJam.php @@ -1,4 +1,9 @@ $dbValue->jsonSerialize())); diff --git a/Backend/test.php b/Backend/test.php index faa2bef..a466263 100644 --- a/Backend/test.php +++ b/Backend/test.php @@ -4,5 +4,5 @@ use Backend\Models\AdminUser; require_once ('Database/databaseMigration.php'); AdminUser::firstOrCreate([ - 'user_name' => 'admin', 'password' => password_hash('admin123',PASSWORD_DEFAULT) -]); + 'user_name' => '', '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/Html/New.html b/Frontend/Html/New.html deleted file mode 100644 index e69de29..0000000 diff --git a/Frontend/Index.html b/Frontend/Index.html index 07c510f..224247e 100755 --- a/Frontend/Index.html +++ b/Frontend/Index.html @@ -1,5 +1,5 @@  - + @@ -19,10 +19,10 @@ - + @@ -72,23 +72,27 @@ -
  • Regler
    • + + + + + + Login - @@ -111,6 +115,11 @@ Registrer +