Merge branch 'dev' into dev-#82

Distribution of last Sprints changes Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de> Co-authored-by: Sai Varun Varanasi <varun.sai.varanasi@fau.de>
amosproj · Jun 22, 2021 · bfb3e95 · bfb3e95
2 parents bd73f1f + 3886ab1
commit bfb3e95
Show file tree

Hide file tree

Showing 96 changed files with 849 additions and 1,802 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ node_modules
 .idea
 /.vs/slnx.sqlite-journal
 .vs/slnx.sqlite
+
+frontend/yarn.lock
diff --git a/deliverables/2021-06-16 - AMOS SS2021 - Team 8 - Planning Document.pdf b/deliverables/2021-06-16 - AMOS SS2021 - Team 8 - Planning Document.pdf
diff --git a/deliverables/2021-06-16 Kanban Board.png b/deliverables/2021-06-16 Kanban Board.png
diff --git a/frontend/package.json b/frontend/package.json
@@ -4,6 +4,7 @@
     "version": "0.1.0",
     "private": true,
     "dependencies": {
+        "@material-ui/core": "^4.11.4",
         "@react-pdf/renderer": "^2.0.12",
         "apexcharts": "^3.26.1",
         "axios": "^0.21.1",

diff --git a/frontend/src/assets/icons/checkbox-off.js b/frontend/src/assets/icons/checkbox-off.js
diff --git a/frontend/src/assets/icons/checkbox-on.js b/frontend/src/assets/icons/checkbox-on.js
diff --git a/frontend/src/assets/icons/icon-agents.js b/frontend/src/assets/icons/icon-agents.js
diff --git a/frontend/src/assets/icons/icon-arrow-down.js b/frontend/src/assets/icons/icon-arrow-down.js
diff --git a/frontend/src/assets/icons/icon-arrow-up.js b/frontend/src/assets/icons/icon-arrow-up.js
diff --git a/frontend/src/assets/icons/icon-arrow.js b/frontend/src/assets/icons/icon-arrow.js
diff --git a/frontend/src/assets/icons/icon-articles.js b/frontend/src/assets/icons/icon-articles.js
diff --git a/frontend/src/assets/icons/icon-bell-new.js b/frontend/src/assets/icons/icon-bell-new.js
diff --git a/frontend/src/assets/icons/icon-browse.js b/frontend/src/assets/icons/icon-browse.js
diff --git a/frontend/src/assets/icons/icon-building.js b/frontend/src/assets/icons/icon-building.js
diff --git a/frontend/src/assets/icons/icon-burger.js b/frontend/src/assets/icons/icon-burger.js
diff --git a/frontend/src/assets/icons/icon-circle.js b/frontend/src/assets/icons/icon-circle.js
diff --git a/frontend/src/assets/icons/icon-contacts.js b/frontend/src/assets/icons/icon-contacts.js
diff --git a/frontend/src/assets/icons/icon-heart.js b/frontend/src/assets/icons/icon-heart.js
diff --git a/frontend/src/assets/icons/icon-home.js b/frontend/src/assets/icons/icon-home.js
diff --git a/frontend/src/assets/icons/icon-ideas.js b/frontend/src/assets/icons/icon-ideas.js
diff --git a/frontend/src/assets/icons/icon-inbox.js b/frontend/src/assets/icons/icon-inbox.js
diff --git a/frontend/src/assets/icons/icon-login.js b/frontend/src/assets/icons/icon-login.js
diff --git a/frontend/src/assets/icons/icon-logo.js b/frontend/src/assets/icons/icon-logo.js
diff --git a/frontend/src/assets/icons/icon-logout.js b/frontend/src/assets/icons/icon-logout.js
diff --git a/frontend/src/assets/icons/icon-overview.js b/frontend/src/assets/icons/icon-overview.js
diff --git a/frontend/src/assets/icons/icon-plus.js b/frontend/src/assets/icons/icon-plus.js