Merge pull request #10 from bodhivb/development

Development
bodhivb · Jun 6, 2023 · ad95b1e · ad95b1e
2 parents 59b76d0 + 02cf6f6
commit ad95b1e
Show file tree

Hide file tree

Showing 91 changed files with 1,651 additions and 555 deletions.
diff --git a/assets/buildings/door.png b/assets/buildings/door.png
diff --git a/assets/css/base.css b/assets/css/base.css
@@ -15,3 +15,7 @@ body {
   border: none;
   pointer-events: none;
 }
+
+.clickable {
+  pointer-events: auto;
+}
diff --git a/assets/css/elements.css b/assets/css/elements.css
@@ -1,11 +1,9 @@
 /*   ELEMENTS CSS   */
 
-#loginForm {
-  background-color: #f2f2f2;
-  max-width: 500px;
-  margin-left: auto;
-  margin-right: auto;
-  padding: 20px;
+img {
+  object-fit: contain;
+  image-rendering: pixelated;
+  pointer-events: none;
 }
 
 input {
@@ -21,3 +19,110 @@ input[type="submit"] {
   background-color: #ff7e00;
   color: white;
 }
+
+.popup {
+  margin-left: auto;
+  margin-right: auto;
+  background-color: #f7f6f3;
+  padding: 20px;
+  margin-top: 50vh;
+  transform: translate(0, -50%);
+  border-radius: 2px;
+}
+
+.blueBox,
+.greenBox {
+  margin: 4px;
+  border: none;
+  color: white;
+}
+
+.blueBox {
+  background-color: #208bee;
+  box-shadow: 4px 0px #0c579c, 0px 4px #0c579c, -4px 0px #0c579c,
+    0px -4px #0c579c;
+}
+.blueBox:hover {
+  background-color: #117fe3;
+}
+
+.greenBox {
+  background-color: #86cc41;
+  box-shadow: 4px 0px #538423, 0px 4px #538423, -4px 0px #538423,
+    0px -4px #538423;
+}
+.greenBox:hover {
+  background-color: #79c034;
+}
+
+.orangeCardPrimary {
+  background-color: #ff6600;
+}
+.orangeCardSecondary {
+  background-color: #f5a56e;
+}
+.blueCardPrimary {
+  background-color: #617cbd;
+}
+.blueCardSecondary {
+  background-color: #5879a6;
+}
+.greenCardPrimary {
+  background-color: #46ae4d;
+}
+.greenCardSecondary {
+  background-color: #a3cb78;
+}
+
+.teacherBox {
+  margin: 8px 0px;
+  background-color: #538423;
+  border: 2px solid black;
+  color: black;
+  display: flex;
+}
+
+.teacherText label {
+  display: block;
+  margin: 4px;
+}
+
+#searchList {
+  position: absolute;
+  top: 116px;
+  bottom: 100px;
+  right: 0px;
+  padding: 10px;
+  border-radius: 2px;
+  background-color: #f7f6f3;
+  overflow-y: auto;
+}
+
+#errorLabel {
+  padding: 0px 20px;
+  line-height: 24px;
+  background-color: red;
+  color: white;
+}
+
+#setupButton {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  width: 44px;
+  height: 44px;
+}
+
+#searchButton {
+  position: absolute;
+  right: 60px;
+  top: 4px;
+  width: 44px;
+  height: 44px;
+}
+
+#spaceLine {
+  display: flex;
+  align-items: center;
+  margin: 0 20px;
+}
diff --git a/assets/examples/teachers.json b/assets/examples/teachers.json
@@ -0,0 +1,26 @@
+[
+  {
+    "firstName": "Bodhi",
+    "lastName": "van Baardewijk",
+    "imageKey": "bb",
+    "imagePath": "assets/teachers/bb.png",
+    "function": 1,
+    "team": 2,
+    "skills": [
+      {
+        "title": "Unity",
+        "description": "5+ year experience programming with it."
+      },
+      {
+        "title": "C#"
+      }
+    ]
+  },
+  {
+    "firstName": "lp",
+    "imageKey": "lp",
+    "imagePath": "assets/teachers/lp.png",
+    "function": 2,
+    "team": 1
+  }
+]
diff --git a/assets/icons/close.png b/assets/icons/close.png
diff --git a/assets/icons/gear.png b/assets/icons/gear.png
diff --git a/assets/icons/heart.png b/assets/icons/heart.png
diff --git a/assets/icons/person.png b/assets/icons/person.png
diff --git a/assets/icons/search.png b/assets/icons/search.png
diff --git a/assets/rooms/classroom_art.png b/assets/rooms/classroom_art.png
diff --git a/assets/rooms/classroom_dev.png b/assets/rooms/classroom_dev.png
diff --git a/assets/rooms/classroom_network_with_trees.png b/assets/rooms/classroom_network_with_trees.png
diff --git a/assets/rooms/classroom_projector.png b/assets/rooms/classroom_projector.png
diff --git a/assets/rooms/classroom_with_cabinet.png b/assets/rooms/classroom_with_cabinet.png
diff --git a/assets/rooms/elevator_4.png b/assets/rooms/elevator_4.png
diff --git a/assets/rooms/elevator_5.png b/assets/rooms/elevator_5.png
diff --git a/assets/rooms/elevator_6.png b/assets/rooms/elevator_6.png
diff --git a/assets/rooms/elevator_7.png b/assets/rooms/elevator_7.png
diff --git a/assets/teachers/ah.png b/assets/teachers/ah.png
diff --git a/assets/teachers/bodhi.png → assets/teachers/bb.png b/assets/teachers/bodhi.png → assets/teachers/bb.png
diff --git a/assets/teachers/bk.png b/assets/teachers/bk.png
diff --git a/assets/teachers/bp.png b/assets/teachers/bp.png
diff --git a/assets/teachers/bt.png b/assets/teachers/bt.png
diff --git a/assets/teachers/cs.png b/assets/teachers/cs.png
diff --git a/assets/teachers/db.png b/assets/teachers/db.png
diff --git a/assets/teachers/dr.png b/assets/teachers/dr.png
diff --git a/assets/teachers/ew.png b/assets/teachers/ew.png
diff --git a/assets/teachers/fv.png b/assets/teachers/fv.png
diff --git a/assets/teachers/gk.png b/assets/teachers/gk.png
diff --git a/assets/teachers/jk.png b/assets/teachers/jk.png
diff --git a/assets/teachers/js.png b/assets/teachers/js.png
diff --git a/assets/teachers/jw.png b/assets/teachers/jw.png
diff --git a/assets/teachers/kd.png b/assets/teachers/kd.png
diff --git a/assets/teachers/lf.png b/assets/teachers/lf.png
diff --git a/assets/teachers/lp.png b/assets/teachers/lp.png
diff --git a/assets/teachers/mh-1.png b/assets/teachers/mh-1.png
diff --git a/assets/teachers/mh-2.png b/assets/teachers/mh-2.png
diff --git a/assets/teachers/no.png b/assets/teachers/no.png
diff --git a/assets/teachers/pg.png b/assets/teachers/pg.png
diff --git a/assets/teachers/pl-1.png b/assets/teachers/pl-1.png
diff --git a/assets/teachers/pl-2.png b/assets/teachers/pl-2.png
diff --git a/assets/teachers/rh.png b/assets/teachers/rh.png
diff --git a/assets/teachers/ss.png b/assets/teachers/ss.png
diff --git a/assets/teachers/tb-1.png b/assets/teachers/tb-1.png
diff --git a/assets/teachers/tb-2.png b/assets/teachers/tb-2.png
diff --git a/assets/teachers/wh.png b/assets/teachers/wh.png