erudit 3.0.0-dev.17 → 3.0.0-dev.19
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/app/app.vue +193 -191
- package/app/assets/icons/graduation.svg +3 -0
- package/app/components/Loading.vue +23 -23
- package/app/components/SiteAside.vue +393 -393
- package/app/components/SiteMain.vue +32 -32
- package/app/components/aside/AsideListItem.vue +74 -74
- package/app/components/aside/AsideMajor.vue +56 -56
- package/app/components/aside/AsideMinor.vue +97 -73
- package/app/components/aside/major/PaneContentScroll.vue +23 -23
- package/app/components/aside/major/PaneSwitch.vue +54 -54
- package/app/components/aside/major/PaneSwitchButton.vue +63 -63
- package/app/components/aside/major/SiteInfo.vue +85 -85
- package/app/components/aside/major/panes/Language.vue +79 -79
- package/app/components/aside/major/panes/Pages.vue +31 -34
- package/app/components/aside/major/panes/Search.vue +11 -11
- package/app/components/aside/major/panes/nav/Nav.vue +92 -92
- package/app/components/aside/major/panes/nav/NavBook.vue +95 -95
- package/app/components/aside/major/panes/nav/NavBookLoading.vue +24 -24
- package/app/components/aside/major/panes/nav/NavGlobal.vue +16 -16
- package/app/components/aside/major/panes/nav/fnav/FNav.vue +105 -105
- package/app/components/aside/major/panes/nav/fnav/FNavBook.vue +32 -32
- package/app/components/aside/major/panes/nav/fnav/FNavFlags.vue +40 -40
- package/app/components/aside/major/panes/nav/fnav/FNavFolder.vue +60 -60
- package/app/components/aside/major/panes/nav/fnav/FNavItem.vue +34 -34
- package/app/components/aside/major/panes/nav/fnav/FNavSeparator.vue +80 -80
- package/app/components/aside/major/panes/nav/fnav/FNavTopic.vue +24 -24
- package/app/components/aside/major/panes/other/ItemContent.vue +29 -29
- package/app/components/aside/major/panes/other/ItemGenerator.vue +13 -13
- package/app/components/aside/major/panes/other/ItemTheme.vue +54 -54
- package/app/components/aside/major/panes/other/Other.vue +16 -16
- package/app/components/aside/minor/{Contribute.vue → AsideMinorContribute.vue} +175 -145
- package/app/components/aside/minor/AsideMinorNews.vue +11 -11
- package/app/components/aside/minor/AsideMinorPane.vue +15 -15
- package/app/components/aside/minor/AsideMinorTopLink.vue +67 -67
- package/app/components/aside/minor/content/AsideMinorContent.vue +89 -92
- package/app/components/aside/minor/contributor/AsideMinorContributor.vue +78 -0
- package/app/components/aside/minor/contributor/BookContribution.vue +64 -0
- package/app/components/aside/minor/topic/AsideMinorTopic.vue +29 -32
- package/app/components/aside/minor/topic/TopicContributors.vue +177 -177
- package/app/components/aside/minor/topic/TopicNav.vue +49 -49
- package/app/components/aside/minor/topic/TopicToc.vue +213 -214
- package/app/components/aside/minor/topic/TopicTocItem.vue +32 -32
- package/app/components/aside/utils/AsideOverlayPane.vue +40 -40
- package/app/components/bitran/BitranContent.vue +90 -91
- package/app/components/bitran/RenderWrapper.vue +10 -10
- package/app/components/contributor/ContributorAvatar.vue +45 -45
- package/app/components/contributor/ContributorListItem.vue +35 -35
- package/app/components/main/MainBitranContent.vue +41 -0
- package/app/components/main/{utils/Breadcrumb.vue → MainBreadcrumb.vue} +67 -74
- package/app/components/main/MainDescription.vue +24 -0
- package/app/components/main/{utils/ContentTitle.vue → MainTitle.vue} +72 -63
- package/app/components/main/content/ContentBreadcrumb.vue +28 -0
- package/app/components/main/{utils → content}/ContentDecoration.vue +29 -29
- package/app/components/main/{utils → content}/ContentPopover.vue +188 -188
- package/app/components/main/{utils → content}/ContentPopovers.vue +111 -111
- package/app/components/main/{utils → content}/ContentReferences.vue +70 -70
- package/app/components/main/{utils → content}/ContentSection.vue +45 -45
- package/app/components/main/{utils → content}/reference/ReferenceGroup.vue +38 -38
- package/app/components/main/{utils → content}/reference/ReferenceItem.vue +70 -70
- package/app/components/main/{utils → content}/reference/ReferenceSource.vue +120 -120
- package/app/components/main/topic/MainTopic.vue +83 -88
- package/app/components/main/topic/TopicPartSwitch.vue +124 -118
- package/app/components/preview/Preview.vue +186 -186
- package/app/components/preview/PreviewDisplay.vue +139 -139
- package/app/components/preview/PreviewFooterAction.vue +73 -73
- package/app/components/preview/PreviewLoading.vue +14 -14
- package/app/components/preview/PreviewScreen.vue +141 -141
- package/app/components/preview/display/Alert.vue +50 -50
- package/app/components/preview/display/Custom.vue +18 -18
- package/app/components/preview/display/GenericLink.vue +48 -48
- package/app/components/preview/display/PageLink.vue +22 -22
- package/app/components/preview/display/Unique.vue +46 -55
- package/app/components/transition/Fade.vue +19 -19
- package/app/components/tree/TreeContainer.vue +11 -11
- package/app/components/tree/TreeItem.vue +89 -89
- package/app/composables/adsAllowed.ts +11 -0
- package/app/composables/bitran.ts +108 -108
- package/app/composables/bitranLocation.ts +7 -7
- package/app/composables/contentData.ts +38 -38
- package/app/composables/contentPage.ts +168 -158
- package/app/composables/contentRoute.ts +45 -45
- package/app/composables/darkMagic.ts +24 -24
- package/app/composables/externalApi.ts +69 -69
- package/app/composables/favicon.ts +8 -8
- package/app/composables/formatText.ts +99 -99
- package/app/composables/majorPane.ts +61 -60
- package/app/composables/phrases.ts +77 -65
- package/app/composables/theme.ts +29 -29
- package/app/composables/url.ts +33 -33
- package/app/pages/_test/preview.vue +110 -110
- package/app/pages/article/[...articleId].vue +3 -3
- package/app/pages/book/[...bookId].vue +42 -47
- package/app/pages/contributor/[contributorId].vue +225 -0
- package/app/pages/contributors.vue +183 -0
- package/app/pages/group/[...groupId].vue +58 -66
- package/app/pages/index.vue +32 -32
- package/app/pages/practice/[...practice].vue +3 -3
- package/app/pages/summary/[...summaryId].vue +3 -3
- package/app/plugins/analytics.ts +8 -0
- package/app/plugins/prerender.server.ts +22 -22
- package/app/scripts/_immediate.js +9 -9
- package/app/scripts/aside/index.ts +59 -59
- package/app/scripts/aside/major/nav.ts +26 -26
- package/app/scripts/aside/minor/state.ts +37 -37
- package/app/scripts/aside/minor/topic.ts +3 -3
- package/app/scripts/flag.ts +28 -28
- package/app/scripts/og.ts +27 -27
- package/app/scripts/preview/build.ts +76 -76
- package/app/scripts/preview/data/alert.ts +19 -19
- package/app/scripts/preview/data/custom.ts +8 -8
- package/app/scripts/preview/data/genericLink.ts +24 -24
- package/app/scripts/preview/data/pageLink.ts +23 -23
- package/app/scripts/preview/data/unique.ts +69 -72
- package/app/scripts/preview/data.ts +24 -24
- package/app/scripts/preview/display.ts +37 -37
- package/app/scripts/preview/footer.ts +9 -9
- package/app/scripts/preview/request.ts +51 -51
- package/app/scripts/preview/state.ts +63 -63
- package/app/styles/_immediate.css +7 -7
- package/app/styles/_util.scss +43 -43
- package/app/styles/_utils.scss +44 -44
- package/app/styles/app.scss +91 -91
- package/app/styles/def/_bp.scss +27 -27
- package/app/styles/def/_size.scss +7 -7
- package/app/styles/def/_z.scss +5 -5
- package/app/styles/normalize.scss +49 -49
- package/app/styles/partials/_darkMagic.scss +5 -5
- package/app/styles/partials/_fnav.scss +15 -15
- package/app/styles/partials/_preview.scss +5 -5
- package/bin/erudit.mjs +2 -2
- package/const.ts +4 -4
- package/globalPath.ts +21 -21
- package/globals/bitran.ts +1 -1
- package/globals/content.ts +27 -27
- package/globals/contributor.ts +5 -5
- package/globals/erudit.ts +5 -5
- package/globals/register.ts +18 -18
- package/languages/en.ts +103 -94
- package/languages/ru.ts +107 -98
- package/module/bitran.ts +66 -66
- package/module/config.ts +35 -35
- package/module/imports.ts +67 -67
- package/module/index.ts +47 -47
- package/module/logger.ts +10 -10
- package/module/paths.ts +22 -22
- package/module/restart.ts +61 -61
- package/nuxt.config.ts +131 -131
- package/package.json +5 -5
- package/server/api/aside/major/nav/bookIds.ts +5 -5
- package/server/api/aside/major/nav/bookNav/[...bookId].ts +17 -20
- package/server/api/aside/major/nav/global.ts +7 -7
- package/server/api/aside/minor/book/[...bookId].ts +18 -0
- package/server/api/aside/minor/contributor/[contributorId].ts +18 -0
- package/server/api/aside/minor/group/[...groupId].ts +18 -0
- package/server/api/aside/minor/news.ts +7 -7
- package/server/api/aside/minor/topic.ts +36 -0
- package/server/api/bitran/content/[...location].ts +13 -10
- package/server/api/bitran/toc/[...location].ts +9 -9
- package/server/api/content/data.ts +75 -75
- package/server/api/contributor/count.ts +6 -6
- package/server/api/contributor/list.ts +44 -0
- package/server/api/contributor/page/[contributorId].ts +14 -0
- package/server/api/fake/content.ts +11 -11
- package/server/api/fake/shared/languages.ts +12 -12
- package/server/api/language/functions.ts +12 -12
- package/server/api/language/phrase/[phraseId].ts +19 -19
- package/server/api/language/phraseIds.ts +8 -8
- package/server/api/prerender.ts +19 -120
- package/server/api/preview/page/[...parts].ts +78 -78
- package/server/api/preview/unique/[...location].ts +48 -61
- package/server/plugin/bitran/content.ts +252 -190
- package/server/plugin/bitran/elements/include.ts +229 -229
- package/server/plugin/bitran/location.ts +43 -39
- package/server/plugin/bitran/toc.ts +94 -94
- package/server/plugin/bitran/transpiler.ts +18 -18
- package/server/plugin/build/close.ts +12 -12
- package/server/plugin/build/jobs/content/builderArgs.ts +8 -8
- package/server/plugin/build/jobs/content/generic.ts +191 -191
- package/server/plugin/build/jobs/content/parse.ts +113 -113
- package/server/plugin/build/jobs/content/path.ts +6 -6
- package/server/plugin/build/jobs/content/type/book.ts +9 -9
- package/server/plugin/build/jobs/content/type/group.ts +37 -37
- package/server/plugin/build/jobs/content/type/topic.ts +36 -36
- package/server/plugin/build/jobs/contributors.ts +69 -66
- package/server/plugin/build/jobs/language.ts +36 -36
- package/server/plugin/build/jobs/nav.ts +345 -345
- package/server/plugin/build/process.ts +32 -32
- package/server/plugin/build/rebuild.ts +66 -66
- package/server/plugin/build/setup.ts +19 -19
- package/server/plugin/content/context.ts +119 -119
- package/server/plugin/db/entities/Book.ts +7 -7
- package/server/plugin/db/entities/Content.ts +45 -45
- package/server/plugin/db/entities/Contribution.ts +10 -10
- package/server/plugin/db/entities/Contributor.ts +25 -16
- package/server/plugin/db/entities/File.ts +10 -10
- package/server/plugin/db/entities/Group.ts +14 -14
- package/server/plugin/db/entities/Hash.ts +15 -15
- package/server/plugin/db/entities/Topic.ts +20 -20
- package/server/plugin/db/entities/Unique.ts +21 -21
- package/server/plugin/db/reset.ts +12 -12
- package/server/plugin/db/setup.ts +49 -49
- package/server/plugin/global.ts +16 -16
- package/server/plugin/importer.ts +16 -16
- package/server/plugin/index.ts +9 -9
- package/server/plugin/logger.ts +23 -23
- package/server/plugin/nav/node.ts +27 -27
- package/server/plugin/nav/utils.ts +179 -175
- package/server/plugin/repository/asideMinor.ts +51 -0
- package/server/plugin/repository/book.ts +39 -21
- package/server/plugin/repository/content.ts +240 -240
- package/server/plugin/repository/contentId.ts +40 -40
- package/server/plugin/repository/contributor.ts +98 -8
- package/server/plugin/repository/file.ts +10 -10
- package/server/plugin/repository/frontNav.ts +145 -145
- package/server/plugin/repository/topic.ts +35 -35
- package/server/tsconfig.json +9 -9
- package/shared/aside/minor.ts +55 -51
- package/shared/asset.ts +22 -22
- package/shared/bitran/content.ts +9 -0
- package/shared/bitran/contentId.ts +56 -56
- package/shared/bitran/toc.ts +8 -8
- package/shared/breadcrumb.ts +7 -0
- package/shared/content/bookId.ts +12 -12
- package/shared/content/context.ts +9 -9
- package/shared/content/data/base.ts +32 -32
- package/shared/content/data/index.ts +5 -5
- package/shared/content/data/type/book.ts +5 -5
- package/shared/content/data/type/group.ts +6 -6
- package/shared/content/data/type/topic.ts +11 -11
- package/shared/content/previousNext.ts +9 -9
- package/shared/contributor.ts +33 -5
- package/shared/frontNav.ts +41 -41
- package/shared/icons.ts +38 -38
- package/shared/image.ts +5 -5
- package/shared/link.ts +28 -28
- package/shared/popover.ts +8 -8
- package/shared/types/language.ts +79 -74
- package/shared/utils/objectsEqual.ts +4 -4
- package/shared/utils/stringColor.ts +9 -9
- package/test/contentId.test.ts +91 -91
- package/tsconfig.json +8 -8
- package/utils/contentPath.ts +67 -67
- package/utils/slash.ts +11 -11
- package/utils/stress.ts +9 -9
- package/app/components/aside/minor/AsideMinorContributor.vue +0 -5
- package/app/components/main/utils/ContentDescription.vue +0 -19
- package/app/composables/bitranContent.ts +0 -92
- package/app/pages/members.vue +0 -6
- package/server/api/aside/minor/path.ts +0 -82
- package/shared/bitran/stringContent.ts +0 -6
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
import type { ShallowRef } from 'vue';
|
|
2
|
-
import type { BitranContent } from '@bitran-js/renderer-vue';
|
|
3
|
-
import {
|
|
4
|
-
encodeBitranLocation,
|
|
5
|
-
NO_ALIASES,
|
|
6
|
-
setEruditBitranRuntime,
|
|
7
|
-
stringifyBitranLocation,
|
|
8
|
-
type BitranLocation,
|
|
9
|
-
} from '@erudit-js/cog/schema';
|
|
10
|
-
|
|
11
|
-
import type { StringBitranContent } from '@erudit/shared/bitran/stringContent';
|
|
12
|
-
|
|
13
|
-
import eruditConfig from '#erudit/config';
|
|
14
|
-
|
|
15
|
-
export async function useBitranContent(
|
|
16
|
-
location: Ref<BitranLocation | undefined>,
|
|
17
|
-
) {
|
|
18
|
-
const nuxtApp = useNuxtApp();
|
|
19
|
-
const content = shallowRef<BitranContent>();
|
|
20
|
-
|
|
21
|
-
let contentPromise: Promise<ShallowRef<BitranContent>>;
|
|
22
|
-
|
|
23
|
-
watchEffect(() => {
|
|
24
|
-
if (!location.value) {
|
|
25
|
-
// @ts-ignore
|
|
26
|
-
contentPromise = (() => {
|
|
27
|
-
content.value = undefined;
|
|
28
|
-
return content;
|
|
29
|
-
})();
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
const contentApiRoute = `/api/bitran/content/${encodeBitranLocation(stringifyBitranLocation(location.value!))}`;
|
|
33
|
-
|
|
34
|
-
// @ts-ignore
|
|
35
|
-
contentPromise = (async () => {
|
|
36
|
-
const locationString = encodeBitranLocation(
|
|
37
|
-
stringifyBitranLocation(location.value!),
|
|
38
|
-
);
|
|
39
|
-
|
|
40
|
-
const payloadKey = `content`;
|
|
41
|
-
const payload =
|
|
42
|
-
(nuxtApp.static.data[payloadKey] ||=
|
|
43
|
-
nuxtApp.payload.data[payloadKey] ||=
|
|
44
|
-
{});
|
|
45
|
-
|
|
46
|
-
let stringContent: StringBitranContent;
|
|
47
|
-
|
|
48
|
-
if (payload.location === locationString) {
|
|
49
|
-
stringContent = payload;
|
|
50
|
-
} else {
|
|
51
|
-
stringContent = await $fetch(contentApiRoute, {
|
|
52
|
-
responseType: 'json',
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
// Clear the payload and set new data
|
|
56
|
-
Object.keys(payload).forEach((key) => delete payload[key]);
|
|
57
|
-
Object.assign(payload, {
|
|
58
|
-
...stringContent,
|
|
59
|
-
location: locationString,
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
const bitranTranspiler = await useBitranTranspiler();
|
|
64
|
-
|
|
65
|
-
[bitranTranspiler.parser, bitranTranspiler.stringifier].forEach(
|
|
66
|
-
(item) => {
|
|
67
|
-
setEruditBitranRuntime(item, {
|
|
68
|
-
eruditConfig,
|
|
69
|
-
insideInclude: false,
|
|
70
|
-
context: {
|
|
71
|
-
aliases: NO_ALIASES(),
|
|
72
|
-
location: location.value!,
|
|
73
|
-
},
|
|
74
|
-
});
|
|
75
|
-
},
|
|
76
|
-
);
|
|
77
|
-
|
|
78
|
-
const root = await bitranTranspiler.parser.parse(
|
|
79
|
-
stringContent.biCode,
|
|
80
|
-
);
|
|
81
|
-
|
|
82
|
-
content.value = {
|
|
83
|
-
root,
|
|
84
|
-
renderDataStorage: stringContent.renderDataStorage,
|
|
85
|
-
};
|
|
86
|
-
|
|
87
|
-
return content;
|
|
88
|
-
})();
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
return contentPromise!;
|
|
92
|
-
}
|
package/app/pages/members.vue
DELETED
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
import { isTopicPart, locationFromPath } from '@erudit-js/cog/schema';
|
|
2
|
-
|
|
3
|
-
import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
|
|
4
|
-
import { getBitranToc } from '@server/bitran/toc';
|
|
5
|
-
import {
|
|
6
|
-
getContentContributors,
|
|
7
|
-
getPreviousNext,
|
|
8
|
-
} from '@server/repository/content';
|
|
9
|
-
import { getTopicPartsLinks } from '@server/repository/topic';
|
|
10
|
-
import { getFullContentId } from '@server/repository/contentId';
|
|
11
|
-
|
|
12
|
-
export default defineEventHandler(async (event) => {
|
|
13
|
-
const query = getQuery<{ path: string }>(event);
|
|
14
|
-
|
|
15
|
-
if (!query.path) {
|
|
16
|
-
throw createError({
|
|
17
|
-
statusCode: 400,
|
|
18
|
-
statusText: 'Missing "path" query parameter!',
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
const path = query.path.substring(1);
|
|
23
|
-
const pathStart = path.split('/')[0];
|
|
24
|
-
|
|
25
|
-
if (isTopicPart(pathStart)) return await createTopicData(path);
|
|
26
|
-
|
|
27
|
-
if (['book', 'group'].includes(pathStart))
|
|
28
|
-
return await createContentData(pathStart, path);
|
|
29
|
-
|
|
30
|
-
return 'news';
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
async function createTopicData(path: string): Promise<AsideMinorTopic> {
|
|
34
|
-
const location = locationFromPath(path);
|
|
35
|
-
|
|
36
|
-
if (!location) {
|
|
37
|
-
throw createError({
|
|
38
|
-
statusCode: 400,
|
|
39
|
-
statusText: `Provided path "${path}" is not a valid topic location!`,
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
if (location.path) {
|
|
44
|
-
location.path = await getFullContentId(location.path);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
const contentId = location.path;
|
|
48
|
-
|
|
49
|
-
const toc = await getBitranToc(location);
|
|
50
|
-
const previousNext = await getPreviousNext(contentId);
|
|
51
|
-
const topicPartsLinks = await getTopicPartsLinks(contentId);
|
|
52
|
-
const contributors = await getContentContributors(contentId);
|
|
53
|
-
|
|
54
|
-
return {
|
|
55
|
-
type: 'topic',
|
|
56
|
-
topicId: contentId,
|
|
57
|
-
location,
|
|
58
|
-
toc,
|
|
59
|
-
nav: {
|
|
60
|
-
...previousNext,
|
|
61
|
-
...topicPartsLinks,
|
|
62
|
-
},
|
|
63
|
-
contributors,
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
async function createContentData(
|
|
68
|
-
type: string,
|
|
69
|
-
path: string,
|
|
70
|
-
): Promise<AsideMinorContent> {
|
|
71
|
-
const rawContentId = path.split('/').slice(1).join('/');
|
|
72
|
-
const contentId = getFullContentId(rawContentId);
|
|
73
|
-
const previousNext = await getPreviousNext(contentId);
|
|
74
|
-
const contributors = await getContentContributors(contentId);
|
|
75
|
-
|
|
76
|
-
return {
|
|
77
|
-
type: type as any,
|
|
78
|
-
contentId,
|
|
79
|
-
nav: previousNext,
|
|
80
|
-
contributors,
|
|
81
|
-
};
|
|
82
|
-
}
|