Merge branch 'develop' into feature/IDSKRP-160-WP-na-IDSK-web

trexima · Oct 15, 2021 · a153a72 · a153a72
2 parents c51b740 + dc45385
commit a153a72
Show file tree

Hide file tree

Showing 47 changed files with 3,018 additions and 449 deletions.
diff --git a/app/assets/images/cookies-page-pattern/cookies-page.png b/app/assets/images/cookies-page-pattern/cookies-page.png
diff --git a/app/assets/images/header-web/logo-mirri-biele.svg b/app/assets/images/header-web/logo-mirri-biele.svg
diff --git a/app/assets/images/header-web/logo-mirri-farebne.svg b/app/assets/images/header-web/logo-mirri-farebne.svg
diff --git a/app/assets/images/header-web/logo-mirri-small-biele.svg b/app/assets/images/header-web/logo-mirri-small-biele.svg
diff --git a/app/assets/images/header-web/logo-mirri-small-farebne.svg b/app/assets/images/header-web/logo-mirri-small-farebne.svg
diff --git a/app/assets/images/header-web/profile.png b/app/assets/images/header-web/profile.png
diff --git a/app/assets/images/header-web/profile.svg b/app/assets/images/header-web/profile.svg
diff --git a/app/assets/scss/graph.scss b/app/assets/scss/graph.scss
@@ -138,10 +138,6 @@
         box-shadow: 0 0 0 10px govuk-colour("mid-grey");
     }
 
-    .govuk-radios__item {
-        margin-bottom: 0;
-    }
-
     .idsk-graph .govuk-radios .govuk-radios__item:hover .govuk-radios__input:focus + .govuk-radios__label::before {
         box-shadow: 0 0 0 4px govuk-colour("yellow"), 0 0 0 10px govuk-colour("mid-grey");
     }

diff --git a/app/views/header-web/index.njk b/app/views/header-web/index.njk
@@ -0,0 +1,112 @@
+{% extends "layout.njk" %}
+
+
+{% block header %}
+    {% from "../../../src/idsk/components/header-web/macro.njk" import idskHeaderWeb %}
+    {{ idskHeaderWeb({
+        headerType: "website",
+        brand: {
+            gestor: true,
+            languages: [
+                {
+                    text: "Slovenčina",
+                    selected: true,
+                    link: "#"
+                },
+                {
+                    text: "Deutsch",
+                    link: "#"
+                },
+                {
+                    text: "English",
+                    link: "#"
+                },
+                {
+                    text: "Español",
+                    link: "#"
+                }
+            ]
+        },
+
+        main: {
+            logoSrc: "/public/assets/images/header-web/logo-mirri-farebne.svg",
+            title: "IDSK SK",
+            loginButton: true,
+            profileButton: true,
+            secondaryButton: false
+        },
+
+       search: true,
+
+        navBar: {
+            navigation: [
+                {
+                    text: 'Občan',
+                    submenu: [
+                        {
+                            link: '#1',
+                            text: 'Eurofondy'
+                        },
+                        {
+                            link: '#2',
+                            text: 'Regionálny rozvoj'
+                        },
+                        {
+                            link: '#3',
+                            text: 'Informatizácia'
+                        },
+                        {
+                            link: '#4',
+                            text: 'Investície'
+                        }
+                    ]
+                },
+                {
+                    text: 'Podnikateľ',
+                    submenu: [
+                        {
+                            link: '#1',
+                            text: 'Eurofondy'
+                        },
+                        {
+                            link: '#2',
+                            text: 'Regionálny rozvoj'
+                        },
+                        {
+                            link: '#3',
+                            text: 'Informatizácia'
+                        },
+                        {
+                            link: '#4',
+                            text: 'Investície'
+                        },
+                        {
+                            link: '#3',
+                            text: 'Informatizácia'
+                        },
+                        {
+                            link: '#4',
+                            text: 'Investície'
+                        }
+                    ]
+                },
+                {
+                    link: '#3',
+                    text: 'Dôchodca'
+                },
+                {
+                    link: '#4',
+                    text: 'Elektronické služby'
+                },
+                {
+                    link: '#5',
+                    text: 'Inovácie'
+                }
+            ]
+        },
+
+        banner: {
+            text: "Nová verzia ID-SK Frontend nahradzuje pôvodnú verziu."
+        }
+    }) }}
+{% endblock %}
diff --git a/app/views/komponenty/examples/exampleIntroBlock3.njk b/app/views/komponenty/examples/exampleIntroBlock3.njk
@@ -0,0 +1,25 @@
+{% from "../../../../src/idsk/components/intro-block/macro.njk" import idskIntroBlock %}
+{{ idskIntroBlock({
+  sideMenu: [
+    {
+      item:"O Eurofondoch",
+      href:"#"},
+    {
+      item:"Aktuality",
+      href:"#"
+    },
+    {
+      item:"O Ministerstve",
+      href:"#"
+    },
+    {
+      item:"Aktuálne výzvy",
+      href:"#"
+    },
+    {
+      item:"Dokumenty",
+      href:"#"
+    }],
+  classBackground: "app-pane-grey",
+  searchEnabled: true
+})}}
diff --git a/app/views/komponenty/examples/graf1.njk b/app/views/komponenty/examples/graf1.njk
@@ -29,16 +29,12 @@
             downloadTitle: "Stiahnuť údaje",
             items: [
                 {
-                    title: "ako CSV (54 kB)",
-                    value: "/public/assets/data/PCR_denne_kumulat_AG-denne_kumulat.csv"
+                    title: "ako CSV",
+                    value: "https://raw.githubusercontent.com/Institut-Zdravotnych-Analyz/covid19-data/main/DailyStats/OpenData_Slovakia_Covid_DailyStats.csv"
                 },
                 {
-                    title: "ako JSON (54 kB)",
-                    value: "/public/assets/data/PCR_denne_kumulat_AG-denne_kumulat.json"
-                },
-                {
-                    title: "ako XLSX (54 kB)",
-                    value: "/public/assets/data/PCR_denne_kumulat_AG-denne_kumulat.xlsx"
+                    title: "ako XLSX",
+                    value: "https://github.com/Institut-Zdravotnych-Analyz/covid19-data/blob/main/DailyStats/OpenData_Slovakia_Covid_DailyStats.xlsx?raw=true"
                 }
             ]
         },
@@ -85,7 +81,7 @@
             </div>
         </div>
     </div>
-    
+
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-one-half">
             <summary class="govuk-body-s idsk-graph__summary">
@@ -94,7 +90,6 @@
         </div>
     </div>
 
-
     {{ govukTabs({
         "attributes": {
             "data-activetab": params.activeTab
@@ -173,4 +168,4 @@
         </div>
         {% endif %}
     </div>
-</div>
+</div>
diff --git a/app/views/komponenty/intro-block.njk b/app/views/komponenty/intro-block.njk
@@ -36,6 +36,9 @@
                 <li>
                     <a class="govuk-link" href="#ukazka-uvodny-block-grey" title="Populárny obsah v úvodnom bloku">Populárny obsah v úvodnom bloku</a>
                 </li>
+                <li>
+                  <a class="govuk-link" href="#ukazka-uvodny-block-bez-navrhov" title="Úvodný blok bez návrhov vyhľadávania">Úvodný blok bez návrhov vyhľadávania</a>
+                </li>
             </ul>
             <h3 class="govuk-heading-m" id="skladba">Z čoho sa skladá úvodný blok?</h3>
             <p class="govuk-body">Skladá sa z:</p>
@@ -87,6 +90,15 @@
                 {{exampleComponentHtml | safe}}
             </div>
         </div>
+        <div class="govuk-grid-column-full">
+            <h3 class="govuk-heading-m" id="ukazka-uvodny-block-bez-navrhov">Úvodný blok bez návrhov vyhľadávania</h3>
+            <div class="example">
+              {% set exampleComponentHtml %}
+                {% include "../komponenty/examples/exampleIntroBlock3.njk" %}
+              {% endset %}
+              {{exampleComponentHtml | safe}}
+            </div>
+        </div>
     </div>
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-full">
@@ -98,4 +110,4 @@
             </ul>
         </div>
     </div>
-{% endblock %}
+{% endblock %}