erudit 3.0.0-dev.2 → 3.0.0-dev.21

package/app/components/main/topic/MainTopic.vue

@@ -1,79 +1,76 @@
-<script lang="ts" setup>
-import type { TopicPart } from 'erudit-cog/schema';
-import { NO_ALIASES } from '@erudit-js/bitran-elements/aliases/shared';
-
-import eruditConfig from '#erudit/config';
-
-import { type ContentTopicData } from '@erudit/shared/content/data/type/topic';
-import { topicLocation } from '@app/scripts/aside/minor/topic';
-
-import ContentDecoration from '../utils/ContentDecoration.vue';
-import ContentTitle from '../utils/ContentTitle.vue';
-import ContentDescription from '../utils/ContentDescription.vue';
-import TopicPartSwitch from './TopicPartSwitch.vue';
-import Breadcrumb from '../utils/Breadcrumb.vue';
-import ContentPopovers from '../utils/ContentPopovers.vue';
-import ContentReferences from '../utils/ContentReferences.vue';
-import ContentSection from '../utils/ContentSection.vue';
-import { TOPIC_PART_ICON } from '@erudit/shared/icons';
-
-const location = useBitranLocation();
-const topicPart = computed(() => location.value?.type as TopicPart);
-
-const topicData = await useContentData<ContentTopicData>();
-await useContentPage(topicData);
-
-const phrase = await usePhrases('article', 'summary', 'practice');
-
-const content = await useBitranContent(location);
-
-onMounted(() => {
-    watchEffect(() => {
-        // Telling live toc that content is mounted
-        topicLocation.value = location.value;
-    });
-});
-</script>
-
-<template>
-    <ContentDecoration
-        v-if="topicData.generic.decoration"
-        :decoration="topicData.generic.decoration"
-    />
-
-    <Breadcrumb
-        v-if="topicData.generic.context?.length > 1"
-        :context="topicData.generic.context"
-    />
-
-    <ContentTitle
-        :title="
-            topicData.generic?.title ||
-            topicData.generic.contentId.split('/').pop()!
-        "
-        :icon="TOPIC_PART_ICON[location!.type as TopicPart]"
-        :hint="phrase[location!.type as TopicPart]"
-    />
-
-    <ContentDescription
-        v-if="topicData.generic?.description"
-        :description="topicData.generic?.description"
-    />
-
-    <ContentPopovers :generic="topicData.generic" />
-
-    <TopicPartSwitch
-        :partLinks="topicData.topicPartLinks"
-        :active="topicPart"
-    />
-
-    <div style="clear: both"></div>
-
-    <BitranContent :content :context="{ location, aliases: NO_ALIASES() }" />
-
-    <ContentSection v-if="topicData.generic.references">
-        <ContentReferences :references="topicData.generic.references" />
-    </ContentSection>
-
-    <AdsBottomBanner v-if="eruditConfig.ads?.bottomBlockId" />
-</template>
+<script lang="ts" setup>
+import { type BitranLocation, type TopicPart } from '@erudit-js/cog/schema';
+
+import eruditConfig from '#erudit/config';
+
+import { type ContentTopicData } from '@shared/content/data/type/topic';
+import { TOPIC_PART_ICON } from '@shared/icons';
+
+import ContentBreadcrumb from '@app/components/main/content/ContentBreadcrumb.vue';
+import ContentDecoration from '@app/components/main/content/ContentDecoration.vue';
+import ContentPopovers from '@app/components/main/content/ContentPopovers.vue';
+import ContentReferences from '@app/components/main/content/ContentReferences.vue';
+import TopicPartSwitch from './TopicPartSwitch.vue';
+
+const location = useBitranLocation() as Ref<BitranLocation>;
+const topicPart = computed(() => location.value?.type as TopicPart);
+
+const topicData = await useContentData<ContentTopicData>();
+await useContentPage(topicData);
+
+const phrase = await usePhrases('article', 'summary', 'practice');
+</script>
+
+<template>
+    <ContentDecoration
+        v-if="topicData.generic.decoration"
+        :decoration="topicData.generic.decoration"
+    />
+
+    <ContentBreadcrumb :context="topicData.generic.context" />
+
+    <MainTitle
+        :title="
+            topicData.generic?.title ||
+            topicData.generic.contentId.split('/').pop()!
+        "
+        :icon="TOPIC_PART_ICON[location!.type as TopicPart]"
+        :hint="phrase[location!.type as TopicPart]"
+    />
+
+    <MainDescription
+        v-if="topicData.generic?.description"
+        :description="topicData.generic?.description"
+    />
+
+    <ContentPopovers :generic="topicData.generic" />
+
+    <MainCameo />
+
+    <div style="clear: both"></div>
+
+    <MainBitranContent :location>
+        <template v-slot:header>
+            <TopicPartSwitch
+                :partLinks="topicData.topicPartLinks"
+                :active="topicPart"
+            />
+        </template>
+    </MainBitranContent>
+
+    <MainSection v-if="topicData.generic.references">
+        <ContentReferences :references="topicData.generic.references" />
+    </MainSection>
+
+    <MainSection v-if="adsAllowed() && eruditConfig.ads?.bottom">
+        <AdsBannerBottom />
+    </MainSection>
+</template>
+
+<style lang="scss" module>
+.foo {
+    position: relative;
+    width: 100%;
+    height: 300px;
+}
+</style>

package/app/components/main/topic/TopicPartSwitch.vue

@@ -1,118 +1,119 @@
-<script lang="ts" setup>
-import { topicParts, type TopicPart } from 'erudit-cog/schema';
-
-import type { TopicPartLinks } from '@erudit/shared/content/data/type/topic';
-import { TOPIC_PART_ICON } from '@erudit/shared/icons';
-
-defineProps<{ partLinks: TopicPartLinks; active: TopicPart }>();
-
-const phrase = await usePhrases('article', 'summary', 'practice');
-const Link = defineNuxtLink({ prefetch: false });
-</script>
-
-<template>
-    <section :class="$style.topicPartSwitch">
-        <Link
-            v-for="topicPart of topicParts"
-            :to="partLinks[topicPart]"
-            :class="[
-                $style.partButton,
-                active === topicPart && $style.active,
-                !partLinks[topicPart] && $style.noLink,
-            ]"
-        >
-            <MyIcon :name="TOPIC_PART_ICON[topicPart]" />
-            <div :class="$style.label">{{ phrase[topicPart] }}</div>
-        </Link>
-    </section>
-</template>
-
-<style lang="scss" module>
-@use '$/def/bp';
-
-.topicPartSwitch {
-    --height: 50px;
-
-    display: flex;
-    align-items: end;
-    justify-content: center;
-    gap: var(--gapBig);
-    margin: var(--_pMainY) 0;
-    margin-top: var(--gapBig);
-
-    width: 100%;
-    height: var(--height);
-    background: linear-gradient(to bottom, transparent, var(--bgAside));
-    border-bottom: 2px solid var(--border);
-}
-
-.partButton {
-    position: relative;
-    top: 2px;
-
-    display: flex;
-    align-items: center;
-    gap: calc(var(--gap) / 1.3);
-    padding: 0 var(--gap);
-
-    height: var(--height);
-    background: var(--bgMain);
-    border: 2px solid var(--border);
-    border-bottom-color: transparent;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-
-    line-height: 0;
-    text-decoration: none;
-    font-weight: 550;
-    color: var(--textMuted);
-
-    @include transition(color, background, border-color);
-
-    [my-icon] {
-        font-size: 1.1em;
-    }
-
-    &:not(.active) {
-        background: var(--bgAside);
-        border-bottom-color: color-mix(
-            in srgb,
-            var(--border),
-            var(--bgMain) 50%
-        );
-
-        &.noLink {
-            color: color-mix(in srgb, var(--textDisabled), transparent 35%);
-            border-bottom-color: var(--border);
-            cursor: not-allowed;
-        }
-
-        &:not(.noLink):hover {
-            color: var(--text);
-            background: var(--bgMain);
-            border-bottom-color: transparent;
-        }
-    }
-
-    &.active {
-        color: var(--brand);
-    }
-}
-
-@include bp.below('mobile') {
-    .topicPartSwitch {
-        --height: 45px;
-        gap: var(--gap);
-    }
-
-    .partButton {
-        gap: var(--gapSmall);
-
-        &:not(.active) {
-            .label {
-                display: none;
-            }
-        }
-    }
-}
-</style>
+<script lang="ts" setup>
+import { topicParts, type TopicPart } from '@erudit-js/cog/schema';
+
+import type { TopicPartLinks } from '@erudit/shared/content/data/type/topic';
+import { TOPIC_PART_ICON } from '@erudit/shared/icons';
+
+defineProps<{ partLinks: TopicPartLinks; active: TopicPart }>();
+
+const phrase = await usePhrases('article', 'summary', 'practice');
+</script>
+
+<template>
+    <section :class="$style.topicPartSwitch">
+        <EruditLink
+            v-for="topicPart of topicParts"
+            :prefetch="false"
+            :to="partLinks[topicPart]"
+            :class="[
+                $style.partButton,
+                active === topicPart && $style.active,
+                !partLinks[topicPart] && $style.noLink,
+            ]"
+        >
+            <MyIcon :name="TOPIC_PART_ICON[topicPart]" />
+            <div :class="$style.label">{{ phrase[topicPart] }}</div>
+        </EruditLink>
+    </section>
+</template>
+
+<style lang="scss" module>
+@use '$/def/bp';
+
+.topicPartSwitch {
+    --height: 50px;
+
+    display: flex;
+    align-items: end;
+    justify-content: center;
+    gap: var(--gapBig);
+    margin: var(--_pMainY) 0 0;
+
+    position: relative;
+    top: 2px;
+
+    width: 100%;
+    height: var(--height);
+    border-bottom: 2px solid transparent;
+}
+
+.partButton {
+    position: relative;
+    top: 2px;
+
+    display: flex;
+    align-items: center;
+    gap: calc(var(--gap) / 1.3);
+    padding: 0 var(--gap);
+
+    height: var(--height);
+    background: var(--bgMain);
+    border: 2px solid var(--border);
+    border-bottom-color: transparent;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+
+    line-height: 0;
+    text-decoration: none;
+    font-weight: 550;
+    color: var(--textMuted);
+
+    @include transition(color, background, border-color);
+
+    [my-icon] {
+        font-size: 1.1em;
+    }
+
+    &:not(.active) {
+        background: var(--bgAside);
+        border-bottom-color: color-mix(
+            in srgb,
+            var(--border),
+            var(--bgMain) 50%
+        );
+
+        &.noLink {
+            color: color-mix(in srgb, var(--textDisabled), transparent 35%);
+            border-bottom-color: var(--border);
+            cursor: not-allowed;
+        }
+
+        &:not(.noLink):hover {
+            color: var(--text);
+            background: var(--bgMain);
+            border-bottom-color: transparent;
+        }
+    }
+
+    &.active {
+        color: var(--brand);
+    }
+}
+
+@include bp.below('mobile') {
+    .topicPartSwitch {
+        --height: 45px;
+        gap: var(--gap);
+    }
+
+    .partButton {
+        gap: var(--gapSmall);
+
+        &:not(.active) {
+            .label {
+                display: none;
+            }
+        }
+    }
+}
+</style>