2.1.0

diggsweden · Dec 1, 2021 · d90f391 · d90f391
1 parent 90528e0
commit d90f391
Show file tree

Hide file tree

Showing 17 changed files with 166 additions and 40 deletions.
diff --git a/package.json b/package.json
@@ -121,6 +121,7 @@
     "i18next-http-middleware": "^3.1.0",
     "ini": "^1.3.6",
     "isomorphic-unfetch": "^3.0.0",
+    "json-schema": "0.4.0",
     "loadable-components": "^2.2.3",
     "lodash": "4.17.21",
     "lucene": "^2.1.1",
@@ -130,7 +131,7 @@
     "moment": "^2.25.3",
     "node-fetch": "2.6.5",
     "node-notifier": "8.0.1",
-    "node-sass": "^4.13.0",
+    "node-sass": "4.14.0",
     "nth-check": "2.0.1",
     "performant-array-to-tree": "^1.7.1",
     "postcss-modules-extract-imports": "3.0.0",
@@ -181,6 +182,10 @@
     "**/**/node-notifier": "^8.0.1",
     "**/**/prismjs": "^1.25.0",
     "**/**/url-parse": "^1.5.2",
+<<<<<<< HEAD
+=======
+    "**/**/json-schema": "^0.4.0",
+>>>>>>> prod
     "@digg/react-ideal-image": "file:local_modules/digg_react-ideal-image-1.0.2.tgz"
   },
   "jest": {

diff --git a/src/assets/Illustration_1.tsx b/src/assets/Illustration_1.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_1 = require('./illustration_1.png');
 
-export const Illustration_1: React.SFC = () => <img src={illustration_1} alt="Illustration dator" />;
+export const Illustration_1: React.SFC = () => <img src={illustration_1} alt={i18n.t('common|illustration-1')} />;
diff --git a/src/assets/Illustration_2.tsx b/src/assets/Illustration_2.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_2 = require('./illustration_2.png');
 
-export const Illustration_2: React.SFC = () => <img src={illustration_2} alt="Illustration dator" />;
+export const Illustration_2: React.SFC = () => <img src={illustration_2} alt={i18n.t('common|illustration-2')} />;
diff --git a/src/assets/Illustration_3.tsx b/src/assets/Illustration_3.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_3 = require('./illustration_3.png');
 
-export const Illustration_3: React.SFC = () => <img src={illustration_3} alt="Illustration dator" />;
+export const Illustration_3: React.SFC = () => <img src={illustration_3} alt={i18n.t('common|illustration-3')} />;
diff --git a/src/assets/TopImage.tsx b/src/assets/TopImage.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const topimage = require('./start_bg1.jpg');
 
-export const TopImage: React.SFC = () => <img src={topimage} alt=" " />;
+export const TopImage: React.SFC = () => <img src={topimage} alt={i18n.t('common|top-image')}/>;
diff --git a/src/components/StartPageComponents/SearchBlock.tsx b/src/components/StartPageComponents/SearchBlock.tsx
@@ -56,9 +56,6 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
           <div className="search__box">
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/datasets?p=1&q=&f=`;
-              // }}
             >
               <Link
                 className="text-5-bold"
@@ -74,19 +71,15 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
 
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/concepts?p=1&q=&f=`;
-              // }}
             >
               <span className="row">
                 <Link
                   className="text-5-bold"
-                  aria-label="Sök efter begrepp"
+                  aria-label={i18n.t('pages|search|concepts')}
                   to={`/${i18n.languages[0]}/concepts?p=1&q=&f=`}
                 >
                   {i18n.t('pages|search|concepts')}{' '}
                 </Link>
-                <span className="beta_badge text-7-bold"> {i18n.t('common|beta')}</span>
               </span>
 
               <span className="text-6">
@@ -96,19 +89,15 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
 
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/specifications?p=1&q=&f=`;
-              // }}
             >
               <span className="row">
                 <Link
                   className="text-5-bold"
-                  aria-label="Sök efter specifikationer"
+                  aria-label={i18n.t('pages|search|specifications')}
                   to={`/${i18n.languages[0]}/specifications?p=1&q=&f=`}
                 >
                   {i18n.t('pages|search|specifications')}{' '}
                 </Link>
-                <span className="beta_badge text-7-bold"> {i18n.t('common|beta')}</span>
               </span>
 
               <span className="text-6">

diff --git a/src/pages/DetailPages/ConceptPage.tsx b/src/pages/DetailPages/ConceptPage.tsx
@@ -666,7 +666,10 @@ export const ConceptPage: React.FC<PageProps> = ({ env, match }) => {
             <div className="detailpage__wrapper">
               {/* Left column */}
               <div className="detailpage__wrapper--leftcol content">
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--xl">BETA</span>
+=======
+>>>>>>> prod
                 <h1 className="text-2 terminology_header">
                   <span>{entry.title}</span>
                 </h1>

diff --git a/src/pages/DetailPages/SpecificationPage.tsx b/src/pages/DetailPages/SpecificationPage.tsx
@@ -231,10 +231,12 @@ export const SpecificationPage: React.FC<PageProps> = ({
             <div className="detailpage__wrapper">
               {/* Left column */}
               <div className="detailpage__wrapper--leftcol content">
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--xl">BETA</span>
 
+=======
+>>>>>>> prod
                 <h1 className="text-2">{entry.title}</h1>
-
                 <script
                   type="text/x-entryscape-handlebar"
                   data-entryscape="true"

diff --git a/src/pages/NotFoundPage/NotFoundPage.tsx b/src/pages/NotFoundPage/NotFoundPage.tsx
@@ -3,13 +3,19 @@ import { Link, RouteComponentProps } from 'react-router-dom';
 import { RouterContext } from '../../../shared/RouterContext';
 import { PageMetadata } from '../PageMetadata';
 import i18n from 'i18n';
+import { __RouterContext } from 'react-router';
 
 export const NotFoundPage: React.FC<RouteComponentProps<any, RouterContext>> =
-  ({ staticContext }) => {
+  ({ staticContext, location }) => {
     if (staticContext) {
       staticContext.statusCode = 404;
     }
 
+    if(location.pathname && location.pathname.includes("/en/"))
+      i18n.changeLanguage("en");  
+    else
+      i18n.changeLanguage("sv");  
+
     return (
       <>
         <PageMetadata

diff --git a/src/pages/SearchPage/SearchSpecificationsPage.tsx b/src/pages/SearchPage/SearchSpecificationsPage.tsx
@@ -145,7 +145,10 @@ export const SearchSpecificationsPage: React.FC<SearchProps> = ({env}) => {
                 <h1 className="text-2 search-header">
                   {i18n.t('common|search-specs')}
                 </h1>
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--lg">BETA</span>
+=======
+>>>>>>> prod
               </div>
 
               <SearchInput

diff --git a/src/pages/SearchPage/SearchTermsPage.tsx b/src/pages/SearchPage/SearchTermsPage.tsx
@@ -141,7 +141,10 @@ export const SearchTermsPage: React.FC<SearchProps> = ({ location, env }) => {
                 <h1 className="text-2 search-header">
                   {i18n.t('common|search-concept')}
                 </h1>
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--lg">BETA</span>
+=======
+>>>>>>> prod
               </div>
 
               <SearchInput

diff --git a/src/scss/Breadcrumb/breadcrumb.scss b/src/scss/Breadcrumb/breadcrumb.scss
@@ -102,6 +102,10 @@
                     text-decoration: none !important;
                     display: inline-block;
                     padding-right: $space-8;
+<<<<<<< HEAD
+=======
+                    color: $green50;
+>>>>>>> prod
                 }
             }
         }

diff --git a/src/scss/news/news.scss b/src/scss/news/news.scss
@@ -139,8 +139,8 @@
         li {
             display: flex;
             flex-direction: column;
-            padding-top: $space-8;
-            padding-bottom: $space-16;
+            padding-top: $space-16;
+            padding-bottom: $space-24;
             border-bottom: 0.125rem dotted $black10;
 
             &:first-of-type {

diff --git a/src/scss/swagger/swagger.scss b/src/scss/swagger/swagger.scss
@@ -278,6 +278,16 @@ $authorize-btn-green: #258659;
     }
 }
 
+<<<<<<< HEAD
+=======
+//hide "try it out" function on deprecated methods
+.swagger-ui .opblock-deprecated {
+    .try-out {
+        display:none;
+    }
+}
+
+>>>>>>> prod
 //Swagger accordions head
 .swagger-ui .opblock-tag {
     background-color: $black10;

diff --git a/src/translations/en/common.json b/src/translations/en/common.json
@@ -32,5 +32,13 @@
   "home-text" : "Home",
   "cookies" : "cookies",
   "skiptocontent" : "Skip to content",
+<<<<<<< HEAD
   "exploreapi" : "Explore API"
+=======
+  "exploreapi" : "Explore API",
+  "top-image": "View of Stockholm",
+  "illustration-1":"Illustration av kommunikation mellan dator och mobil",
+  "illustration-2":"Illustration av ett hus",
+  "illustration-3":"Illustration av dator som tar emot data"
+>>>>>>> prod
 }
diff --git a/src/translations/sv/common.json b/src/translations/sv/common.json
@@ -30,6 +30,15 @@
   "home-text" : "Hem",
   "cookies" : "om_kakor",
   "skiptocontent" : "Hoppa till innehåll",
+<<<<<<< HEAD
   "exploreapi" : "Utforska API"
+=======
+  "exploreapi" : "Utforska API",
+  "top-image": "Vy över Stockholm",
+  "illustration-1":"Illustration av kommunikation mellan dator och mobil",
+  "illustration-2":"Illustration av ett hus",
+  "illustration-3":"Illustration av dator som tar emot data"
+
+>>>>>>> prod
 }