diff --git a/src/main/webapp/app/core/core.module.ts b/src/main/webapp/app/core/core.module.ts index a371ea41e9b1..30c0442557b2 100644 --- a/src/main/webapp/app/core/core.module.ts +++ b/src/main/webapp/app/core/core.module.ts @@ -20,6 +20,7 @@ import { NgbDateDayjsAdapter } from 'app/core/config/datepicker-adapter'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; import { TraceService } from '@sentry/angular'; import { Router } from '@angular/router'; +import isMobile from 'ismobilejs-es5'; @NgModule({ imports: [ @@ -109,5 +110,8 @@ export class ArtemisCoreModule { const languageKey = sessionStorageService.retrieve('locale') || languageHelper.determinePreferredLanguage(); translateService.use(languageKey); tooltipConfig.container = 'body'; + if (isMobile(window.navigator.userAgent).any ?? false) { + tooltipConfig.disableTooltip = true; + } } } diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html index fd62d2f7e57e..113ab1ca1cd8 100644 --- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html +++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html @@ -10,7 +10,7 @@ (keyup.enter)="onSearch()" placeholder="{{ 'artemisApp.metis.overview.searchBarDefault' | artemisTranslate }}" /> - + @@ -22,7 +22,7 @@ } @if (isCodeOfConductAccepted && isServiceSetUp && course) {
-
+
@if (course && !activeConversation && isCodeOfConductPresented) { @@ -45,7 +46,10 @@
} -
+
@if (activeConversation) {
@if (!!postInThread) { (); + private closeSidebarEventSubscription: Subscription; + private openSidebarEventSubscription: Subscription; + private toggleSidebarEventSubscription: Subscription; + private breakpointSubscription: Subscription; course?: Course; isLoading = false; isServiceSetUp = false; @@ -102,6 +109,7 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { isCollapsed = false; isProduction = true; isTestServer = false; + isMobile = false; readonly CHANNEL_TYPE_SHOW_ADD_OPTION = CHANNEL_TYPE_SHOW_ADD_OPTION; readonly CHANNEL_TYPE_ICON = CHANNEL_TYPE_ICON; @@ -130,6 +138,9 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { createChannelFn?: (channel: ChannelDTO) => Observable; channelActions$ = new EventEmitter(); + private courseSidebarService: CourseSidebarService = inject(CourseSidebarService); + private layoutService: LayoutService = inject(LayoutService); + constructor( private router: Router, private activatedRoute: ActivatedRoute, @@ -156,8 +167,35 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { } ngOnInit(): void { + this.isMobile = this.layoutService.isBreakpointActive(CustomBreakpointNames.extraSmall); + + this.breakpointSubscription = this.layoutService.subscribeToLayoutChanges().subscribe(() => { + this.isMobile = this.layoutService.isBreakpointActive(CustomBreakpointNames.extraSmall); + }); + + this.openSidebarEventSubscription = this.courseSidebarService.openSidebar$.subscribe(() => { + this.setIsCollapsed(true); + }); + + this.closeSidebarEventSubscription = this.courseSidebarService.closeSidebar$.subscribe(() => { + this.setIsCollapsed(false); + }); + + this.toggleSidebarEventSubscription = this.courseSidebarService.toggleSidebar$.subscribe(() => { + this.toggleSidebar(); + }); + + if (!this.isMobile) { + if (this.courseOverviewService.getSidebarCollapseStateFromStorage('conversation')) { + this.courseSidebarService.openSidebar(); + } else { + this.courseSidebarService.closeSidebar(); + } + } else { + this.courseSidebarService.openSidebar(); + } + this.isLoading = true; - this.isCollapsed = this.courseOverviewService.getSidebarCollapseStateFromStorage('conversation'); this.metisConversationService.isServiceSetup$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((isServiceSetUp: boolean) => { if (isServiceSetUp) { this.course = this.metisConversationService.course; @@ -214,9 +252,13 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { this.activatedRoute.queryParams.pipe(take(1), takeUntil(this.ngUnsubscribe)).subscribe((queryParams) => { if (queryParams.conversationId) { this.metisConversationService.setActiveConversation(Number(queryParams.conversationId)); + + this.closeSidebarOnMobile(); } if (queryParams.messageId) { this.postInThread = { id: Number(queryParams.messageId) } as Post; + + this.closeSidebarOnMobile(); } else { this.postInThread = undefined; } @@ -236,12 +278,20 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { ngOnDestroy() { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); + this.openSidebarEventSubscription?.unsubscribe(); + this.closeSidebarEventSubscription?.unsubscribe(); + this.toggleSidebarEventSubscription?.unsubscribe(); this.profileSubscription?.unsubscribe(); + this.breakpointSubscription?.unsubscribe(); } private subscribeToActiveConversation() { this.metisConversationService.activeConversation$.pipe(takeUntil(this.ngUnsubscribe)).subscribe((conversation: ConversationDTO) => { + const previousConversation = this.activeConversation; this.activeConversation = conversation; + if (this.isMobile && conversation && previousConversation?.id !== conversation.id) { + this.courseSidebarService.closeSidebar(); + } this.updateQueryParameters(); }); } @@ -286,8 +336,20 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { : DEFAULT_CHANNEL_GROUPS; } + hideSearchTerm() { + this.courseWideSearchTerm = ''; + } + onSearch() { + if (this.isMobile) { + if (this.courseWideSearchTerm) { + this.courseSidebarService.closeSidebar(); + } else { + this.courseSidebarService.openSidebar(); + } + } this.metisConversationService.setActiveConversation(undefined); + this.activeConversation = undefined; this.updateQueryParameters(); this.courseWideSearchConfig.searchTerm = this.courseWideSearchTerm; this.courseWideSearch?.onSearch(); @@ -316,11 +378,22 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { } onConversationSelected(conversationId: number) { + this.closeSidebarOnMobile(); this.metisConversationService.setActiveConversation(conversationId); } toggleSidebar() { - this.isCollapsed = !this.isCollapsed; + this.setIsCollapsed(!this.isCollapsed); + } + + closeSidebarOnMobile() { + if (this.isMobile) { + this.courseSidebarService.closeSidebar(); + } + } + + setIsCollapsed(value: boolean) { + this.isCollapsed = value; this.courseOverviewService.setSidebarCollapseState('conversation', this.isCollapsed); } @@ -395,12 +468,14 @@ export class CourseConversationsComponent implements OnInit, OnDestroy { complete: () => { if (newActiveConversation) { this.metisConversationService.setActiveConversation(newActiveConversation); + this.closeSidebarOnMobile(); } }, }); } else { if (newActiveConversation) { this.metisConversationService.setActiveConversation(newActiveConversation); + this.closeSidebarOnMobile(); } } this.prepareSidebarData(); diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html index aa3b35159b88..1295be3edf63 100644 --- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html +++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html @@ -1,114 +1,121 @@ -
-
+
+ + +
+
+

@if (!courseWideSearchConfig.searchTerm) { } @else { + }

-
- @if (formGroup) { -
-
- -
- -
-
- -
-
- - + @if (formGroup) { +
+ + +
+ +
+
+ +
+
+ + +
+
+ + +
+
+ + +
-
- - -
-
- - + +
+
+
+ +
- -
-
-
- + +
+ } +
+
+
+
+ + @if (isFetchingPosts) { +
+ +
+ } + + @if (!isFetchingPosts && posts.length === 0) { +
+
+ } + +
+ + + @for (post of posts; track postsTrackByFn($index, post)) { +
+ +
+ }
- -
- } -
-
-
-
-
- - @if (isFetchingPosts) { -
- -
- } - - @if (!isFetchingPosts && posts.length === 0) { -
- -
- } - -
- - - @for (post of posts; track postsTrackByFn($index, post)) { -
- -
- }
diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.scss b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.scss index d4913cca2254..76a2c538cd1f 100644 --- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.scss +++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.scss @@ -1,3 +1,7 @@ +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/mixins'; + .coursewide-search { .bold-line { height: 1px; @@ -28,3 +32,39 @@ padding-bottom: 100px; } } + +.course-wide-search-mobile-disclaimer { + display: none; +} + +@include media-breakpoint-down(sm) { + .is-not-in-active-search { + display: none; + } + + .course-wide-search-mobile-disclaimer { + pointer-events: none; + position: absolute; + top: 10%; + left: 0; + height: 80%; + width: 100%; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + opacity: 0; + + transition: opacity 0.2s ease-in-out; + } + + .course-wide-search-mobile-disclaimer.is-not-in-active-search { + opacity: 1; + pointer-events: all; + } + + .coursewide-search .posting-infinite-scroll-container { + max-height: calc(60vh - var(--header-height) - var(--search-channel-header-height)); + max-height: calc(60dvh - var(--header-height) - var(--search-channel-header-height)); + } +} diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.ts b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.ts index 7c4ce294e0ac..556291d952d1 100644 --- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.ts +++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.ts @@ -12,8 +12,9 @@ import { ViewChild, ViewChildren, ViewEncapsulation, + inject, } from '@angular/core'; -import { faCircleNotch, faEnvelope, faFilter, faLongArrowAltDown, faLongArrowAltUp, faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'; +import { faChevronLeft, faCircleNotch, faEnvelope, faFilter, faLongArrowAltDown, faLongArrowAltUp, faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Subject, takeUntil } from 'rxjs'; import { Course } from 'app/entities/course.model'; @@ -23,6 +24,7 @@ import { MetisService } from 'app/shared/metis/metis.service'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { PostContextFilter, PostSortCriterion, SortDirection } from 'app/shared/metis/metis.util'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; +import { CourseSidebarService } from 'app/overview/course-sidebar.service'; @Component({ selector: 'jhi-course-wide-search', @@ -54,6 +56,7 @@ export class CourseWideSearchComponent implements OnInit, AfterViewInit, OnDestr faTimes = faTimes; faEnvelope = faEnvelope; faCircleNotch = faCircleNotch; + faChevronLeft = faChevronLeft; readonly SortDirection = SortDirection; sortingOrder = SortDirection.ASCENDING; @@ -69,6 +72,8 @@ export class CourseWideSearchComponent implements OnInit, AfterViewInit, OnDestr getAsChannel = getAsChannelDTO; + private courseSidebarService: CourseSidebarService = inject(CourseSidebarService); + constructor( public metisService: MetisService, // instance from course-conversations.component public metisConversationService: MetisConversationService, // instance from course-conversations.component @@ -92,6 +97,10 @@ export class CourseWideSearchComponent implements OnInit, AfterViewInit, OnDestr this.ngUnsubscribe.complete(); } + openSidebar() { + this.courseSidebarService.openSidebar(); + } + private subscribeToMetis() { this.metisService.posts.pipe(takeUntil(this.ngUnsubscribe)).subscribe((posts: Post[]) => { this.setPosts(posts); diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html index 77c54a91e20f..1db98b09814d 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html @@ -1,8 +1,11 @@ @if (activeConversation && course) {
-
-

+
+ +

@if (activeConversationAsChannel) { +
+ }
- @if (_activeConversation && newPost && canCreateNewMessageInConversation(_activeConversation)) { -
+ @if (_activeConversation && newPost && canCreateNewMessageInConversation(_activeConversation) && !isMobile) { +
@if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss index d1beda749f53..3c1445325f8b 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss @@ -1,3 +1,7 @@ +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/mixins'; + .conversation-messages { --message-input-height-prod: 171px; --message-input-height-dev: 187px; @@ -45,10 +49,16 @@ &.content-height-dev { max-height: calc(75vh - var(--message-input-height-dev) - var(--search-height) - var(--channel-header-height)); + + @include media-breakpoint-down(sm) { + max-height: calc(90vh - var(--message-input-height-dev) - var(--search-height) - var(--channel-header-height)); + max-height: calc(90dvh - var(--message-input-height-dev) - var(--search-height) - var(--channel-header-height)); + } } - @media (max-width: 768px) { - max-height: calc(75vh - var(--message-input-height-prod) - var(--search-height) - var(--channel-header-height)) !important; + @include media-breakpoint-down(sm) { + max-height: calc(90vh - var(--message-input-height-prod) - var(--search-height) - var(--channel-header-height)); + max-height: calc(90dvh - var(--message-input-height-prod) - var(--search-height) - var(--channel-header-height)); } } diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts index 2590612104b4..5a73e05471c2 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts @@ -12,6 +12,7 @@ import { ViewChild, ViewChildren, ViewEncapsulation, + inject, } from '@angular/core'; import { faCircleNotch, faEnvelope, faSearch, faTimes } from '@fortawesome/free-solid-svg-icons'; import { Conversation, ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; @@ -27,6 +28,8 @@ import { MetisConversationService } from 'app/shared/metis/metis-conversation.se import { OneToOneChat, isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { canCreateNewMessageInConversation } from 'app/shared/metis/conversations/conversation-permissions.utils'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; +import { LayoutService } from 'app/shared/breakpoints/layout.service'; +import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service'; @Component({ selector: 'jhi-conversation-messages', @@ -77,6 +80,9 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD faSearch = faSearch; faEnvelope = faEnvelope; faCircleNotch = faCircleNotch; + isMobile = false; + + private layoutService: LayoutService = inject(LayoutService); constructor( public metisService: MetisService, // instance from course-conversations.component @@ -88,6 +94,14 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD this.subscribeToSearch(); this.subscribeToMetis(); this.subscribeToActiveConversation(); + this.isMobile = this.layoutService.isBreakpointActive(CustomBreakpointNames.extraSmall); + + this.layoutService + .subscribeToLayoutChanges() + .pipe(takeUntil(this.ngUnsubscribe)) + .subscribe(() => { + this.isMobile = this.layoutService.isBreakpointActive(CustomBreakpointNames.extraSmall); + }); this.cdr.detectChanges(); } diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.scss b/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.scss index 3b80700eff47..0e0f1a6c5991 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.scss +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-thread-sidebar/conversation-thread-sidebar.component.scss @@ -1,4 +1,7 @@ @import 'src/main/webapp/content/scss/artemis-variables'; +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/mixins'; $draggable-width: 15px; $thread-section-card-min-width: 420px; @@ -86,3 +89,13 @@ $thread-section-card-min-width: 420px; } } } + +@include media-breakpoint-down(sm) { + .expanded-thread { + width: 100%; + + & .card { + min-width: 100%; + } + } +} diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html index e0b62084f8b6..b21458e32e67 100644 --- a/src/main/webapp/app/overview/course-overview.component.html +++ b/src/main/webapp/app/overview/course-overview.component.html @@ -149,7 +149,7 @@ @if (hasSidebar) {