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

Teams Ui #712

Merged
merged 15 commits into from
Jun 17, 2022
Merged

Teams Ui #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
be9d6e9
teams ui
Oluwadaminiola Jun 6, 2022
bcf1cae
teams ui
Oluwadaminiola Jun 6, 2022
d64518a
fixed merge conflicts from main
Oluwadaminiola Jun 8, 2022
16bc423
invite team member integration
Oluwadaminiola Jun 9, 2022
bcafd84
fixed merge conflicts
Oluwadaminiola Jun 12, 2022
ca674bd
Merge branch 'main' of https://github.com/frain-dev/convoy into pelum…
Oluwadaminiola Jun 12, 2022
a39d601
team management flow
Oluwadaminiola Jun 13, 2022
22ae6f7
took out projects from invite team member page
Oluwadaminiola Jun 14, 2022
37303d3
Merge branch 'main' of https://github.com/frain-dev/convoy into pelum…
Oluwadaminiola Jun 14, 2022
fd07404
took out creatProjectComponent
Oluwadaminiola Jun 14, 2022
fc3b54e
change in adding filter to url
Oluwadaminiola Jun 14, 2022
2e542f8
updated css link
Oluwadaminiola Jun 14, 2022
2880b93
added updates for teams
Oluwadaminiola Jun 15, 2022
471c10f
fixed space issue on table
Oluwadaminiola Jun 15, 2022
d68233c
dropdown fix
Oluwadaminiola Jun 16, 2022
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
1 change: 1 addition & 0 deletions web/ui/dashboard/src/app/models/group.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export interface GROUP {
created_at: Date;
updated_at: Date;
type: 'incoming' | 'outgoing';
selected?: boolean;
}

export interface SOURCE {
Expand Down
14 changes: 14 additions & 0 deletions web/ui/dashboard/src/app/models/teams.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export interface TEAMS {
role: {
groups: string[];
type: string;
};
uid: string;
status?: boolean;
invitee_email?: string;
user_metadata: {
first_name: string;
last_name: string;
email: string;
};
}
202 changes: 101 additions & 101 deletions web/ui/dashboard/src/app/private/components/table-loader/table-loader.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,102 @@
<table class="table">
<thead>
<tr class="table--head">
<th *ngFor="let head of tableHead" scope="col">{{ head }}</th>
</tr>
</thead>
<tbody>
<tr class="table--date-row">
<td>
<div>
<div class="skeleton-loader smaller padding-top--unset padding-bottom--unset"></div>
</div>
</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr class="table--date-row">
<td>
<div>
<div class="skeleton-loader smaller padding-top--unset padding-bottom--unset"></div>
</div>
</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
</tbody>
<table [ngClass]="'table ' + tableClass">
<thead>
<tr class="table--head">
<th *ngFor="let head of tableHead" scope="col">{{ head }}</th>
</tr>
</thead>
<tbody>
<tr class="table--date-row" *ngIf="!tableClass">
<td>
<div>
<div class="skeleton-loader smaller padding-top--unset padding-bottom--unset"></div>
</div>
</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>

<tr class="table--date-row" *ngIf="!tableClass">
<td>
<div>
<div class="skeleton-loader smaller padding-top--unset padding-bottom--unset"></div>
</div>
</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
<tr>
<td>
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
<td *ngFor="let head of tableHead.slice(1)">
<div>
<div class="skeleton-loader data"></div>
</div>
</td>
</tr>
</tbody>
</table>
2 changes: 1 addition & 1 deletion web/ui/dashboard/src/app/private/components/table-loader/table-loader.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component, Input, OnInit } from '@angular/core';
})
export class TableLoaderComponent implements OnInit {
@Input() tableHead!: string[];

@Input() tableClass!: string;
constructor() {}

ngOnInit(): void {}
Expand Down
4 changes: 2 additions & 2 deletions web/ui/dashboard/src/app/private/pages/projects/projects.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<convoy-loader *ngIf="isloadingOrganisations"></convoy-loader>

<ng-container *ngIf="!isloadingOrganisations && organisations.length > 0">
<ng-container *ngIf="!isloadingOrganisations && organisations.length > 0 && !noData">
<div class="page padding-top__60px">
<div class="page__head">
<div>
Expand Down Expand Up @@ -99,4 +99,4 @@ <h3>You have no project yet</h3>
<p>All your project's summary at a glance</p>
<button class="button button__primary" routerLink="./new">Create Project</button>
</div>
</div>
</div>