Skip to content

Commit

Permalink
Merge branch 'main' into 171-amateur-dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
mwigham committed Dec 5, 2024
2 parents 5255d01 + ed11822 commit b40e9f9
Show file tree
Hide file tree
Showing 20 changed files with 7,415 additions and 7,438 deletions.
6 changes: 4 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ updates:
include: scope
allow:
- dependency-type: direct
groups:
patches:
update-types:
- patch
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-patch']
# Nuxt has it's own update mechanism:
# https://github.com/nuxt/nuxt/blob/7b35a1fe4faed49fffe3427a0db4aabae138f4ae/docs/3.api/5.commands/upgrade.md
- dependency-name: 'nuxt'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20
v22
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ These are the sources for the B&G Data Website, including the content (md) and w

## Prerequisites

- [Node.js](https://nodejs.org/) v20.x.
- [Node.js](https://nodejs.org/) v22.x.

If you use [`nvm`](https://github.com/nvm-sh/nvm) to manage different Node versions, running `nvm use` will activate the required version through `.nvmrc`.

Expand Down
2 changes: 1 addition & 1 deletion components/ArticleHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<section>
<div class="d-flex justify-space-between align-center">
<h3>
<NuxtLink class="category" :to="localePath(path)">
<NuxtLink class="category" :to="$localePath(path)">
{{ $t(dataClass) }}
</NuxtLink>
</h3>
Expand Down
2 changes: 1 addition & 1 deletion components/CardItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
link
:v-ripple="{ class: rippleClass }"
:to="
localePath({
$localePath({
name: path,
params: { slug: card.slug },
})
Expand Down
2 changes: 1 addition & 1 deletion components/ChipList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
label
size="large"
link
:to="localePath('/' + path + '/' + chip.slug)"
:to="$localePath('/' + path + '/' + chip.slug)"
:style="{
backgroundImage: getImageOverlayCSS(
getImageSrc(chip.image),
Expand Down
8 changes: 6 additions & 2 deletions components/PrevNext.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
<v-col>
<NuxtLink
v-if="prev"
:to="localePath({ name: 'showcase-slug', params: { slug: prev.slug } })"
:to="
$localePath({ name: 'showcase-slug', params: { slug: prev.slug } })
"
>
{{ prev.title }}
</NuxtLink>
</v-col>
<v-col>
<NuxtLink
v-if="next"
:to="localePath({ name: 'showcase-slug', params: { slug: next.slug } })"
:to="
$localePath({ name: 'showcase-slug', params: { slug: next.slug } })
"
>
{{ next.title }}
</NuxtLink>
Expand Down
4 changes: 2 additions & 2 deletions components/SectionHeading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h1>
<component
:is="actionPath ? 'NuxtLink' : 'span'"
:to="localePath(actionPath)"
:to="$localePath(actionPath)"
class="text-decoration-none text-grey-darken-4"
>
{{ title }}&nbsp;<span :class="`text-${color}`">/</span>
Expand All @@ -16,7 +16,7 @@
<slot name="actions">
<v-btn
v-if="actionTitle && actionPath"
:to="localePath(actionPath)"
:to="$localePath(actionPath)"
variant="plain"
>
{{ actionTitle }}
Expand Down
2 changes: 1 addition & 1 deletion components/visual/VisualDatasetInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<v-btn
color="primary"
:to="
localePath({
$localePath({
name: 'datasets-slug',
params: { slug: dataset.slug },
})
Expand Down
2 changes: 1 addition & 1 deletion components/visual/VisualMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>

<!-- Button -->
<v-btn :to="localePath('datasets')" color="primary">
<v-btn :to="$localePath('datasets')" color="primary">
{{ $t('all_datasets') }}
</v-btn>
</div>
Expand Down
Loading

0 comments on commit b40e9f9

Please sign in to comment.