erudit 3.0.0-dev.19 → 3.0.0-dev.20

package/app/components/bitran/BitranContent.vue

@@ -5,6 +5,7 @@ import { setEruditBitranRuntime } from '@erudit-js/cog/schema';
 import eruditConfig from '#erudit/config';
 import type { RawBitranContent } from '@shared/bitran/content';
 import RenderWrapper from './RenderWrapper.vue';
+import { HeadingNode } from '@erudit-js/bitran-elements/heading/shared';
 
 const props = defineProps<{
     rawContent: RawBitranContent;
@@ -17,7 +18,7 @@ for (const route of props.rawContent.routes) {
 const bitranTranspiler = await useBitranTranspiler();
 const bitranRenderers = await useBitranRenderers();
 
-[(bitranTranspiler.parser, bitranTranspiler.stringifier)].forEach((item) => {
+[bitranTranspiler.parser, bitranTranspiler.stringifier].forEach((item) => {
     setEruditBitranRuntime(item, {
         eruditConfig,
         insideInclude: false,

package/app/components/main/MainBitranContent.vue

@@ -1,9 +1,16 @@
 <script lang="ts" setup>
 import {
+    locationsEqual,
     stringifyBitranLocation,
     type BitranLocation,
 } from '@erudit-js/cog/schema';
-import type { RawBitranContent } from '@erudit/shared/bitran/content';
+
+import type { RawBitranContent } from '@shared/bitran/content';
+import ContentSection from '@app/components/main/content/ContentSection.vue';
+
+type MainBitranPayload = RawBitranContent & {
+    mainLocation: BitranLocation;
+};
 
 const props = defineProps<{ location: BitranLocation }>();
 
@@ -11,20 +18,15 @@ const nuxtApp = useNuxtApp();
 const stringLocation = stringifyBitranLocation(props.location);
 
 const payloadKey = `main-bitran-content`;
-const payloadValue: RawBitranContent =
+const payloadValue: MainBitranPayload =
     (nuxtApp.static.data[payloadKey] ||=
     nuxtApp.payload.data[payloadKey] ||=
         {});
 
-const payloadStringLocation = (() => {
-    if (!payloadValue?.context?.location) {
-        return undefined;
-    }
-
-    return stringifyBitranLocation(payloadValue.context.location);
-})();
-
-if (stringLocation !== payloadStringLocation) {
+if (
+    !payloadValue.mainLocation ||
+    !locationsEqual(payloadValue.mainLocation, props.location)
+) {
     const rawBitranContent = await $fetch<RawBitranContent>(
         `/api/bitran/content/${stringLocation}`,
         {
@@ -32,10 +34,14 @@ if (stringLocation !== payloadStringLocation) {
         },
     );
 
-    Object.assign(payloadValue, rawBitranContent);
+    Object.assign(payloadValue, rawBitranContent, {
+        mainLocation: props.location,
+    });
 }
 </script>
 
 <template>
-    <BitranContent :rawContent="payloadValue" />
+    <ContentSection v-if="payloadValue.biCode">
+        <BitranContent :rawContent="payloadValue" />
+    </ContentSection>
 </template>

package/app/components/main/MainTitle.vue

@@ -30,7 +30,11 @@ defineProps<{ icon: string; title: string; hint?: string }>();
     display: flex;
     align-items: center;
     gap: var(--gap);
-    padding: var(--_pMainY) var(--_pMainX);
+    padding: 0 var(--_pMainX);
+
+    @include bp.below('mobile') {
+        padding: var(--_pMainY) var(--_pMainX);
+    }
 
     [my-icon] {
         flex-shrink: 0;

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

@@ -61,9 +61,7 @@ onMounted(() => {
 
     <div style="clear: both"></div>
 
-    <ContentSection>
-        <MainBitranContent :location />
-    </ContentSection>
+    <MainBitranContent :location />
 
     <ContentSection v-if="topicData.generic.references">
         <ContentReferences :references="topicData.generic.references" />

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

@@ -41,7 +41,7 @@ const Link = defineNuxtLink({ prefetch: false });
     justify-content: center;
     gap: var(--gapBig);
     margin: var(--_pMainY) 0;
-    margin-top: -30px;
+    margin-top: -40px;
 
     width: 100%;
     height: var(--height);

package/app/pages/contributor/[contributorId].vue

@@ -127,11 +127,10 @@ useSeoMeta({
             </div>
         </div>
     </header>
-    <ContentSection v-if="contributor.hasDescription">
-        <MainBitranContent
-            :location="{ type: 'contributor', path: contributor.contributorId }"
-        />
-    </ContentSection>
+    <MainBitranContent
+        v-if="contributor.hasDescription"
+        :location="{ type: 'contributor', path: contributor.contributorId }"
+    />
 </template>
 
 <style lang="scss" module>

package/app/pages/group/[...groupId].vue

@@ -42,15 +42,9 @@ const phrase = await usePhrases('group');
 
     <ContentPopovers :generic="groupData.generic" />
 
-    <!-- TODO: List of materials in group -->
-
     <div style="clear: both"></div>
 
-    <hr style="display: none" />
-
-    <ContentSection>
-        <MainBitranContent :location />
-    </ContentSection>
+    <MainBitranContent :location />
 
     <ContentSection v-if="adsAllowed() && eruditConfig.ads?.bottom">
         <AdsBannerBottom />

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.19",
+    "version": "3.0.0-dev.20",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -15,9 +15,9 @@
         "erudit": "bin/erudit.mjs"
     },
     "peerDependencies": {
-        "@erudit-js/cog": "3.0.0-dev.19",
-        "@erudit-js/cli": "3.0.0-dev.19",
-        "@erudit-js/bitran-elements": "3.0.0-dev.19"
+        "@erudit-js/cog": "3.0.0-dev.20",
+        "@erudit-js/cli": "3.0.0-dev.20",
+        "@erudit-js/bitran-elements": "3.0.0-dev.20"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.13",