-
Notifications
You must be signed in to change notification settings - Fork 510
⏺️ 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.
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
master
from
feature/6766/add-useful-information-to-the-topbar
Nov 22, 2022
Merged
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 2973e18
Add Participants button
marcoambrosini 3a7fadf
Add call time
marcoambrosini f4f1c96
Implement timer logic with dummy values
marcoambrosini f162927
Fix app navigation toggle alignment
marcoambrosini 0382d65
Fix year
marcoambrosini e7f3388
Do not show descriptions in call
marcoambrosini fcfc1e1
Fix call time position when not recording
marcoambrosini fe2f54a
Fix width for wide button
marcoambrosini 19e3bfa
Open correct sidebar tabs when clicking the toggles
marcoambrosini f10e614
Use real call start timestamp
marcoambrosini 91137ec
Update topbar buttons
marcoambrosini 3426538
Make text white in callview
marcoambrosini 900899d
Address review comments
marcoambrosini 0165332
Fix icon color
nickvergessen e6662e5
Fix participant count
nickvergessen c18297d
Revert prop declarations in isInLobby mixin
marcoambrosini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add call time
Signed-off-by: Marco <[email protected]>
- Loading branch information
commit 3a7fadfcb40586f8d4edc8e19be2d859fc3fc4fc
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2021 Marco Ambrosini <[email protected]> - | ||
| - @author Marco Ambrosini <[email protected]> | ||
| - | ||
| - @license GNU AGPL version 3 or any later version | ||
| - | ||
| - This program is free software: you can redistribute it and/or modify | ||
| - it under the terms of the GNU Affero General Public License as | ||
| - published by the Free Software Foundation, either version 3 of the | ||
| - License, or (at your option) any later version. | ||
| - | ||
| - This program is distributed in the hope that it will be useful, | ||
| - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| - GNU Affero General Public License for more details. | ||
| - | ||
| - You should have received a copy of the GNU Affero General Public License | ||
| - along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| --> | ||
|
|
||
| <template> | ||
| <div class="call-time"> | ||
| <NcPopover class="top-bar__button" | ||
| close-after-click="true" | ||
| :menu-title="callTime" | ||
| :shown.sync="showPopover" | ||
| :triggers="[]" | ||
| :container="container"> | ||
| <template #trigger> | ||
| <NcButton :disabled="!isRecording" type="tertiary" @click="showPopover = true"> | ||
| <template v-if="isRecording" #icon> | ||
| <RecordCircle :size="20" | ||
| fill-color="#e9322d" /> | ||
| </template> | ||
| {{ callTime }} | ||
| </ncbutton> | ||
| </template> | ||
| <NcButton type="tertiary-no-background" | ||
| @click="stopRecording"> | ||
| <template #icon> | ||
| <StopIcon :size="20" /> | ||
| </template> | ||
| {{ t('spreed', 'Stop recording') }} | ||
| </NcButton> | ||
| </NcPopover> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
|
|
||
| import RecordCircle from 'vue-material-design-icons/RecordCircle.vue' | ||
| import StopIcon from 'vue-material-design-icons/Stop.vue' | ||
| import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js' | ||
| import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' | ||
|
|
||
| export default { | ||
| name: 'CallTime', | ||
|
|
||
| components: { | ||
| RecordCircle, | ||
| StopIcon, | ||
| NcPopover, | ||
| NcButton, | ||
| }, | ||
|
|
||
| props: { | ||
| /** | ||
| * The date object, if undefined the stopwatch is back to the initial | ||
| * state. | ||
| */ | ||
| start: { | ||
| type: Date, | ||
| default: undefined, | ||
| }, | ||
|
|
||
| isRecording: { | ||
| type: Boolean, | ||
| required: true, | ||
| }, | ||
| }, | ||
|
|
||
| data() { | ||
| return { | ||
| hours: undefined, | ||
| minutes: undefined, | ||
| seconds: undefined, | ||
| showPopover: false, | ||
| } | ||
| }, | ||
|
|
||
| computed: { | ||
| hasTime() { | ||
| return this.start !== undefined | ||
| }, | ||
|
|
||
| container() { | ||
| return this.$store.getters.getMainContainerSelector() | ||
| }, | ||
|
|
||
| callTime() { | ||
| return '11:11' | ||
| }, | ||
| }, | ||
|
|
||
| methods: { | ||
| stopRecording() { | ||
| this.$emit('stop-recording') | ||
| this.showPopover = false | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .call-time { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 44px; | ||
| font-weight: bold; | ||
| color: #fff; | ||
| } | ||
|
|
||
| ::v-deep .button-vue:disabled { | ||
| opacity: 1 !important; | ||
| } | ||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.