From f655b54937fd9815f37acf48bb9e57b227d7ff0c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 15 Nov 2020 13:42:04 +0900
Subject: Improve Pages

Resolve #6654
---
 src/client/components/page-preview.vue    |  9 ++-----
 src/client/components/page/page.block.vue |  3 ++-
 src/client/components/page/page.note.vue  | 39 +++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 src/client/components/page/page.note.vue

(limited to 'src/client/components')

diff --git a/src/client/components/page-preview.vue b/src/client/components/page-preview.vue
index 95ed8d0e38..d59813e00d 100644
--- a/src/client/components/page-preview.vue
+++ b/src/client/components/page-preview.vue
@@ -1,5 +1,5 @@
 <template>
-<MkA :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj" tabindex="-1">
+<MkA :to="`/@${page.user.username}/pages/${page.name}`" class="vhpxefrj _panel" tabindex="-1">
 	<div class="thumbnail" v-if="page.eyeCatchingImage" :style="`background-image: url('${page.eyeCatchingImage.thumbnailUrl}')`"></div>
 	<article>
 		<header>
@@ -35,16 +35,11 @@ export default defineComponent({
 <style lang="scss" scoped>
 .vhpxefrj {
 	display: block;
-	overflow: hidden;
 	width: 100%;
-	border: solid var(--lineWidth) var(--urlPreviewBorder);
-	border-radius: 4px;
-	overflow: hidden;
-	border: 1px solid var(--divider);
 
 	&:hover {
 		text-decoration: none;
-		border-color: var(--urlPreviewBorderHover);
+		color: var(--accent);
 	}
 
 	> .thumbnail {
diff --git a/src/client/components/page/page.block.vue b/src/client/components/page/page.block.vue
index 412c91ee0d..be933c8623 100644
--- a/src/client/components/page/page.block.vue
+++ b/src/client/components/page/page.block.vue
@@ -18,10 +18,11 @@ import XPost from './page.post.vue';
 import XCounter from './page.counter.vue';
 import XRadioButton from './page.radio-button.vue';
 import XCanvas from './page.canvas.vue';
+import XNote from './page.note.vue';
 
 export default defineComponent({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton, XCanvas
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton, XCanvas, XNote
 	},
 	props: {
 		value: {
diff --git a/src/client/components/page/page.note.vue b/src/client/components/page/page.note.vue
new file mode 100644
index 0000000000..4f1df77675
--- /dev/null
+++ b/src/client/components/page/page.note.vue
@@ -0,0 +1,39 @@
+<template>
+<div class="voxdxuby">
+	<XNote v-if="note" v-model:note="note" :key="note.id"/>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import XNote from '@/components/note.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		XNote
+	},
+	props: {
+		value: {
+			required: true
+		},
+		hpml: {
+			required: true
+		}
+	},
+	data() {
+		return {
+			note: null,
+		};
+	},
+	async mounted() {
+		this.note = await os.api('notes/show', { noteId: this.value.note });
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.voxdxuby {
+	margin: 1em 0;
+}
+</style>
-- 
cgit v1.2.3-freya