-
Notifications
You must be signed in to change notification settings - Fork 84
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* show available marketplace updates in menu * complete feature * delete unused class * update tsmatches to remove console log * fix merge conflict * change config header font size * fix new options emission for config elements * delete unecessary import * add custom modal for service marketplace conflict action * cleanup * remove unecessary imports * pr cleanup of unused imports and classes Co-authored-by: Matt Hill <matthewonthemoon@gmail.com>
- Loading branch information
Showing
13 changed files
with
168 additions
and
38 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
frontend/projects/ui/src/app/modals/action-marketplace/action-marketplace.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
<ion-header> | ||
<ion-toolbar> | ||
<ion-buttons slot="start"> | ||
<ion-button (click)="dismiss()"> | ||
<ion-icon name="close"></ion-icon> | ||
</ion-button> | ||
</ion-buttons> | ||
<ion-title>{{ title }}</ion-title> | ||
</ion-toolbar> | ||
</ion-header> | ||
<ion-content> | ||
<ng-container> | ||
<div class="center text-center"> | ||
<div class="card"> | ||
<h4>This service was installed from:</h4> | ||
<p class="courier-new color-success-shade">{{ packageMarketplace }}</p> | ||
<h4>But you are currently connected to:</h4> | ||
<p class="courier-new color-primary-shade">{{ currentMarketplace }}</p> | ||
</div> | ||
<br /> | ||
<div> | ||
<p>To switch marketplaces visit your</p> | ||
<ion-button | ||
color="success" | ||
routerLink="embassy/marketplaces" | ||
(click)="dismiss()" | ||
>Marketplace Settings</ion-button | ||
> | ||
<p>or you can</p> | ||
<ion-button | ||
[routerLink]="['marketplace/', pkgId]" | ||
click="dismiss()" | ||
(click)="dismiss()" | ||
>Continue to {{ currentMarketplace }}</ion-button | ||
> | ||
</div> | ||
</div> | ||
</ng-container> | ||
</ion-content> |
12 changes: 12 additions & 0 deletions
12
...tend/projects/ui/src/app/modals/action-marketplace/action-marketplace.component.module.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { NgModule } from '@angular/core' | ||
import { CommonModule } from '@angular/common' | ||
import { IonicModule } from '@ionic/angular' | ||
import { RouterModule } from '@angular/router' | ||
import { ActionMarketplaceComponent } from './action-marketplace.component' | ||
|
||
@NgModule({ | ||
declarations: [ActionMarketplaceComponent], | ||
imports: [CommonModule, IonicModule, RouterModule.forChild([])], | ||
exports: [ActionMarketplaceComponent], | ||
}) | ||
export class ActionMarketplaceComponentModule {} |
16 changes: 16 additions & 0 deletions
16
frontend/projects/ui/src/app/modals/action-marketplace/action-marketplace.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
.center { | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
flex-direction: column; | ||
} | ||
|
||
.text-center { | ||
text-align: center; | ||
} | ||
|
||
.card { | ||
background: rgba(53, 56, 62, 0.768); | ||
border-radius: 7px; | ||
padding: 27px; | ||
} |
20 changes: 20 additions & 0 deletions
20
frontend/projects/ui/src/app/modals/action-marketplace/action-marketplace.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { Component, Input } from '@angular/core' | ||
import { ModalController } from '@ionic/angular' | ||
|
||
@Component({ | ||
selector: 'action-marketplace', | ||
templateUrl: './action-marketplace.component.html', | ||
styleUrls: ['./action-marketplace.component.scss'], | ||
}) | ||
export class ActionMarketplaceComponent { | ||
@Input() title: string | ||
@Input() packageMarketplace: string | ||
@Input() currentMarketplace: string | ||
@Input() pkgId: string | ||
|
||
constructor(private readonly modalCtrl: ModalController) {} | ||
|
||
dismiss() { | ||
this.modalCtrl.dismiss() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,8 @@ | |
// kills the lines | ||
--border-width: 0; | ||
--inner-border-width: 0; | ||
} | ||
|
||
.header-details { | ||
font-size: 20px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters