Skip to content

Commit

Permalink
feat: 优化文件结构、组件、布局
Browse files Browse the repository at this point in the history
  • Loading branch information
Chanzhaoyu committed Feb 13, 2023
1 parent 72df35c commit 39f718e
Show file tree
Hide file tree
Showing 15 changed files with 192 additions and 76 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"OPENAI",
"pinia",
"rushstack",
"Sider",
"tailwindcss",
"unplugin",
"VITE",
Expand Down
5 changes: 2 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<script setup lang="ts">
import { GithubSite, NaiveProvider } from '@/components'
import { NaiveProvider } from '@/components/common'
import Chat from '@/views/Chat/index.vue'
</script>

<template>
<NaiveProvider>
<div class="h-full overflow-hidden pb-[50px] p-4">
<div class="h-full p-4 overflow-hidden">
<Chat />
<GithubSite />
</div>
</NaiveProvider>
</template>
27 changes: 0 additions & 27 deletions src/components/NaiveProvider.vue

This file was deleted.

20 changes: 20 additions & 0 deletions src/components/common/HoverButton/Button.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<script setup lang='ts'>
interface Emit {
(e: 'click'): void
}
const emit = defineEmits<Emit>()
function handleClick() {
emit('click')
}
</script>

<template>
<button
class="flex items-center justify-center w-10 h-10 transition rounded-full hover:bg-neutral-100"
@click="handleClick"
>
<slot />
</button>
</template>
46 changes: 46 additions & 0 deletions src/components/common/HoverButton/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<script setup lang='ts'>
import { computed } from 'vue'
import type { PopoverPlacement } from 'naive-ui'
import { NTooltip } from 'naive-ui'
import Button from './Button.vue'
interface Props {
tooltip?: string
placement?: PopoverPlacement
}
interface Emit {
(e: 'click'): void
}
const props = withDefaults(defineProps<Props>(), {
tooltip: '',
placement: 'bottom',
})
const emit = defineEmits<Emit>()
const showTooltip = computed(() => Boolean(props.tooltip))
function handleClick() {
emit('click')
}
</script>

<template>
<div v-if="showTooltip">
<NTooltip :placement="placement" trigger="hover">
<template #trigger>
<Button @click="handleClick">
<slot />
</Button>
</template>
{{ tooltip }}
</NTooltip>
</div>
<div v-else>
<Button @click="handleClick">
<slot />
</Button>
</div>
</template>
46 changes: 46 additions & 0 deletions src/components/common/NaiveProvider.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<script setup lang="ts">
import { defineComponent, h } from 'vue'
import {
NConfigProvider,
NDialogProvider,
NLoadingBarProvider,
NMessageProvider,
NNotificationProvider,
useDialog,
useLoadingBar,
useMessage,
useNotification,
} from 'naive-ui'
function registerNaiveTools() {
window.$loadingBar = useLoadingBar()
window.$dialog = useDialog()
window.$message = useMessage()
window.$notification = useNotification()
}
const NaiveProviderContent = defineComponent({
name: 'NaiveProviderContent',
setup() {
registerNaiveTools()
},
render() {
return h('div')
},
})
</script>

<template>
<NConfigProvider class="h-full">
<NLoadingBarProvider>
<NDialogProvider>
<NNotificationProvider>
<NMessageProvider>
<slot />
<NaiveProviderContent />
</NMessageProvider>
</NNotificationProvider>
</NDialogProvider>
</NLoadingBarProvider>
</NConfigProvider>
</template>
File renamed without changes.
5 changes: 5 additions & 0 deletions src/components/common/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import HoverButton from './HoverButton/index.vue'
import NaiveProvider from './NaiveProvider.vue'
import SvgIcon from './SvgIcon.vue'

export { HoverButton, NaiveProvider, SvgIcon }
File renamed without changes.
3 changes: 3 additions & 0 deletions src/components/custom/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import GithubSite from './GithubSite.vue'

export { GithubSite }
5 changes: 0 additions & 5 deletions src/components/index.ts

This file was deleted.

3 changes: 3 additions & 0 deletions src/typings/global.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
interface Window {
$loadingBar?: import('naive-ui').LoadingBarProviderInst;
$dialog?: import('naive-ui').DialogProviderInst;
$message?: import('naive-ui').MessageProviderInst;
$notification?: import('naive-ui').NotificationProviderInst;
}
77 changes: 36 additions & 41 deletions src/views/Chat/index.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<script setup lang='ts'>
import { nextTick, onMounted, ref } from 'vue'
import { NButton, NInput, NPopover, useMessage } from 'naive-ui'
import { NButton, NInput, useMessage } from 'naive-ui'
import { Message } from './components'
import { clearChatContext, fetchChatAPI } from './request'
import { Icon } from '@/components'
import { Layout } from './layout'
import { HoverButton, SvgIcon } from '@/components/common'
interface ListProps {
dateTime: string
Expand Down Expand Up @@ -75,44 +76,38 @@ function addMessage(message: string, reversal = false) {
</script>

<template>
<div class="flex flex-col h-full overflow-hidden border rounded-md shadow-md">
<header class="flex items-center justify-between p-4">
<h1 class="text-xl font-bold">
ChatGPT Web
</h1>
<div>
<NPopover>
<template #trigger>
<button
class="w-[40px] h-[40px] rounded-full hover:bg-neutral-100 transition flex justify-center items-center"
@click="handleClear"
>
<Icon icon="ri:delete-bin-6-line" />
</button>
</template>
<span>Clear Context</span>
</NPopover>
</div>
</header>
<main class="flex-1 overflow-hidden border-y">
<div ref="scrollRef" class="h-full p-4 overflow-hidden overflow-y-auto">
<div>
<Message
v-for="(item, index) of list" :key="index" :date-time="item.dateTime" :message="item.message"
:reversal="item.reversal"
/>
<Layout>
<div class="flex flex-col h-full">
<header class="flex items-center justify-between p-4">
<h1 class="text-xl font-bold">
ChatGPT Web
</h1>
<div class="flex items-center space-x-4">
<HoverButton tooltip="Clear" @click="handleClear">
<SvgIcon icon="ri:delete-bin-6-line" />
</HoverButton>
</div>
</div>
</main>
<footer class="p-4">
<div class="flex items-center justify-between space-x-2">
<NInput v-model:value="prompt" placeholder="Type a message..." @keypress="handleEnter" />
<NButton type="primary" :loading="loading" @click="handleSubmit">
<template #icon>
<Icon icon="ri:send-plane-fill" />
</template>
</NButton>
</div>
</footer>
</div>
</header>
<main class="flex-1 overflow-hidden border-y">
<div ref="scrollRef" class="h-full p-4 overflow-hidden overflow-y-auto">
<div>
<Message
v-for="(item, index) of list" :key="index" :date-time="item.dateTime" :message="item.message"
:reversal="item.reversal"
/>
</div>
</div>
</main>
<footer class="p-4">
<div class="flex items-center justify-between space-x-2">
<NInput v-model:value="prompt" placeholder="Type a message..." @keypress="handleEnter" />
<NButton type="primary" :loading="loading" @click="handleSubmit">
<template #icon>
<SvgIcon icon="ri:send-plane-fill" />
</template>
</NButton>
</div>
</footer>
</div>
</Layout>
</template>
27 changes: 27 additions & 0 deletions src/views/Chat/layout/Layout.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<script setup lang='ts'>
import { NLayout, NLayoutContent, NLayoutSider } from 'naive-ui'
</script>

<template>
<div class="h-full overflow-hidden border rounded-md shadow-md">
<NLayout class="h-full" has-sider>
<NLayoutSider
collapse-mode="width"
:collapsed-width="120"
:width="240"
show-trigger="arrow-circle"
class="p-4"
bordered
>
<span>Sider</span>
</NLayoutSider>
<NLayoutContent class="h-full">
<slot />
</NLayoutContent>
</NLayout>
</div>
</template>

<style>
</style>
3 changes: 3 additions & 0 deletions src/views/Chat/layout/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Layout from './Layout.vue'

export { Layout }

0 comments on commit 39f718e

Please sign in to comment.