erudit 3.0.0-dev.17 → 3.0.0-dev.18

package/app/composables/url.ts

@@ -1,33 +1,33 @@
-import eruditConfig from '#erudit/config';
-
-export function useBaseUrlPath() {
-    const runtimeConfig = useRuntimeConfig();
-    return (path: string) => {
-        const baseURL = runtimeConfig.app.baseURL;
-        if (path.startsWith(baseURL)) return path;
-        else if (path.startsWith('/')) return baseURL + path.substring(1);
-        else return path;
-    };
-}
-
-export function useSiteUrl() {
-    const runtimeConfig = useRuntimeConfig();
-    const baseUrl = runtimeConfig.app.baseURL;
-    const url = useRequestURL();
-
-    if (!import.meta.dev && eruditConfig.site?.buildUrl)
-        return eruditConfig.site.buildUrl + baseUrl.slice(0, -1);
-
-    return url.origin;
-}
-
-export function usePageUrl() {
-    const siteUrl = useSiteUrl();
-    const route = useRoute();
-
-    return computed(() => {
-        if (route.path === '/') return siteUrl;
-
-        return siteUrl + route.path;
-    });
-}
+import eruditConfig from '#erudit/config';
+
+export function useBaseUrlPath() {
+    const runtimeConfig = useRuntimeConfig();
+    return (path: string) => {
+        const baseURL = runtimeConfig.app.baseURL;
+        if (path.startsWith(baseURL)) return path;
+        else if (path.startsWith('/')) return baseURL + path.substring(1);
+        else return path;
+    };
+}
+
+export function useSiteUrl() {
+    const runtimeConfig = useRuntimeConfig();
+    const baseUrl = runtimeConfig.app.baseURL;
+    const url = useRequestURL();
+
+    if (!import.meta.dev && eruditConfig.site?.buildUrl)
+        return eruditConfig.site.buildUrl + baseUrl.slice(0, -1);
+
+    return url.origin;
+}
+
+export function usePageUrl() {
+    const siteUrl = useSiteUrl();
+    const route = useRoute();
+
+    return computed(() => {
+        if (route.path === '/') return siteUrl;
+
+        return siteUrl + route.path;
+    });
+}

package/app/pages/_test/preview.vue

@@ -1,110 +1,110 @@
-<script lang="ts" setup>
-import { PreviewDataType } from '@app/scripts/preview/data';
-import { createPreviewError } from '@app/scripts/preview/data/alert';
-import { PreviewRequestType } from '@app/scripts/preview/request';
-import {
-    PreviewThemeName,
-    showPreview,
-    togglePreview,
-} from '@app/scripts/preview/state';
-
-function showCustom() {
-    showPreview({
-        type: PreviewRequestType.Data,
-        data: {
-            type: PreviewDataType.Custom,
-            message: 'This is custom message for preview!',
-            footer: {
-                //iconName: 'arrow-left',
-                iconSvg:
-                    '<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path fill-rule="evenodd" clip-rule="evenodd" d="M6.42436 0H9.57565L14.995 16H11.8276L10.8115 13H5.18855L4.17242 16H1.005L6.42436 0ZM6.20468 10H9.79533L8 4.69952L6.20468 10Z"></path> </g></svg>',
-                secondary: 'Secondary raw text',
-                primary: 'Primary raw text',
-                href: 'https://google.com',
-            },
-        },
-    });
-}
-
-function showAlert(theme: PreviewThemeName) {
-    showPreview({
-        type: PreviewRequestType.Data,
-        data: createPreviewError({
-            theme,
-            message: 'This is message!',
-            title: 'Custom Title',
-            pre: JSON.stringify(
-                {
-                    foo: 1337,
-                    bar: 'Some text',
-                },
-                null,
-                4,
-            ),
-        }),
-    });
-}
-</script>
-
-<template>
-    <button @click="() => togglePreview()">Toggle Preview</button>
-    <div>
-        Show:
-        <br />
-        <button :class="$style.button" @click="showCustom">Custom</button>
-        <br />
-        <button
-            :class="$style.button"
-            v-for="theme in PreviewThemeName"
-            @click="() => showAlert(theme)"
-        >
-            Alert {{ theme }}
-        </button>
-        <br />
-        <button
-            :class="$style.button"
-            @click="
-                showPreview({
-                    type: PreviewRequestType.MissingElement,
-                    elementId: 'foo-id',
-                })
-            "
-        >
-            Missing element
-        </button>
-        <button
-            :class="$style.button"
-            @click="
-                showPreview({
-                    type: PreviewRequestType.MissingElement,
-                    elementId: 'foo-id',
-                    hashMismatch: { current: 'bar', expected: 'baz' },
-                })
-            "
-        >
-            Missing element + hash mismatch
-        </button>
-        <br />
-        <button
-            :class="$style.button"
-            @click="
-                showPreview({
-                    type: PreviewRequestType.HashMismatch,
-                    currentHash: 'foo',
-                    expectedHash: 'bar',
-                })
-            "
-        >
-            Hash mismatch
-        </button>
-    </div>
-</template>
-
-<style lang="scss" module>
-.button {
-    border: 2px solid var(--border);
-    border-radius: 3px;
-    padding: 3px;
-    margin: 3px;
-}
-</style>
+<script lang="ts" setup>
+import { PreviewDataType } from '@app/scripts/preview/data';
+import { createPreviewError } from '@app/scripts/preview/data/alert';
+import { PreviewRequestType } from '@app/scripts/preview/request';
+import {
+    PreviewThemeName,
+    showPreview,
+    togglePreview,
+} from '@app/scripts/preview/state';
+
+function showCustom() {
+    showPreview({
+        type: PreviewRequestType.Data,
+        data: {
+            type: PreviewDataType.Custom,
+            message: 'This is custom message for preview!',
+            footer: {
+                //iconName: 'arrow-left',
+                iconSvg:
+                    '<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path fill-rule="evenodd" clip-rule="evenodd" d="M6.42436 0H9.57565L14.995 16H11.8276L10.8115 13H5.18855L4.17242 16H1.005L6.42436 0ZM6.20468 10H9.79533L8 4.69952L6.20468 10Z"></path> </g></svg>',
+                secondary: 'Secondary raw text',
+                primary: 'Primary raw text',
+                href: 'https://google.com',
+            },
+        },
+    });
+}
+
+function showAlert(theme: PreviewThemeName) {
+    showPreview({
+        type: PreviewRequestType.Data,
+        data: createPreviewError({
+            theme,
+            message: 'This is message!',
+            title: 'Custom Title',
+            pre: JSON.stringify(
+                {
+                    foo: 1337,
+                    bar: 'Some text',
+                },
+                null,
+                4,
+            ),
+        }),
+    });
+}
+</script>
+
+<template>
+    <button @click="() => togglePreview()">Toggle Preview</button>
+    <div>
+        Show:
+        <br />
+        <button :class="$style.button" @click="showCustom">Custom</button>
+        <br />
+        <button
+            :class="$style.button"
+            v-for="theme in PreviewThemeName"
+            @click="() => showAlert(theme)"
+        >
+            Alert {{ theme }}
+        </button>
+        <br />
+        <button
+            :class="$style.button"
+            @click="
+                showPreview({
+                    type: PreviewRequestType.MissingElement,
+                    elementId: 'foo-id',
+                })
+            "
+        >
+            Missing element
+        </button>
+        <button
+            :class="$style.button"
+            @click="
+                showPreview({
+                    type: PreviewRequestType.MissingElement,
+                    elementId: 'foo-id',
+                    hashMismatch: { current: 'bar', expected: 'baz' },
+                })
+            "
+        >
+            Missing element + hash mismatch
+        </button>
+        <br />
+        <button
+            :class="$style.button"
+            @click="
+                showPreview({
+                    type: PreviewRequestType.HashMismatch,
+                    currentHash: 'foo',
+                    expectedHash: 'bar',
+                })
+            "
+        >
+            Hash mismatch
+        </button>
+    </div>
+</template>
+
+<style lang="scss" module>
+.button {
+    border: 2px solid var(--border);
+    border-radius: 3px;
+    padding: 3px;
+    margin: 3px;
+}
+</style>

package/app/pages/article/[...articleId].vue

@@ -1,3 +1,3 @@
-<template>
-    <MainTopic />
-</template>
+<template>
+    <MainTopic />
+</template>

package/app/pages/book/[...bookId].vue

@@ -1,47 +1,47 @@
-<script lang="ts" setup>
-import type { ContentBookData } from '@erudit/shared/content/data/type/book';
-import type { MyIconName } from '#my-icons';
-
-import ContentDecoration from '@app/components/main/utils/ContentDecoration.vue';
-import Breadcrumb from '@app/components/main/utils/Breadcrumb.vue';
-import ContentTitle from '@app/components/main/utils/ContentTitle.vue';
-import ContentDescription from '@app/components/main/utils/ContentDescription.vue';
-import ContentPopovers from '@app/components/main/utils/ContentPopovers.vue';
-
-const bookData = await useContentData<ContentBookData>();
-await useContentPage(bookData);
-
-const phrase = await usePhrases('book');
-</script>
-
-<template>
-    <ContentDecoration
-        v-if="bookData.generic.decoration"
-        :decoration="bookData.generic.decoration"
-    />
-
-    <Breadcrumb
-        v-if="bookData.generic.context?.length > 1"
-        :context="bookData.generic.context"
-    />
-
-    <ContentTitle
-        :title="
-            bookData.generic?.title ||
-            bookData.generic.contentId.split('/').pop()!
-        "
-        :icon="<MyIconName>'outline/book'"
-        :hint="phrase.book"
-    />
-
-    <ContentDescription
-        v-if="bookData.generic?.description"
-        :description="bookData.generic?.description"
-    />
-
-    <ContentPopovers :generic="bookData.generic" />
-
-    <!-- Counters, fancy "GO LEARN" button and etc. -->
-
-    <div style="clear: both"></div>
-</template>
+<script lang="ts" setup>
+import type { ContentBookData } from '@erudit/shared/content/data/type/book';
+import type { MyIconName } from '#my-icons';
+
+import ContentDecoration from '@app/components/main/utils/ContentDecoration.vue';
+import Breadcrumb from '@app/components/main/utils/Breadcrumb.vue';
+import ContentTitle from '@app/components/main/utils/ContentTitle.vue';
+import ContentDescription from '@app/components/main/utils/ContentDescription.vue';
+import ContentPopovers from '@app/components/main/utils/ContentPopovers.vue';
+
+const bookData = await useContentData<ContentBookData>();
+await useContentPage(bookData);
+
+const phrase = await usePhrases('book');
+</script>
+
+<template>
+    <ContentDecoration
+        v-if="bookData.generic.decoration"
+        :decoration="bookData.generic.decoration"
+    />
+
+    <Breadcrumb
+        v-if="bookData.generic.context?.length > 1"
+        :context="bookData.generic.context"
+    />
+
+    <ContentTitle
+        :title="
+            bookData.generic?.title ||
+            bookData.generic.contentId.split('/').pop()!
+        "
+        :icon="<MyIconName>'outline/book'"
+        :hint="phrase.book"
+    />
+
+    <ContentDescription
+        v-if="bookData.generic?.description"
+        :description="bookData.generic?.description"
+    />
+
+    <ContentPopovers :generic="bookData.generic" />
+
+    <!-- Counters, fancy "GO LEARN" button and etc. -->
+
+    <div style="clear: both"></div>
+</template>

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

@@ -1,66 +1,66 @@
-<script lang="ts" setup>
-import { NO_ALIASES } from '@erudit-js/cog/schema';
-import eruditConfig from '#erudit/config';
-
-import { type ContentGroupData } from '@shared/content/data/type/group';
-import { locationIcon } from '@erudit/shared/icons';
-import ContentDecoration from '@app/components/main/utils/ContentDecoration.vue';
-import Breadcrumb from '@app/components/main/utils/Breadcrumb.vue';
-import ContentTitle from '@app/components/main/utils/ContentTitle.vue';
-import ContentDescription from '@app/components/main/utils/ContentDescription.vue';
-import ContentPopovers from '@app/components/main/utils/ContentPopovers.vue';
-import ContentSection from '@app/components/main/utils/ContentSection.vue';
-
-const location = useBitranLocation();
-
-const groupData = await useContentData<ContentGroupData>();
-await useContentPage(groupData);
-
-const content = await useBitranContent(location);
-const phrase = await usePhrases('group');
-</script>
-
-<template>
-    <ContentDecoration
-        v-if="groupData.generic.decoration"
-        :decoration="groupData.generic.decoration"
-    />
-
-    <Breadcrumb
-        v-if="groupData.generic.context?.length > 1"
-        :context="groupData.generic.context"
-    />
-
-    <ContentTitle
-        :title="
-            groupData.generic?.title ||
-            groupData.generic.contentId.split('/').pop()!
-        "
-        :icon="locationIcon(location!)"
-        :hint="phrase.group"
-    />
-
-    <ContentDescription
-        v-if="groupData.generic?.description"
-        :description="groupData.generic?.description"
-    />
-
-    <ContentPopovers :generic="groupData.generic" />
-
-    <!-- TODO: List of materials in group -->
-
-    <div style="clear: both"></div>
-
-    <hr style="display: none" />
-
-    <ContentSection>
-        <BitranContent
-            :content
-            :context="{ location, aliases: NO_ALIASES() }"
-        />
-    </ContentSection>
-
-    <ContentSection v-if="eruditConfig.ads?.bottom">
-        <AdsBannerBottom />
-    </ContentSection>
-</template>
+<script lang="ts" setup>
+import { NO_ALIASES } from '@erudit-js/cog/schema';
+import eruditConfig from '#erudit/config';
+
+import { type ContentGroupData } from '@shared/content/data/type/group';
+import { locationIcon } from '@erudit/shared/icons';
+import ContentDecoration from '@app/components/main/utils/ContentDecoration.vue';
+import Breadcrumb from '@app/components/main/utils/Breadcrumb.vue';
+import ContentTitle from '@app/components/main/utils/ContentTitle.vue';
+import ContentDescription from '@app/components/main/utils/ContentDescription.vue';
+import ContentPopovers from '@app/components/main/utils/ContentPopovers.vue';
+import ContentSection from '@app/components/main/utils/ContentSection.vue';
+
+const location = useBitranLocation();
+
+const groupData = await useContentData<ContentGroupData>();
+await useContentPage(groupData);
+
+const content = await useBitranContent(location);
+const phrase = await usePhrases('group');
+</script>
+
+<template>
+    <ContentDecoration
+        v-if="groupData.generic.decoration"
+        :decoration="groupData.generic.decoration"
+    />
+
+    <Breadcrumb
+        v-if="groupData.generic.context?.length > 1"
+        :context="groupData.generic.context"
+    />
+
+    <ContentTitle
+        :title="
+            groupData.generic?.title ||
+            groupData.generic.contentId.split('/').pop()!
+        "
+        :icon="locationIcon(location!)"
+        :hint="phrase.group"
+    />
+
+    <ContentDescription
+        v-if="groupData.generic?.description"
+        :description="groupData.generic?.description"
+    />
+
+    <ContentPopovers :generic="groupData.generic" />
+
+    <!-- TODO: List of materials in group -->
+
+    <div style="clear: both"></div>
+
+    <hr style="display: none" />
+
+    <ContentSection>
+        <BitranContent
+            :content
+            :context="{ location, aliases: NO_ALIASES() }"
+        />
+    </ContentSection>
+
+    <ContentSection v-if="adsAllowed() && eruditConfig.ads?.bottom">
+        <AdsBannerBottom />
+    </ContentSection>
+</template>

package/app/pages/index.vue

@@ -1,32 +1,32 @@
-<script lang="ts" setup>
-import eruditConfig from '#erudit/config';
-
-const phrase = await usePhrases('seo_index_title', 'seo_index_description');
-
-const seoTitle =
-    eruditConfig.seo?.indexTitle ||
-    eruditConfig.seo?.title ||
-    phrase.seo_index_title;
-const seoDescription =
-    eruditConfig.seo?.indexDescription || phrase.seo_index_description;
-
-useSeoMeta({
-    title: seoTitle,
-    ogTitle: seoTitle,
-    description: seoDescription,
-    ogDescription: seoDescription,
-});
-</script>
-
-<template>
-    <div style="padding: var(--_pMainY) var(--_pMainX)">
-        <h1>
-            {{
-                eruditConfig.seo?.title ||
-                eruditConfig.site?.title ||
-                phrase.seo_index_title
-            }}
-        </h1>
-        <p>TODO</p>
-    </div>
-</template>
+<script lang="ts" setup>
+import eruditConfig from '#erudit/config';
+
+const phrase = await usePhrases('seo_index_title', 'seo_index_description');
+
+const seoTitle =
+    eruditConfig.seo?.indexTitle ||
+    eruditConfig.seo?.title ||
+    phrase.seo_index_title;
+const seoDescription =
+    eruditConfig.seo?.indexDescription || phrase.seo_index_description;
+
+useSeoMeta({
+    title: seoTitle,
+    ogTitle: seoTitle,
+    description: seoDescription,
+    ogDescription: seoDescription,
+});
+</script>
+
+<template>
+    <div style="padding: var(--_pMainY) var(--_pMainX)">
+        <h1>
+            {{
+                eruditConfig.seo?.title ||
+                eruditConfig.site?.title ||
+                phrase.seo_index_title
+            }}
+        </h1>
+        <p>TODO</p>
+    </div>
+</template>

package/app/pages/members.vue

@@ -1,6 +1,5 @@
-<script lang="ts" setup></script>
-
-<template>
-    <p>Members</p>
-    <NuxtLink to="/practice/topic-b">Погнали епты!</NuxtLink>
-</template>
+<script lang="ts" setup></script>
+
+<template>
+    <p>Members</p>
+</template>

package/app/pages/practice/[...practice].vue

@@ -1,3 +1,3 @@
-<template>
-    <MainTopic />
-</template>
+<template>
+    <MainTopic />
+</template>

package/app/pages/summary/[...summaryId].vue

@@ -1,3 +1,3 @@
-<template>
-    <MainTopic />
-</template>
+<template>
+    <MainTopic />
+</template>

package/app/plugins/analytics.ts

@@ -8,6 +8,14 @@ export default defineNuxtPlugin({
                 return;
             }
 
+            if (typeof eruditConfig?.debug?.analytics === 'undefined') {
+                if (import.meta.dev) {
+                    return;
+                }
+            } else if (!Boolean(eruditConfig?.debug?.analytics)) {
+                return;
+            }
+
             if (eruditConfig.analytics.yandex) {
                 const yandex = eruditConfig.analytics.yandex;