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

Vuepress v2 #279

Draft
wants to merge 31 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7e8f28f
weather.md: update for recent changes (#230)
crazyscot Jan 29, 2024
154a843
add updates feature configuration (#234)
bugsounet Mar 23, 2024
a78bd1f
Update calendar.md (#236)
bugsounet Mar 23, 2024
2ce3c94
updateOnFetch feature Docs (#235)
bugsounet Mar 23, 2024
4e451f8
Minor changes (#238)
KristjanESPERANTO Mar 30, 2024
43103c3
Merge branch 'mm-master' into mm-develop
rejas Apr 2, 2024
942936f
Merge branch 'mm-master' into mm-develop
rejas Jul 3, 2024
6b6eb2d
Update compliments docs page (#242)
WallysWellies Jul 3, 2024
87ff347
Cleanup formatting (#247)
rejas Jul 3, 2024
f642eb1
Merge branch 'mm-master' into mm-develop
rejas Jul 3, 2024
61f70b7
UK Met Office Documentation Fix (#253)
jargordon Jul 8, 2024
89b6259
Merge branch 'master' into develop
khassel Jul 11, 2024
085392a
add doc for new compliments(#3481) and support custom positions (#351…
sdetweil Aug 4, 2024
6f61f0c
update compliments, and module position info (#255)
sdetweil Aug 31, 2024
ff262af
Merge branch 'mm-master' into mm-develop
rejas Sep 10, 2024
73fae2b
Added docs for new notification `MODULE_DOM_UPDATED` (#262)
ryan-d-williams Sep 19, 2024
eac07b0
Merge branch 'master' into develop
khassel Sep 30, 2024
3f661a4
Update Windows section and add Wayland section (#265)
KristjanESPERANTO Oct 25, 2024
1d53e8d
add clarification for nextDaysRelative and showEndsOnlyWithDuration, …
sdetweil Oct 27, 2024
eff6c0d
electron-rebuild -> @electron/rebuild (#271)
KristjanESPERANTO Nov 9, 2024
57499ae
update doc for #3630 (#273)
sdetweil Nov 12, 2024
d547306
Merge branch 'mm_master' into mm_develop
Dec 11, 2024
9f756ef
fix typos, add doc for calendar FullDateEnd format usage, add new env…
sdetweil Dec 30, 2024
98e9f94
Merge branch 'master' into develop
rejas Dec 30, 2024
90da8ee
Merge branch 'mm_master' into mm_develop
Jan 1, 2025
8567162
prepare release 2.31.0
Jan 1, 2025
a107053
Upgrade to Vuepress2 (#214)
rejas Jan 1, 2025
4f01306
Merge branch 'master' into develop
Jan 8, 2025
cbbe318
fix and update dependencies
Jan 8, 2025
5c0f8bb
update package-lock.json
khassel Jan 8, 2025
f22acb3
Merge branch 'mm_master' into mm_develop
Jan 9, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.DS_Store
.idea/
node_modules/

.vuepress/.cache
.vuepress/.temp
.vuepress/dist
1 change: 0 additions & 1 deletion .vuepress/.gitignore

This file was deleted.

8 changes: 8 additions & 0 deletions .vuepress/client.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { defineClientConfig } from 'vuepress/client';
import Layout from './layouts/Layout.vue';

export default defineClientConfig({
layouts: {
Layout,
},
})
80 changes: 80 additions & 0 deletions .vuepress/components/CarbonAds.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<script>
import {h} from 'vue';

export default {
watch: {
'$route'(to, from) {
if (
to.path !== from.path
// Only reload if the ad has been loaded
// otherwise it's possible that the script is appended but
// the ads are not loaded yet. This would result in duplicated ads.
&& this.$el.querySelector('#carbonads')
) {
this.$el.innerHTML = '';
this.load();
}
},
},
mounted() {
this.load();
},
methods: {
load() {
const s = document.createElement('script');
s.id = '_carbonads_js';
s.src = `//cdn.carbonads.com/carbon.js?serve=CK7IC23N&placement=magicmirror`;
this.$el.appendChild(s);
},
},
render() {
return h('div', {class: 'carbon-ads'});
},
};
</script>

<style lang="scss">
.sidebar {
.carbon-ads {
a {
display: block;
}
}
}
.carbon-ads {
min-height: 130px;
padding: 1.5rem 1.5rem 0;
margin-bottom: -0.5rem;
font-size: 0.75rem;
border-bottom: 1px solid var(--c-border);
a {
color: #444;
font-weight: normal;
display: inline;
}
.carbon-img {
float: left;
margin-right: 1rem;
border: 1px solid var(--c-border);
img {
display: block;
}
}
.carbon-poweredby {
color: #999;
display: block;
margin-top: 0.5em;
}
}
.dark {
a.carbon-text {
color: var(--c-text-light);
}
}
@media (max-width: 719px) {
.carbon-ads .carbon-img img {
width: 100px;
height: 77px;
}
}
</style>
139 changes: 69 additions & 70 deletions .vuepress/config.js
Original file line number Diff line number Diff line change
@@ -1,96 +1,94 @@
module.exports = {
title: "MagicMirror² Documentation",
import { defaultTheme } from '@vuepress/theme-default';
import { googleAnalyticsPlugin } from '@vuepress/plugin-google-analytics';
import { docsearchPlugin } from '@vuepress/plugin-docsearch';
import { viteBundler } from '@vuepress/bundler-vite';

export default {
title: "MagicMirror² Docs",
description: "The open source modular smart mirror platform.",
themeConfig: {
// logo: '/mm.png',
algolia: {
appId: "U3QOOOGLZR",
apiKey: "96d207343bbb5e45068a1e3c8d141bb4",
indexName: "docs-magicmirror-builders",
},
nav: [
bundler: viteBundler({}),
theme: defaultTheme({
contributors: false,
docsRepo: "MagicMirrorOrg/MagicMirror-Documentation",
docsBranch: "master",
editLinkText: "Help us improve this page!",
logo: 'logo.png',
navbar: [
{ text: "Donate", link: "https://magicmirror.builders/donate" },
{ text: "Forum", link: "https://forum.magicmirror.builders" },
],
repo: "MagicMirrorOrg/MagicMirror",
repoLabel: "GitHub",
sidebar: [
{
title: "Getting Started",
collapsable: true,
text: "Getting Started",
collapsible: true,
children: [
"/",
"getting-started/requirements",
"getting-started/installation",
"getting-started/upgrade-guide",
"/getting-started/requirements.md",
"/getting-started/installation.md",
"/getting-started/upgrade-guide",
],
},
{
title: "Configuration",
collapsable: true,
text: "Configuration",
collapsible: true,
children: [
"configuration/introduction",
"configuration/autostart",
"configuration/raspberry",
"/configuration/introduction",
"/configuration/autostart",
"/configuration/raspberry",
],
},
{
title: "Modules",
collapsable: true,
text: "Modules",
collapsible: true,
children: [
"modules/introduction",
"modules/configuration",
"/modules/introduction",
"/modules/configuration",
{
title: "Default Modules",
collapsable: false,
text: "Default Modules",
collapsible: false,
children: [
"modules/alert",
"modules/calendar",
"modules/clock",
"modules/compliments",
"modules/helloworld",
"modules/newsfeed",
"modules/updatenotification",
"modules/weather",
"/modules/alert",
"/modules/calendar",
"/modules/clock",
"/modules/compliments",
"/modules/helloworld",
"/modules/newsfeed",
"/modules/updatenotification",
"/modules/weather",
],
},
"modules/customcss",
"modules/animate"
"/modules/animate"
],
},
{
title: "Module Development",
collapsable: true,
text: "Module Development",
collapsible: true,
children: [
"development/introduction.md",
"development/core-module-file.md",
"development/node-helper.md",
"development/helper-methods.md",
"development/logger.md",
"development/notifications.md",
"development/weather-provider.md",
"development/documentation.md",
"/development/introduction.md",
"/development/core-module-file.md",
"/development/node-helper.md",
"/development/helper-methods.md",
"/development/logger.md",
"/development/notifications.md",
"/development/weather-provider.md",
"/development/documentation.md",
],
},
{
title: "About",
collapsable: true,
text: "About",
collapsible: true,
children: [
"about/manifesto",
"about/contributing",
"about/donate",
"about/support",
"about/LICENSE",
"/about/manifesto",
"/about/contributing",
"/about/donate",
"/about/support",
"/about/LICENSE",
],
},
],
repo: "MagicMirrorOrg/MagicMirror",
repoLabel: "GitHub",

docsRepo: "MagicMirrorOrg/MagicMirror-Documentation",
docsBranch: "master",
editLinks: true,
editLinkText: "Help us improve this page!",
lastUpdated: "Updated",
},
}),
markdown: {
toc: { includeLevel: [2, 3, 4] },
},
Expand All @@ -100,13 +98,14 @@ module.exports = {
},
},
plugins: [
["@vuepress/back-to-top"],
['check-md'],
[
"@vuepress/google-analytics",
{
ga: "UA-1219071-59", // UA-00000000-0
},
],
googleAnalyticsPlugin({
id: "UA-1219071-59",
}),
docsearchPlugin({
apiKey: "96d207343bbb5e45068a1e3c8d141bb4",
appId: "U3QOOOGLZR",
indexName: "docs-magicmirror-builders",
}),
],
};

13 changes: 13 additions & 0 deletions .vuepress/layouts/Layout.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script setup>
import ParentLayout from '@vuepress/theme-default/layouts/Layout.vue'
import CarbonAds from "../components/CarbonAds.vue";
</script>

<template>
<ParentLayout>
<template #sidebar-top>
<slot name="sidebar-top" />
<CarbonAds/>
</template>
</ParentLayout>
</template>
Binary file added .vuepress/public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions .vuepress/styles/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:root {
scroll-behavior: smooth;
}
20 changes: 0 additions & 20 deletions .vuepress/styles/palette.styl

This file was deleted.

67 changes: 0 additions & 67 deletions .vuepress/theme/components/CarbonAds.vue

This file was deleted.

Loading