Skip to content

Created custom titlebar for Windows and Mac/Linux + Added reaction buttons/box on each message component which appear on hover. #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicroy23 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Created custom titlebar for Windows and Mac/Linux + Added reaction buttons/box on each message component which appear on hover. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d83e9a7
Updated titlebar to match the UI. Not tested on other platforms yet
nicroy23 Jul 14, 2020
024da46
Now tested on linux.
nicroy23 Jul 14, 2020
8f9c99a
"Cleaned the code a bit. Small bug: can't open devtools with custom t…
nicroy23 Jul 14, 2020
6c170a5
Added macOs/linux titlebar style.
nicroy23 Jul 14, 2020
8fa3a8b
Added reaction buttons/box for each messages which appear on hover.
Jul 18, 2020
d12ed2e
Added a edit button for the reaction box only if you wrote the message.
Jul 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 10 additions & 24 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>entropychat.app</title>
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@200;300;400;500;600;700&display=swap" rel="stylesheet">
<script src="https://kit.fontawesome.com/1c9144b004.js" crossorigin="anonymous"></script>
</head>
<body>
<noscript>
Expand Down
1 change: 1 addition & 0 deletions client/src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function createWindow() {
webPreferences: {
nodeIntegration: true,
},
frame: false
});

if (process.env.WEBPACK_DEV_SERVER_URL) {
Expand Down
27 changes: 24 additions & 3 deletions client/src/components/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
<template>
<div class="message">
<div class="message__avatar">
<img :src="message.user.image">
<img :src="message.user.image" />
</div>
<div class="message__contents">
<div class="message__info">{{message.user.name}} <small>{{new Date(message.createdAt).toLocaleString()}}</small></div>
<ReactionBox :userId="message.user._id" />
<div class="message__info">
{{message.user.name}}
<small>{{new Date(message.createdAt).toLocaleString()}}</small>
</div>
<div class="message__text">{{message.text}}</div>
</div>
</div>
</template>

<script>
import ReactionBox from "./ReactionBox";

export default {
props: ['message'],
props: ["message"],
components: {
ReactionBox
}
};
</script>

Expand All @@ -34,4 +43,16 @@ export default {
}
}
}

.message:hover {
background-color: $bg_dark;
.reaction-box {
visibility: visible;
}
}

.reaction-box {
float: right;
visibility: hidden;
}
</style>
49 changes: 49 additions & 0 deletions client/src/components/ReactionBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<template>
<div class="reaction-box">
<button class="reaction-btn">
<i class="far fa-smile" style="font-size: 15px;"></i>
</button>
<button class="reaction-btn" v-if="this.$props.userId === this.user._id">
<i class="fas fa-pen"></i>
</button>
<button class="reaction-btn">
<i class="fas fa-ellipsis-h" style="font-size: 15px;"></i>
</button>
</div>
</template>

<script>
import { useState } from "@u3u/vue-hooks";

export default {
props: ["userId"],
setup() {
const { user } = useState("auth", ["user"]);

return {
user
};
}
};
</script>

<style lang="scss">
.reaction-box {
display: inline-flex;
justify-content: space-between;
}

.reaction-btn {
border: none;
border-radius: 50px;
padding: 0.4rem;
color: white;
background-color: $bg_dark;
cursor: pointer;
outline: none;
}

.reaction-btn:hover {
background-color: $bg_lighter;
}
</style>
Loading