erudit 4.0.0-dev.4 → 4.0.0-dev.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.nuxtrc +1 -1
- package/app/app.vue +34 -34
- package/app/components/EruditLink.ts +7 -7
- package/app/components/FancyBold.vue +16 -16
- package/app/components/FancyCard.vue +52 -58
- package/app/components/FancyCardTag.vue +16 -16
- package/app/components/Loading.vue +7 -7
- package/app/components/Prose.vue +55 -52
- package/app/components/ScrollHolder.vue +13 -13
- package/app/components/SmartMedia.vue +107 -112
- package/app/components/ads/Ads.vue +17 -17
- package/app/components/ads/AdsBannerAside.vue +29 -29
- package/app/components/ads/AdsBannerBottom.vue +6 -6
- package/app/components/ads/AdsReplacer.vue +19 -21
- package/app/components/ads/provider/Custom.vue +9 -9
- package/app/components/ads/provider/Yandex.vue +56 -56
- package/app/components/aside/AsideListItem.vue +47 -52
- package/app/components/aside/AsideMajor.vue +6 -6
- package/app/components/aside/AsideMinor.vue +47 -52
- package/app/components/aside/AsidePlainMessage.vue +9 -9
- package/app/components/aside/AsideSwitch.vue +53 -54
- package/app/components/aside/major/PaneHolder.vue +61 -61
- package/app/components/aside/major/PaneSwitcher.vue +50 -55
- package/app/components/aside/major/PaneSwitcherButton.vue +24 -24
- package/app/components/aside/major/PaneTemplate.vue +3 -3
- package/app/components/aside/major/SiteInfo.vue +40 -42
- package/app/components/aside/major/contentNav/PaneBookNav.vue +107 -116
- package/app/components/aside/major/contentNav/PaneGlobalNav.vue +19 -19
- package/app/components/aside/major/contentNav/items/ContentNavBook.vue +8 -8
- package/app/components/aside/major/contentNav/items/ContentNavFolder.vue +55 -56
- package/app/components/aside/major/contentNav/items/ContentNavItem.vue +16 -16
- package/app/components/aside/major/contentNav/items/ContentNavPage.vue +2 -6
- package/app/components/aside/major/contentNav/items/ContentNavSeparator.vue +34 -35
- package/app/components/aside/major/contentNav/items/ContentNavTopic.vue +6 -6
- package/app/components/aside/major/contentNav/items/Flags.vue +31 -33
- package/app/components/aside/major/contentNav/items/ItemTemplate.vue +13 -13
- package/app/components/aside/major/languages/PaneLanguages.vue +40 -40
- package/app/components/aside/major/pages/PanePages.vue +45 -45
- package/app/components/aside/major/search/PaneSearch.vue +109 -100
- package/app/components/aside/major/search/SearchInput.vue +52 -53
- package/app/components/aside/major/search/SearchResult.vue +123 -75
- package/app/components/aside/major/search/SearchStatus.vue +28 -28
- package/app/components/aside/major/search/search.worker.ts +129 -129
- package/app/components/aside/major/settings/BuildTime.vue +15 -15
- package/app/components/aside/major/settings/EngineVersion.vue +8 -7
- package/app/components/aside/major/settings/PaneSettings.vue +8 -8
- package/app/components/aside/major/settings/ThemeSwitcher.vue +36 -36
- package/app/components/aside/major/settings/repository/Repository.vue +18 -18
- package/app/components/aside/major/settings/repository/SecondaryGitHub.vue +47 -47
- package/app/components/aside/minor/AsideMinorPane.vue +5 -5
- package/app/components/aside/minor/AsideMinorPlainHeader.vue +20 -20
- package/app/components/aside/minor/content/AsideMinorContentContributions.vue +47 -51
- package/app/components/aside/minor/content/AsideMinorContentPage.vue +37 -37
- package/app/components/aside/minor/content/AsideMinorContentTopic.vue +61 -66
- package/app/components/aside/minor/content/ButtonPaneContributions.vue +101 -114
- package/app/components/aside/minor/content/ButtonPaneImprove.vue +112 -123
- package/app/components/aside/minor/content/Contribution.vue +36 -36
- package/app/components/aside/minor/content/Toc.vue +163 -163
- package/app/components/aside/minor/content/TocItem.vue +91 -91
- package/app/components/aside/minor/content/TopicPartButton.vue +35 -35
- package/app/components/aside/minor/contributor/AsideMinorContributor.vue +36 -39
- package/app/components/aside/minor/contributor/ItemBook.vue +33 -39
- package/app/components/aside/minor/contributor/ItemContent.vue +17 -17
- package/app/components/aside/minor/news/AsideMinorNews.vue +132 -132
- package/app/components/aside/minor/news/NewsItem.vue +69 -69
- package/app/components/aside/minor/news/RenderNewsElement.vue +42 -42
- package/app/components/aside/minor/news/elements/Mix.vue +11 -11
- package/app/components/aside/minor/news/elements/P.vue +14 -14
- package/app/components/aside/minor/news/elements/Ref.vue +59 -58
- package/app/components/aside/minor/news/elements/Text.vue +18 -18
- package/app/components/indexPage/IndexPagePersons.vue +116 -117
- package/app/components/main/MainAction.vue +26 -26
- package/app/components/main/MainBreadcrumbs.vue +28 -28
- package/app/components/main/MainContentChild.vue +44 -47
- package/app/components/main/MainContentChildren.vue +13 -14
- package/app/components/main/MainDecoration.vue +15 -15
- package/app/components/main/MainDescription.vue +13 -13
- package/app/components/main/MainFlag.vue +129 -133
- package/app/components/main/MainFlags.vue +17 -17
- package/app/components/main/MainGlow.vue +12 -12
- package/app/components/main/MainQuickLink.vue +90 -91
- package/app/components/main/MainQuickLinks.vue +40 -40
- package/app/components/main/MainQuote.vue +149 -161
- package/app/components/main/MainQuoteLoader.vue +86 -86
- package/app/components/main/MainSection.vue +44 -44
- package/app/components/main/MainSectionPreamble.vue +5 -5
- package/app/components/main/MainSubTitle.vue +11 -12
- package/app/components/main/MainTitle.vue +32 -32
- package/app/components/main/MainTopicPartPage.vue +88 -88
- package/app/components/main/MainTopicPartSwitch.vue +67 -71
- package/app/components/main/connections/Deps.vue +30 -34
- package/app/components/main/connections/Externals.vue +80 -104
- package/app/components/main/connections/MainConnections.vue +90 -94
- package/app/components/main/connections/MainConnectionsButton.vue +81 -81
- package/app/components/main/connections/ScrollPane.vue +10 -10
- package/app/components/main/contentStats/Item.vue +28 -34
- package/app/components/main/contentStats/ItemElement.vue +19 -19
- package/app/components/main/contentStats/ItemMaterials.vue +11 -11
- package/app/components/main/contentStats/MainContentStats.vue +50 -53
- package/app/components/preview/Preview.vue +110 -118
- package/app/components/preview/PreviewError.vue +4 -4
- package/app/components/preview/PreviewLoading.vue +3 -3
- package/app/components/preview/PreviewScreen.vue +48 -48
- package/app/components/preview/PreviewScreenButton.vue +27 -27
- package/app/components/preview/screen/ContentPage.vue +27 -30
- package/app/components/preview/screen/DirectLink.vue +13 -13
- package/app/components/preview/screen/Unique.vue +31 -32
- package/app/components/site/SiteAside.vue +50 -51
- package/app/components/site/SiteAsideOverlay.vue +8 -8
- package/app/components/site/SiteMain.vue +11 -11
- package/app/components/transition/Fade.vue +16 -16
- package/app/components/transition/Slide.vue +27 -27
- package/app/components/tree/TreeContainer.vue +3 -3
- package/app/components/tree/TreeItem.vue +27 -31
- package/app/composables/ads.ts +11 -11
- package/app/composables/analytics.ts +102 -102
- package/app/composables/appElements.ts +21 -21
- package/app/composables/aside.ts +15 -15
- package/app/composables/asideMajorPane.ts +82 -82
- package/app/composables/asideMinor.ts +109 -109
- package/app/composables/contentNav.ts +7 -7
- package/app/composables/favicon.ts +103 -108
- package/app/composables/file.ts +4 -3
- package/app/composables/formatText.ts +100 -100
- package/app/composables/loading.ts +26 -26
- package/app/composables/mainContent.ts +22 -22
- package/app/composables/og.ts +184 -182
- package/app/composables/phrases.ts +98 -98
- package/app/composables/preview.ts +44 -44
- package/app/composables/route.ts +4 -2
- package/app/composables/theme.ts +47 -51
- package/app/composables/url.ts +19 -11
- package/app/formatters/ru.ts +14 -14
- package/app/pages/article/[...articleId].vue +12 -12
- package/app/pages/book/[...bookId].vue +56 -56
- package/app/pages/contributor/[contributorId].vue +144 -150
- package/app/pages/contributors.vue +95 -102
- package/app/pages/group/[...groupId].vue +58 -58
- package/app/pages/index.vue +113 -117
- package/app/pages/page/[...pageId].vue +60 -60
- package/app/pages/practice/[...practiceId].vue +12 -12
- package/app/pages/sponsors.vue +88 -92
- package/app/pages/summary/[...summaryId].vue +12 -12
- package/app/plugins/appSetup/client/htmlBranding.ts +6 -6
- package/app/plugins/appSetup/client/welcome.ts +37 -35
- package/app/plugins/appSetup/config.ts +6 -6
- package/app/plugins/appSetup/global.ts +3 -3
- package/app/plugins/appSetup/index.ts +27 -28
- package/app/plugins/prerender.server.ts +40 -40
- package/app/router.options.ts +5 -5
- package/app/scripts/theme.js +21 -24
- package/app/styles/main.css +128 -124
- package/bin/erudit.js +12 -0
- package/modules/erudit/env.ts +8 -0
- package/modules/erudit/globals/content.ts +4 -4
- package/modules/erudit/globals/contributor.ts +1 -1
- package/modules/erudit/globals/eruditConfig.ts +5 -10
- package/modules/erudit/globals/problem.ts +1 -1
- package/modules/erudit/globals/prose.ts +1 -1
- package/modules/erudit/globals/public.ts +18 -18
- package/modules/erudit/index.ts +50 -60
- package/modules/erudit/logger.ts +10 -10
- package/modules/erudit/setup/elements/appTemplate.ts +44 -45
- package/modules/erudit/setup/elements/globalTemplate.ts +82 -82
- package/modules/erudit/setup/elements/globalTypes.ts +259 -273
- package/modules/erudit/setup/elements/setup.ts +163 -167
- package/modules/erudit/setup/elements/shared.ts +10 -10
- package/modules/erudit/setup/elements/tagsTable.ts +28 -28
- package/modules/erudit/setup/fullRestart.ts +61 -71
- package/modules/erudit/setup/globals.ts +206 -196
- package/modules/erudit/setup/publicAssets.ts +43 -52
- package/modules/erudit/setup/runtimeConfig.ts +106 -58
- package/modules/erudit/watcher.ts +20 -27
- package/nuxt.config.ts +102 -84
- package/package.json +51 -55
- package/server/api/aside/major/frontNav/book/[...shortId].ts +10 -10
- package/server/api/aside/major/frontNav/global.ts +5 -5
- package/server/api/aside/major/pages.ts +6 -6
- package/server/api/contributor/list.ts +60 -61
- package/server/api/contributor/page/[contributorId].ts +68 -68
- package/server/api/indexPage.ts +81 -81
- package/server/api/language/functions.ts +11 -11
- package/server/api/language/phrase/[phraseKey].ts +35 -35
- package/server/api/main/content/[...contentTypePath].ts +149 -153
- package/server/api/news/batch/[batchIndex].ts +5 -5
- package/server/api/pageSponsors.ts +56 -58
- package/server/api/prerender/content.ts +79 -82
- package/server/api/prerender/default.ts +35 -35
- package/server/api/prerender/files.ts +10 -10
- package/server/api/prerender/frontNav.ts +13 -13
- package/server/api/prerender/language.ts +7 -7
- package/server/api/prerender/news.ts +8 -8
- package/server/api/prerender/quotes.ts +15 -15
- package/server/api/preview/contentPage/[...contentTypePath].ts +63 -63
- package/server/api/preview/contentUnique/[...contentTypePathUnique].ts +73 -81
- package/server/api/problemScript/[...problemScriptPath].ts +88 -92
- package/server/api/quote/data/[quoteId].ts +84 -87
- package/server/api/quote/ids.ts +3 -3
- package/server/erudit/build.ts +132 -137
- package/server/erudit/cameos/build.ts +161 -161
- package/server/erudit/config.ts +13 -13
- package/server/erudit/content/global/build.ts +300 -297
- package/server/erudit/content/global/singleton.ts +5 -5
- package/server/erudit/content/nav/build.ts +459 -463
- package/server/erudit/content/nav/front.ts +125 -127
- package/server/erudit/content/nav/repository/books.ts +37 -40
- package/server/erudit/content/nav/repository/get.ts +33 -33
- package/server/erudit/content/nav/repository/hasChildren.ts +5 -5
- package/server/erudit/content/nav/repository/hasNav.ts +3 -3
- package/server/erudit/content/nav/repository/hasParent.ts +5 -5
- package/server/erudit/content/nav/repository/id.ts +9 -9
- package/server/erudit/content/nav/repository/index.ts +9 -9
- package/server/erudit/content/nav/repository/order.ts +14 -14
- package/server/erudit/content/nav/repository/previousNext.ts +35 -35
- package/server/erudit/content/nav/repository/walk.ts +127 -127
- package/server/erudit/content/nav/setup.ts +13 -13
- package/server/erudit/content/nav/types.ts +24 -24
- package/server/erudit/content/repository/breadcrumbs.ts +24 -24
- package/server/erudit/content/repository/children.ts +47 -47
- package/server/erudit/content/repository/connections.ts +35 -35
- package/server/erudit/content/repository/contentLink.ts +16 -16
- package/server/erudit/content/repository/decoration.ts +23 -23
- package/server/erudit/content/repository/deps.ts +121 -84
- package/server/erudit/content/repository/description.ts +11 -11
- package/server/erudit/content/repository/elementSnippets.ts +105 -105
- package/server/erudit/content/repository/externals.ts +50 -50
- package/server/erudit/content/repository/flags.ts +33 -33
- package/server/erudit/content/repository/seo.ts +12 -12
- package/server/erudit/content/repository/stats.ts +97 -97
- package/server/erudit/content/repository/title.ts +27 -27
- package/server/erudit/content/repository/topicParts.ts +39 -39
- package/server/erudit/content/repository/unique.ts +76 -76
- package/server/erudit/content/resolve/book.ts +29 -32
- package/server/erudit/content/resolve/group.ts +34 -39
- package/server/erudit/content/resolve/index.ts +272 -290
- package/server/erudit/content/resolve/page.ts +80 -87
- package/server/erudit/content/resolve/topic.ts +220 -246
- package/server/erudit/content/resolve/utils/contentError.ts +10 -10
- package/server/erudit/content/resolve/utils/insertContentItem.ts +113 -122
- package/server/erudit/content/resolve/utils/insertContentResolved.ts +126 -132
- package/server/erudit/content/search.ts +146 -163
- package/server/erudit/contributors/build.ts +158 -166
- package/server/erudit/contributors/global.ts +3 -3
- package/server/erudit/contributors/repository/avatarUrl.ts +10 -10
- package/server/erudit/contributors/repository/contributions.ts +171 -178
- package/server/erudit/contributors/repository/count.ts +3 -3
- package/server/erudit/contributors/search.ts +34 -34
- package/server/erudit/db/repository/pushFile.ts +23 -26
- package/server/erudit/db/repository/pushProblemScript.ts +19 -19
- package/server/erudit/db/repository/pushProseLink.ts +40 -40
- package/server/erudit/db/schema/cameos.ts +7 -7
- package/server/erudit/db/schema/content.ts +18 -18
- package/server/erudit/db/schema/contentContributions.ts +15 -15
- package/server/erudit/db/schema/contentDeps.ts +21 -21
- package/server/erudit/db/schema/contentElementStats.ts +20 -20
- package/server/erudit/db/schema/contentProseLinks.ts +23 -23
- package/server/erudit/db/schema/contentSnippets.ts +15 -15
- package/server/erudit/db/schema/contentToc.ts +16 -16
- package/server/erudit/db/schema/contentUniques.ts +19 -25
- package/server/erudit/db/schema/contributors.ts +12 -12
- package/server/erudit/db/schema/files.ts +11 -11
- package/server/erudit/db/schema/groups.ts +6 -6
- package/server/erudit/db/schema/index.ts +17 -17
- package/server/erudit/db/schema/news.ts +7 -7
- package/server/erudit/db/schema/pages.ts +7 -7
- package/server/erudit/db/schema/problemScripts.ts +14 -14
- package/server/erudit/db/schema/sponsors.ts +9 -9
- package/server/erudit/db/schema/topics.ts +9 -9
- package/server/erudit/db/setup.ts +62 -62
- package/server/erudit/db/types.ts +10 -10
- package/server/erudit/global.ts +38 -33
- package/server/erudit/importer.ts +94 -97
- package/server/erudit/index.ts +96 -90
- package/server/erudit/language/list/en.ts +116 -116
- package/server/erudit/language/list/ru.ts +120 -120
- package/server/erudit/language/list.ts +6 -6
- package/server/erudit/language/setup.ts +36 -36
- package/server/erudit/language/types.ts +16 -16
- package/server/erudit/logger.ts +73 -77
- package/server/erudit/news/build.ts +112 -114
- package/server/erudit/news/repository/batch.ts +61 -61
- package/server/erudit/path.ts +19 -0
- package/server/erudit/prose/repository/finalize.ts +68 -68
- package/server/erudit/prose/repository/get.ts +54 -54
- package/server/erudit/prose/repository/resolve.ts +17 -17
- package/server/erudit/prose/storage/callout.ts +16 -14
- package/server/erudit/prose/storage/image.ts +22 -20
- package/server/erudit/prose/storage/link.ts +222 -226
- package/server/erudit/prose/storage/problemScript.ts +23 -21
- package/server/erudit/prose/storage/video.ts +16 -14
- package/server/erudit/prose/transform/bundleProblemScript.ts +6 -6
- package/server/erudit/prose/transform/extensions.ts +15 -15
- package/server/erudit/quote/repository/ids.ts +31 -31
- package/server/erudit/repository.ts +96 -96
- package/server/erudit/sponsors/build.ts +161 -165
- package/server/erudit/sponsors/repository/avatarUrl.ts +10 -10
- package/server/erudit/sponsors/repository/count.ts +4 -4
- package/server/erudit/staticFile.ts +28 -28
- package/server/plugins/augmentCss.ts +17 -17
- package/server/plugins/lang.ts +5 -7
- package/server/plugins/metaViewport.ts +15 -15
- package/server/plugins/theme.ts +13 -13
- package/server/routes/file/[...path].ts +18 -18
- package/server/routes/robots.txt.ts +9 -9
- package/server/routes/search.json.gz.ts +76 -75
- package/server/routes/sitemap.xml.ts +83 -81
- package/shared/search/encoders.ts +10 -10
- package/shared/types/asideMajorPages.ts +2 -2
- package/shared/types/breadcrumbs.ts +3 -3
- package/shared/types/contentChildren.ts +10 -10
- package/shared/types/contentConnections.ts +27 -27
- package/shared/types/contentStats.ts +6 -6
- package/shared/types/elementSnippet.ts +14 -14
- package/shared/types/frontContentNav.ts +17 -17
- package/shared/types/indexPage.ts +20 -20
- package/shared/types/language.ts +174 -174
- package/shared/types/mainContent.ts +40 -40
- package/shared/types/news.ts +13 -13
- package/shared/types/preview.ts +28 -28
- package/shared/types/runtimeConfig.ts +29 -48
- package/shared/types/search.ts +32 -32
- package/shared/utils/contentTypePath.ts +44 -44
- package/shared/utils/icons.ts +7 -7
- package/shared/utils/pages.ts +19 -20
- package/shared/utils/stringColor.ts +8 -8
- package/shared/utils/toStringEqual.ts +13 -13
- package/shared/utils/zip.ts +64 -64
- package/test/shared/utils/zip.test.ts +8 -8
- package/tsconfig.json +15 -15
- package/bin/erudit.mjs +0 -2
- package/modules/erudit/setup/aliases.ts +0 -17
- package/modules/erudit/setup/baseUrl.ts +0 -19
- package/modules/erudit/setup/nuxtConfig.ts +0 -62
- package/modules/erudit/setup/projectConfig.ts +0 -115
- package/shared/utils/slasher.ts +0 -64
- package/test/shared/utils/slasher.test.ts +0 -75
|
@@ -4,37 +4,37 @@ import { appElements as _appElements } from '#erudit/prose/app';
|
|
|
4
4
|
export const appElements: Record<string, AppElement> = { ..._appElements };
|
|
5
5
|
|
|
6
6
|
export async function initAppElements() {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
7
|
+
for (const [name, element] of Object.entries(appElements)) {
|
|
8
|
+
const languageCode = ERUDIT.config.language.current;
|
|
9
|
+
if (!element.languages[languageCode]) {
|
|
10
|
+
throw createError({
|
|
11
|
+
statusCode: 500,
|
|
12
|
+
statusMessage: `App element "${name}" does not support the current project language "${languageCode}"!`,
|
|
13
|
+
});
|
|
15
14
|
}
|
|
15
|
+
}
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
export async function getElementIcon(elementName: string) {
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const appElement = getAppElement(elementName);
|
|
20
|
+
return await appElement.icon();
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
export async function getElementPhrase(elementName: string) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
const appElement = getAppElement(elementName);
|
|
25
|
+
const languageCode = ERUDIT.config.language.current;
|
|
26
|
+
return await appElement.languages[languageCode]!();
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
function getAppElement(elementName: string) {
|
|
30
|
-
|
|
30
|
+
const appElement = appElements[elementName];
|
|
31
31
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
if (!appElement) {
|
|
33
|
+
throw createError({
|
|
34
|
+
statusCode: 500,
|
|
35
|
+
statusMessage: `App element "${elementName}" not found! Make sure it is installed and configured correctly!`,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
38
|
|
|
39
|
-
|
|
39
|
+
return appElement;
|
|
40
40
|
}
|
package/app/composables/aside.ts
CHANGED
|
@@ -1,28 +1,28 @@
|
|
|
1
1
|
export enum AsideType {
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
Major = 'major',
|
|
3
|
+
Minor = 'minor',
|
|
4
4
|
}
|
|
5
5
|
|
|
6
6
|
export interface AsideState {
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
opened: AsideType | undefined;
|
|
8
|
+
scrolledUp: boolean;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export const asideTypeSymbol = Symbol() as InjectionKey<AsideType>;
|
|
12
12
|
|
|
13
13
|
export const useAsideState = () => {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
return useState<AsideState>('aside-state', () => ({
|
|
15
|
+
opened: undefined,
|
|
16
|
+
scrolledUp: true,
|
|
17
|
+
}));
|
|
18
18
|
};
|
|
19
19
|
|
|
20
20
|
export const useCanShowAsideSwitches = () => {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
21
|
+
const asideState = useAsideState();
|
|
22
|
+
const { previewState } = usePreview();
|
|
23
|
+
return computed(() => {
|
|
24
|
+
const noOpenedAsides = !asideState.value.opened;
|
|
25
|
+
const scrolledUp = asideState.value.scrolledUp;
|
|
26
|
+
return noOpenedAsides && scrolledUp && !previewState.value.opened;
|
|
27
|
+
});
|
|
28
28
|
};
|
|
@@ -2,68 +2,68 @@ import { isTopicPart } from '@erudit-js/core/content/topic';
|
|
|
2
2
|
import { isContentType } from '@erudit-js/core/content/type';
|
|
3
3
|
|
|
4
4
|
export enum AsideMajorPane {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
5
|
+
GlobalNav = 'global-nav',
|
|
6
|
+
BookNav = 'book-nav',
|
|
7
|
+
Pages = 'pages',
|
|
8
|
+
Search = 'search',
|
|
9
|
+
Settings = 'settings',
|
|
10
|
+
Languages = 'languages',
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
export const asideMajorPanes = Object.values(AsideMajorPane);
|
|
14
14
|
|
|
15
15
|
export const useAsideMajorPane = () => {
|
|
16
|
-
|
|
16
|
+
return useState<AsideMajorPane>('aside-major-pane');
|
|
17
17
|
};
|
|
18
18
|
|
|
19
19
|
export const initAsideMajorPaneWatcher = () => {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
const asideMajorPane = useAsideMajorPane();
|
|
21
|
+
const routePath = useRoutePath();
|
|
22
|
+
const { shortBookId } = useContentId();
|
|
23
23
|
|
|
24
|
+
asideMajorPane.value = getActivePane(
|
|
25
|
+
asideMajorPane.value,
|
|
26
|
+
routePath.value,
|
|
27
|
+
shortBookId.value,
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
watch([routePath, shortBookId], () => {
|
|
24
31
|
asideMajorPane.value = getActivePane(
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
32
|
+
asideMajorPane.value,
|
|
33
|
+
routePath.value,
|
|
34
|
+
shortBookId.value,
|
|
28
35
|
);
|
|
29
|
-
|
|
30
|
-
watch([routePath, shortBookId], () => {
|
|
31
|
-
asideMajorPane.value = getActivePane(
|
|
32
|
-
asideMajorPane.value,
|
|
33
|
-
routePath.value,
|
|
34
|
-
shortBookId.value,
|
|
35
|
-
);
|
|
36
|
-
});
|
|
36
|
+
});
|
|
37
37
|
};
|
|
38
38
|
|
|
39
39
|
function getActivePane(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
40
|
+
currentPane: AsideMajorPane,
|
|
41
|
+
path: string,
|
|
42
|
+
bookId: string | undefined,
|
|
43
43
|
) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
if (currentPane === AsideMajorPane.Search) {
|
|
45
|
+
// The user might be clicking on search result so keep him in search pane!
|
|
46
|
+
return AsideMajorPane.Search;
|
|
47
|
+
}
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
if (bookId) {
|
|
50
|
+
return AsideMajorPane.BookNav;
|
|
51
|
+
}
|
|
52
52
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
if (path === PAGES.contributors) {
|
|
54
|
+
return AsideMajorPane.Pages;
|
|
55
|
+
}
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
if (path.startsWith(PAGES.contributor())) {
|
|
58
|
+
return AsideMajorPane.Pages;
|
|
59
|
+
}
|
|
60
60
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
if (path === PAGES.sponsors) {
|
|
62
|
+
return AsideMajorPane.Pages;
|
|
63
|
+
}
|
|
64
64
|
|
|
65
|
-
|
|
66
|
-
|
|
65
|
+
// Fallback to global nav
|
|
66
|
+
return AsideMajorPane.GlobalNav;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
//
|
|
@@ -73,59 +73,59 @@ function getActivePane(
|
|
|
73
73
|
export let globalContentNav: FrontGlobalContentNav;
|
|
74
74
|
|
|
75
75
|
export async function initGlobalContentNav() {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
76
|
+
const nuxtApp = useNuxtApp();
|
|
77
|
+
const payloadKey = 'global-content-nav';
|
|
78
|
+
const payloadValue: FrontGlobalContentNav =
|
|
79
|
+
(nuxtApp.static.data[payloadKey] ||=
|
|
80
|
+
nuxtApp.payload.data[payloadKey] ||=
|
|
81
|
+
await $fetch('/api/aside/major/frontNav/global', {
|
|
82
|
+
responseType: 'json',
|
|
83
|
+
}));
|
|
84
|
+
|
|
85
|
+
globalContentNav = payloadValue;
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
export function useContentId() {
|
|
89
|
-
|
|
89
|
+
const routePath = useRoutePath();
|
|
90
90
|
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
const shortContentId = computed(() => {
|
|
92
|
+
const path = routePath.value;
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
94
|
+
const parts = path.split('/');
|
|
95
|
+
parts.pop(); // Remove trailing slash part
|
|
96
|
+
parts.shift(); // Remove leading slash part
|
|
97
97
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
98
|
+
const type = parts.shift();
|
|
99
|
+
if (isContentType(type) || isTopicPart(type)) {
|
|
100
|
+
return parts.join('/');
|
|
101
|
+
}
|
|
102
102
|
|
|
103
|
-
|
|
104
|
-
|
|
103
|
+
return undefined;
|
|
104
|
+
});
|
|
105
105
|
|
|
106
|
-
|
|
107
|
-
|
|
106
|
+
const shortBookId = computed(() => {
|
|
107
|
+
const shortId = shortContentId.value;
|
|
108
108
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
109
|
+
if (!shortId) {
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
112
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
}
|
|
119
|
-
}
|
|
113
|
+
let longestMatch = '';
|
|
114
|
+
for (const bookShortId of globalContentNav.bookShortIds) {
|
|
115
|
+
if (shortId.startsWith(bookShortId)) {
|
|
116
|
+
if (bookShortId.length > longestMatch.length) {
|
|
117
|
+
longestMatch = bookShortId;
|
|
120
118
|
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
121
|
|
|
122
|
-
|
|
123
|
-
|
|
122
|
+
return longestMatch || undefined;
|
|
123
|
+
});
|
|
124
124
|
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
125
|
+
return {
|
|
126
|
+
shortContentId,
|
|
127
|
+
shortBookId,
|
|
128
|
+
};
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
//
|
|
@@ -1,109 +1,109 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
} from '@erudit-js/core/content/contributions';
|
|
5
|
-
import type { TopicPart } from '@erudit-js/core/content/topic';
|
|
6
|
-
import type { ContentType } from '@erudit-js/core/content/type';
|
|
7
|
-
import type { ResolvedTocItem } from '@erudit-js/prose';
|
|
8
|
-
|
|
9
|
-
export interface AsideMinorStateNews {
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export interface AsideMinorContributor {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
export interface AsideMinorContentContributions {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export interface AsideMinorContentPage {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
export interface AsideMinorContentTopic {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
export type AsideMinorState =
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
export const useAsideMinor = () => {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
};
|
|
1
|
+
import type {
|
|
2
|
+
ContentContribution,
|
|
3
|
+
ContributorContribution,
|
|
4
|
+
} from '@erudit-js/core/content/contributions';
|
|
5
|
+
import type { TopicPart } from '@erudit-js/core/content/topic';
|
|
6
|
+
import type { ContentType } from '@erudit-js/core/content/type';
|
|
7
|
+
import type { ResolvedTocItem } from '@erudit-js/prose';
|
|
8
|
+
|
|
9
|
+
export interface AsideMinorStateNews {
|
|
10
|
+
type: 'news';
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export interface AsideMinorContributor {
|
|
14
|
+
type: 'contributor';
|
|
15
|
+
contributions?: ContributorContribution[];
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface AsideMinorContentContributions {
|
|
19
|
+
type: 'content-contributions';
|
|
20
|
+
contentRelativePath: string;
|
|
21
|
+
contentType: ContentType;
|
|
22
|
+
topicPart?: TopicPart;
|
|
23
|
+
contributions?: ContentContribution[];
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export interface AsideMinorContentPage {
|
|
27
|
+
type: 'content-page';
|
|
28
|
+
contentRelativePath: string;
|
|
29
|
+
toc?: ResolvedTocItem[];
|
|
30
|
+
contributions?: ContentContribution[];
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export interface AsideMinorContentTopic {
|
|
34
|
+
type: 'content-topic';
|
|
35
|
+
topicPart: TopicPart;
|
|
36
|
+
contentRelativePath: string;
|
|
37
|
+
shortContentId: string;
|
|
38
|
+
parts: TopicPart[];
|
|
39
|
+
toc?: ResolvedTocItem[];
|
|
40
|
+
contributions?: ContentContribution[];
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export type AsideMinorState =
|
|
44
|
+
| AsideMinorStateNews
|
|
45
|
+
| AsideMinorContributor
|
|
46
|
+
| AsideMinorContentContributions
|
|
47
|
+
| AsideMinorContentPage
|
|
48
|
+
| AsideMinorContentTopic;
|
|
49
|
+
|
|
50
|
+
export const useAsideMinor = () => {
|
|
51
|
+
const asideMinor = useState<AsideMinorState | undefined>('aside-minor');
|
|
52
|
+
|
|
53
|
+
return {
|
|
54
|
+
asideMinorState: asideMinor,
|
|
55
|
+
showNewsAside() {
|
|
56
|
+
asideMinor.value = { type: 'news' };
|
|
57
|
+
},
|
|
58
|
+
showContributorAside(contributions?: ContributorContribution[]) {
|
|
59
|
+
asideMinor.value = {
|
|
60
|
+
type: 'contributor',
|
|
61
|
+
contributions,
|
|
62
|
+
};
|
|
63
|
+
},
|
|
64
|
+
showContentContributionsAside(
|
|
65
|
+
contentRelativePath: string,
|
|
66
|
+
contentType: ContentType,
|
|
67
|
+
topicPart?: TopicPart,
|
|
68
|
+
contributions?: ContentContribution[],
|
|
69
|
+
) {
|
|
70
|
+
asideMinor.value = {
|
|
71
|
+
type: 'content-contributions',
|
|
72
|
+
contentRelativePath,
|
|
73
|
+
contentType,
|
|
74
|
+
topicPart,
|
|
75
|
+
contributions,
|
|
76
|
+
};
|
|
77
|
+
},
|
|
78
|
+
showContentPageAside(
|
|
79
|
+
contentRelativePath: string,
|
|
80
|
+
toc?: ResolvedTocItem[],
|
|
81
|
+
contributions?: ContentContribution[],
|
|
82
|
+
) {
|
|
83
|
+
asideMinor.value = {
|
|
84
|
+
type: 'content-page',
|
|
85
|
+
contentRelativePath,
|
|
86
|
+
toc,
|
|
87
|
+
contributions,
|
|
88
|
+
};
|
|
89
|
+
},
|
|
90
|
+
showContentTopicAside(args: {
|
|
91
|
+
part: TopicPart;
|
|
92
|
+
parts: TopicPart[];
|
|
93
|
+
shortContentId: string;
|
|
94
|
+
contentRelativePath: string;
|
|
95
|
+
toc?: ResolvedTocItem[];
|
|
96
|
+
contributions?: ContentContribution[];
|
|
97
|
+
}) {
|
|
98
|
+
asideMinor.value = {
|
|
99
|
+
type: 'content-topic',
|
|
100
|
+
topicPart: args.part,
|
|
101
|
+
contentRelativePath: args.contentRelativePath,
|
|
102
|
+
toc: args.toc,
|
|
103
|
+
contributions: args.contributions,
|
|
104
|
+
shortContentId: args.shortContentId,
|
|
105
|
+
parts: args.parts,
|
|
106
|
+
};
|
|
107
|
+
},
|
|
108
|
+
};
|
|
109
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
const contentNavGlobalKey = 'contentNav-global';
|
|
2
|
-
|
|
3
|
-
export const contentNavSymbol = Symbol() as InjectionKey<{
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}>;
|
|
1
|
+
const contentNavGlobalKey = 'contentNav-global';
|
|
2
|
+
|
|
3
|
+
export const contentNavSymbol = Symbol() as InjectionKey<{
|
|
4
|
+
shortContentId: ComputedRef<string | undefined>;
|
|
5
|
+
shortBookId: ComputedRef<string | undefined>;
|
|
6
|
+
showBookNav: Ref<boolean>;
|
|
7
|
+
}>;
|