Skip to content

Commit cafa5cd

Browse files
authored
Merge pull request #1141 from activist-org/dependabot/npm_and_yarn/frontend/vue-i18n-10.0.6
Bump vue-i18n from 10.0.5 to 10.0.6 in /frontend
2 parents 1826050 + 6a49133 commit cafa5cd

12 files changed

+393
-37
lines changed

.github/workflows/check_dependency_updates.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
169169
echo -e "\n### Type Check Results" >> ../reports.md
170170
echo "\`\`\`" >> ../reports.md
171-
yarn nuxi typecheck 2>&1 | sed 's/\[.*\]/\n&\n/g' | tee -a ../reports.md || true
171+
yarn typecheck 2>&1 | sed 's/\[.*\]/\n&\n/g' | tee -a ../reports.md || true
172172
echo "\`\`\`" >> ../reports.md
173173
174174
- name: Create GitHub Issue

.github/workflows/pr_ci_frontend.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Run Nuxt Type Check
4444
if: always()
4545
working-directory: ./frontend
46-
run: sudo yarn nuxi typecheck
46+
run: sudo yarn typecheck
4747

4848
- name: Run ESLint - Linting
4949
if: always()

CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ You can further run the following commands for TypeScript type checks on the fro
394394

395395
```bash
396396
# Within ./frontend:
397-
yarn run postinstall
397+
yarn install # necessary for non-Linux users as node_modules are set via Docker
398+
yarn postinstall # prepare types in frontend/.nuxt
398399
yarn typecheck
399400
```
400401

STYLEGUIDE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ There is a limited set of package types that are available in the global scope.
136136
Before opening a new PR, it is recommended to first generate the current types, then manually check those types:
137137

138138
1. cd into `frontend`
139-
2. run `yarn run postinstall` to generate types in `frontend/.nuxt`
140-
3. run `yarn nuxi typecheck`
139+
2. run `yarn postinstall` to generate types in `frontend/.nuxt`
140+
3. run `yarn typecheck`
141141

142142
Within VS Code TS errors are visible, however, running these commands will help to ensure the new code does not introduce unintended TS errors at build time. Existing TS errors may be ignored. PRs are always welcome to address these errors!
143143

frontend/components/image/ImageOrganization.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<!-- Note: Placeholder image for if no image is provided. -->
88
<div
99
v-else
10-
class="flex h-full w-full items-center justify-center rounded-r-md border bg-distinct-text text-layer-1"
10+
class="flex h-full w-full items-center justify-center text-primary-text"
1111
>
12-
<Icon class="mb-1" :name="IconMap.PEOPLE" />
12+
<Icon class="h-[75%] w-[75%]" :name="IconMap.ORGANIZATION" />
1313
</div>
1414
</div>
1515
</template>

frontend/components/media/MediaMap.vue

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
22
<template>
33
<div
4-
@click="resetDirectionsControl(map)"
4+
@click="resetDirectionsControl()"
55
id="map"
66
class="card-style-base dark:brightness-95 dark:contrast-[90%] dark:hue-rotate-180 dark:invert"
77
></div>
@@ -185,6 +185,7 @@ const setSelectedRoute = () => {
185185
};
186186

187187
let map: Map;
188+
let marker: maplibregl.Marker;
188189
let directions: MapLibreGlDirections;
189190

190191
// MARK: Profile Switcher
@@ -432,7 +433,7 @@ onMounted(() => {
432433
</div>
433434
`);
434435

435-
const marker = new maplibregl.Marker({
436+
marker = new maplibregl.Marker({
436437
color: `${props.markerColors[0]}`,
437438
});
438439

@@ -503,7 +504,7 @@ onMounted(() => {
503504
directions.interactive = true;
504505
});
505506

506-
resetDirectionsControl(map);
507+
resetDirectionsControl();
507508
});
508509
}
509510
});

frontend/components/media/image-carousel/MediaImageCarouselFull.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const defaultImageUrls = [
6262

6363
const imageUrls = ref(defaultImageUrls);
6464
const uploadError = ref(false);
65-
const swiperRef = ref<{ swiper: Swiper | null }>(null);
65+
const swiperRef = ref<{ swiper: Swiper | null }>();
6666

6767
interface OrganizationImage {
6868
id: string;

frontend/components/menu/MenuSubPageSelector.vue

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const defaultIndex = computed(() => {
5353
function changeTab(index: number) {
5454
const selectedRoute = props.selectors[index]?.routeUrl;
5555
if (selectedRoute) {
56-
// @ts-expect-error 'nuxtApp.$localePath' is of type 'unknown'
5756
router.push(nuxtApp.$localePath(selectedRoute));
5857
}
5958
}

frontend/components/sidebar/left/SidebarLeft.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const sidebarType = computed(() => {
123123

124124
// TODO: Use real name of organization / event when available from backend.
125125
const placeholderName = route.path.split("/").at(-2)?.replaceAll("-", " ");
126-
const placeholderLogo = "/images/tech-from-below.svg";
126+
const placeholderLogo = "";
127127

128128
const topicsArray: { label: string; value: string }[] = [];
129129

frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@nuxt/test-utils": "3.15.4",
2626
"@nuxtjs/color-mode": "3.5.2",
2727
"@nuxtjs/device": "3.2.4",
28-
"@nuxtjs/i18n": "9.1.3",
28+
"@nuxtjs/i18n": "9.3.0",
2929
"@nuxtjs/tailwindcss": "6.12.2",
3030
"@pinia/nuxt": "0.9.0",
3131
"@playwright/test": "1.49.1",
@@ -76,7 +76,7 @@
7676
"@types/geojson": "7946.0.16",
7777
"@unocss/reset": "65.4.3",
7878
"@vueuse/math": "^12.7.0",
79-
"axios": "1.7.9",
79+
"axios": "1.8.2",
8080
"dotenv": "16.4.7",
8181
"eslint-config-prettier": "10.0.1",
8282
"eslint-flat-config-utils": "2.0.0",

frontend/public/images/tech-from-below.svg

-7
This file was deleted.

0 commit comments

Comments
 (0)