Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #592

Merged
merged 4 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 106 additions & 101 deletions composer.lock

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions conf/cmi/core.entity_form_display.node.page.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- publication_date
- scheduler
_core:
default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
id: node.page.default
targetEntityType: node
bundle: page
Expand Down Expand Up @@ -79,10 +79,12 @@ content:
duplicate: '0'
third_party_settings: { }
field_lead_in:
type: string_textarea
type: textarea_character_counter
weight: 13
region: content
settings:
counter_step: 160
counter_total: 200
rows: 3
placeholder: ''
third_party_settings: { }
Expand Down Expand Up @@ -203,10 +205,12 @@ content:
display_label: true
third_party_settings: { }
title:
type: string_textfield
type: textfield_character_counter
weight: 1
region: content
settings:
counter_step: 0
counter_total: 55
size: 60
placeholder: ''
third_party_settings: { }
Expand Down
19 changes: 14 additions & 5 deletions conf/cmi/core.entity_form_display.paragraph.hero.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,29 @@ dependencies:
- field.field.paragraph.hero.field_hero_title
- paragraphs.paragraphs_type.hero
module:
- allowed_formats
- hdbt_admin_tools
- media_library
- text
_core:
default_config_hash: CvDiqRtujItZjhiR7KUf0a9dQrlgEcmuDDhJHmzUNOw
default_config_hash: 1GjBs_T3tKYlTF4jxU6lUtwC7YSCChaZ4Tmsrialewk
id: paragraph.hero.default
targetEntityType: paragraph
bundle: hero
mode: default
content:
field_hero_desc:
type: text_textarea
type: formatted_text_character_counter
weight: 3
region: content
settings:
counter_step: 160
counter_total: 200
rows: 5
placeholder: ''
third_party_settings: { }
third_party_settings:
allowed_formats:
hide_help: '0'
hide_guidelines: '0'
field_hero_design:
type: design_field_widget
weight: 0
Expand All @@ -47,6 +52,8 @@ content:
weight: 6
region: content
settings:
placeholder_url: ''
placeholder_title: ''
linkit_profile: helfi
linkit_auto_link_text: false
third_party_settings: { }
Expand All @@ -57,10 +64,12 @@ content:
settings: { }
third_party_settings: { }
field_hero_title:
type: string_textfield
type: textfield_character_counter
weight: 2
region: content
settings:
counter_step: 0
counter_total: 55
size: 60
placeholder: ''
third_party_settings: { }
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.image.hero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- responsive_image
_core:
default_config_hash: UX2CrJYBdnGTpSaqiYid65d46ihnZEmWEBJbdXJZQ7g
default_config_hash: 1TRAhLvz-37rbjca1TJiVCP65Gy_X5ppn2iiiTRvl-g
id: media.image.hero
targetEntityType: media
bundle: image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- telephone
- text
_core:
default_config_hash: i0i5Sy5UJYyKJqoc7NKFbAMaMlXpC53GoO7Z3mahaBE
default_config_hash: NC4qX-7naY7U9PAcLK80wAYby0wkk8T8ZuqKK2_fRd0
id: tpr_service_channel.tpr_service_channel.default
targetEntityType: tpr_service_channel
bundle: tpr_service_channel
Expand Down Expand Up @@ -106,6 +106,13 @@ content:
third_party_settings: { }
weight: 22
region: content
information:
type: text_default
label: hidden
settings: { }
third_party_settings: { }
weight: 4
region: content
langcode:
type: language
label: hidden
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_mode.media.hero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA
default_config_hash: zAj-eiOJoImMZ2MAmC2k7HFfOKvT0JA_aHDz6RaN2uQ
id: media.hero
label: Hero
description: ''
Expand Down
22 changes: 11 additions & 11 deletions conf/cmi/field.field.node.page.field_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ settings:
handler_settings:
target_bundles:
text: text
columns: columns
image: image
accordion: accordion
banner: banner
image: image
list_of_links: list_of_links
contact_card_listing: contact_card_listing
content_cards: content_cards
content_liftup: content_liftup
banner: banner
event_list: event_list
news_list: news_list
from_library: from_library
columns: columns
phasing: phasing
chart: chart
remote_video: remote_video
from_library: from_library
map: map
unit_search: unit_search
remote_video: remote_video
chart: chart
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
negate: 0
target_bundles_drag_drop:
accordion:
Expand Down
24 changes: 12 additions & 12 deletions conf/cmi/field.field.node.page.field_lower_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@ settings:
handler: 'default:paragraph'
handler_settings:
target_bundles:
text: text
columns: columns
image: image
accordion: accordion
list_of_links: list_of_links
contact_card_listing: contact_card_listing
content_cards: content_cards
content_liftup: content_liftup
text: text
accordion: accordion
banner: banner
event_list: event_list
news_list: news_list
from_library: from_library
chart: chart
image: image
columns: columns
phasing: phasing
remote_video: remote_video
from_library: from_library
map: map
unit_search: unit_search
remote_video: remote_video
chart: chart
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
negate: 0
target_bundles_drag_drop:
accordion:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.field.node.page.field_sidebar_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ settings:
handler: 'default:paragraph'
handler_settings:
target_bundles:
sidebar_text: sidebar_text
from_library: from_library
sidebar_text: sidebar_text
negate: 0
target_bundles_drag_drop:
from_library:
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/field.field.paragraph.event_list.field_api_url.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ dependencies:
module:
- link
_core:
default_config_hash: Y-6hGxIpid7_ScRXE2GozslolF7R3tkTNiJFFaLEw4Y
default_config_hash: qFl3v-buWHh5wpZVM1bBbrLFD8prLGRuI8-zz1PX_sA
id: paragraph.event_list.field_api_url
field_name: field_api_url
entity_type: paragraph
bundle: event_list
label: 'Api URL'
description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum'
description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum. If you want to use the location filter, the URL should contain the IDs of all relevant locations. For example: &places=tprek:123,tprek:456'
required: false
translatable: false
default_value: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ dependencies:
- field.storage.paragraph.field_event_location
- paragraphs.paragraphs_type.event_list
_core:
default_config_hash: qn_ofDevCfu_ZKP8n6kRAQFTmy0cRAXNJUvxS6mU-6Q
default_config_hash: DSXkHRCUYDva2angAe8mEVxY95-9mh8B_oOd_9i-1I0
id: paragraph.event_list.field_event_location
field_name: field_event_location
entity_type: paragraph
bundle: event_list
label: 'Event location'
description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter.'
description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
required: false
translatable: false
default_value:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ third_party_settings:
allowed_formats:
allowed_formats: { }
_core:
default_config_hash: 8R816KbWZKNUvPgCHKY1nRR0RRNTUOhsmU9s2eQCy-c
default_config_hash: cwwrLHDaOq3Y_x5EhOnPYng3P2Qpk-AZNL5Zo6DZn20
id: paragraph.hero.field_hero_desc
field_name: field_hero_desc
entity_type: paragraph
Expand Down
19 changes: 2 additions & 17 deletions conf/cmi/field.storage.paragraph.field_hero_design.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,13 @@ dependencies:
- options
- paragraphs
_core:
default_config_hash: zZ661kERU722BOWyFdnw3UIzhMePsDzfGXd2TsHAJYc
default_config_hash: KXFi1Afbypvb78pxWyzXeA3ha5otHESFK39t-DuF16Q
id: paragraph.field_hero_design
field_name: field_hero_design
entity_type: paragraph
type: list_string
settings:
allowed_values:
-
value: without-image-left
label: 'Without image, align left'
-
value: with-image-right
label: 'Image on the right'
-
value: with-image-left
label: 'Image on the left'
-
value: with-image-bottom
label: 'Image on the bottom'
-
value: diagonal
label: Diagonal
allowed_values: { }
allowed_values_function: helfi_paragraphs_hero_design_allowed_values
module: options
locked: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
description: 'Tapahtumat.hel.fi-osoite, jonka perusteella listaus muodostetaan.'
description: 'Tapahtumat.hel.fi-osoite, jonka perusteella listaus muodostetaan. Esimerkki: https://tapahtumat.hel.fi/fi/events?categories=museum. Jos haluat käyttää tapahtumapaikka-suodatinta, URLissa tulee olla mukana tapahtumapaikkojen ID:t. Esim: &places=tprek:123,tprek:456'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
label: Tapahtumapaikka
description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa.'
description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa. API URL kentässä tulee olla tapahtumapaikkojen ID:t mukana, muuten listassa näytetään kaikki aktiiviset tapahtumapaikat.'
settings:
on_label: Kyllä
off_label: Ei
12 changes: 0 additions & 12 deletions conf/cmi/language/fi/field.storage.paragraph.field_hero_design.yml

This file was deleted.

12 changes: 0 additions & 12 deletions conf/cmi/language/sv/field.storage.paragraph.field_hero_design.yml

This file was deleted.

2 changes: 1 addition & 1 deletion conf/cmi/views.view.service_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ display:
type: full
options:
offset: 0
items_per_page: 15
items_per_page: 5
total_pages: null
id: 0
tags:
Expand Down
20 changes: 0 additions & 20 deletions public/themes/custom/hdbt_subtheme/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,15 @@ hdbt_subtheme
│ │ └───...
│ └───js
│ │ │ common.js
│ └───icons
│ | some-icon.svg
└───dist
└───css
| styles.min.css
└───js
| bundle.min.js
└───icons
| sprite.svg
```

## How tos

### How can I add a new SVG icon and then use it on my site.

You can add your custom icons to `./src/icons/`. F.e. `my-awesome-icon.svg`.
Running `nvm use && npm i && npm run build` will collect the icon to the sprite.svg and it should then be available for use on your site by calling `my-awesome-icon`. Just remember to clear caches.
The icons can be used in twig like so:

{# HDBT Subtheme specific icons #}
{% include "@hdbt_subtheme/misc/icon.twig" with {icon: 'my-awesome-icon'} %}

{# HDBT specific icons #}
{% include "@hdbt/misc/icon.twig" with {icon: 'google-view'} %}

To use the icon in SCSS, you can call it like so:

background-image: url('../icons/my-awesome-icon.svg');

### My javascript has unexpected errors when loading a page in Drupal.

If you have compiled the code with dev-flag (`nmp run dev`), then the sourcemaps expects the JS files to be found in correct places.
Expand Down

This file was deleted.

7 changes: 0 additions & 7 deletions public/themes/custom/hdbt_subtheme/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const glob = require('glob');
const FriendlyErrorsWebpackPlugin = require('@nuxt/friendly-errors-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
const SvgToSprite = require('./webpack.svgToSprite');
const { merge } = require('webpack-merge');

// Handle entry points.
Expand Down Expand Up @@ -105,12 +104,6 @@ module.exports = (env, argv) => {
extensions: ['.js', '.json'],
},
plugins: [
// Uncomment following lines to create svg icon sprite.
// new SvgToSprite(
// path.resolve(__dirname, 'src/icons/**/*.svg'),
// 'icons/hdbt-subtheme-sprite.svg',
// 'icons.json'
// ),
new FriendlyErrorsWebpackPlugin(),
new RemoveEmptyScriptsPlugin(),
new MiniCssExtractPlugin({
Expand Down
Loading
Loading