Merge pull request #10 from ConductionNL/dev-barry

Updated with pc and DESIGN.md deleted
ConductionNL · Jan 7, 2020 · fa1a05a · fa1a05a
2 parents af8b7c7 + b1c2d09
commit fa1a05a
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 711 deletions.
diff --git a/.env b/.env
@@ -49,7 +49,7 @@ ORGANIZATION_UNIT_NAME=Common-Ground
 ##################################################
 
 APP_DOMAIN=conduction.nl
-# he domains on wich you want to provide this component, the first wil be used as primary (or common in cert-manger terms)
+# The domains on wich you want to provide this component, the first wil be used as primary (or common in cert-manger terms)
 APP_DOMAINS=["conduction.nl","zaakonline.nl","huwelijksplanner.online","common-ground.dev"]
 APP_DEMO=vtc.zaakonline.nl
 APP_REPRO=https://github.com/ConductionNL/verzoektypecatalogus

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/DESIGN.md b/DESIGN.md
diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/helm/values.yaml b/api/helm/values.yaml
@@ -48,7 +48,7 @@ settings:
 
 
 php:
-  repository: docker.io/conduction/protocomponent-php
+  repository: docker.io/conduction/vtc-php
   tag: latest
   mercure:
     jwtSecret: ""
@@ -64,7 +64,7 @@ nginx:
 varnish:
   enabled: true
   #url: https://example.com
-  repository: docker.io/conduction/protocomponent-varnish
+  repository: docker.io/conduction/vtc-varnish
   tag: latest
   pullPolicy: Always
   replicaCount: 1

diff --git a/api/src/DataFixtures/AppFixtures.php b/api/src/DataFixtures/AppFixtures.php
@@ -345,6 +345,6 @@ public function load(ObjectManager $manager)
     	$trouwenUtrecht->setId($id);
     	$manager->persist($trouwenUtrecht);
 
-        $manager->flush();
+      $manager->flush();
     }
 }
diff --git a/api/src/Entity/Property.php b/api/src/Entity/Property.php
@@ -67,6 +67,7 @@ class Property
      */
     private $title;
 
+
     /**     
 	   * @var string $name The name of the property as used in api calls, extracted from title on snake_case basis
      * @example my_property
@@ -464,6 +465,7 @@ class Property
      */
     private $maxDate;
 
+
     /**
      * @ORM\ManyToOne(targetEntity="App\Entity\Property", inversedBy="previous")
      */

diff --git a/api/src/Entity/RequestType.php b/api/src/Entity/RequestType.php
@@ -51,7 +51,7 @@ class RequestType
 	 * @var \Ramsey\Uuid\UuidInterface $id The UUID identifier of this object
 	 * @example e2984465-190a-4562-829e-a8cca81aa35d
 	 * 
-     * @Groups({"read"})
+   * @Groups({"read"})
 	 * @Assert\Uuid
 	 * @ORM\Id
 	 * @ORM\Column(type="uuid", unique=true)
@@ -104,6 +104,7 @@ class RequestType
      * @Assert\Valid
      */
     private $properties;
+
 
     /**
      * @Groups({"read"})
@@ -172,6 +173,7 @@ public function getName(): ?string
         return $this->name;
     }
 
+
     public function setName(string $name): self
     {
         $this->name = $name;
@@ -338,5 +340,4 @@ public function getFirstStage()
 
     	return $this->getProperties()->matching($criteria)->first();    	
     }
-
 }
diff --git a/api/src/Repository/RequestTypeRepository.php b/api/src/Repository/RequestTypeRepository.php
@@ -14,6 +14,7 @@
  */
 class RequestTypeRepository extends ServiceEntityRepository
 {
+
 	public function __construct(ManagerRegistry $registry)
     {
     	parent::__construct($registry, RequestType::class);