Merge branch 'development' into seo-improvements

.cicd/manifests/ingress-kr.yaml

@@ -0,0 +1,31 @@
+# note: We explicitly create each language subdomain, rather than a wildcard domain
+# as wildcards are not supportd by http01 cert-manager ClusterIssuer
+
+{{- if .Values.ingressDomainName}}
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: {{.Values.namespace}}
+  name: kr-{{.Values.appName}}-{{.Values.envName}}-ingress
+  annotations:     
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+spec:
+  tls:
+  - hosts:
+    - kr.{{.Values.ingressDomainName}}
+    secretName: kr-{{.Values.appName}}-{{.Values.envName}}-tls
+  rules:
+  - host: kr.{{.Values.ingressDomainName}}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: {{.Values.appName}}-{{.Values.envName}}-svc
+            port:
+              number: {{.Values.servicePort}}
+  ingressClassName: nginx
+
+  {{- end}}

.cicd/values/frontend-prod.yaml

@@ -1,5 +1,5 @@
 #Deployment
-replicaCount: 15
+replicaCount: 3
 
 #Pod
 resourceCpuRequest: 200m

src/components/Header.vue

@@ -197,7 +197,8 @@ export default {
   // destroyed() {},
   methods: {
     testForCountryPage() {
-      this.hideNavigation = /^[a-zA-Z]{2}.casper.network/.test(window.location.hostname);
+      const { hostname } = window.location;
+      this.hideNavigation = /^[a-zA-Z]{2}.casper.network/.test(hostname) || /^[a-zA-Z]{2}.staging.casper.network/.test(hostname);
     },
     goHome() {
       if (this.hideNavigation) {

src/router/index.js

@@ -86,11 +86,16 @@ export function getRouter() {
 
         let isCountryLP = false;
         let countryCode = null;
-        const hostname = window.location.hostname;
+        const { hostname } = window.location;
 
-        if (/^[a-zA-Z]{2}.casper.network/.test(hostname)) {
+        const prodDomainTest = /^[a-zA-Z]{2}.casper.network/.test(hostname);
+        const stagingDomainTest = /^[a-zA-Z]{2}.staging.casper.network/.test(hostname);
+        if (prodDomainTest || stagingDomainTest) {
           isCountryLP = true;
           countryCode = hostname.replace('.casper.network', '');
+          if (countryCode.includes('.')) {
+            countryCode = hostname.replace('.staging.casper.network', '');
+          }
           ignoreLanguage = true;
           language = 'en-us';
         }