Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation page improvements #50

Merged
merged 7 commits into from
Apr 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .github/app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 13 additions & 2 deletions frontend/components/doc/TableOfContents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const props = defineProps<{
text: string;
children: { id: string; text: string }[];
}> | null;
currentlyActiveId: string | null;
}>()

defineEmits<{(e: 'scrollToId', id: string): void }>()
Expand All @@ -20,15 +21,25 @@ defineEmits<{(e: 'scrollToId', id: string): void }>()
class="text-sm list-none"
>
<template v-if="text !== 'Table of contents'">
<a :href="`#${id}`" class="!text-neutral-800" @click="$emit('scrollToId', id)">{{ text }}</a>
<a
:href="`#${id}`"
class="!text-neutral-800"
:class="{'font-semibold': currentlyActiveId === id }"
@click="$emit('scrollToId', id)"
>{{ text }}</a>
<ul v-if="children" class="!p-0 ml-4 mt-1 mb-2 flex flex-col gap-2">
<li
v-for="{ id: childId, text: childText } in children"
:id="`toc-${childId}`"
:key="childId"
class="text-xs list-none ml-0 hover:underline"
>
<a :href="`#${childId}`" class="!text-neutral-700" @click="$emit('scrollToId', childId)">{{ childText }}</a>
<a
:href="`#${childId}`"
class="!text-neutral-700"
:class="{'font-semibold': currentlyActiveId === childId }"
@click="$emit('scrollToId', childId)"
>{{ childText }}</a>
</li>
</ul>
</template>
Expand Down
16 changes: 15 additions & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@
"vue-tsc": "^1.0.24"
},
"dependencies": {
"github-markdown-css": "^5.2.0",
"@vueuse/core": "^9.13.0",
"date-fns": "^2.29.3",
"github-markdown-css": "^5.2.0",
"jwt-decode": "^3.1.2",
"nuxt-graphql-client": "^0.2.27"
"nuxt-graphql-client": "^0.2.27",
"scroll-into-view-if-needed": "^3.0.10"
}
}
71 changes: 56 additions & 15 deletions frontend/pages/documentation.vue
Original file line number Diff line number Diff line change
@@ -1,24 +1,65 @@
<script setup lang="ts">
const { data: blogPost } = await useAsyncData('blogToc', () =>
import scrollIntoView from 'scroll-into-view-if-needed'

const { data: documentation } = await useAsyncData('blogToc', () =>
queryContent('/documentation').findOne()
)

const tocLinks = computed(() => blogPost.value?.body.toc.links ?? [])
const currentlyActiveId = ref(null as string | null)
const content = ref<HTMLDivElement>()
const tocLinks = computed(() => documentation.value?.body.toc.links ?? [])

const scrollToId = function (id: string) {
const navigationElement = document.querySelector(`nav [href="#${id}"]`)
if (navigationElement) {
scrollIntoView(navigationElement, {
scrollMode: 'if-needed',
behavior: 'smooth',
block: 'center',
inline: 'start'
})
}
}

const trackCurrentlyActiveId = function () {
const observer = new IntersectionObserver((entries) => {
entries.forEach((entry) => {
if (entry.isIntersecting) {
const id = entry.target.getAttribute('id')
if (id) {
currentlyActiveId.value = id
scrollToId(id)
}
}
})
}, {
root: document,
rootMargin: '0px 0px -90%',
threshold: 0
})
document
.querySelectorAll('.markdown-body h2[id], .markdown-body h3[id]')
.forEach((section) => {
observer.observe(section)
})
}

onMounted(trackCurrentlyActiveId)

useHead({
title: 'Makerdao Document Model Documentation'
})
</script>

<template>
<div class="w-full max-w-screen-2xl m-auto">
<ContentDoc path="/documentation" class="w-full">
<template #default="{doc}">
<div class="flex flex-row w-full px-4">
<div class="flex-shrink-0 w-56 py-3 hidden md:block h-screen overflow-x-scroll sticky top-14">
<DocTableOfContents :toc-links="tocLinks" class="pb-14" />
</div>
<div class="flex-grow w-[calc(100%-28rem)] p-4 pt-2 mt-4 bg-white w-full">
<ContentRenderer :value="doc" class="markdown-body w-full" />
</div>
</div>
</template>
</ContentDoc>
<div ref="content" class="w-full max-w-screen-2xl m-auto">
<div class="flex flex-row w-full px-4">
<div class="flex-shrink-0 w-56 py-3 hidden md:block h-screen overflow-x-scroll sticky top-14">
<DocTableOfContents :toc-links="tocLinks" :currently-active-id="currentlyActiveId" class="pb-14" />
</div>
<div class="flex-grow !w-[calc(100%-18rem)] p-4 pt-2 mt-4 bg-white w-full">
<ContentRendererMarkdown v-if="documentation" :value="documentation" class="markdown-body w-full" />
</div>
</div>
</div>
</template>
2 changes: 1 addition & 1 deletion frontend/pages/user/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
<div class="w-full bg-white p-5 pt-4">
<div class="mb-2 font-semibold">
Existing tokens3
Existing tokens
</div>
<AuthSessionTable
:sessions="sessions"
Expand Down