Skip to content

⏺️ Recording part 1 - Add useful information to the top-bar #8341

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

Merged
nickvergessen merged 17 commits into from
Nov 22, 2022
Merged

⏺️ Recording part 1 - Add useful information to the top-bar #8341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
84c60c9
Show .topbar-header in calls
marcoambrosini Nov 10, 2022
2973e18
Add Participants button
marcoambrosini Nov 15, 2022
3a7fadf
Add call time
marcoambrosini Nov 16, 2022
f4f1c96
Implement timer logic with dummy values
marcoambrosini Nov 18, 2022
f162927
Fix app navigation toggle alignment
marcoambrosini Nov 18, 2022
0382d65
Fix year
marcoambrosini Nov 18, 2022
e7f3388
Do not show descriptions in call
marcoambrosini Nov 18, 2022
fcfc1e1
Fix call time position when not recording
marcoambrosini Nov 18, 2022
fe2f54a
Fix width for wide button
marcoambrosini Nov 18, 2022
19e3bfa
Open correct sidebar tabs when clicking the toggles
marcoambrosini Nov 18, 2022
f10e614
Use real call start timestamp
marcoambrosini Nov 18, 2022
91137ec
Update topbar buttons
marcoambrosini Nov 18, 2022
3426538
Make text white in callview
marcoambrosini Nov 18, 2022
900899d
Address review comments
marcoambrosini Nov 22, 2022
0165332
Fix icon color
nickvergessen Nov 22, 2022
e6662e5
Fix participant count
nickvergessen Nov 22, 2022
c18297d
Revert prop declarations in isInLobby mixin
marcoambrosini Nov 22, 2022
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
Prev Previous commit
Next Next commit
Fix call time position when not recording 
Signed-off-by: Marco <[email protected]>
  • Loading branch information
@marcoambrosini
marcoambrosini committed Nov 18, 2022
commit fcfc1e1ecf75b24b7e77e4588ed65e43b1d1b01d
8 changes: 7 additions & 1 deletion src/components/TopBar/CallTime.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<template #trigger>
<NcButton :disabled="!isRecording"
:wide="true"
:class="{ 'call-time__not-recording': !isRecording }"
type="tertiary"
@click="showPopover = true">
<template v-if="isRecording" #icon>
Expand Down Expand Up @@ -155,15 +156,20 @@ export default {
</script>

<style lang="scss" scoped>

.call-time {
display: flex;
justify-content: center;
align-items: center;
height: 44px;
height: var(--default-clickable-area);
font-weight: bold;
color: #fff;
width: 120px;

&__not-recording {
padding-left: var(--default-clickable-area) !important
}

&--wide {
width: 180px;
}
Expand Down
13 changes: 6 additions & 7 deletions src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@
<p class="title">
{{ conversation.displayName }}
</p>
<template v-if="!isInCall">
<p v-if="showUserStatusAsDescription"
class="description">
{{ statusMessage }}
</p>
<p v-else-if="conversation.description"
v-tooltip.bottom="{
<p v-if="showUserStatusAsDescription"
class="description">
{{ statusMessage }}
</p>
<template v-if="!isInCall && conversation.description">
<p v-tooltip.bottom="{
content: renderedDescription,
delay: { show: 500, hide: 500 },
autoHide: false,
Expand Down