Merge remote-tracking branch 'origin/develop' into f/react-grundstruktur

.gitlab-ci.yml

@@ -24,6 +24,9 @@ build_frontend:
   - ssh $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET "rm -rf /home/$DEPLOY_ENV_USER/serve/*" 
   - ssh $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET "mkdir -p /home/$DEPLOY_ENV_USER/serve/$CI_COMMIT_REF_NAME" 
   - rsync --progress -av -e ssh /workdir/build/* $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET:/home/$DEPLOY_ENV_USER/serve/
+  environment:
+    name: deploy
+    url: https://$DEPLOY_ENV_TARGET
 
 build_docker_host:
   stage: build
@@ -37,7 +40,7 @@ build_docker_host:
   - docker info
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script: 
-  - docker build -f Docker/Dockerfile_FE_Host -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve .
+  - docker build -f Docker/Dockerfile_FE_Host.dockerfile -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve .
   - docker push registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-serve
   - ls -la Docker/config/restart-host.sh
   - rsync --progress -av -e ssh Docker/config/restart-host.sh $DEPLOY_ENV_USER@$DEPLOY_ENV_TARGET:/home/$DEPLOY_ENV_USER/restart-host.sh
@@ -52,7 +55,7 @@ build_docker_builder:
   - docker info
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script: 
-  - docker build -f Docker/Dockerfile_FE_Builder -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build .
+  - docker build -f Docker/Dockerfile_FE_Builder.dockerfile -t registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build .
   - docker push registry.gitlab.com/fia72-dev/eva_lernsituation/frontend-build
   when: manual
   

_Dokumente/Ausgearbeitete Dokumente/EVA ERD Umletino.uxf

@@ -0,0 +1,47 @@
+<diagram program="umletino" version="14.3.0"><zoom_level>10</zoom_level><help_text></help_text><element><id>UMLClass</id><coordinates><x>5</x><y>30</y><w>240</w><h>190</h></coordinates><panel_attributes>Person
+&lt;&lt;abstract&gt;&gt;
+--
+_Id_
+Name, Vorname
+Preisklasse
+Geburtsdatum, Geburtsort
+PLZ, Ort, Strasse, Hausnummer
+Telefon, EMail
+Bankname
+BLZ
+KontoNr</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>5</x><y>250</y><w>100</w><h>30</h></coordinates><panel_attributes>Schueler</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>145</x><y>250</y><w>100</w><h>50</h></coordinates><panel_attributes>Dozent
+--
+Stundensatz</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>184</x><y>210</y><w>30</w><h>60</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;10;40</additional_attributes></element><element><id>Relation</id><coordinates><x>44</x><y>210</y><w>30</w><h>60</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;10;40</additional_attributes></element><element><id>UMLClass</id><coordinates><x>64</x><y>411</y><w>120</w><h>130</h></coordinates><panel_attributes>Kurs
+--
+_Id_
+*Name*
+*Preis*
+Laufzeit
+Kuendigungsfrist
+Bestaetigt</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>514</x><y>321</y><w>100</w><h>80</h></coordinates><panel_attributes>Raum
+--
+_Nr_
+Name
+Belegt</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>344</x><y>411</y><w>100</w><h>120</h></coordinates><panel_attributes>Unterricht
+--
+_Id_
+Name
+Anfangszeit
+Endzeit
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>134</x><y>291</y><w>80</w><h>140</h></coordinates><panel_attributes>m1=1
+m2=0..n</panel_attributes><additional_attributes>60;10;10;120</additional_attributes></element><element><id>Relation</id><coordinates><x>44</x><y>271</y><w>90</w><h>160</h></coordinates><panel_attributes>m1=0..n
+m2=1..n</panel_attributes><additional_attributes>10;10;60;140</additional_attributes></element><element><id>Relation</id><coordinates><x>174</x><y>451</y><w>190</w><h>40</h></coordinates><panel_attributes>m1=1..n
+m2=1</panel_attributes><additional_attributes>170;10;10;10</additional_attributes></element><element><id>Relation</id><coordinates><x>434</x><y>391</y><w>160</w><h>100</h></coordinates><panel_attributes>m1=1
+m2=1..n</panel_attributes><additional_attributes>130;10;130;70;10;70</additional_attributes></element><element><id>UMLClass</id><coordinates><x>64</x><y>590</y><w>120</w><h>70</h></coordinates><panel_attributes>UnterrichtTyp
+&lt;&lt;enum&gt;&gt;
+--
+Einzel
+Gruppe</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>114</x><y>531</y><w>50</w><h>80</h></coordinates><panel_attributes>*Typ*</panel_attributes><additional_attributes>10;60;10;10</additional_attributes></element><element><id>UMLClass</id><coordinates><x>344</x><y>181</y><w>100</w><h>120</h></coordinates><panel_attributes>Instrument
+&lt;&lt;enum&gt;&gt;
+--
+Klavier
+Schlagzeug
+Geige
+Gitarre</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>434</x><y>241</y><w>160</w><h>100</h></coordinates><panel_attributes>m1=1..n
+m2=1</panel_attributes><additional_attributes>10;10;130;10;130;80</additional_attributes></element><element><id>Relation</id><coordinates><x>234</x><y>271</y><w>130</w><h>40</h></coordinates><panel_attributes>m1=1..n
+m2=0..n</panel_attributes><additional_attributes>110;10;10;10</additional_attributes></element></diagram>