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

Convoy Dashboard and App Portal #352

Merged
merged 27 commits into from
Jan 17, 2022
Merged

Convoy Dashboard and App Portal #352

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3a1dc2a
WIP
horlah Nov 10, 2021
bcceda1
undo push
horlah Nov 10, 2021
30fbf37
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Nov 13, 2021
21e2dfd
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Nov 16, 2021
9d95757
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Nov 17, 2021
87219eb
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Nov 19, 2021
4cf2f11
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Nov 20, 2021
1b235ef
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Dec 6, 2021
3499efd
test repo split
horlah Dec 6, 2021
c9d0e28
undo change
horlah Dec 6, 2021
191b83f
create new file
horlah Dec 6, 2021
5dac969
delete created file
horlah Dec 6, 2021
f6f299e
start convoy dashboard global component
horlah Dec 17, 2021
a09eab2
update dashboard component to ng 13
horlah Dec 17, 2021
d4da900
build dashboard UI to new folder as global ng component
horlah Dec 17, 2021
4e74b6e
WIP
horlah Jan 3, 2022
07823a3
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Jan 3, 2022
e4caa48
Merge branch 'main' into emmanuel/feature/build-app-portal
horlah Jan 3, 2022
9dc9617
add docker-compose to gitignore
horlah Jan 3, 2022
ae382e7
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Jan 6, 2022
b6fe356
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Jan 6, 2022
0621d1e
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Jan 6, 2022
ed44e1a
Merge branch 'main' of https://github.com/frain-dev/convoy
horlah Jan 13, 2022
87524ed
Merge branch 'main' into emmanuel/feature/build-app-portal
horlah Jan 13, 2022
ca73c27
UI fixes
horlah Jan 15, 2022
712a3c6
update git ignore for angular cache
horlah Jan 15, 2022
e5197c0
update git ignore for angular cache
horlah Jan 15, 2022
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
Prev Previous commit
Next Next commit
build dashboard UI to new folder as global ng component
  • Loading branch information
@horlah
horlah committed Dec 17, 2021
commit d4da900720019f8643ed716e545f15c779075e33
80 changes: 40 additions & 40 deletions web/ui/dashboard-component/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": "e67a4711-42bc-4670-876e-50871e70b7ef"
},
"version": 1,
"newProjectRoot": "projects",
"projects": {
"convoy-dashboard": {
"projectType": "library",
"root": "projects/convoy-dashboard",
"sourceRoot": "projects/convoy-dashboard/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/convoy-dashboard/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/convoy-dashboard/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/convoy-dashboard/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/convoy-dashboard/src/test.ts",
"tsConfig": "projects/convoy-dashboard/tsconfig.spec.json",
"karmaConfig": "projects/convoy-dashboard/karma.conf.js"
}
}
}
}
},
"defaultProject": "convoy-dashboard"
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": "e67a4711-42bc-4670-876e-50871e70b7ef"
},
"version": 1,
"newProjectRoot": "projects",
"projects": {
"convoy-dashboard": {
"projectType": "library",
"root": "projects/convoy-dashboard",
"sourceRoot": "projects/convoy-dashboard/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/convoy-dashboard/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/convoy-dashboard/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/convoy-dashboard/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/convoy-dashboard/src/test.ts",
"tsConfig": "projects/convoy-dashboard/tsconfig.spec.json",
"karmaConfig": "projects/convoy-dashboard/karma.conf.js"
}
}
}
}
},
"defaultProject": "convoy-dashboard"
}
21 changes: 13 additions & 8 deletions web/ui/dashboard-component/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 44 additions & 43 deletions web/ui/dashboard-component/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
{
"name": "dashboard-component",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng build --watch",
"build": "ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test"
},
"private": true,
"dependencies": {
"@angular/animations": "~13.1.1",
"@angular/cdk": "^12.2.13",
"@angular/common": "~13.1.1",
"@angular/compiler": "~13.1.1",
"@angular/core": "~13.1.1",
"@angular/forms": "~13.1.1",
"@angular/material": "~12.2.13",
"@angular/platform-browser": "~13.1.1",
"@angular/platform-browser-dynamic": "~13.1.1",
"@angular/router": "~13.1.1",
"chart.js": "^3.6.0",
"moment": "^2.29.1",
"prismjs": "^1.25.0",
"rxjs": "~6.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.1.2",
"@angular/cli": "~13.1.2",
"@angular/compiler-cli": "~13.1.1",
"@types/jasmine": "~3.8.0",
"@types/node": "^12.11.1",
"jasmine-core": "~3.8.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"ng-packagr": "^13.1.2",
"typescript": "~4.5.4"
}
"name": "dashboard-component",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng build --watch",
"build": "ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test"
},
"private": true,
"dependencies": {
"@angular/animations": "~13.1.1",
"@angular/cdk": "^13.1.1",
"@angular/common": "~13.1.1",
"@angular/compiler": "~13.1.1",
"@angular/core": "~13.1.1",
"@angular/forms": "~13.1.1",
"@angular/material": "~13.1.1",
"@angular/platform-browser": "~13.1.1",
"@angular/platform-browser-dynamic": "~13.1.1",
"@angular/router": "~13.1.1",
"chart.js": "^3.6.0",
"date-fns": "^2.27.0",
"moment": "^2.29.1",
"prismjs": "^1.25.0",
"rxjs": "~6.6.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.1.2",
"@angular/cli": "~13.1.2",
"@angular/compiler-cli": "~13.1.1",
"@types/jasmine": "~3.8.0",
"@types/node": "^12.11.1",
"jasmine-core": "~3.8.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"ng-packagr": "^13.1.2",
"typescript": "~4.5.4"
}
}
14 changes: 14 additions & 0 deletions web/ui/dashboard-component/projects/convoy-dashboard/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 29 additions & 10 deletions web/ui/dashboard-component/projects/convoy-dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
{
"name": "convoy-dashboard",
"version": "0.0.1",
"peerDependencies": {
"@angular/common": "^12.2.0",
"@angular/core": "^12.2.0"
},
"dependencies": {
"tslib": "^2.3.0"
}
}
"name": "convoy-dashboard",
"version": "0.0.2",
"description": "Convoy Dashboard UI",
"repository": {
"type": "git",
"url": "git+https://github.com/frain-dev/convoy.git"
},
"keywords": [
"convoy",
"dashboard",
"frain",
"angular"
],
"author": "Frain Technologies",
"bugs": {
"url": "https://github.com/frain-dev/convoy/issues"
},
"homepage": "https://github.com/frain-dev/convoy/blob/main/web/ui/dashboard-component/README.md",
"peerDependencies": {
"@angular/common": "^12.2.0",
"@angular/core": "^12.2.0"
},
"dependencies": {
"tslib": "^2.3.0"
},
"devDependencies": {
"@types/prismjs": "^1.16.6"
}
}
36 changes: 5 additions & 31 deletions web/ui/dashboard-component/projects/convoy-dashboard/src/lib/convoy-dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
<div class="dashboard">
<header class="dashboard--header">
<div class="dashboard--header--container">
<div class="logo">
<a target="_blank" href="https://getconvoy.io" rel="noreferrer">
<img src="/assets/img/logo.svg" alt="convoy logo" />
</a>
</div>

<div>
<a target="_blank" href="https://getconvoy.io/docs" rel="noreferrer">Go to docs</a>
<button class="user" (click)="showDropdown = !showDropdown" *ngIf="authDetails()">
<div>
<div class="icon">O</div>
<div class="name">{{ authDetails().username }}</div>
</div>
<img src="/assets/img/angle-arrow-down.svg" alt="arrow down icon" />
<div *ngIf="showDropdown" class="dropdown organisations">
<ul>
<li (click)="logout()">Logout</li>
</ul>
</div>
</button>
</div>
</div>
</header>

<div class="dashboard--page">
<div class="dashboard--page--head">
<div class="filter" [ngClass]="{ 'show-calendar': showFilterCalendar }">
Expand Down Expand Up @@ -80,7 +54,7 @@

<div>
<h3>Events Sent</h3>
<canvas id="chart" width="400" height="200"></canvas>
<canvas id="dahboard_events_chart" width="400" height="200"></canvas>
</div>
</div>

Expand Down Expand Up @@ -510,20 +484,20 @@ <h3>Details</h3>
<div class="dashboard--logs--details--req-res" *ngIf="activeTab === 'events' || activeTab === 'event deliveries'">
<div [class]="'dashboard--logs--details--tabs-data ' + (eventDetailsActiveTab === 'data' ? 'show' : '')">
<h3>Event</h3>
<!-- <app-shared language="json" [code]="getCodeSnippetString(activeTab === 'events' ? 'event' : 'event_delivery')"></app-shared> -->
<prism language="json" [code]="getCodeSnippetString(activeTab === 'events' ? 'event' : 'event_delivery')"></prism>
</div>

<div [class]="'dashboard--logs--details--tabs-data ' + (eventDetailsActiveTab === 'response' ? 'show' : '')">
<h3>Header</h3>
<!-- <app-shared language="json" [code]="getCodeSnippetString('res_head')"></app-shared> -->
<prism language="json" [code]="getCodeSnippetString('res_head')"></prism>

<h3>Body</h3>
<!-- <app-shared language="json" [code]="getCodeSnippetString('res_body')"></app-shared> -->
<prism language="json" [code]="getCodeSnippetString('res_body')"></prism>
</div>

<div [class]="'dashboard--logs--details--tabs-data ' + (eventDetailsActiveTab === 'request' ? 'show' : '')">
<h3>Header</h3>
<!-- <app-shared language="json" [code]="getCodeSnippetString('req')"></app-shared> -->
<prism language="json" [code]="getCodeSnippetString('req')"></prism>
</div>
</div>

Expand Down
Loading