From bd8d7c3d0f1bb831f26a75a6107e34a85a1bc804 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 7 Jul 2019 06:56:13 +0900
Subject: Improve Page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ページをピン留めできるように
* デッキでカラム内でページを見れるように
---
 .../common/views/components/page/page.block.vue    |  40 ++++
 .../common/views/components/page/page.button.vue   |  55 +++++
 .../common/views/components/page/page.counter.vue  |  47 +++++
 .../app/common/views/components/page/page.if.vue   |  30 +++
 .../common/views/components/page/page.image.vue    |  36 ++++
 .../views/components/page/page.number-input.vue    |  41 ++++
 .../app/common/views/components/page/page.post.vue |  68 +++++++
 .../common/views/components/page/page.section.vue  |  55 +++++
 .../common/views/components/page/page.switch.vue   |  43 ++++
 .../views/components/page/page.text-input.vue      |  41 ++++
 .../app/common/views/components/page/page.text.vue |  62 ++++++
 .../views/components/page/page.textarea-input.vue  |  36 ++++
 .../common/views/components/page/page.textarea.vue |  33 +++
 .../app/common/views/components/page/page.vue      | 218 ++++++++++++++++++++
 .../app/common/views/deck/deck.page-column.vue     |  69 +++++++
 .../common/views/deck/deck.user-column.home.vue    |   7 +
 .../common/views/pages/page-editor/page-editor.vue |   6 +
 src/client/app/common/views/pages/page.vue         |  63 ++++++
 .../app/common/views/pages/page/page.block.vue     |  40 ----
 .../app/common/views/pages/page/page.button.vue    |  55 -----
 .../app/common/views/pages/page/page.counter.vue   |  47 -----
 src/client/app/common/views/pages/page/page.if.vue |  30 ---
 .../app/common/views/pages/page/page.image.vue     |  36 ----
 .../common/views/pages/page/page.number-input.vue  |  41 ----
 .../app/common/views/pages/page/page.post.vue      |  68 -------
 .../app/common/views/pages/page/page.section.vue   |  55 -----
 .../app/common/views/pages/page/page.switch.vue    |  43 ----
 .../common/views/pages/page/page.text-input.vue    |  41 ----
 .../app/common/views/pages/page/page.text.vue      |  62 ------
 .../views/pages/page/page.textarea-input.vue       |  36 ----
 .../app/common/views/pages/page/page.textarea.vue  |  33 ---
 src/client/app/common/views/pages/page/page.vue    | 224 ---------------------
 src/client/app/desktop/script.ts                   |   4 +-
 .../app/desktop/views/home/user/user.home.vue      |   5 +-
 src/client/app/mobile/script.ts                    |   3 +-
 src/client/app/mobile/views/pages/user/home.vue    |   8 +
 36 files changed, 966 insertions(+), 815 deletions(-)
 create mode 100644 src/client/app/common/views/components/page/page.block.vue
 create mode 100644 src/client/app/common/views/components/page/page.button.vue
 create mode 100644 src/client/app/common/views/components/page/page.counter.vue
 create mode 100644 src/client/app/common/views/components/page/page.if.vue
 create mode 100644 src/client/app/common/views/components/page/page.image.vue
 create mode 100644 src/client/app/common/views/components/page/page.number-input.vue
 create mode 100644 src/client/app/common/views/components/page/page.post.vue
 create mode 100644 src/client/app/common/views/components/page/page.section.vue
 create mode 100644 src/client/app/common/views/components/page/page.switch.vue
 create mode 100644 src/client/app/common/views/components/page/page.text-input.vue
 create mode 100644 src/client/app/common/views/components/page/page.text.vue
 create mode 100644 src/client/app/common/views/components/page/page.textarea-input.vue
 create mode 100644 src/client/app/common/views/components/page/page.textarea.vue
 create mode 100644 src/client/app/common/views/components/page/page.vue
 create mode 100644 src/client/app/common/views/deck/deck.page-column.vue
 create mode 100644 src/client/app/common/views/pages/page.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.block.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.button.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.counter.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.if.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.image.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.number-input.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.post.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.section.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.switch.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.text-input.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.text.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.textarea-input.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.textarea.vue
 delete mode 100644 src/client/app/common/views/pages/page/page.vue

(limited to 'src/client')

diff --git a/src/client/app/common/views/components/page/page.block.vue b/src/client/app/common/views/components/page/page.block.vue
new file mode 100644
index 0000000000..1c421fc2c0
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.block.vue
@@ -0,0 +1,40 @@
+<template>
+<component :is="'x-' + value.type" :value="value" :page="page" :script="script" :key="value.id" :h="h"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import XText from './page.text.vue';
+import XSection from './page.section.vue';
+import XImage from './page.image.vue';
+import XButton from './page.button.vue';
+import XNumberInput from './page.number-input.vue';
+import XTextInput from './page.text-input.vue';
+import XTextareaInput from './page.textarea-input.vue';
+import XSwitch from './page.switch.vue';
+import XIf from './page.if.vue';
+import XTextarea from './page.textarea.vue';
+import XPost from './page.post.vue';
+import XCounter from './page.counter.vue';
+
+export default Vue.extend({
+	components: {
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+		h: {
+			required: true
+		}
+	},
+});
+</script>
diff --git a/src/client/app/common/views/components/page/page.button.vue b/src/client/app/common/views/components/page/page.button.vue
new file mode 100644
index 0000000000..87112aca0d
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.button.vue
@@ -0,0 +1,55 @@
+<template>
+<div>
+	<ui-button class="kudkigyw" @click="click()" :primary="value.primary">{{ script.interpolate(value.text) }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	methods: {
+		click() {
+			if (this.value.action === 'dialog') {
+				this.script.eval();
+				this.$root.dialog({
+					text: this.script.interpolate(this.value.content)
+				});
+			} else if (this.value.action === 'resetRandom') {
+				this.script.aiScript.updateRandomSeed(Math.random());
+				this.script.eval();
+			} else if (this.value.action === 'pushEvent') {
+				this.$root.api('page-push', {
+					pageId: this.script.page.id,
+					event: this.value.event,
+					...(this.value.var ? {
+						var: this.script.vars[this.value.var]
+					} : {})
+				});
+
+				this.$root.dialog({
+					type: 'success',
+					text: this.script.interpolate(this.value.message)
+				});
+			}
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kudkigyw
+	display inline-block
+	min-width 200px
+	max-width 450px
+	margin 8px 0
+</style>
diff --git a/src/client/app/common/views/components/page/page.counter.vue b/src/client/app/common/views/components/page/page.counter.vue
new file mode 100644
index 0000000000..8d55319fe9
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.counter.vue
@@ -0,0 +1,47 @@
+<template>
+<div>
+	<ui-button class="llumlmnx" @click="click()">{{ script.interpolate(value.text) }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: 0,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	},
+
+	methods: {
+		click() {
+			this.v = this.v + (this.value.inc || 1);
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.llumlmnx
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>
diff --git a/src/client/app/common/views/components/page/page.if.vue b/src/client/app/common/views/components/page/page.if.vue
new file mode 100644
index 0000000000..417ef0c553
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.if.vue
@@ -0,0 +1,30 @@
+<template>
+<div v-show="script.vars[value.var]">
+	<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+		h: {
+			required: true
+		}
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlock = require('./page.block.vue').default
+	},
+});
+</script>
diff --git a/src/client/app/common/views/components/page/page.image.vue b/src/client/app/common/views/components/page/page.image.vue
new file mode 100644
index 0000000000..1285445eb0
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.image.vue
@@ -0,0 +1,36 @@
+<template>
+<div class="lzyxtsnt">
+	<img v-if="image" :src="image.url"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			image: null,
+		};
+	},
+
+	created() {
+		this.image = this.page.attachedFiles.find(x => x.id === this.value.fileId);
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.lzyxtsnt
+	> img
+		max-width 100%
+</style>
diff --git a/src/client/app/common/views/components/page/page.number-input.vue b/src/client/app/common/views/components/page/page.number-input.vue
new file mode 100644
index 0000000000..31da37330a
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.number-input.vue
@@ -0,0 +1,41 @@
+<template>
+<div>
+	<ui-input class="kudkigyw" v-model="v" type="number">{{ script.interpolate(value.text) }}</ui-input>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kudkigyw
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>
diff --git a/src/client/app/common/views/components/page/page.post.vue b/src/client/app/common/views/components/page/page.post.vue
new file mode 100644
index 0000000000..cb695e21e9
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.post.vue
@@ -0,0 +1,68 @@
+<template>
+<div class="ngbfujlo">
+	<ui-textarea class="textarea" :value="text" readonly></ui-textarea>
+	<ui-button primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted-from-post-form') : $t('post-from-post-form') }}</ui-button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			text: this.script.interpolate(this.value.text),
+			posted: false,
+			posting: false,
+		};
+	},
+
+	created() {
+		this.$watch('script.vars', () => {
+			this.text = this.script.interpolate(this.value.text);
+		}, { deep: true });
+	},
+
+	methods: {
+		post() {
+			this.posting = true;
+			this.$root.api('notes/create', {
+				text: this.text,
+			}).then(() => {
+				this.posted = true;
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.ngbfujlo
+	padding 0 32px 32px 32px
+	border solid 2px var(--pageBlockBorder)
+	border-radius 6px
+
+	@media (max-width 600px)
+		padding 0 16px 16px 16px
+
+		> .textarea
+			margin-top 16px
+			margin-bottom 16px
+
+</style>
diff --git a/src/client/app/common/views/components/page/page.section.vue b/src/client/app/common/views/components/page/page.section.vue
new file mode 100644
index 0000000000..03c009d9c3
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.section.vue
@@ -0,0 +1,55 @@
+<template>
+<section class="sdgxphyu">
+	<component :is="'h' + h">{{ value.title }}</component>
+
+	<div class="children">
+		<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h + 1"/>
+	</div>
+</section>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		},
+		page: {
+			required: true
+		},
+		h: {
+			required: true
+		}
+	},
+
+	beforeCreate() {
+		this.$options.components.XBlock = require('./page.block.vue').default
+	},
+});
+</script>
+
+<style lang="stylus" scoped>
+.sdgxphyu
+	margin 1.5em 0
+
+	> h2
+		font-size 1.35em
+		margin 0 0 0.5em 0
+
+	> h3
+		font-size 1em
+		margin 0 0 0.5em 0
+
+	> h4
+		font-size 1em
+		margin 0 0 0.5em 0
+
+	> .children
+		//padding 16px
+
+</style>
diff --git a/src/client/app/common/views/components/page/page.switch.vue b/src/client/app/common/views/components/page/page.switch.vue
new file mode 100644
index 0000000000..53695f1b36
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.switch.vue
@@ -0,0 +1,43 @@
+<template>
+<div class="hkcxmtwj">
+	<ui-switch v-model="v">{{ script.interpolate(value.text) }}</ui-switch>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.hkcxmtwj
+	display inline-block
+	margin 16px auto
+
+	& + .hkcxmtwj
+		margin-left 16px
+
+</style>
diff --git a/src/client/app/common/views/components/page/page.text-input.vue b/src/client/app/common/views/components/page/page.text-input.vue
new file mode 100644
index 0000000000..cf917dd5a8
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.text-input.vue
@@ -0,0 +1,41 @@
+<template>
+<div>
+	<ui-input class="kudkigyw" v-model="v" type="text">{{ script.interpolate(value.text) }}</ui-input>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.kudkigyw
+	display inline-block
+	min-width 300px
+	max-width 450px
+	margin 8px 0
+</style>
diff --git a/src/client/app/common/views/components/page/page.text.vue b/src/client/app/common/views/components/page/page.text.vue
new file mode 100644
index 0000000000..326fd39050
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.text.vue
@@ -0,0 +1,62 @@
+<template>
+<div class="mrdgzndn">
+	<mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
+
+	<mk-url-preview v-for="url in urls" :url="url" :key="url" class="url"/>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { parse } from '../../../../../../mfm/parse';
+import { unique } from '../../../../../../prelude/array';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			text: this.script.interpolate(this.value.text),
+		};
+	},
+
+	computed: {
+		urls(): string[] {
+			if (this.text) {
+				const ast = parse(this.text);
+				// TODO: 再帰的にURL要素がないか調べる
+				return unique(ast
+					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
+					.map(t => t.node.props.url));
+			} else {
+				return [];
+			}
+		}
+	},
+
+	created() {
+		this.$watch('script.vars', () => {
+			this.text = this.script.interpolate(this.value.text);
+		}, { deep: true });
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.mrdgzndn
+	&:not(:first-child)
+		margin-top 0.5em
+
+	&:not(:last-child)
+		margin-bottom 0.5em
+
+	> .url
+		margin 0.5em 0
+</style>
diff --git a/src/client/app/common/views/components/page/page.textarea-input.vue b/src/client/app/common/views/components/page/page.textarea-input.vue
new file mode 100644
index 0000000000..eece59fefb
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.textarea-input.vue
@@ -0,0 +1,36 @@
+<template>
+<div>
+	<ui-textarea class="" v-model="v">{{ script.interpolate(value.text) }}</ui-textarea>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/src/client/app/common/views/components/page/page.textarea.vue b/src/client/app/common/views/components/page/page.textarea.vue
new file mode 100644
index 0000000000..03c8542cb0
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.textarea.vue
@@ -0,0 +1,33 @@
+<template>
+<ui-textarea class="" :value="text" readonly></ui-textarea>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			text: this.script.interpolate(this.value.text),
+		};
+	},
+
+	created() {
+		this.$watch('script.vars', () => {
+			this.text = this.script.interpolate(this.value.text);
+		}, { deep: true });
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/src/client/app/common/views/components/page/page.vue b/src/client/app/common/views/components/page/page.vue
new file mode 100644
index 0000000000..99e627fd89
--- /dev/null
+++ b/src/client/app/common/views/components/page/page.vue
@@ -0,0 +1,218 @@
+<template>
+<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }">
+	<header v-if="showTitle">
+		<div class="title">{{ page.title }}</div>
+	</header>
+
+	<div v-if="script">
+		<x-block v-for="child in page.content" :value="child" @input="v => updateBlock(v)" :page="page" :script="script" :key="child.id" :h="2"/>
+	</div>
+
+	<footer v-if="showFooter">
+		<small>@{{ page.user.username }}</small>
+		<template v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId">
+			<router-link :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
+			<a v-if="$store.state.i.pinnedPageId === page.id" @click="pin(false)">{{ $t('unpin-this-page') }}</a>
+			<a v-else @click="pin(true)">{{ $t('pin-this-page') }}</a>
+		</template>
+		<router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link>
+		<div class="like">
+			<button @click="unlike()" v-if="page.isLiked" :title="$t('unlike')"><fa :icon="faHeartS"/></button>
+			<button @click="like()" v-else :title="$t('like')"><fa :icon="faHeart"/></button>
+			<span class="count" v-if="page.likedCount > 0">{{ page.likedCount }}</span>
+		</div>
+	</footer>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faHeart as faHeartS } from '@fortawesome/free-solid-svg-icons';
+import { faHeart } from '@fortawesome/free-regular-svg-icons';
+import XBlock from './page.block.vue';
+import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator';
+import { collectPageVars } from '../../../scripts/collect-page-vars';
+import { url } from '../../../../config';
+
+class Script {
+	public aiScript: ASEvaluator;
+	private onError: any;
+	public vars: Record<string, any>;
+	public page: Record<string, any>;
+
+	constructor(page, aiScript, onError) {
+		this.page = page;
+		this.aiScript = aiScript;
+		this.onError = onError;
+		this.eval();
+	}
+
+	public eval() {
+		try {
+			this.vars = this.aiScript.evaluateVars();
+		} catch (e) {
+			this.onError(e);
+		}
+	}
+
+	public interpolate(str: string) {
+		if (str == null) return null;
+		return str.replace(/{(.+?)}/g, match => {
+			const v = this.vars[match.slice(1, -1).trim()];
+			return v == null ? 'NULL' : v.toString();
+		});
+	}
+}
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XBlock
+	},
+
+	props: {
+		page: {
+			type: Object,
+			required: true
+		},
+		showTitle: {
+			type: Boolean,
+			required: false,
+			default: true
+		},
+		showFooter: {
+			type: Boolean,
+			required: false,
+			default: false
+		},
+	},
+
+	data() {
+		return {
+			script: null,
+			faHeartS, faHeart
+		};
+	},
+
+	created() {
+		const pageVars = this.getPageVars();
+		this.script = new Script(this.page, new ASEvaluator(this.page.variables, pageVars, {
+			randomSeed: Math.random(),
+			user: this.page.user,
+			visitor: this.$store.state.i,
+			page: this.page,
+			url: url
+		}), e => {
+			console.dir(e);
+		});
+	},
+
+	methods: {
+		getPageVars() {
+			return collectPageVars(this.page.content);
+		},
+
+		like() {
+			this.$root.api('pages/like', {
+				pageId: this.page.id,
+			}).then(() => {
+				this.page.isLiked = true;
+				this.page.likedCount++;
+			});
+		},
+
+		unlike() {
+			this.$root.api('pages/unlike', {
+				pageId: this.page.id,
+			}).then(() => {
+				this.page.isLiked = false;
+				this.page.likedCount--;
+			});
+		},
+
+		pin(pin) {
+			this.$root.api('i/update', {
+				pinnedPageId: pin ? this.page.id : null,
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+.iroscrza
+	overflow hidden
+	background var(--face)
+
+	&.center
+		text-align center
+
+	&.round
+		border-radius 6px
+
+	&.shadow
+		box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
+
+	> header
+		> .title
+			z-index 1
+			margin 0
+			padding 16px 32px
+			font-size 20px
+			font-weight bold
+			color var(--text)
+			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
+
+			@media (max-width 600px)
+				padding 16px 32px
+				font-size 20px
+
+			@media (max-width 400px)
+				padding 10px 20px
+				font-size 16px
+
+	> div
+		color var(--text)
+		padding 24px 32px
+		font-size 16px
+
+		@media (max-width 600px)
+			padding 24px 32px
+			font-size 16px
+
+		@media (max-width 400px)
+			padding 20px 20px
+			font-size 15px
+
+	> footer
+		color var(--text)
+		padding 0 32px 28px 32px
+
+		@media (max-width 600px)
+			padding 0 32px 28px 32px
+
+		@media (max-width 400px)
+			padding 0 20px 20px 20px
+			font-size 14px
+
+		> small
+			display block
+			opacity 0.5
+
+		> a
+			font-size 90%
+
+		> a + a
+			margin-left 8px
+
+		> .like
+			margin-top 16px
+
+</style>
diff --git a/src/client/app/common/views/deck/deck.page-column.vue b/src/client/app/common/views/deck/deck.page-column.vue
new file mode 100644
index 0000000000..0ef391a51d
--- /dev/null
+++ b/src/client/app/common/views/deck/deck.page-column.vue
@@ -0,0 +1,69 @@
+<template>
+<x-column>
+	<template #header>
+		<fa :icon="faStickyNote"/>{{ page ? page.name : '' }}
+	</template>
+
+	<div v-if="page">
+		<x-page :page="page" :key="page.id"/>
+	</div>
+</x-column>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../i18n';
+import XColumn from './deck.column.vue';
+import XPage from '../../../common/views/components/page/page.vue';
+
+export default Vue.extend({
+	i18n: i18n(),
+
+	components: {
+		XColumn,
+		XPage
+	},
+
+	props: {
+		pageName: {
+			type: String,
+			required: true
+		},
+		username: {
+			type: String,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			page: null,
+			faStickyNote
+		};
+	},
+
+	watch: {
+		$route: 'fetch'
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.username,
+			}).then(page => {
+				this.page = page;
+				this.$emit('init', {
+					title: this.page.title,
+					icon: faStickyNote
+				});
+			});
+		}
+	}
+});
+</script>
diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
index 56b117a7dd..9fb50a6672 100644
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -1,5 +1,11 @@
 <template>
 <div>
+	<ui-container v-if="user.pinnedPage" :body-togglable="true">
+		<template #header><fa icon="thumbtack"/> {{ $t('pinned-page') }}</template>
+		<div>
+			<x-page :page="user.pinnedPage" :key="user.pinnedPage.id" :show-title="!user.pinnedPage.hideTitleWhenPinned"/>
+		</div>
+	</ui-container>
 	<ui-container v-if="user.pinnedNotes && user.pinnedNotes.length > 0" :body-togglable="true">
 		<template #header><fa icon="thumbtack"/> {{ $t('pinned-notes') }}</template>
 		<div>
@@ -48,6 +54,7 @@ export default Vue.extend({
 
 	components: {
 		XNotes,
+		XPage: () => import('../../../common/views/components/page/page.vue').then(m => m.default),
 	},
 
 	props: {
diff --git a/src/client/app/common/views/pages/page-editor/page-editor.vue b/src/client/app/common/views/pages/page-editor/page-editor.vue
index ebe0f4688d..ade7d86991 100644
--- a/src/client/app/common/views/pages/page-editor/page-editor.vue
+++ b/src/client/app/common/views/pages/page-editor/page-editor.vue
@@ -35,6 +35,8 @@
 					<option value="sans-serif">{{ $t('fontSansSerif') }}</option>
 				</ui-select>
 
+				<ui-switch v-model="hideTitleWhenPinned">{{ $t('hide-title-when-pinned') }}</ui-switch>
+
 				<div class="eyeCatch">
 					<ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catching-image') }}</ui-button>
 					<div v-else-if="eyeCatchingImage">
@@ -140,6 +142,7 @@ export default Vue.extend({
 			font: 'sans-serif',
 			content: [],
 			alignCenter: false,
+			hideTitleWhenPinned: false,
 			variables: [],
 			aiScript: null,
 			showOptions: false,
@@ -192,6 +195,7 @@ export default Vue.extend({
 			this.currentName = this.page.name;
 			this.summary = this.page.summary;
 			this.font = this.page.font;
+			this.hideTitleWhenPinned = this.page.hideTitleWhenPinned;
 			this.alignCenter = this.page.alignCenter;
 			this.content = this.page.content;
 			this.variables = this.page.variables;
@@ -223,6 +227,7 @@ export default Vue.extend({
 					name: this.name.trim(),
 					summary: this.summary,
 					font: this.font,
+					hideTitleWhenPinned: this.hideTitleWhenPinned,
 					alignCenter: this.alignCenter,
 					content: this.content,
 					variables: this.variables,
@@ -240,6 +245,7 @@ export default Vue.extend({
 					name: this.name.trim(),
 					summary: this.summary,
 					font: this.font,
+					hideTitleWhenPinned: this.hideTitleWhenPinned,
 					alignCenter: this.alignCenter,
 					content: this.content,
 					variables: this.variables,
diff --git a/src/client/app/common/views/pages/page.vue b/src/client/app/common/views/pages/page.vue
new file mode 100644
index 0000000000..d1c4c2be43
--- /dev/null
+++ b/src/client/app/common/views/pages/page.vue
@@ -0,0 +1,63 @@
+<template>
+<x-page v-if="page" :page="page" :key="page.id" :show-footer="true"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XPage from '../components/page/page.vue';
+
+export default Vue.extend({
+	components: {
+		XPage
+	},
+
+	props: {
+		pageName: {
+			type: String,
+			required: true
+		},
+		username: {
+			type: String,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			page: null,
+		};
+	},
+
+	computed: {
+		path(): string {
+			return this.username + '/' + this.pageName;
+		}
+	},
+
+	watch: {
+		path() {
+			this.fetch();
+		}
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.username,
+			}).then(page => {
+				this.page = page;
+				this.$emit('init', {
+					title: this.page.title,
+					icon: faStickyNote
+				});
+			});
+		},
+	}
+});
+</script>
diff --git a/src/client/app/common/views/pages/page/page.block.vue b/src/client/app/common/views/pages/page/page.block.vue
deleted file mode 100644
index 1c421fc2c0..0000000000
--- a/src/client/app/common/views/pages/page/page.block.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-<component :is="'x-' + value.type" :value="value" :page="page" :script="script" :key="value.id" :h="h"/>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import XText from './page.text.vue';
-import XSection from './page.section.vue';
-import XImage from './page.image.vue';
-import XButton from './page.button.vue';
-import XNumberInput from './page.number-input.vue';
-import XTextInput from './page.text-input.vue';
-import XTextareaInput from './page.textarea-input.vue';
-import XSwitch from './page.switch.vue';
-import XIf from './page.if.vue';
-import XTextarea from './page.textarea.vue';
-import XPost from './page.post.vue';
-import XCounter from './page.counter.vue';
-
-export default Vue.extend({
-	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
-	},
-
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		},
-		page: {
-			required: true
-		},
-		h: {
-			required: true
-		}
-	},
-});
-</script>
diff --git a/src/client/app/common/views/pages/page/page.button.vue b/src/client/app/common/views/pages/page/page.button.vue
deleted file mode 100644
index 4dc6570019..0000000000
--- a/src/client/app/common/views/pages/page/page.button.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-<div>
-	<ui-button class="kudkigyw" @click="click()" :primary="value.primary">{{ script.interpolate(value.text) }}</ui-button>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	methods: {
-		click() {
-			if (this.value.action === 'dialog') {
-				this.script.eval();
-				this.$root.dialog({
-					text: this.script.interpolate(this.value.content)
-				});
-			} else if (this.value.action === 'resetRandom') {
-				this.script.aiScript.updateRandomSeed(Math.random());
-				this.script.eval();
-			} else if (this.value.action === 'pushEvent') {
-				this.$root.api('page-push', {
-					pageId: this.script.page.id,
-					event: this.value.event,
-					...(this.value.var ? {
-						var: this.script.vars[this.value.var]
-					} : {})
-				});
-
-				this.$root.dialog({
-					type: 'success',
-					text: this.script.interpolate(this.value.message)
-				});
-			}
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.kudkigyw
-	display inline-block
-	min-width 300px
-	max-width 450px
-	margin 8px 0
-</style>
diff --git a/src/client/app/common/views/pages/page/page.counter.vue b/src/client/app/common/views/pages/page/page.counter.vue
deleted file mode 100644
index 8d55319fe9..0000000000
--- a/src/client/app/common/views/pages/page/page.counter.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-<div>
-	<ui-button class="llumlmnx" @click="click()">{{ script.interpolate(value.text) }}</ui-button>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			v: 0,
-		};
-	},
-
-	watch: {
-		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
-			this.script.eval();
-		}
-	},
-
-	methods: {
-		click() {
-			this.v = this.v + (this.value.inc || 1);
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.llumlmnx
-	display inline-block
-	min-width 300px
-	max-width 450px
-	margin 8px 0
-</style>
diff --git a/src/client/app/common/views/pages/page/page.if.vue b/src/client/app/common/views/pages/page/page.if.vue
deleted file mode 100644
index 417ef0c553..0000000000
--- a/src/client/app/common/views/pages/page/page.if.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-<div v-show="script.vars[value.var]">
-	<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h"/>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		},
-		page: {
-			required: true
-		},
-		h: {
-			required: true
-		}
-	},
-
-	beforeCreate() {
-		this.$options.components.XBlock = require('./page.block.vue').default
-	},
-});
-</script>
diff --git a/src/client/app/common/views/pages/page/page.image.vue b/src/client/app/common/views/pages/page/page.image.vue
deleted file mode 100644
index 1285445eb0..0000000000
--- a/src/client/app/common/views/pages/page/page.image.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-<div class="lzyxtsnt">
-	<img v-if="image" :src="image.url"/>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		page: {
-			required: true
-		},
-	},
-
-	data() {
-		return {
-			image: null,
-		};
-	},
-
-	created() {
-		this.image = this.page.attachedFiles.find(x => x.id === this.value.fileId);
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.lzyxtsnt
-	> img
-		max-width 100%
-</style>
diff --git a/src/client/app/common/views/pages/page/page.number-input.vue b/src/client/app/common/views/pages/page/page.number-input.vue
deleted file mode 100644
index 31da37330a..0000000000
--- a/src/client/app/common/views/pages/page/page.number-input.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-<div>
-	<ui-input class="kudkigyw" v-model="v" type="number">{{ script.interpolate(value.text) }}</ui-input>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			v: this.value.default,
-		};
-	},
-
-	watch: {
-		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
-			this.script.eval();
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.kudkigyw
-	display inline-block
-	min-width 300px
-	max-width 450px
-	margin 8px 0
-</style>
diff --git a/src/client/app/common/views/pages/page/page.post.vue b/src/client/app/common/views/pages/page/page.post.vue
deleted file mode 100644
index cb695e21e9..0000000000
--- a/src/client/app/common/views/pages/page/page.post.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-<div class="ngbfujlo">
-	<ui-textarea class="textarea" :value="text" readonly></ui-textarea>
-	<ui-button primary @click="post()" :disabled="posting || posted">{{ posted ? $t('posted-from-post-form') : $t('post-from-post-form') }}</ui-button>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../../i18n';
-
-export default Vue.extend({
-	i18n: i18n('pages'),
-
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			text: this.script.interpolate(this.value.text),
-			posted: false,
-			posting: false,
-		};
-	},
-
-	created() {
-		this.$watch('script.vars', () => {
-			this.text = this.script.interpolate(this.value.text);
-		}, { deep: true });
-	},
-
-	methods: {
-		post() {
-			this.posting = true;
-			this.$root.api('notes/create', {
-				text: this.text,
-			}).then(() => {
-				this.posted = true;
-				this.$root.dialog({
-					type: 'success',
-					splash: true
-				});
-			});
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.ngbfujlo
-	padding 0 32px 32px 32px
-	border solid 2px var(--pageBlockBorder)
-	border-radius 6px
-
-	@media (max-width 600px)
-		padding 0 16px 16px 16px
-
-		> .textarea
-			margin-top 16px
-			margin-bottom 16px
-
-</style>
diff --git a/src/client/app/common/views/pages/page/page.section.vue b/src/client/app/common/views/pages/page/page.section.vue
deleted file mode 100644
index 03c009d9c3..0000000000
--- a/src/client/app/common/views/pages/page/page.section.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-<section class="sdgxphyu">
-	<component :is="'h' + h">{{ value.title }}</component>
-
-	<div class="children">
-		<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h + 1"/>
-	</div>
-</section>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		},
-		page: {
-			required: true
-		},
-		h: {
-			required: true
-		}
-	},
-
-	beforeCreate() {
-		this.$options.components.XBlock = require('./page.block.vue').default
-	},
-});
-</script>
-
-<style lang="stylus" scoped>
-.sdgxphyu
-	margin 1.5em 0
-
-	> h2
-		font-size 1.35em
-		margin 0 0 0.5em 0
-
-	> h3
-		font-size 1em
-		margin 0 0 0.5em 0
-
-	> h4
-		font-size 1em
-		margin 0 0 0.5em 0
-
-	> .children
-		//padding 16px
-
-</style>
diff --git a/src/client/app/common/views/pages/page/page.switch.vue b/src/client/app/common/views/pages/page/page.switch.vue
deleted file mode 100644
index 53695f1b36..0000000000
--- a/src/client/app/common/views/pages/page/page.switch.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-<div class="hkcxmtwj">
-	<ui-switch v-model="v">{{ script.interpolate(value.text) }}</ui-switch>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			v: this.value.default,
-		};
-	},
-
-	watch: {
-		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
-			this.script.eval();
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.hkcxmtwj
-	display inline-block
-	margin 16px auto
-
-	& + .hkcxmtwj
-		margin-left 16px
-
-</style>
diff --git a/src/client/app/common/views/pages/page/page.text-input.vue b/src/client/app/common/views/pages/page/page.text-input.vue
deleted file mode 100644
index cf917dd5a8..0000000000
--- a/src/client/app/common/views/pages/page/page.text-input.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-<div>
-	<ui-input class="kudkigyw" v-model="v" type="text">{{ script.interpolate(value.text) }}</ui-input>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			v: this.value.default,
-		};
-	},
-
-	watch: {
-		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
-			this.script.eval();
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.kudkigyw
-	display inline-block
-	min-width 300px
-	max-width 450px
-	margin 8px 0
-</style>
diff --git a/src/client/app/common/views/pages/page/page.text.vue b/src/client/app/common/views/pages/page/page.text.vue
deleted file mode 100644
index 326fd39050..0000000000
--- a/src/client/app/common/views/pages/page/page.text.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-<div class="mrdgzndn">
-	<mfm :text="text" :is-note="false" :i="$store.state.i" :key="text"/>
-
-	<mk-url-preview v-for="url in urls" :url="url" :key="url" class="url"/>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import { parse } from '../../../../../../mfm/parse';
-import { unique } from '../../../../../../prelude/array';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			text: this.script.interpolate(this.value.text),
-		};
-	},
-
-	computed: {
-		urls(): string[] {
-			if (this.text) {
-				const ast = parse(this.text);
-				// TODO: 再帰的にURL要素がないか調べる
-				return unique(ast
-					.filter(t => ((t.node.type == 'url' || t.node.type == 'link') && t.node.props.url && !t.node.props.silent))
-					.map(t => t.node.props.url));
-			} else {
-				return [];
-			}
-		}
-	},
-
-	created() {
-		this.$watch('script.vars', () => {
-			this.text = this.script.interpolate(this.value.text);
-		}, { deep: true });
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.mrdgzndn
-	&:not(:first-child)
-		margin-top 0.5em
-
-	&:not(:last-child)
-		margin-bottom 0.5em
-
-	> .url
-		margin 0.5em 0
-</style>
diff --git a/src/client/app/common/views/pages/page/page.textarea-input.vue b/src/client/app/common/views/pages/page/page.textarea-input.vue
deleted file mode 100644
index eece59fefb..0000000000
--- a/src/client/app/common/views/pages/page/page.textarea-input.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-<div>
-	<ui-textarea class="" v-model="v">{{ script.interpolate(value.text) }}</ui-textarea>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			v: this.value.default,
-		};
-	},
-
-	watch: {
-		v() {
-			this.script.aiScript.updatePageVar(this.value.name, this.v);
-			this.script.eval();
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-</style>
diff --git a/src/client/app/common/views/pages/page/page.textarea.vue b/src/client/app/common/views/pages/page/page.textarea.vue
deleted file mode 100644
index 03c8542cb0..0000000000
--- a/src/client/app/common/views/pages/page/page.textarea.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-<ui-textarea class="" :value="text" readonly></ui-textarea>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-
-export default Vue.extend({
-	props: {
-		value: {
-			required: true
-		},
-		script: {
-			required: true
-		}
-	},
-
-	data() {
-		return {
-			text: this.script.interpolate(this.value.text),
-		};
-	},
-
-	created() {
-		this.$watch('script.vars', () => {
-			this.text = this.script.interpolate(this.value.text);
-		}, { deep: true });
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-</style>
diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
deleted file mode 100644
index a93d5316d5..0000000000
--- a/src/client/app/common/views/pages/page/page.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-<div v-if="page" class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }" :key="path">
-	<header>
-		<div class="title">{{ page.title }}</div>
-	</header>
-
-	<div v-if="script">
-		<x-block v-for="child in page.content" :value="child" @input="v => updateBlock(v)" :page="page" :script="script" :key="child.id" :h="2"/>
-	</div>
-
-	<footer>
-		<small>@{{ page.user.username }}</small>
-		<router-link v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId" :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
-		<router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link>
-		<div class="like">
-			<button @click="unlike()" v-if="page.isLiked" :title="$t('unlike')"><fa :icon="faHeartS"/></button>
-			<button @click="like()" v-else :title="$t('like')"><fa :icon="faHeart"/></button>
-			<span class="count" v-if="page.likedCount > 0">{{ page.likedCount }}</span>
-		</div>
-	</footer>
-</div>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import i18n from '../../../../i18n';
-import { faHeart as faHeartS } from '@fortawesome/free-solid-svg-icons';
-import { faHeart, faStickyNote } from '@fortawesome/free-regular-svg-icons';
-import XBlock from './page.block.vue';
-import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator';
-import { collectPageVars } from '../../../scripts/collect-page-vars';
-import { url } from '../../../../config';
-
-class Script {
-	public aiScript: ASEvaluator;
-	private onError: any;
-	public vars: Record<string, any>;
-	public page: Record<string, any>;
-
-	constructor(page, aiScript, onError) {
-		this.page = page;
-		this.aiScript = aiScript;
-		this.onError = onError;
-		this.eval();
-	}
-
-	public eval() {
-		try {
-			this.vars = this.aiScript.evaluateVars();
-		} catch (e) {
-			this.onError(e);
-		}
-	}
-
-	public interpolate(str: string) {
-		if (str == null) return null;
-		return str.replace(/{(.+?)}/g, match => {
-			const v = this.vars[match.slice(1, -1).trim()];
-			return v == null ? 'NULL' : v.toString();
-		});
-	}
-}
-
-export default Vue.extend({
-	i18n: i18n('pages'),
-
-	components: {
-		XBlock
-	},
-
-	props: {
-		pageName: {
-			type: String,
-			required: true
-		},
-		username: {
-			type: String,
-			required: true
-		},
-	},
-
-	data() {
-		return {
-			page: null,
-			script: null,
-			faHeartS, faHeart
-		};
-	},
-
-	computed: {
-		path(): string {
-			return this.username + '/' + this.pageName;
-		}
-	},
-
-	watch: {
-		path() {
-			this.fetch();
-		}
-	},
-
-	created() {
-		this.fetch();
-	},
-
-	methods: {
-		fetch() {
-			this.$root.api('pages/show', {
-				name: this.pageName,
-				username: this.username,
-			}).then(page => {
-				this.page = page;
-				this.$emit('init', {
-					title: this.page.title,
-					icon: faStickyNote
-				});
-				const pageVars = this.getPageVars();
-				this.script = new Script(this.page, new ASEvaluator(this.page.variables, pageVars, {
-					randomSeed: Math.random(),
-					user: page.user,
-					visitor: this.$store.state.i,
-					page: page,
-					url: url
-				}), e => {
-					console.dir(e);
-				});
-			});
-		},
-
-		getPageVars() {
-			return collectPageVars(this.page.content);
-		},
-
-		like() {
-			this.$root.api('pages/like', {
-				pageId: this.page.id,
-			}).then(() => {
-				this.page.isLiked = true;
-				this.page.likedCount++;
-			});
-		},
-
-		unlike() {
-			this.$root.api('pages/unlike', {
-				pageId: this.page.id,
-			}).then(() => {
-				this.page.isLiked = false;
-				this.page.likedCount--;
-			});
-		}
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.iroscrza
-	overflow hidden
-	background var(--face)
-
-	&.center
-		text-align center
-
-	&.round
-		border-radius 6px
-
-	&.shadow
-		box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
-
-	> header
-		> .title
-			z-index 1
-			margin 0
-			padding 16px 32px
-			font-size 20px
-			font-weight bold
-			color var(--text)
-			box-shadow 0 var(--lineWidth) rgba(#000, 0.07)
-
-			@media (max-width 600px)
-				padding 16px 32px
-				font-size 20px
-
-			@media (max-width 400px)
-				padding 10px 20px
-				font-size 16px
-
-	> div
-		color var(--text)
-		padding 24px 32px
-		font-size 16px
-
-		@media (max-width 600px)
-			padding 24px 32px
-			font-size 16px
-
-		@media (max-width 400px)
-			padding 20px 20px
-			font-size 15px
-
-	> footer
-		color var(--text)
-		padding 0 32px 28px 32px
-
-		@media (max-width 600px)
-			padding 0 32px 28px 32px
-
-		@media (max-width 400px)
-			padding 0 20px 20px 20px
-			font-size 14px
-
-		> small
-			display block
-			opacity 0.5
-
-		> a
-			font-size 90%
-
-		> a + a
-			margin-left 8px
-
-		> .like
-			margin-top 16px
-
-</style>
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 8065241714..1a4be33020 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -148,6 +148,7 @@ init(async (launch, os) => {
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
 					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
+					{ path: '/@:username/pages/:pageName', name: 'page', props: true, component: () => import('../common/views/deck/deck.page-column.vue').then(m => m.default) },
 				]}
 				: { path: '/', component: MkHome, children: [
 					{ path: '', name: 'index', component: MkHomeTimeline },
@@ -171,12 +172,11 @@ init(async (launch, os) => {
 					{ path: '/i/follow-requests', component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) },
 					{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
 					{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
-					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
+					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
 					{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 				]},
 			{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
 			{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
-			{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
 			{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/i/messaging/group/:group', component: MkMessagingRoom },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
diff --git a/src/client/app/desktop/views/home/user/user.home.vue b/src/client/app/desktop/views/home/user/user.home.vue
index ec533efd3e..c47e0a0771 100644
--- a/src/client/app/desktop/views/home/user/user.home.vue
+++ b/src/client/app/desktop/views/home/user/user.home.vue
@@ -1,5 +1,6 @@
 <template>
 <div class="lnctpgve">
+	<x-page v-if="user.pinnedPage" :page="user.pinnedPage" :key="user.pinnedPage.id" :show-title="!user.pinnedPage.hideTitleWhenPinned"/>
 	<mk-note-detail v-for="n in user.pinnedNotes" :key="n.id" :note="n" :compact="true"/>
 	<!--<mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/>-->
 	<div class="activity">
@@ -21,13 +22,15 @@ import i18n from '../../../../i18n';
 import XTimeline from './user.timeline.vue';
 import XPhotos from './user.photos.vue';
 import XActivity from '../../../../common/views/components/activity.vue';
+import XPage from '../../../../common/views/components/page/page.vue';
 
 export default Vue.extend({
 	i18n: i18n(),
 	components: {
 		XTimeline,
 		XPhotos,
-		XActivity
+		XActivity,
+		XPage,
 	},
 	props: {
 		user: {
diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts
index d04662cc1f..6222409931 100644
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -129,6 +129,7 @@ init((launch, os) => {
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
 					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
+					{ path: '/@:username/pages/:pageName', name: 'page', props: true, component: () => import('../common/views/deck/deck.page-column.vue').then(m => m.default) },
 				]}]
 			: [
 				{ path: '/', name: 'index', component: MkIndex },
@@ -163,7 +164,7 @@ init((launch, os) => {
 				{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
 				{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
 			]},
-			{ path: '/@:user/pages/:page', component: UI, props: route => ({ component: () => import('../common/views/pages/page/page.vue').then(m => m.default), pageName: route.params.page, username: route.params.user }) },
+			{ path: '/@:user/pages/:page', component: UI, props: route => ({ component: () => import('../common/views/pages/page.vue').then(m => m.default), pageName: route.params.page, username: route.params.user }) },
 			{ path: '/@:user/pages/:pageName/view-source', component: UI, props: route => ({ component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/notes/:note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow },
diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue
index 1d7b0a4e6d..316b2a12fe 100644
--- a/src/client/app/mobile/views/pages/user/home.vue
+++ b/src/client/app/mobile/views/pages/user/home.vue
@@ -1,5 +1,6 @@
 <template>
 <div class="wojmldye">
+	<x-page class="page" v-if="user.pinnedPage" :page="user.pinnedPage" :key="user.pinnedPage.id" :show-title="!user.pinnedPage.hideTitleWhenPinned"/>
 	<mk-note-detail class="note" v-for="n in user.pinnedNotes" :key="n.id" :note="n" :compact="true"/>
 	<ui-container :body-togglable="true">
 		<template #header><fa :icon="['far', 'comments']"/>{{ $t('recent-notes') }}</template>
@@ -33,6 +34,7 @@ export default Vue.extend({
 	components: {
 		XNotes,
 		XPhotos,
+		XPage: () => import('../../../../common/views/components/page/page.vue').then(m => m.default),
 		XActivity: () => import('../../../../common/views/components/activity.vue').then(m => m.default)
 	},
 	props: ['user'],
@@ -53,6 +55,12 @@ export default Vue.extend({
 
 <style lang="stylus" scoped>
 .wojmldye
+	> .page
+		margin 0 0 8px 0
+
+		@media (min-width 500px)
+			margin 0 0 16px 0
+	
 	> .note
 		margin 0 0 8px 0
 
-- 
cgit v1.2.3-freya