From f467837ccce02cbc9de7b05127b08e3c0e831652 Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 22 Oct 2020 14:01:39 +0200 Subject: [PATCH 1/5] Created dashboard paging structure --- api/helm/id-vault-0.1.0.tgz | Bin 7122 -> 7121 bytes api/helm/index.yaml | 6 +- api/public/schema/openapi.yaml | 8 +- api/src/Controller/DashboardController.php | 49 +++ api/templates/dashboard/dashboard.html.twig | 106 ++++++ api/templates/dashboard/general.html.twig | 209 ++++++++++++ api/templates/dashboard/security.html.twig | 337 ++++++++++++++++++++ 7 files changed, 708 insertions(+), 7 deletions(-) create mode 100644 api/src/Controller/DashboardController.php create mode 100644 api/templates/dashboard/dashboard.html.twig create mode 100644 api/templates/dashboard/general.html.twig create mode 100644 api/templates/dashboard/security.html.twig diff --git a/api/helm/id-vault-0.1.0.tgz b/api/helm/id-vault-0.1.0.tgz index 5b6584ac9a0d4b9e48181ae4ef0a8d9d1ee8b45d..c27a429c4c4a1f6fe8a75e156b1ff373302b4792 100644 GIT binary patch literal 7121 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 H0MGycPH)rT literal 7122 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 diff --git a/api/helm/index.yaml b/api/helm/index.yaml index e6f8c39a..227ac3f4 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-22T07:53:37.278139Z" + created: "2020-10-22T10:55:47.1992129Z" description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar. - digest: f5c0d6df80ba454ce7155543675b48248a44a38123dcc9fb3ff58ad37e80fb55 + digest: 150ec7a20c7e0d01284b9ebc95547294dc52f6f0334324076c72f175f536034f 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-22T07:53:37.2554771Z" +generated: "2020-10-22T10:55:47.1871156Z" diff --git a/api/public/schema/openapi.yaml b/api/public/schema/openapi.yaml index 4477ae8e..9053ef5a 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 07:54:23' + example: '2020-10-22 10:56:54' dateModified: description: 'The moment this request last Modified' type: string format: date-time - example: '2020-10-22 07:54:23' + example: '2020-10-22 10:56:54' 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 07:54:23' + example: '2020-10-22 10:56:54' dateModified: description: 'The moment this request last Modified' type: string format: date-time - example: '2020-10-22 07:54:23' + example: '2020-10-22 10:56:54' required: [] ChangeLog-write: properties: diff --git a/api/src/Controller/DashboardController.php b/api/src/Controller/DashboardController.php new file mode 100644 index 00000000..2c353dfd --- /dev/null +++ b/api/src/Controller/DashboardController.php @@ -0,0 +1,49 @@ + +
+
+
+
+ + +

+ Account Settings +

+ + +

+ Settings for dhgamache@gmail.com +

+ +
+
+ + + + +
+
+
+
+ + +
+
+
+
+ + +
+ + +
+
+ + +
+ Account +
+ + + + + +
+ Billing +
+ + + + +
+
+
+ +
+
+ + {% block pageContent %} + + {% endblock %} + +
+
+
+
+{% endblock %} diff --git a/api/templates/dashboard/general.html.twig b/api/templates/dashboard/general.html.twig new file mode 100644 index 00000000..5085736b --- /dev/null +++ b/api/templates/dashboard/general.html.twig @@ -0,0 +1,209 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} + +
+
+ + +

+ Basic Information +

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


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

+ Your media +

+ +
+
+ + +
+
+
+
+ + +
+ ... +
+ +
+
+ + +

+ Your avatar +

+ + + + PNG or JPG no larger than 1000px + + +
+
+ + + + +
+
+
+
+ + +

+ Profile cover +

+ + +

+ PNG or JPG at 16:9 ratio no larger than 2MB +

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

+ Privacy +

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

+ Public Profile +

+ + + + Making your profile public means anyone can see your information. + + +
+
+ + +
+ + +
+ +
+
+
+
+
+
+ + +

+ Expose your email +

+ + + + This lets users find you by your email address. + + +
+
+ + +
+ + +
+ +
+
+
+
+ +
+
+ + +

+ If you no longer want to use Landkit, you can delete your account. +

+{% endblock %} diff --git a/api/templates/dashboard/security.html.twig b/api/templates/dashboard/security.html.twig new file mode 100644 index 00000000..8b25598b --- /dev/null +++ b/api/templates/dashboard/security.html.twig @@ -0,0 +1,337 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} + +
+
+
+
+ + +

+ Two Factor +

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

+ Authenticator App +

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

+ SMS Recovery +

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

+ Recovery Codes +

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

+ Password +

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

+ Device History +

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

+ 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 %} From 4a5cce88de44156b4ea305f0ed4616f31c58b81c Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 22 Oct 2020 14:23:27 +0200 Subject: [PATCH 2/5] Added claims and contracts pages (without loading in resources) --- api/src/Controller/DashboardController.php | 22 + api/templates/dashboard/claims.html.twig | 18 + api/templates/dashboard/contracts.html.twig | 18 + api/templates/dashboard/dashboard.html.twig | 71 +-- api/templates/dashboard/general.html.twig | 357 ++++++------ api/templates/dashboard/security.html.twig | 583 ++++++++++--------- api/templates/dashboard/sidenavbar.html.twig | 53 ++ 7 files changed, 599 insertions(+), 523 deletions(-) create mode 100644 api/templates/dashboard/claims.html.twig create mode 100644 api/templates/dashboard/contracts.html.twig create mode 100644 api/templates/dashboard/sidenavbar.html.twig diff --git a/api/src/Controller/DashboardController.php b/api/src/Controller/DashboardController.php index 2c353dfd..2308643f 100644 --- a/api/src/Controller/DashboardController.php +++ b/api/src/Controller/DashboardController.php @@ -46,4 +46,26 @@ public function securityAction(Session $session, Request $request, CommonGroundS return $variables; } + + /** + * @Route("/claims") + * @Template + */ + public function claimsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home') + { + $variables = []; + + return $variables; + } + + /** + * @Route("/contracts") + * @Template + */ + public function contractsAction(Session $session, Request $request, CommonGroundService $commonGroundService, ApplicationService $applicationService, ParameterBagInterface $params, string $slug = 'home') + { + $variables = []; + + return $variables; + } } diff --git a/api/templates/dashboard/claims.html.twig b/api/templates/dashboard/claims.html.twig new file mode 100644 index 00000000..4727aded --- /dev/null +++ b/api/templates/dashboard/claims.html.twig @@ -0,0 +1,18 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'claims' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/contracts.html.twig b/api/templates/dashboard/contracts.html.twig new file mode 100644 index 00000000..d095f19b --- /dev/null +++ b/api/templates/dashboard/contracts.html.twig @@ -0,0 +1,18 @@ +{% extends 'dashboard/dashboard.html.twig' %} + +{% block pageContent %} +
+
+
+ + {% set activeItem = 'contracts' %} + {% include 'dashboard/sidenavbar.html.twig' %} + +
+ +
+ +
+
+
+{% endblock %} diff --git a/api/templates/dashboard/dashboard.html.twig b/api/templates/dashboard/dashboard.html.twig index 7835548b..b3ddfbe2 100644 --- a/api/templates/dashboard/dashboard.html.twig +++ b/api/templates/dashboard/dashboard.html.twig @@ -15,7 +15,7 @@

- Settings for dhgamache@gmail.com + Settings for 'Wallet voornaam'

@@ -34,73 +34,8 @@
-
-
-
- - -
- - -
-
- - -
- Account -
- - - - - -
- Billing -
- - - - -
-
-
+ {% block pageContent %} -
-
- - {% block pageContent %} - - {% endblock %} - -
-
-
+ {% endblock %}
{% endblock %} diff --git a/api/templates/dashboard/general.html.twig b/api/templates/dashboard/general.html.twig index 5085736b..3955f782 100644 --- a/api/templates/dashboard/general.html.twig +++ b/api/templates/dashboard/general.html.twig @@ -1,209 +1,224 @@ {% extends 'dashboard/dashboard.html.twig' %} {% block pageContent %} - -
-
- - -

- Basic Information -

- -
-
- - -
-
-
- - -
- - -
+
+
+
-
-
+ {% set activeItem = 'general' %} + {% include 'dashboard/sidenavbar.html.twig' %} - -
- - -
+
-
-
+
- -
- -


-
+ +
+
-
-
- - - + +

+ Basic Information +

-
- - -
-
- - -
-
- - -

- Your media -

- -
-
- - -
-
-
-
- - -
- ... +
+ + +
+
+
+ + +
+ + +
+ +
+
+ + +
+ + +
+ +
+
+ + +
+ +


+
+ +
+
+ + + + +
+
-
-
- - -

- Your avatar -

- - - - PNG or JPG no larger than 1000px - - -
-
- - - - -
-
- - -

- Profile cover -

- - -

- PNG or JPG at 16:9 ratio no larger than 2MB -

- - -
- - - -
+ +
+
-
+ +

+ Your media +

-
-
-
-
+
+
+ + +
+
+
+
+ + +
+ ... +
+ +
+
+ + +

+ Your avatar +

+ + + + PNG or JPG no larger than 1000px + + +
+
+ + + + +
+
+
+
- -
-
+ +

+ Profile cover +

- -

- Privacy -

+ +

+ PNG or JPG at 16:9 ratio no larger than 2MB +

-
-
+ +
- -
-
-
-
+ - -

- Public Profile -

+ +
- - - Making your profile public means anyone can see your information. - +
-
-
- - -
- -
-
-
-
-
- -

- Expose your email -

+ +
+
- - - This lets users find you by your email address. - + +

+ Privacy +

-
-
- - -
- - +
+
+ + +
+
+
+
+ + +

+ Public Profile +

+ + + + Making your profile public means anyone can see your information. + + +
+
+ + +
+ + +
+ +
+
+
+
+
+
+ + +

+ Expose your email +

+ + + + This lets users find you by your email address. + + +
+
+ + +
+ + +
+ +
+
-
+
-
-
-
+ +

+ If you no longer want to use Landkit, you can delete your account. +

- -

- If you no longer want to use Landkit, you can delete your account. -

+
+
+
{% endblock %} diff --git a/api/templates/dashboard/security.html.twig b/api/templates/dashboard/security.html.twig index 8b25598b..495f177a 100644 --- a/api/templates/dashboard/security.html.twig +++ b/api/templates/dashboard/security.html.twig @@ -1,337 +1,352 @@ {% extends 'dashboard/dashboard.html.twig' %} {% block pageContent %} - -
-
-
-
+
+
+
- -

- Two Factor -

+ {% set activeItem = 'security' %} + {% include 'dashboard/sidenavbar.html.twig' %} -
-
- - - - Requred? - - -
-
- - -
- - -
- -
-
-
- - -
-
-
-
- -

- Authenticator App -

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

+ Two Factor +

-
-
-
-
-
-
- - -

- SMS Recovery -

+
+
- - - Standard messaging rates apply - + + + Requred? + -
-
+
+
- - + +
+ + +
+
-
-
-
-
- - -

- Recovery Codes -

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

+ Authenticator App +

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

+ SMS Recovery +

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

+ Recovery Codes +

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

- Password -

- -
- -
-
-
- - -
- - -
- - -
- - -
- - -
- - -
- -
-
+ +
+
+
+
- - + +

+ Password +

-
-
- -
-
- - -
-
-
-
- - -

- Device History -

- -
- -
-
-
- - -
-
-
-
- - -
-
+
-
-
- - -

- iPhone 11 -

- - - - Los Angeles, CA · April 20 at 4:16PM - - -
-
- - - + + + Forgot your password? + +
-
-
-
-
- - -
- -
+
+ +
+ +
-
- - -

- iMac OSX · Chrome v80.02 -

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

- iPhone 11 -

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

+ Device History +

- -

- iMac OSX · Chrome v80.02 -

+
+
- - - Los Angeles, CA · April 20 at 4:16PM - + + + 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..5730d6fc --- /dev/null +++ b/api/templates/dashboard/sidenavbar.html.twig @@ -0,0 +1,53 @@ + +
+ + +
+
+ + +
+ Account +
+ + + + + +
+ Wallet +
+ + + + +
+
+
From 6f2c2aa4354f43de5f2c01eec8a288bc39ff43e8 Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 22 Oct 2020 15:49:25 +0200 Subject: [PATCH 3/5] Translations and added tables with resources for claims and contracts --- api/src/Controller/DashboardController.php | 2 + api/templates/dashboard/claims.html.twig | 38 ++++++++++++++ api/templates/dashboard/contracts.html.twig | 40 +++++++++++++++ api/templates/dashboard/dashboard.html.twig | 6 +-- api/templates/dashboard/sidenavbar.html.twig | 14 ++--- api/templates/landkit/menu.html.twig | 2 +- api/translations/messages.nl.xlf | 54 +++++++++++++++++++- 7 files changed, 144 insertions(+), 12 deletions(-) diff --git a/api/src/Controller/DashboardController.php b/api/src/Controller/DashboardController.php index 2308643f..1f3085fb 100644 --- a/api/src/Controller/DashboardController.php +++ b/api/src/Controller/DashboardController.php @@ -54,6 +54,7 @@ public function securityAction(Session $session, Request $request, CommonGroundS 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; } @@ -65,6 +66,7 @@ public function claimsAction(Session $session, Request $request, CommonGroundSer 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 index 4727aded..5221c3ab 100644 --- a/api/templates/dashboard/claims.html.twig +++ b/api/templates/dashboard/claims.html.twig @@ -12,6 +12,44 @@
+ +
+
+ + +

+ {{ '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 %} + +
+
+
diff --git a/api/templates/dashboard/contracts.html.twig b/api/templates/dashboard/contracts.html.twig index d095f19b..b142faea 100644 --- a/api/templates/dashboard/contracts.html.twig +++ b/api/templates/dashboard/contracts.html.twig @@ -12,6 +12,46 @@
+ +
+
+ + +

+ {{ '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 %} + +
+
+
diff --git a/api/templates/dashboard/dashboard.html.twig b/api/templates/dashboard/dashboard.html.twig index b3ddfbe2..aa1561dd 100644 --- a/api/templates/dashboard/dashboard.html.twig +++ b/api/templates/dashboard/dashboard.html.twig @@ -10,12 +10,12 @@

- Account Settings + {{ 'account settings'|trans|capitalize }}

- Settings for 'Wallet voornaam' + {{ 'settings for'|trans|capitalize }} Wilco Louwerse

@@ -23,7 +23,7 @@
diff --git a/api/templates/dashboard/sidenavbar.html.twig b/api/templates/dashboard/sidenavbar.html.twig index 5730d6fc..9053cbc5 100644 --- a/api/templates/dashboard/sidenavbar.html.twig +++ b/api/templates/dashboard/sidenavbar.html.twig @@ -7,43 +7,43 @@
- Account + {{ 'account'|trans|capitalize }}
- Wallet + {{ 'wallet'|trans|capitalize }}
diff --git a/api/templates/landkit/menu.html.twig b/api/templates/landkit/menu.html.twig index c3c5aede..6ed7a74d 100644 --- a/api/templates/landkit/menu.html.twig +++ b/api/templates/landkit/menu.html.twig @@ -36,7 +36,7 @@ {{ 'register'|trans|capitalize }} - + {{ 'login'|trans|capitalize }} diff --git a/api/translations/messages.nl.xlf b/api/translations/messages.nl.xlf index bc525843..46f49270 100644 --- a/api/translations/messages.nl.xlf +++ b/api/translations/messages.nl.xlf @@ -113,10 +113,62 @@ place of birth geboorteplaats - + + account + account + + + 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 + internships stages From 38d361f2f6c413f41a7d1985021b9f1c02176b1d Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 22 Oct 2020 16:11:26 +0200 Subject: [PATCH 4/5] layout fixes --- api/helm/id-vault-0.1.0.tgz | Bin 7119 -> 7120 bytes api/helm/index.yaml | 6 +++--- api/public/schema/openapi.yaml | 8 ++++---- api/templates/dashboard/claims.html.twig | 2 +- api/templates/dashboard/contracts.html.twig | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/helm/id-vault-0.1.0.tgz b/api/helm/id-vault-0.1.0.tgz index d0e175170109d0bce492784b15862e4b5e27349c..d6901af40e42de1b3ba4f5d65f1be097fe39f92f 100644 GIT binary patch delta 5650 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 delta 5649 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
-
+
{% if claims is defined and claims is not empty %} diff --git a/api/templates/dashboard/contracts.html.twig b/api/templates/dashboard/contracts.html.twig index b142faea..c3ae3f96 100644 --- a/api/templates/dashboard/contracts.html.twig +++ b/api/templates/dashboard/contracts.html.twig @@ -22,8 +22,7 @@ -
- +
{% if contracts is defined and contracts is not empty %}
From 2cda535a355c1f2697887ee87f582689bb885dc9 Mon Sep 17 00:00:00 2001 From: Wilco Louwerse Date: Thu, 22 Oct 2020 16:34:47 +0200 Subject: [PATCH 5/5] Update van de general dashboard page --- api/templates/dashboard/general.html.twig | 162 +++------------------- api/translations/messages.nl.xlf | 20 ++- 2 files changed, 37 insertions(+), 145 deletions(-) diff --git a/api/templates/dashboard/general.html.twig b/api/templates/dashboard/general.html.twig index 3955f782..03c24ce6 100644 --- a/api/templates/dashboard/general.html.twig +++ b/api/templates/dashboard/general.html.twig @@ -18,7 +18,7 @@

- Basic Information + {{ 'basic information'|trans|capitalize }}

@@ -31,8 +31,8 @@
- - + +
@@ -40,17 +40,8 @@
- - -
- - -
- - -
- -


+ +
@@ -58,7 +49,7 @@ @@ -74,150 +65,39 @@

- Your media + {{ 'become a developer'|trans|capitalize }}

-
- - -
-
-
-
- - -
- ... -
- -
-
- - -

- Your avatar -

- - - - PNG or JPG no larger than 1000px - - -
-
- - - - -
-
-
-
- - -

- Profile cover -

- - -

- PNG or JPG at 16:9 ratio no larger than 2MB -

- - -
- - - - -
- -
- -
-
-
- - -
-
- - -

- Privacy -

- -
- -
-
-
-
- - -

- Public Profile -

- - - - Making your profile public means anyone can see your information. - + +
+
+
+ +
+ +
-
- -
- - -
- -
-
-
-
-
- - -

- Expose your email -

- - - - This lets users find you by your email address. - - -
-
+
- -
- - -
+ + -
-
+
- -

- If you no longer want to use Landkit, you can delete your account. -

-
diff --git a/api/translations/messages.nl.xlf b/api/translations/messages.nl.xlf index 1f4196a2..482d72f6 100644 --- a/api/translations/messages.nl.xlf +++ b/api/translations/messages.nl.xlf @@ -113,10 +113,6 @@ place of birth geboorteplaats - - account - account - wallet wallet @@ -169,6 +165,14 @@ scope omvang + + basic information + basis informatie + + + become a developer + word een ontwikkelaar + internships stages @@ -197,6 +201,10 @@ submit indienen + + save changes + wijzigingen opslaan + properties of the request eigenschappen van het verzoek @@ -397,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