Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
74694d1
sidebar particiapnts lists
Pratiyushkumar Aug 22, 2023
c837982
feature and testing ready
Pratiyushkumar Aug 26, 2023
0755212
Merge branch '536-live-site-move-to-room-codes' into feature/sidebar
Pratiyushkumar Aug 26, 2023
9bf2668
changes done in testing
Pratiyushkumar Aug 27, 2023
67551fb
adding one loop for multiple roleNames
Pratiyushkumar Aug 27, 2023
7d6586c
removed unwanted lines from code and gave some spaces between the tes…
Pratiyushkumar Aug 27, 2023
24d567b
added the findby method again
Pratiyushkumar Aug 27, 2023
4f82c31
made sidebar collapsible
Pratiyushkumar Aug 30, 2023
9fb6f86
removed one assert statement
Pratiyushkumar Aug 30, 2023
0043b60
fixed css
Pratiyushkumar Aug 30, 2023
9bddcdc
Merge branch '536-live-site-move-to-room-codes' of https://github.com…
satyam73 Aug 31, 2023
d90578a
Merge pull request #583 from Real-Dev-Squad/feature/sidebar
satyam73 Aug 31, 2023
f0acee3
resolved merge conflicts
Pratiyushkumar Aug 31, 2023
3e4198f
reso;ved merge conflicts
Pratiyushkumar Sep 2, 2023
ccc3ead
edited the background color of hamburger
Pratiyushkumar Sep 2, 2023
cca7d9e
removed the changes
Pratiyushkumar Sep 2, 2023
d7dc4dc
changes color and background color of hamburger icon
Pratiyushkumar Sep 5, 2023
aeb069b
fixed the changes suggested on review
Pratiyushkumar Sep 6, 2023
edc77ca
Merge branch 'develop-ember' of https://github.com/Real-Dev-Squad/web…
Pratiyushkumar Sep 7, 2023
502f980
css added for hamburger icon
Pratiyushkumar Sep 8, 2023
5853807
merge conflict resolved
Pratiyushkumar Oct 10, 2023
2be1d34
changed position of toggle button on live-panel
Pratiyushkumar Oct 16, 2023
9bf06aa
tried new icon for fullscreen
Pratiyushkumar Oct 27, 2023
b779742
merge conflict resolved
Pratiyushkumar Oct 27, 2023
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
11 changes: 11 additions & 0 deletions app/components/live-panel.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<div class='live-panel' data-test-live-panel>
<Reusables::IconButton
@id='toggle-panel'
@class='icon-button--md icon__sidebar__toggle'
@title='toggle sidebar panel'
@onClick={{@sidebarDisplayToggle}}
@icon={{if
@isExpanded
'material-symbols:fullscreen-exit'
'material-symbols:fullscreen'
}}
/>
{{#if (eq @role this.ROLES.host)}}
<Reusables::IconButton
@id='screen-share'
Expand Down
18 changes: 15 additions & 3 deletions app/components/live-sidebar.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
<div data-test-sidebar class='sidebar {{if this.isSideBarOpen "open" "close"}}'>
<div data-test-sidebar-participants class='sidebar__participants'>
<h4>Participants</h4>
<div
data-test-sidebar
class='sidebar
{{if this.isSideBarOpen "open" "close"}}
{{if @isExpanded "sidebar--closes" "sidebar--opens"}}'
>

<div
data-test-sidebar-participants
class='sidebar__participants
{{if @isExpanded "sidebar__participants--hide"}}'
>
<h4
class='{{if @isExpanded "participants__heading--hide" ""}}'
>Participants</h4>
<button
data-test-sidebar-button
class='sidebar__accordian-button'
Expand Down
6 changes: 6 additions & 0 deletions app/controllers/live.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export default class LiveController extends Controller {
@tracked newRoomCode = '';
@tracked isActiveEventFound;
@tracked buttonText = '';
@tracked isExpanded = false;

@globalRef('videoEl') videoEl;
get liveService() {
return getOwner(this).lookup('service:live');
Expand All @@ -43,6 +45,10 @@ export default class LiveController extends Controller {
}, 4000);
}

@action sidebarDisplayToggle() {
this.isExpanded = !this.isExpanded;
}

@action inputHandler(type, event) {
const updatedValue = event.target.value;
switch (type) {
Expand Down
57 changes: 36 additions & 21 deletions app/styles/icon-button.module.css
Original file line number Diff line number Diff line change
@@ -1,34 +1,49 @@
.icon-button {
all: unset;
background-color: var(--color-lightgrey);
cursor: pointer;
display: inline-block;
all: unset;
background-color: var(--color-lightgrey);
cursor: pointer;
display: inline-block;
}

.icon-button--pink-bg {
background-color: var(--color-pink);
color: var(--color-white)
background-color: var(--color-pink);
color: var(--color-white);
}

.icon-button--md {
border-radius: 50%;
height: 54px;
width: 54px;
margin-right: 2rem;
position: relative;
border-radius: 50%;
height: 54px;
width: 54px;
margin-right: 2rem;
position: relative;
}

.icon-button--md .icon__sidebar__toggle {
height: 50%;
width: 50%;
position: absolute;
bottom: 50%;
right: 50%;
transform: translate(50%, 50%);
}

.icon-button--md .iconify.iconify--material-symbols {
height: 50%;
width: 50%;
position: absolute;
bottom: 50%;
right: 50%;
transform: translate(50%, 50%);
height: 50%;
width: 50%;
position: absolute;
bottom: 50%;
right: 50%;
transform: translate(50%, 50%);
}

@media (max-width: 425px) {
.icon-button--md {
margin-right: 1rem;
}
}
.icon-button--md {
margin-right: 1rem;
}
}

@media (max-width: 768px) {
.icon__sidebar__toggle {
display: none;
}
}
80 changes: 76 additions & 4 deletions app/styles/live-sidebar.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.sidebar {
padding: 1rem 0;
width: 100%;
width: 0%;
background-color: var(--color-sidebar);
height: 100%;
z-index: 2;
Expand All @@ -11,6 +11,14 @@
box-sizing: border-box;
}

.sidebar--opens {
width: 90%;
}

.sidebar--closes {
width: 0%;
}

.sidebar__accordian-button {
all: unset;
display: none;
Expand All @@ -31,6 +39,10 @@
border-radius: 10px;
}

.participants__heading--hide {
display: none;
}

.sidebar__participants {
width: 90%;
display: flex;
Expand All @@ -49,6 +61,10 @@
box-sizing: border-box;
}

.sidebar__participants--hide {
display: none;
}

.sidebar__participants--mobile {
display: none;
width: 100%;
Expand Down Expand Up @@ -151,6 +167,60 @@
cursor: pointer;
}

@media only screen and (max-width: 768px) {
.sidebar {
height: 70px;
width: 100%;
}

.participantsHeadingHide {
display: block;
}

.sidebar__accordian-button {
display: block;
}
.sidebar__participants {
background: var(--color-sidebar-participants);
text-align: initial;
padding-left: 1rem;
}

.sidebar.open {
height: fit-content;
}
.sidebar__body {
overflow: hidden;
}
.sidebar__body.open {
animation: opensidebar 2s;
transition: height 2s;
animation-fill-mode: forwards;
overflow: auto;
}
.sidebar__body.close {
animation: closesidebar 2s;
transition: height 2s;
animation-fill-mode: forwards;
}
@keyframes opensidebar {
0% {
height: 0px;
}
100% {
height: 300px;
}
}

@keyframes closesidebar {
0% {
height: 300px;
}
100% {
height: 0px;
}
}
}
.loading span {
width: 0.5rem;
height: 0.5rem;
Expand Down Expand Up @@ -192,6 +262,10 @@
padding-top: 1rem;
}

.participantsHeadingHide {
display: block;
}

.sidebar__accordian-button {
display: block;
}
Expand Down Expand Up @@ -244,10 +318,8 @@
}
}
}

/* utility classes */

.self {
border: 3px solid var(--color-pink);
background: var(--color-pink-low-opacity);
}
}
Loading