1.1.0

config/env/EnvSettings.ts

@@ -13,6 +13,10 @@ export abstract class EnvSettings {
 
   abstract ENTRYSCAPE_BLOCKS_URL:string;  
 
+  abstract ENTRYSCAPE_OPENDATA_SV_URL:string;  
+
+  abstract ENTRYSCAPE_OPENDATA_EN_URL:string;  
+
   abstract CONTENTBACKEND_SITEURL: string;
 
   abstract CONTENTBACKEND_GRAPHAPI: string;

config/env/Settings.Dev.ts

@@ -11,14 +11,17 @@ export class Settings_Dev extends EnvSettings {
   ENTRYSCAPE_CONCEPT_STATS_URL="https://editera.dataportal.se/stats/entityData.json"
   ENTRYSCAPE_HISTORY_STATS_URL="https://registrera.oppnadata.se/stats/historyData.json"  
 
-  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.19.app.js"
+  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.20.app-0.6.js"
+
+  ENTRYSCAPE_OPENDATA_SV_URL="https://dataportal.azureedge.net/cdn/ext-opendata-sv-0.6.js"
+  ENTRYSCAPE_OPENDATA_EN_URL="https://dataportal.azureedge.net/cdn/ext-opendata-en-0.6.js"
 
   ENTRYSCAPE_SITEMAP_JSON_URL="https://registrera.oppnadata.se/sitemap.json";
 
   CONTENTBACKEND_SITEURL="*";
 
-  CONTENTBACKEND_GRAPHAPI="https://digg-test-graphproxy.azurewebsites.net";
-  // CONTENTBACKEND_GRAPHAPI="http://localhost:4444";
+  // CONTENTBACKEND_GRAPHAPI="https://digg-test-graphproxy.azurewebsites.net";
+  CONTENTBACKEND_GRAPHAPI="http://localhost:4444";
 
   CANONICAL_URL = "http://localhost:8080";
 

config/env/Settings.Prod.ts

@@ -11,7 +11,10 @@ export class Settings_Prod extends EnvSettings {
   ENTRYSCAPE_CONCEPT_STATS_URL="https://editera.dataportal.se/stats/entityData.json"
   ENTRYSCAPE_HISTORY_STATS_URL="https://registrera.oppnadata.se/stats/historyData.json"
 
-  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.19.app.js"
+  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.20.app-0.6.js"
+
+  ENTRYSCAPE_OPENDATA_SV_URL="https://dataportal.azureedge.net/cdn/ext-opendata-sv-0.6.js"
+  ENTRYSCAPE_OPENDATA_EN_URL="https://dataportal.azureedge.net/cdn/ext-opendata-en-0.6.js"
 
   ENTRYSCAPE_SITEMAP_JSON_URL="https://registrera.oppnadata.se/sitemap.json";
 

config/env/Settings.Sandbox.ts

@@ -11,7 +11,10 @@ export class Settings_Sandbox extends EnvSettings {
   ENTRYSCAPE_CONCEPT_STATS_URL="https://editera.dataportal.se/stats/entityData.json"
   ENTRYSCAPE_HISTORY_STATS_URL="https://registrera.oppnadata.se/stats/historyData.json"
 
-  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.19.app.js"
+  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.20.app-0.6.js"
+
+  ENTRYSCAPE_OPENDATA_SV_URL="https://dataportal.azureedge.net/cdn/ext-opendata-sv-0.6.js"
+  ENTRYSCAPE_OPENDATA_EN_URL="https://dataportal.azureedge.net/cdn/ext-opendata-en-0.6.js"
 
   ENTRYSCAPE_SITEMAP_JSON_URL="https://registrera.oppnadata.se/sitemap.json";
 

config/env/Settings.Test.ts

@@ -11,7 +11,10 @@ export class Settings_Test extends EnvSettings {
   ENTRYSCAPE_CONCEPT_STATS_URL="https://editera.dataportal.se/stats/entityData.json"
   ENTRYSCAPE_HISTORY_STATS_URL="https://registrera.oppnadata.se/stats/historyData.json"
 
-  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.19.app.js"
+  ENTRYSCAPE_BLOCKS_URL="https://dataportal.azureedge.net/cdn/blocks.0.20.app-0.6.js"
+
+  ENTRYSCAPE_OPENDATA_SV_URL="https://dataportal.azureedge.net/cdn/ext-opendata-sv-0.6.js"
+  ENTRYSCAPE_OPENDATA_EN_URL="https://dataportal.azureedge.net/cdn/ext-opendata-en-0.6.js"
 
   ENTRYSCAPE_SITEMAP_JSON_URL="https://registrera.oppnadata.se/sitemap.json";
 

package.json

@@ -76,6 +76,7 @@
   },
   "dependencies": {
     "@apollo/react-hooks": "^3.1.5",
+    "@datapunt/matomo-tracker-react": "^0.2.1",
     "@digg/design-system": "file:local_modules/digg_design-system-1.1.87.tgz",
     "@digg/react-ideal-image": "file:local_modules/digg_react-ideal-image-1.0.2.tgz",
     "@emotion/core": "^10.0.17",

public/index.html

@@ -67,5 +67,33 @@
       crossorigin="anonymous"
     ></script>    
     <script src="/app.js"></script>
+    <!-- Matomo -->
+    <script>
+      var matomoId;
+
+      if(window.document.domain === 'www.dataportal.se') {
+        console.log('prod');
+        matomoId = '4';
+      } else if(window.document.domain === 'localhost') {
+        console.log('dev');
+        matomoId = '6';
+      } else {
+        console.log('test');
+        matomoId = '5';
+      }
+
+      var _paq = window._paq = window._paq || [];
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      _paq.push(['trackPageView']);
+      _paq.push(['enableLinkTracking']);
+      (function() {
+        var u="//webbanalys.digg.se/";
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
+        _paq.push(['setSiteId', matomoId]);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+      })();
+    </script>
+    <!-- End Matomo Code -->
   </body>
 </html>

server/index.ts

@@ -42,7 +42,8 @@ var csp_headers = {
     '*.googleapis.com',
     '*.gstatic.com',
     'digg-test-graphproxy.azurewebsites.net',
-    'digg-prod-graphproxy.azurewebsites.net'
+    'digg-prod-graphproxy.azurewebsites.net',
+    'webbanalys.digg.se'
   ],
   'base-uri': ["'self'"],
   'manifest-src': ["'self'"],
@@ -85,7 +86,8 @@ app.use(function forceLiveDomain(req, res, next) {
       host === 'ckan.xn--ppnadata-m4a.se' || 
       host === 'www.xn--ppnadata-m4a.se' || 
       host === 'ckan.oppnadata.se' || 
-      host === 'www.oppnadata.se') {
+      host === 'www.oppnadata.se' ||
+      host === 'vidareutnyttjande.se') {
     return res.redirect(301, 'https://www.dataportal.se/oppnadata');
   }
   if (host === 'oppnadata.local:3003') {

server/renderer/html-template.tsx

@@ -80,7 +80,7 @@ export const getFooter = ({ bundles, ids }: FooterData) => {
       <script>window.__EMOTION_IDS__ = ${serialize(ids)};</script>                   
       <div id="scriptsPlaceholder"></div>     
       <script src="https://dataportal.azureedge.net/cdn/postscribe.min.js" crossorigin="anonymous"></script>              
-      ${bundles.map(src => createScriptTag(src))}                        
+      ${bundles.map(src => createScriptTag(src))}                   
     </body>
     </html>
   `;

src/assets/Illustration_1.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const illustration_1 = require('./illustration_1.png');
+
+export const Illustration_1: React.SFC = () => <img src={illustration_1} alt="Illustration dator" />;

src/assets/Illustration_2.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const illustration_2 = require('./illustration_2.png');
+
+export const Illustration_2: React.SFC = () => <img src={illustration_2} alt="Illustration dator" />;

src/assets/Illustration_3.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const illustration_3 = require('./illustration_3.png');
+
+export const Illustration_3: React.SFC = () => <img src={illustration_3} alt="Illustration dator" />;

src/assets/TopImage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
 
-const topimage = require('./Sthlm_28.jpg');
+const topimage = require('./start_bg1.jpg');
 
-export const TopImage: React.SFC = () => <img src={topimage} alt="Stockholm och blå himmel" />;
+export const TopImage: React.SFC = () => <img src={topimage} alt=" " />;

src/assets/TopImageInspo.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const topimage = require('./project_bg.jpg');
+
+export const TopImageInspo: React.SFC = () => <img src={topimage} alt="" />;

src/assets/TopImageTellUS.tsx

@@ -0,0 +1,5 @@
+import React from 'react';
+
+const topimage = require('./tellus_bg.jpg');
+
+export const TopImageTellUs: React.SFC = () => <img src={topimage} alt="" />;

src/components/Articles/ArticleBlock.tsx

@@ -18,13 +18,12 @@ const lang = 'sv';
 const NEWS = gql`
   {
     othernews:
-      news(siteurl:"*", lang:"${i18n.languages[0]}", take:3, skip:0, skiptags:["sticky"]){
+      news(siteurl:"*", lang:"${i18n.languages[0]}", take:3, skip:0){
         id        
         heading
         preamble
         published
-        modified
-        tags
+        modified        
         body
         imageUrl
       }          
@@ -36,21 +35,12 @@ export const ArticleBlock: React.FC<ArticleBlockProps> = () => {
     othernews: Array<any>;
   }>(NEWS);
 
-  // const stickyNews =
-  //   data && data.stickynews && data.stickynews.length > 0
-  //     ? data.stickynews
-  //     : [];
-
   const articleList =
     data && data.othernews && data.othernews.length > 0 ? data.othernews : [];
 
-  // if (stickyNews.length == 0 && newsList.length == 0) {
-  //   return <></>;
-  // }
-
   if (articleList && articleList.length > 0) {
     return (
-      <div>
+      <div className="main-container">
         <h2 className="text-3">{i18n.t('pages|articles|articles')}</h2>
         <div className="news-compact">
           <div className="news-list-compact">
@@ -86,22 +76,20 @@ export const ArticleBlock: React.FC<ArticleBlockProps> = () => {
                           />
                         )}
                       </div>
-
                       <div className="news-text">
                         <span className="text-6">
                           {moment(n.published.toString()).format('D MMM YYYY')}
                         </span>
-
                         <h3>
                           <a
                             className="text-4"
-                            href={`/${i18n.languages[0]}/${i18n.t('routes|news|path')}/${n.id}/${slugify(n.heading)}`}>{n.heading}
-
-
-
+                            href={`/${i18n.languages[0]}/${i18n.t(
+                              'routes|news|path'
+                            )}/${n.id}/${slugify(n.heading)}`}
+                          >
+                            {n.heading}
                           </a>
                         </h3>
-
                         <ChopLines lines={3} lineHeight={27}>
                           <p
                             className="text-5"

src/components/Articles/ArticleItem.tsx

@@ -40,8 +40,7 @@ export const ArticleItem : React.FC<ArticleItemProps> = (props) => {
       heading
       preamble
       published
-      modified
-      tags
+      modified      
       body 
       imageUrl
     }
@@ -57,18 +56,15 @@ export const ArticleItem : React.FC<ArticleItemProps> = (props) => {
 
     return (                    
       <div className="news-article content">
-
         {loading && (<span className="text-5 loading">{i18n.t('common|loading')}</span>)}
         {!loading && articleItem && id && id != '0' ?
           <>
             <Helmet>
               <title>{articleItem.heading} - {i18n.t('common|seo-title')}</title>
-            </Helmet>
-
+            </Helmet>            
             {articleItem && articleItem.imageUrl && (
               <img src={`${articleItem.imageUrl}?width=1024`} />
             )}
-
             <span className="text-6">{moment(articleItem.published.toString()).format("D MMM YYYY")}</span>
             <h1 className="text-1">{articleItem.heading}</h1>
             <p className="preamble text-4">

src/components/Articles/ArticleList.tsx

@@ -1,6 +1,5 @@
 import React, { Component, useState } from 'react';
 import i18n from '../../i18n';
-import { TopImage } from 'assets/TopImage';
 import { EnvSettings } from '../../../config/env/EnvSettings';
 import { useQuery } from '@apollo/react-hooks';
 import { gql } from 'apollo-boost';
@@ -23,8 +22,7 @@ export const ArticleList: React.FC<ArticleListProps> = (props) => {
       heading
       preamble
       published
-      modified
-      tags
+      modified      
       body 
     }
   }
@@ -73,7 +71,7 @@ export const ArticleList: React.FC<ArticleListProps> = (props) => {
                 <a
                   className="text-4"
                   href={`/${i18n.languages[0]}/${i18n.t(
-                    'pages|articles|articles'
+                    'routes|news|path'
                   )}/${n.id}/${slugify(n.heading)}`}
                 >
                   {n.heading}

src/components/Footer/Footer.tsx

@@ -59,6 +59,15 @@ export class Footer extends React.Component<FooterProps> {
                     <Box className="footer-main">
                       <Box className="footer__links">
                         <div className="footer__links-nav">
+                          <a
+                            href={`/${i18n.languages[0]}/${i18n.t(
+                              'routes|register-data|path'
+                            )}`}
+                            className="footer-link text-6-link"
+                          >
+                            {i18n.t('routes|register-data|title')}
+                          </a>
+
                           <a
                             href={`/${i18n.languages[0]}/${i18n.t(
                               'routes|about|path'