diff --git a/api/helm/id-vault-0.1.0.tgz b/api/helm/id-vault-0.1.0.tgz index d0e17517..d6901af4 100644 Binary files a/api/helm/id-vault-0.1.0.tgz and b/api/helm/id-vault-0.1.0.tgz differ diff --git a/api/helm/index.yaml b/api/helm/index.yaml index 6c8e0016..ca3b5edc 100644 --- a/api/helm/index.yaml +++ b/api/helm/index.yaml @@ -3,14 +3,14 @@ entries: id-vault: - apiVersion: v1 appVersion: V1.0 - created: "2020-10-22T13:17:59.9926366Z" + created: "2020-10-22T14:00:02.0855736Z" description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar. - digest: 5bb1598948dab1828d4e3ded2425fa54dcfc305f8080f91b42b332e304b3434c + digest: 06334dcb85c7880859551d2a551e8aa8f1883d2500143efe9bc5772dc9cceb7d home: www.id-vault.com icon: www.id-vault.com name: id-vault urls: - id-vault-0.1.0.tgz version: 0.1.0 -generated: "2020-10-22T13:17:59.9782147Z" +generated: "2020-10-22T14:00:02.0687661Z" diff --git a/api/public/schema/openapi.yaml b/api/public/schema/openapi.yaml index 668afee8..c963e291 100644 --- a/api/public/schema/openapi.yaml +++ b/api/public/schema/openapi.yaml @@ -2391,12 +2391,12 @@ definitions: description: 'The moment this request was created' type: string format: date-time - example: '2020-10-22 13:18:44' + example: '2020-10-22 14:01:25' dateModified: description: 'The moment this request last Modified' type: string format: date-time - example: '2020-10-22 13:18:44' + example: '2020-10-22 14:01:25' required: [] AuditTrail-write: properties: @@ -2444,12 +2444,12 @@ definitions: description: 'The moment this request was created' type: string format: date-time - example: '2020-10-22 13:18:44' + example: '2020-10-22 14:01:25' dateModified: description: 'The moment this request last Modified' type: string format: date-time - example: '2020-10-22 13:18:44' + example: '2020-10-22 14:01:25' required: [] ChangeLog-write: properties: diff --git a/api/src/Controller/DashboardController.php b/api/src/Controller/DashboardController.php index fa96e883..1f3085fb 100644 --- a/api/src/Controller/DashboardController.php +++ b/api/src/Controller/DashboardController.php @@ -17,9 +17,9 @@ use Symfony\Component\Routing\Annotation\Route; /** - * The Procces test handles any calls that have not been picked up by another test, and wel try to handle the slug based against the wrc. + * Description. * - * Class ProcessController + * Class DashboardController * * @Route("/dashboard") */ @@ -36,6 +36,38 @@ public function generalAction(Session $session, Request $request, CommonGroundSe return $variables; } + /** + * @Route("/security") + * @Template + */ + public function securityAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home') + { + $variables = []; + + return $variables; + } + + /** + * @Route("/claims") + * @Template + */ + public function claimsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home') + { + $variables = []; + $variables['claims'] = $commonGroundService->getResourceList('https://dev.zuid-drecht.nl/api/v1/wac/claims')['hydra:member']; //['component' => 'wac', 'type' => 'claims'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc'] + + return $variables; + } + /** + * @Route("/contracts") + * @Template + */ + public function contractsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home') + { + $variables = []; + $variables['contracts'] = $commonGroundService->getResourceList('https://dev.zuid-drecht.nl/api/v1/wac/contracts')['hydra:member']; //['component' => 'wac', 'type' => 'contracts'], ['person' => $this->getUser()->getPerson(), 'order[dateCreated]' => 'desc'] + return $variables; + } } diff --git a/api/templates/dashboard/claims.html.twig b/api/templates/dashboard/claims.html.twig new file mode 100644 index 00000000..82975b5f --- /dev/null +++ b/api/templates/dashboard/claims.html.twig @@ -0,0 +1,56 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'claims' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ + +
+
+ + +

+ {{ 'claims'|trans|capitalize }} +

+ +
+
+ + {% if claims is defined and claims is not empty %} + + + + + + + + + {% for claim in claims %} + + + + + {% endfor %} + +
{{ 'property'|trans|capitalize }}{{ 'value'|trans|capitalize }}
{{ claim.property }}{% for dataItem in claim.data %}{{ dataItem }}
{% endfor %}
+ {% else %} + + {% endif %} + +
+
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/contracts.html.twig b/api/templates/dashboard/contracts.html.twig new file mode 100644 index 00000000..c3ae3f96 --- /dev/null +++ b/api/templates/dashboard/contracts.html.twig @@ -0,0 +1,57 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'contracts' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ + +
+
+ + +

+ {{ 'contracts'|trans|capitalize }} +

+ +
+
+ {% if contracts is defined and contracts is not empty %} + + + + + + + + + + {% for contract in contracts %} + + + + + + {% endfor %} + +
{{ 'application'|trans|capitalize }}{{ 'goal'|trans|capitalize }}{{ 'scope'|trans|capitalize }}
{{ contract.application }}{{ contract.goal }}{% for scopeItem in contract.scope %}{{ scopeItem }}
{% endfor %}
+ {% else %} + + {% endif %} + +
+
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/dashboard.html.twig b/api/templates/dashboard/dashboard.html.twig new file mode 100644 index 00000000..aa1561dd --- /dev/null +++ b/api/templates/dashboard/dashboard.html.twig @@ -0,0 +1,41 @@ +{% extends 'base.html.twig' %} + +{% block content %} + +
+
+
+
+ + +

+ {{ 'account settings'|trans|capitalize }} +

+ + +

+ {{ 'settings for'|trans|capitalize }} Wilco Louwerse +

+ +
+
+ + + + +
+
+
+
+ + +
+ {% block pageContent %} + + {% endblock %} +
+{% endblock %} diff --git a/api/templates/dashboard/general.html.twig b/api/templates/dashboard/general.html.twig index e69de29b..03c24ce6 100644 --- a/api/templates/dashboard/general.html.twig +++ b/api/templates/dashboard/general.html.twig @@ -0,0 +1,104 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'general' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ + +
+
+ + +

+ {{ 'basic information'|trans|capitalize }} +

+ +
+
+ + +
+
+
+ + +
+ + +
+ +
+
+ + +
+ + +
+ +
+
+ + + + +
+
+
+ +
+
+ + +
+
+ + +

+ {{ 'become a developer'|trans|capitalize }} +

+ +
+ +
+ + +
+
+
+ + +
+ + +
+ +
+
+ + + + +
+
+
+ +
+
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/security.html.twig b/api/templates/dashboard/security.html.twig new file mode 100644 index 00000000..495f177a --- /dev/null +++ b/api/templates/dashboard/security.html.twig @@ -0,0 +1,352 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'security' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ + +
+
+
+
+ + +

+ Two Factor +

+ +
+
+ + + + Requred? + + +
+
+ + +
+ + +
+ +
+
+
+
+ + +
+
+
+
+ + +

+ Authenticator App +

+ + + + Google auth or 1Password + + +
+
+ + + + +
+
+
+
+
+
+ + +

+ SMS Recovery +

+ + + + Standard messaging rates apply + + +
+
+ + + + +
+
+
+
+
+
+ + +

+ Recovery Codes +

+ + + + One time use safety codes + + +
+
+ + + + +
+
+
+
+ +
+
+ + +
+
+
+
+ + +

+ Password +

+ +
+
+ + + + Forgot your password? + + +
+
+
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+ + + + +
+
+ +
+
+ + +
+
+
+
+ + +

+ Device History +

+ +
+
+ + + + Log out all + + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ +
+
+ + +

+ iPhone 11 +

+ + + + Los Angeles, CA · April 20 at 4:16PM + + +
+
+ + + + +
+
+
+
+
+
+ + +
+ +
+ +
+
+ + +

+ iMac OSX · Chrome v80.02 +

+ + + + Los Angeles, CA · April 20 at 4:16PM + + +
+
+ + + + +
+
+
+
+
+
+ + +
+ +
+ +
+
+ + +

+ iPhone 11 +

+ + + + Los Angeles, CA · April 20 at 4:16PM + + +
+
+ + + + +
+
+
+
+
+
+ + +
+ +
+ +
+
+ + +

+ iMac OSX · Chrome v80.02 +

+ + + + Los Angeles, CA · April 20 at 4:16PM + + +
+
+ + + + +
+
+
+
+
+
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/sidenavbar.html.twig b/api/templates/dashboard/sidenavbar.html.twig new file mode 100644 index 00000000..9053cbc5 --- /dev/null +++ b/api/templates/dashboard/sidenavbar.html.twig @@ -0,0 +1,53 @@ + +
+ + +
+
+ + +
+ {{ 'account'|trans|capitalize }} +
+ + + + + +
+ {{ 'wallet'|trans|capitalize }} +
+ + + + +
+
+
diff --git a/api/translations/messages.nl.xlf b/api/translations/messages.nl.xlf index 8ecb97cf..482d72f6 100644 --- a/api/translations/messages.nl.xlf +++ b/api/translations/messages.nl.xlf @@ -113,10 +113,66 @@ place of birth geboorteplaats - + + wallet + wallet + + account settings account gegevens + + settings for + gegevens van + + + claims + claims + + + contracts + contracten + + + general + algemeen + + + security + beveiliging + + + notifications + meldingen + + + property + eigenschap + + + value + waarde + + + application + applicatie + + + goal + doel + + + scope + omvang + + + basic information + basis informatie + + + become a developer + word een ontwikkelaar + internships stages @@ -145,6 +201,10 @@ submit indienen + + save changes + wijzigingen opslaan + properties of the request eigenschappen van het verzoek @@ -345,6 +405,10 @@ last name achternaam + + full name + voor-en achternaam + What product do you want to subscribe to: voor welke producten with u abonneren