Skip to content
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

Jump to bottom

Dashboard: Add accordion Layout for smaller screens #7111

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+310 −112
Open

Dashboard: Add accordion Layout for smaller screens #7111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
45a6a34
WIP: Accordion layout
Mutugiii May 30, 2022
f5167c3
Linting Fix
Mutugiii May 30, 2022
224c768
Update component names && remove testing data
Mutugiii May 30, 2022
a11918f
Updated data passing between components
Mutugiii Jun 3, 2022
1966520
Updated data passing between components
Mutugiii Jun 3, 2022
d1110d0
Linting fix
Mutugiii Jun 3, 2022
da63f6a
Current Status: Data sharing works
Mutugiii Jun 8, 2022
c9890f4
Linting ix
Mutugiii Jun 8, 2022
5f3a488
Add media query for accordion height
Mutugiii Jun 10, 2022
a3b2ec3
cardtype
lmmrssa Jun 15, 2022
6ed602e
Merge branch 'master' into 7068-dashboard-list-accordion
Mutugiii Jun 12, 2023
f8239ff
Update the dashboard-tile component to use the checkMobile service to…
Mutugiii Jun 12, 2023
b93d488
Merge branch 'master' into 7068-dashboard-list-accordion
Mutugiii Jul 6, 2023
42aee1f
Update to use the device-info service
Mutugiii Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Update component names && remove testing data
  • Loading branch information
@Mutugiii @lmmrssa
Mutugiii authored and lmmrssa committed Jun 15, 2022
commit 224c76820b38f74e359597d585b858a399efebb4
5 changes: 2 additions & 3 deletions src/app/dashboard/dashboard-tile-left-tile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<div class="left-tile accent-color">
<!-- <a *ngIf="link || emptyLink; else noLink" [routerLink]="[link || emptyLink]">
<a *ngIf="link || emptyLink; else noLink" [routerLink]="[link || emptyLink]">
<planet-dashboard-tile-title [cardTitle]="cardTitle" [cardType]="cardType"></planet-dashboard-tile-title>
</a>
<ng-template #noLink>
<span *ngIf="cardTitle==='myLife'">
<planet-dashboard-tile-title [cardTitle]="cardTitle" [cardType]="cardType"></planet-dashboard-tile-title>
</span>
</ng-template>
<a class="small" *ngIf="cardTitle==='myCourses'" routerLink="myProgress" i18n>My Progress</a> -->
Potato
<a class="small" *ngIf="cardTitle==='myCourses'" routerLink="myProgress" i18n>My Progress</a>
</div>
5 changes: 2 additions & 3 deletions src/app/dashboard/dashboard-tile-right-tile.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="right-tile" #items>
<!-- <div class="dashboard-items" [ngClass]="{'dashboard-empty': itemData.length === 0}" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="drop($event)">
<div class="dashboard-items" [ngClass]="{'dashboard-empty': itemData.length === 0}" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="drop($event)">
<ng-container *ngFor="let item of itemData;let even=even">
<ng-container *planetAuthorizedRoles="item.authorization || '_any'">
<div
Expand All @@ -22,6 +22,5 @@
<span *ngIf="itemData.length === 0" class="dashboard-item cursor-pointer" [routerLink]="[emptyLink]" i18n>
Add item to {{cardTitle}}
</span>
</div> -->
tomato
</div>
</div>
16 changes: 8 additions & 8 deletions src/app/home/home.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import { MaterialModule } from '../shared/material.module';
import {
DashboardTileComponent,
DashboardTileTitleComponent,
DashboardTileLeftTile,
DashboardTileRightTile,
DashboardTileRowLayout,
DashboardTileAccordionLayout
DashboardTileLeftTileComponent,
DashboardTileRightTileComponent,
DashboardTileRowLayoutComponent,
DashboardTileAccordionLayoutComponent
} from '../dashboard/dashboard-tile.component';
import { NotificationsComponent } from '../notifications/notifications.component';
import { PlanetDialogsModule } from '../shared/dialogs/planet-dialogs.module';
Expand Down Expand Up @@ -58,10 +58,10 @@ import { CoursesViewDetailModule } from '../courses/view-courses/courses-view-de
DashboardComponent,
DashboardTileComponent,
DashboardTileTitleComponent,
DashboardTileLeftTile,
DashboardTileRightTile,
DashboardTileRowLayout,
DashboardTileAccordionLayout,
DashboardTileLeftTileComponent,
DashboardTileRightTileComponent,
DashboardTileRowLayoutComponent,
DashboardTileAccordionLayoutComponent,
NotificationsComponent,
PulsateIconDirective,
UpgradeComponent,
Expand Down