diff --git a/Backend/test.php b/Backend/test.php new file mode 100644 index 0000000..faa2bef --- /dev/null +++ b/Backend/test.php @@ -0,0 +1,8 @@ + 'admin', 'password' => password_hash('admin123',PASSWORD_DEFAULT) +]); diff --git a/Frontend/Html/AdminPage.html b/Frontend/Html/AdminPage.html index 2a751e6..f6c83da 100755 --- a/Frontend/Html/AdminPage.html +++ b/Frontend/Html/AdminPage.html @@ -10,16 +10,19 @@ - + + + + @@ -49,11 +52,21 @@
- - + + +
+ + +

+
+ @@ -65,7 +78,7 @@
- +
@@ -90,12 +103,17 @@
- + + diff --git a/Frontend/Index.html b/Frontend/Index.html index 363b91d..39e13d2 100755 --- a/Frontend/Index.html +++ b/Frontend/Index.html @@ -1,5 +1,5 @@  - + @@ -9,11 +9,12 @@ - + + @@ -22,6 +23,7 @@ + @@ -385,7 +387,7 @@
Hvad bliver der lagt vægt på når man finder vinderen?

Når alle deltagerne har udviklet på livet løs, og tiden er løbet ud, bliver alle spillende uploadet og afprøvet af andre deltagere samt tilskuere. Når man skal finde en vinder, skal man kigge på forskellige ting som:

-
-
- +
    +
  1. Subject name
  2. +
  3. Subject name
  4. +
  5. Subject name
  6. +
  7. Subject name
  8. +
  9. Subject name
  10. +
  11. Subject name
  12. +
@@ -698,12 +699,15 @@ + + + - + diff --git a/Frontend/Javascript/LoginFunctionality.js b/Frontend/Javascript/LoginFunctionality.js index 9733dbe..dea0d64 100755 --- a/Frontend/Javascript/LoginFunctionality.js +++ b/Frontend/Javascript/LoginFunctionality.js @@ -21,13 +21,13 @@ $(document).ready(function () { // Populate select with options from the database axios.get('/Backend/Controllers/GameJam/GetGameJam.php') .then(function(res) { - let resArr = res.data; + let resArr = res.data.data; for(let i = 0; i < res.data.data.length; i++) { arr.push({ - id: res.data.data[i].id, - Gamejam: res.data.data[i].name + id: resArr[i].id, + Gamejam: resArr[i].name }); } diff --git a/Frontend/Javascript/OverlayScrollbar.js b/Frontend/Javascript/OverlayScrollbar.js new file mode 100644 index 0000000..edfa535 --- /dev/null +++ b/Frontend/Javascript/OverlayScrollbar.js @@ -0,0 +1,10 @@ +document.addEventListener("DOMContentLoaded", function() { + //The first argument are the elements to which the plugin shall be initialized + //The second argument has to be at least a empty object or a object with your desired options + OverlayScrollbars(document.querySelectorAll('body'), { }); +}); + +$(function() { + //The passed argument has to be at least a empty object or a object with your desired options + $('body').overlayScrollbars({ }); +}); \ No newline at end of file diff --git a/Frontend/Javascript/ScrollController.js b/Frontend/Javascript/ScrollController.js new file mode 100644 index 0000000..1f89603 --- /dev/null +++ b/Frontend/Javascript/ScrollController.js @@ -0,0 +1,21 @@ +/* When the user scrolls down, hide the navbar. When the user scrolls up, show the navbar */ +$(document).ready(function() { + var instance = $('body').overlayScrollbars(); + var prevScrollpos = instance.scroll().position.y; + + console.log(prevScrollpos); + + window.onscroll = function() { + + var currentScrollPos = instance.scroll().position.y; + console.log(currentScrollPos); + if (prevScrollpos > currentScrollPos) { + $("#header").css({"top" : "0"}); + } else { + $("#header").css({"top" : "-50px"}); + } + + prevScrollpos = currentScrollPos; + } + +}); \ No newline at end of file diff --git a/Frontend/Styles/AdminPage.css b/Frontend/Styles/AdminPage.css index 38c300f..fb7579a 100755 --- a/Frontend/Styles/AdminPage.css +++ b/Frontend/Styles/AdminPage.css @@ -1,6 +1,7 @@ -body{ +body { text-align: center; } + .HeaderPanel { position: fixed; overflow: hidden; @@ -42,6 +43,10 @@ body{ position: center; } +#createGameJam input:focus-visible { + outline: none; +} + #startTime { border-radius: 15px; color: #474747; @@ -82,8 +87,6 @@ body{ border: double; } - - #description { background-color: rgb(18, 18, 18); color: rgba(255, 255, 255, .55); @@ -99,4 +102,65 @@ body{ background-color: rgb(18, 18, 18); border: double; } -/*Create Game Jam end*/ \ No newline at end of file +/*Create Game Jam end*/ + + +.FormField { + position: relative; + padding: 15px 0 0; + margin-top: 10px; +} + +.FormFieldInput { + font-family: inherit; + width: 100%; + border: 0; + border-bottom: 2px solid #9b9b9b; + outline: 0; + font-size: 1.3rem; + color: #fff; + padding: 7px 0; + background: transparent; + transition: border-color 0.2s; +} + +.FormFieldInput::placeholder { + color: transparent; +} + +.FormFieldInput:placeholder-shown ~ .FormFieldLabel { + font-size: 1.3rem; + cursor: text; + top: 20px; +} + +.FormFieldLabel { + position: absolute; + top: 0; + display: block; + transition: 0.2s; + font-size: 1rem; + color: #9b9b9b; +} + +.FormFieldInput:focus { + padding-bottom: 6px; + font-weight: 700; + border-width: 3px; + border-image: linear-gradient(to right, #11998e, #38ef7d); + border-image-slice: 1; +} +.FormFieldInput:focus ~ .FormFieldLabel { + position: absolute; + top: 0; + display: block; + transition: 0.2s; + font-size: 1rem; + color: #11998e; + font-weight: 700; +} + +.FormFieldInput:required, +.FormFieldInput:invalid { + box-shadow: none; +} \ No newline at end of file diff --git a/Frontend/Styles/Index.css b/Frontend/Styles/Index.css index 3c89585..657021b 100755 --- a/Frontend/Styles/Index.css +++ b/Frontend/Styles/Index.css @@ -868,4 +868,27 @@ image_gruppenavn{ border: double; border-color: rgb(0, 113, 185); border-radius: 15px; +} + +.Collapse-Button:hover { + border-color: rgb(52, 152, 219); +} + +ul.Circle-list { + display: inline-block; + text-align: initial; +} + + ul.Circle-list li:before { + content: "\2022"; /* Unicode for a bullet */ + color: rgb(0, 113, 185); + font-weight: bold; + display: inline-block; /* Needed to add space between the bullet and the text */ + width: 1em; /* Also needed for space (tweak if needed) */ + margin-left: -1em; /* Also needed for space (tweak if needed) */ + } + +ol.Subject-list { + list-style-type: decimal; + color: red; } \ No newline at end of file diff --git a/bootstrap.php b/bootstrap.php index b988801..1959089 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -6,4 +6,3 @@ $con = json_decode(file_get_contents('config/database.json', true), true); $capsule->addConnection($con); $capsule->setAsGlobal(); $capsule->bootEloquent(); -$capsule->Connection()->getPdo(); diff --git a/config/database.json b/config/database.json new file mode 100644 index 0000000..364d1a8 --- /dev/null +++ b/config/database.json @@ -0,0 +1,7 @@ +{ + "driver":"mysql", + "host":"localhost", + "database":"testdb", + "username":"root", + "password":"V#_xWL6_" +} \ No newline at end of file