diff --git a/src/App.vue b/src/App.vue index 4cb8741..4cef5f2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,20 +1,18 @@ - - + + + @@ -24,7 +22,4 @@ const isAuth = computed(() => !!authStore.token) .chat-fullscreen { height: 100vh; } -.message-shaped { - border-radius: 0 24px; -} diff --git a/src/components/ChatList.vue b/src/components/ChatList.vue index d9b26c2..a783271 100644 --- a/src/components/ChatList.vue +++ b/src/components/ChatList.vue @@ -1,27 +1,53 @@ - + Чаты - {{ chats }} - + {{ getChatName(chat) }} - 2 - 22:22 + 0 + 00:00 diff --git a/src/components/MessageData.vue b/src/components/MessageData.vue index 7bfd2f1..a68f5ea 100644 --- a/src/components/MessageData.vue +++ b/src/components/MessageData.vue @@ -2,8 +2,9 @@ import { computed } from 'vue' const props = withDefaults( - defineProps<{ createdAt?: string; username?: string; side?: 'right'; text?: string }>(), + defineProps<{ createdAt?: string; username?: string; my?: boolean; text?: string }>(), { + my: false, text: 'foobar', username: 'robot', }, @@ -34,19 +35,13 @@ const avatarLetter = computed(() => { - - - {{ avatarLetter }} - - + + + + + + + {{ props.text }} {{ createdAt }} diff --git a/src/components/MessageForm.vue b/src/components/MessageForm.vue index c5f3670..4ccd1ca 100644 --- a/src/components/MessageForm.vue +++ b/src/components/MessageForm.vue @@ -1,9 +1,43 @@ - + - + mdi-emoticon-outline @@ -12,14 +46,14 @@ - + mdi-paperclip - + mdi-send diff --git a/src/components/MessagesPane.vue b/src/components/MessagesPane.vue index 018165b..c16138b 100644 --- a/src/components/MessagesPane.vue +++ b/src/components/MessagesPane.vue @@ -2,6 +2,16 @@ import MessageToolbar from '@/components/MessageToolbar.vue' import MessageForm from '@/components/MessageForm.vue' import MessageData from '@/components/MessageData.vue' +import { useMessagesStore } from '@/stores/messages.ts' +import { useAuthStore } from '@/stores/auth.ts' +import { computed } from 'vue' + +const authStore = useAuthStore() +const messagesStore = useMessagesStore() + +const messages = computed(() => { + return [...messagesStore.messages] +}) @@ -14,8 +24,14 @@ import MessageData from '@/components/MessageData.vue' color="grey-lighten-3" class="flex-grow-1 d-flex flex-column overflow-hidden" > - - + + diff --git a/src/components/WebSocketComponent.vue b/src/components/WebSocketComponent.vue index 971f407..165e712 100644 --- a/src/components/WebSocketComponent.vue +++ b/src/components/WebSocketComponent.vue @@ -1,6 +1,5 @@ - + - - - error:{{ error }} - is connected:{{ isConnected }} - chats {{ chats }} + + diff --git a/src/views/LoginView.vue b/src/views/SignInView.vue similarity index 74% rename from src/views/LoginView.vue rename to src/views/SignInView.vue index deb96dc..c2306f6 100644 --- a/src/views/LoginView.vue +++ b/src/views/SignInView.vue @@ -6,18 +6,15 @@ const authStore = useAuthStore() const email = ref('vadim.olonin@gmail.com') async function onSubmit() { - console.log('onSubmit') await authStore.login(email.value) } - + - - - - + + Sign in @@ -27,11 +24,11 @@ async function onSubmit() { v-model="email" placeholder="email" type="email" - rounded="xl" + rounded="lg" /> - login + login diff --git a/vite.config.ts b/vite.config.ts index a243ff8..93807df 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -16,6 +16,7 @@ export default defineConfig({ }, }, server: { + host: '0.0.0.0', proxy: { '/login': 'http://localhost:3000', },