feat: clean front-end disable DNSSEC on accp

GemeenteNijmegen · Oct 13, 2022 · 95bea6b · 95bea6b
1 parent 9909788
commit 95bea6b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 22 deletions.
diff --git a/src/ApiStage.ts b/src/ApiStage.ts
@@ -39,7 +39,8 @@ export class ApiStage extends Stage {
     usEastCertificateStack.addDependency(dnsStack);
 
     // Only deploy DNSSEC on accp and prod
-    if (props.branch != 'development') {
+    // TODO enable DNSSEC on accp (deployment on accp did not work yet)
+    if (props.branch == 'production') {
       const dnssecStack = new DNSSECStack(this, 'dnssec-stack', { env: { region: 'us-east-1' } });
       dnssecStack.addDependency(dnsStack);
     }

diff --git a/src/DNSSECStack.ts b/src/DNSSECStack.ts
@@ -33,7 +33,7 @@ export class DNSSECStack extends Stack {
 
     // KSK
     const accountDnssecKmsKeyArn = SSM.StringParameter.valueForStringParameter(this, Statics.ssmAccountDnsSecKmsKey);
-    const dnssecKeySigning = new Route53.CfnKeySigningKey(this, 'dnssec-keysigning-key-2', {
+    const dnssecKeySigning = new Route53.CfnKeySigningKey(this, 'dnssec-keysigning-key', {
       name: 'irma_issue_ksk',
       status: 'ACTIVE',
       hostedZoneId: zoneId,

diff --git a/src/DNSStack.ts b/src/DNSStack.ts
@@ -73,7 +73,7 @@ export class DNSStack extends Stack {
     let dsValue = '';
     switch (this.branch) {
       case 'acceptance':
-        dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A';
+        dsValue = '52561 13 2 EBD9ED03EC245E70D458F7B300606FB1DBB3C6D185E19EDB835FBC47B396530A'; // TODO manually removed so add again when deploying DNSSEC stack to accp again
         break;
       case 'production':
         dsValue = '60066 13 2 932CD585B029E674E17C4C33DFE7DE2C84353ACD8C109760FD17A6CDBD0CF3FA'; // TODO fix in prod

diff --git a/src/app/templates/footer.mustache b/src/app/templates/footer.mustache
@@ -3,17 +3,9 @@
             <div class="container">
                 <div class="row">
                     <div class="hidden-md-down col-lg-6">
-                    {{#shownav}}
-                        <h2 class="title">Mijn Nijmegen</h2>
-                        <div class="link-list-wrapper">
-                            <ul class="link-list">
-                                <li><a href="/persoonsgegevens">Persoonsgegevens</a></li>
-                                <li><a href="/uitkeringen">Uitkeringen</a></li>
-                            </ul>
-                        </div>
-                    {{/shownav}}
                     </div>
                     <div class="col-md-12 col-lg-6">
+                        <!--
                         <div class="row">
                             <div class="hidden-md-down col-lg-5">
                                 <h2 class="title">Over deze site</h2>
@@ -67,6 +59,7 @@
                                 </ul>
                             </div>
                         </div>
+                        -->
                     </div>
                 </div>
             </div>

diff --git a/src/app/templates/header.mustache b/src/app/templates/header.mustache
@@ -73,13 +73,7 @@
         <div class="collapse navbar-collapse" id="navbar-collapse">
             <ul class="navbar-nav mr-auto nijmegen-smooth-scroll">
                 <li class="nav-item">
-                    <a href="/" class="nav-link">Overzicht</a>
-                </li>
-                <li class="nav-item">
-                    <a href="/persoonsgegevens" class="nav-link">Persoonsgegevens</a>
-                </li>
-                <li class="nav-item">
-                    <a href="/uitkeringen" class="nav-link">Uitkeringen</a>
+                    <a href="#" class="nav-link active">IRMA opladen</a>
                 </li>
             </ul>
             <ul class="navbar-nav ml-auto">

diff --git a/test/__snapshots__/main.test.ts.snap b/test/__snapshots__/main.test.ts.snap