Commit e4ad27c93a6f758a794e81b8353411ae0f4b5257

Authored by kristinlaahneolsen
1 parent 26693b83

Rapport knyttet til oppgaven er påbegynt. Her mangler vi hovedsaklig et oppdater…

…t deploymentdiagram, samt diskutere om der er flere utfordringer vi kan komme på knyttet til oppgaven
Rapport - Distribuert server-klient.docx 0 → 100644
No preview for this file type
restApi/.idea/workspace.xml
... ... @@ -2,6 +2,7 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="8a337026-05ab-47b0-872d-ab1e8037e9a0" name="Default" comment="">
  5 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 6 <change beforePath="$PROJECT_DIR$/api/routes/routes.js" afterPath="$PROJECT_DIR$/api/routes/routes.js" />
6 7 </list>
7 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -55,7 +56,7 @@
55 56 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
56 57 <provider selected="true" editor-type-id="text-editor">
57 58 <state relative-caret-position="690">
58   - <caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
  59 + <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
59 60 <folding />
60 61 </state>
61 62 </provider>
... ... @@ -74,8 +75,8 @@
74 75 <file leaf-file-name="README.txt" pinned="false" current-in-tab="false">
75 76 <entry file="file://$PROJECT_DIR$/README.txt">
76 77 <provider selected="true" editor-type-id="text-editor">
77   - <state relative-caret-position="120">
78   - <caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
  78 + <state relative-caret-position="30">
  79 + <caret line="2" column="50" lean-forward="false" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="81" />
79 80 <folding />
80 81 </state>
81 82 </provider>
... ... @@ -195,10 +196,10 @@
195 196 </component>
196 197 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
197 198 <component name="ProjectFrameBounds" fullScreen="true">
198   - <option name="x" value="1440" />
199   - <option name="y" value="-180" />
200   - <option name="width" value="1920" />
201   - <option name="height" value="1080" />
  199 + <option name="x" value="1360" />
  200 + <option name="y" value="23" />
  201 + <option name="width" value="80" />
  202 + <option name="height" value="22" />
202 203 </component>
203 204 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
204 205 <component name="ProjectView">
... ... @@ -216,7 +217,6 @@
216 217 <foldersAlwaysOnTop value="true" />
217 218 </navigator>
218 219 <panes>
219   - <pane id="Scratches" />
220 220 <pane id="ProjectPane">
221 221 <subPane>
222 222 <expand>
... ... @@ -245,6 +245,7 @@
245 245 <select />
246 246 </subPane>
247 247 </pane>
  248 + <pane id="Scratches" />
248 249 <pane id="Scope" />
249 250 </panes>
250 251 </component>
... ... @@ -290,28 +291,29 @@
290 291 <workItem from="1538928470276" duration="5791000" />
291 292 <workItem from="1538934478875" duration="76000" />
292 293 <workItem from="1540900056741" duration="8173000" />
293   - <workItem from="1540976986771" duration="6708000" />
  294 + <workItem from="1540976986771" duration="7543000" />
  295 + <workItem from="1540993198725" duration="335000" />
294 296 </task>
295 297 <servers />
296 298 </component>
297 299 <component name="TimeTrackingManager">
298   - <option name="totallyTimeSpent" value="32345000" />
  300 + <option name="totallyTimeSpent" value="33515000" />
299 301 </component>
300 302 <component name="ToolWindowManager">
301   - <frame x="1440" y="-180" width="1920" height="1080" extended-state="0" />
  303 + <frame x="0" y="0" width="1440" height="900" extended-state="0" />
302 304 <editor active="true" />
303 305 <layout>
304   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18746708" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  306 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17195208" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
305 307 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
306   - <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
  308 + <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
307 309 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
308   - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
309 310 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  311 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
310 312 <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
311 313 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
312   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
313   - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  314 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
314 315 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  316 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
315 317 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
316 318 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
317 319 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -335,6 +337,70 @@
335 337 <component name="editorHistoryManager">
336 338 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
337 339 <provider selected="true" editor-type-id="text-editor">
  340 + <state relative-caret-position="690">
  341 + <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
  342 + <folding />
  343 + </state>
  344 + </provider>
  345 + </entry>
  346 + <entry file="file://$PROJECT_DIR$/server.js">
  347 + <provider selected="true" editor-type-id="text-editor">
  348 + <state relative-caret-position="105">
  349 + <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
  350 + <folding />
  351 + </state>
  352 + </provider>
  353 + </entry>
  354 + <entry file="file://$PROJECT_DIR$/package-lock.json">
  355 + <provider selected="true" editor-type-id="text-editor">
  356 + <state relative-caret-position="0">
  357 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  358 + <folding />
  359 + </state>
  360 + </provider>
  361 + </entry>
  362 + <entry file="file://$PROJECT_DIR$/package.json">
  363 + <provider selected="true" editor-type-id="text-editor">
  364 + <state relative-caret-position="360">
  365 + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
  366 + <folding />
  367 + </state>
  368 + </provider>
  369 + </entry>
  370 + <entry file="file://$PROJECT_DIR$/api/modules/incident.js">
  371 + <provider selected="true" editor-type-id="text-editor">
  372 + <state relative-caret-position="135">
  373 + <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
  374 + <folding />
  375 + </state>
  376 + </provider>
  377 + </entry>
  378 + <entry file="file://$PROJECT_DIR$/api/modules/activity.js">
  379 + <provider selected="true" editor-type-id="text-editor">
  380 + <state relative-caret-position="105">
  381 + <caret line="7" column="23" lean-forward="true" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
  382 + <folding />
  383 + </state>
  384 + </provider>
  385 + </entry>
  386 + <entry file="file://$PROJECT_DIR$/api/modules/evaluation.js">
  387 + <provider selected="true" editor-type-id="text-editor">
  388 + <state relative-caret-position="30">
  389 + <caret line="2" column="9" lean-forward="false" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="19" />
  390 + <folding />
  391 + </state>
  392 + </provider>
  393 + </entry>
  394 + <entry file="file://$PROJECT_DIR$/README.txt">
  395 + <provider selected="true" editor-type-id="text-editor">
  396 + <state relative-caret-position="30">
  397 + <caret line="2" column="50" lean-forward="true" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="81" />
  398 + <folding />
  399 + </state>
  400 + </provider>
  401 + </entry>
  402 + <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
  403 + <provider selected="true" editor-type-id="text-editor">
338 404 <state relative-caret-position="0">
339 405 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
340 406 <folding />
... ... @@ -440,14 +506,6 @@
440 506 </state>
441 507 </provider>
442 508 </entry>
443   - <entry file="file://$PROJECT_DIR$/README.txt">
444   - <provider selected="true" editor-type-id="text-editor">
445   - <state relative-caret-position="120">
446   - <caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
447   - <folding />
448   - </state>
449   - </provider>
450   - </entry>
451 509 <entry file="file://$PROJECT_DIR$/package-lock.json">
452 510 <provider selected="true" editor-type-id="text-editor">
453 511 <state relative-caret-position="0">
... ... @@ -488,10 +546,18 @@
488 546 </state>
489 547 </provider>
490 548 </entry>
  549 + <entry file="file://$PROJECT_DIR$/README.txt">
  550 + <provider selected="true" editor-type-id="text-editor">
  551 + <state relative-caret-position="30">
  552 + <caret line="2" column="50" lean-forward="false" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="81" />
  553 + <folding />
  554 + </state>
  555 + </provider>
  556 + </entry>
491 557 <entry file="file://$PROJECT_DIR$/api/routes/routes.js">
492 558 <provider selected="true" editor-type-id="text-editor">
493 559 <state relative-caret-position="690">
494   - <caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
  560 + <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
495 561 <folding />
496 562 </state>
497 563 </provider>
... ...
restApi/api/routes/routes.js
... ... @@ -44,7 +44,7 @@ var appRouter = function(app) {
44 44 app.get("/", function(req, res) {
45 45 res.send("Evaluation API by Ali, Kristin and Anna is up and running...");
46 46 });
47   -
  47 +
48 48  
49 49 /**
50 50 * Get incident by id endpoint (http://localhost:3000/getIncident?id=1 will return incident with id 1)
... ...
~$pport - Distribuert server-klient.docx 0 → 100644
No preview for this file type