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.

Sign up for GitHub

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

Jump to bottom

Move setup template sections #4679

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Move setup template sections #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e543939
Move script to top of the file and add component name
obulat Jul 31, 2024
4caf4a8
Move script to top of the file
obulat Jul 31, 2024
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
66 changes: 33 additions & 33 deletions frontend/src/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,3 @@
<template>
<div>
<Html :lang="head.htmlAttrs.lang" :dir="head.htmlAttrs.dir">
<Head>
<template v-for="link in head.link" :key="link.id">
<Link
:id="link.id"
:rel="link.rel"
:href="link.href"
:hreflang="link.hreflang"
/>
</template>
<template v-for="meta in head.meta" :key="meta.id">
<Meta
:id="meta.id"
:property="meta.property"
:content="meta.content"
/>
</template>
</Head>
<Body>
<div :class="[isDesktopLayout ? 'desktop' : 'mobile', breakpoint]">
<VSkipToContentButton />
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
<VGlobalAudioSection />
</div>
</Body>
</Html>
</div>
</template>

<script setup lang="ts">
import { computed, onMounted, useLocaleHead } from "#imports"

Expand Down Expand Up @@ -66,3 +33,36 @@ onMounted(() => {
featureFlagStore.syncAnalyticsWithLocalStorage()
})
</script>

<template>
<div>
<Html :lang="head.htmlAttrs.lang" :dir="head.htmlAttrs.dir">
<Head>
<template v-for="link in head.link" :key="link.id">
<Link
:id="link.id"
:rel="link.rel"
:href="link.href"
:hreflang="link.hreflang"
/>
</template>
<template v-for="meta in head.meta" :key="meta.id">
<Meta
:id="meta.id"
:property="meta.property"
:content="meta.content"
/>
</template>
</Head>
<Body>
<div :class="[isDesktopLayout ? 'desktop' : 'mobile', breakpoint]">
<VSkipToContentButton />
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
<VGlobalAudioSection />
</div>
</Body>
</Html>
</div>
</template>
1 change: 1 addition & 0 deletions frontend/src/components/VContentSwitcher/VSearchTypeButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</template>
</VButton>
</template>

<script lang="ts">
import { defineComponent, PropType } from "vue"

Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/VContentSwitcher/VSearchTypes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
</div>
</VItemGroup>
</template>

<script lang="ts">
import { computed, defineComponent, type PropType } from "vue"

Expand Down
18 changes: 9 additions & 9 deletions frontend/src/components/VErrorSection/VErrorImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
<template>
<figure class="error-image">
<img :src="image.src" :alt="$t(image.alt)" :title="$t(image.alt)" />
<!-- Disable reason: We control the attribution HTML generation so this is safe and will not lead to XSS attacks -->
<!-- eslint-disable-next-line vue/no-v-html -->
<figcaption class="attribution" v-html="image.attribution" />
</figure>
</template>

<script setup lang="ts">
import { useI18n } from "#imports"

Expand Down Expand Up @@ -54,6 +45,15 @@ const images = Object.fromEntries(
const image = computed(() => images[props.errorCode])
</script>

<template>
<figure class="error-image">
<img :src="image.src" :alt="$t(image.alt)" :title="$t(image.alt)" />
<!-- Disable reason: We control the attribution HTML generation so this is safe and will not lead to XSS attacks -->
<!-- eslint-disable-next-line vue/no-v-html -->
<figcaption class="attribution" v-html="image.attribution" />
</figure>
</template>

<style scoped>
::v-deep(.attribution) {
@apply mt-4 text-sr text-dark-charcoal-70;
Expand Down
35 changes: 18 additions & 17 deletions frontend/src/components/VErrorSection/VErrorSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<template>
<div class="error-section mx-auto flex max-w-screen-xl flex-row items-center">
<div class="image-pane hidden max-w-[432px] flex-grow md:block">
<VErrorImage class="hidden md:block" :error-code="errorCode" />
</div>
<div class="flex-grow p-4 md:p-20">
<VNoResults v-if="errorCode === NO_RESULT" :search-term="searchTerm" />
<div v-else>
<h1 class="heading-4 md:heading-2 text-center !font-semibold">
{{
isTimeout ? $t("serverTimeout.heading") : $t("unknownError.heading")
}}
</h1>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineAsyncComponent } from "#imports"

Expand Down Expand Up @@ -49,3 +32,21 @@ const isTimeout = computed(() =>
[SERVER_TIMEOUT, ECONNABORTED].includes(props.fetchingError.code)
)
</script>

<template>
<div class="error-section mx-auto flex max-w-screen-xl flex-row items-center">
<div class="image-pane hidden max-w-[432px] flex-grow md:block">
<VErrorImage class="hidden md:block" :error-code="errorCode" />
</div>
<div class="flex-grow p-4 md:p-20">
<VNoResults v-if="errorCode === NO_RESULT" :search-term="searchTerm" />
<div v-else>
<h1 class="heading-4 md:heading-2 text-center !font-semibold">
{{
isTimeout ? $t("serverTimeout.heading") : $t("unknownError.heading")
}}
</h1>
</div>
</div>
</div>
</template>
58 changes: 29 additions & 29 deletions frontend/src/components/VErrorSection/VNoResults.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
<template>
<div class="no-results text-center md:text-left">
<h1 class="heading-4 md:heading-2 break-words">
{{ $t("noResults.heading", { query: searchTerm }) }}
</h1>
<h2 class="description-regular md:heading-5 mt-4">
{{ $t("noResults.alternatives") }}
</h2>

<div class="mt-10 flex flex-col flex-wrap gap-4 sm:flex-row">
<VButton
v-for="source in externalSources"
:key="source.name"
as="VLink"
:href="source.url"
variant="bordered-gray"
size="medium"
class="label-bold !w-full text-dark-charcoal sm:!w-auto"
show-external-icon
has-icon-end
:external-icon-size="6"
@mousedown="handleClick(source.name)"
>
{{ source.name }}
</VButton>
</div>
</div>
</template>

<script setup lang="ts">
import { onMounted } from "vue"

Expand Down Expand Up @@ -59,3 +30,32 @@ onMounted(() => {
uiStore.setFiltersState(false)
})
</script>

<template>
<div class="no-results text-center md:text-left">
<h1 class="heading-4 md:heading-2 break-words">
{{ $t("noResults.heading", { query: searchTerm }) }}
</h1>
<h2 class="description-regular md:heading-5 mt-4">
{{ $t("noResults.alternatives") }}
</h2>

<div class="mt-10 flex flex-col flex-wrap gap-4 sm:flex-row">
<VButton
v-for="source in externalSources"
:key="source.name"
as="VLink"
:href="source.url"
variant="bordered-gray"
size="medium"
class="label-bold !w-full text-dark-charcoal sm:!w-auto"
show-external-icon
has-icon-end
:external-icon-size="6"
@mousedown="handleClick(source.name)"
>
{{ source.name }}
</VButton>
</div>
</div>
</template>
104 changes: 52 additions & 52 deletions frontend/src/components/VExternalSearch/VExternalSearchForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,55 @@
<script setup lang="ts">
import { computed, ref } from "vue"

import { storeToRefs } from "pinia"

import { useUiStore } from "~/stores/ui"
import { useSearchStore } from "~/stores/search"
import { useMediaStore } from "~/stores/media"

import { useAnalytics } from "~/composables/use-analytics"
import { useExternalSources } from "~/composables/use-external-sources"

import VExternalSourceList from "~/components/VExternalSearch/VExternalSourceList.vue"
import VButton from "~/components/VButton.vue"
import VIcon from "~/components/VIcon/VIcon.vue"
import VModal from "~/components/VModal/VModal.vue"
import VIconButton from "~/components/VIconButton/VIconButton.vue"

withDefaults(
defineProps<{
searchTerm: string
isSupported?: boolean
hasNoResults?: boolean
}>(),
{
isSupported: false,
hasNoResults: true,
}
)

const sectionRef = ref<HTMLElement | null>(null)
const searchStore = useSearchStore()
const uiStore = useUiStore()

const { sendCustomEvent } = useAnalytics()

const mediaStore = useMediaStore()
const { currentPage } = storeToRefs(mediaStore)

const handleModalOpen = () => {
sendCustomEvent("VIEW_EXTERNAL_SOURCES", {
searchType: searchStore.searchType,
query: searchStore.searchTerm,
resultPage: currentPage.value || 1,
})
}

const { externalSourcesType } = useExternalSources()

const isMd = computed(() => uiStore.isBreakpoint("md"))
</script>

<template>
<section
:key="externalSourcesType"
Expand Down Expand Up @@ -61,55 +113,3 @@
</VModal>
</section>
</template>

<script setup lang="ts">
import { computed, ref } from "vue"

import { storeToRefs } from "pinia"

import { useUiStore } from "~/stores/ui"
import { useSearchStore } from "~/stores/search"
import { useMediaStore } from "~/stores/media"

import { useAnalytics } from "~/composables/use-analytics"
import { useExternalSources } from "~/composables/use-external-sources"

import VExternalSourceList from "~/components/VExternalSearch/VExternalSourceList.vue"
import VButton from "~/components/VButton.vue"
import VIcon from "~/components/VIcon/VIcon.vue"
import VModal from "~/components/VModal/VModal.vue"
import VIconButton from "~/components/VIconButton/VIconButton.vue"

withDefaults(
defineProps<{
searchTerm: string
isSupported?: boolean
hasNoResults?: boolean
}>(),
{
isSupported: false,
hasNoResults: true,
}
)

const sectionRef = ref<HTMLElement | null>(null)
const searchStore = useSearchStore()
const uiStore = useUiStore()

const { sendCustomEvent } = useAnalytics()

const mediaStore = useMediaStore()
const { currentPage } = storeToRefs(mediaStore)

const handleModalOpen = () => {
sendCustomEvent("VIEW_EXTERNAL_SOURCES", {
searchType: searchStore.searchType,
query: searchStore.searchTerm,
resultPage: currentPage.value || 1,
})
}

const { externalSourcesType } = useExternalSources()

const isMd = computed(() => uiStore.isBreakpoint("md"))
</script>
Loading
Loading