diff --git a/.prettierrc b/.prettierrc index 4f7ca55..ec0bc5a 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "tabWidth": 4, "useTabs": true, - "semi": false + "semi": false, + "printWidth": 100 } diff --git a/src/assets/base.css b/src/assets/base.css index 276a83f..eb31a78 100644 --- a/src/assets/base.css +++ b/src/assets/base.css @@ -1,4 +1,43 @@ +:root { + --color-primary: #1C1F32; + --color-secondary: #FDFEBA; + + --color-neutral-dark: #212121; + --color-neutral-light: #6b6b6b; +} + +* { + box-sizing: border-box; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; +} + body { margin: 0; box-sizing: border-box; -} \ No newline at end of file + + background-color: var(--color-primary); +} + +.button-primary, +.button-secondary, +input[type="text"] { + padding: 16px; + + border: none; + border-radius: 16px; + outline: none; + + color: var(--color-neutral-dark); + background-color: var(--color-secondary); + + font-weight: 700; + + cursor: pointer; +} + +.button-secondary, +input[type="text"] { + border: solid 2px var(--color-secondary); + color: var(--color-secondary); + background-color: var(--color-primary); +} diff --git a/src/components/nicknameSelection.vue b/src/components/nicknameSelection.vue index 59c7ffa..c459287 100644 --- a/src/components/nicknameSelection.vue +++ b/src/components/nicknameSelection.vue @@ -11,13 +11,36 @@ function setNickname() { - + diff --git a/src/views/Chat.vue b/src/views/Chat.vue index c89b8ba..e711a74 100644 --- a/src/views/Chat.vue +++ b/src/views/Chat.vue @@ -19,12 +19,7 @@ const messages: Ref> = ref([]) const currentMessage = ref("") const lastUserMessageId = ref("") -const messagesPath = collection( - db, - "groups", - sessionStore.groupId as string, - "messages" -) +const messagesPath = collection(db, "groups", sessionStore.groupId as string, "messages") interface Message { author: string @@ -44,9 +39,7 @@ async function postMessage(): Promise { } function updateMessages(querSnap: QuerySnapshot): void { - messages.value = querSnap.docs.map((x) => - x.data({ serverTimestamps: "estimate" }) - ) + messages.value = querSnap.docs.map((x) => x.data({ serverTimestamps: "estimate" })) messages.value = messages.value.sort((a, b) => { return a.timestamp.toDate() - b.timestamp.toDate() @@ -58,6 +51,14 @@ async function onFormSubmit() { currentMessage.value = "" } +function getShareUrl() { + return window.location.href +} + +function getMessageClass(message: Message) { + return message.author === sessionStore.nickname ? "author-message" : "message" +} + onMounted(() => { if (!sessionStore.groupId) return @@ -68,34 +69,104 @@ onMounted(() => { diff --git a/src/views/GroupSelection.vue b/src/views/GroupSelection.vue index 639aa79..f7f75cc 100644 --- a/src/views/GroupSelection.vue +++ b/src/views/GroupSelection.vue @@ -27,8 +27,30 @@ async function createGroup() { - +