-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #596 from DigitalExcellence/develop
Release v.1.8.0-beta - 11-4-2021
- Loading branch information
Showing
35 changed files
with
653 additions
and
59 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
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
16 changes: 16 additions & 0 deletions
16
src/app/components/modals/modal-information-generic/modal-information-generic.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,16 @@ | ||
| <div class="modal-information-container"> | ||
| <button type="button" class="close pull-right" aria-label="Close" (click)="bsModalRef.hide()"> | ||
| <span aria-hidden="true">×</span> | ||
| </button> | ||
| <div class="modal-body"> | ||
| <h2>{{titleText}}</h2> | ||
| <p [innerHTML]="mainText"></p> | ||
| <div class="row"> | ||
| <div class="col-12 modal-buttons"> | ||
| <button type="button" class="cancel" (click)="bsModalRef.hide()">{{secondaryButtonText}}</button> | ||
| <button type="button" class="primary" (click)="onClickCta()">{{ctaButtonText}}</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> |
55 changes: 55 additions & 0 deletions
55
src/app/components/modals/modal-information-generic/modal-information-generic.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,55 @@ | ||
| /* | ||
| * | ||
| * Digital Excellence Copyright (C) 2020 Brend Smits | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Lesser General Public License as published | ||
| * by the Free Software Foundation version 3 of the License. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * See the GNU Lesser General Public License for more details. | ||
| * | ||
| * You can find a copy of the GNU Lesser General Public License | ||
| * along with this program, in the LICENSE.md file in the root project directory. | ||
| * If not, see https://www.gnu.org/licenses/lgpl-3.0.txt | ||
| * | ||
| */ | ||
| @import "assets/styles/variables"; | ||
|
|
||
| .modal-body { | ||
| position: unset; | ||
| } | ||
|
|
||
| .modal-information-container { | ||
| background: #f8f8f8; | ||
| width: 100%; | ||
| max-width: 600px; | ||
| border-radius: 6px; | ||
| border: none; | ||
| outline: none; | ||
| box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16); | ||
| padding: 15px; | ||
|
|
||
| button.close { | ||
| border: none; | ||
| background: none; | ||
| display: flex; | ||
| float: right; | ||
| &:focus, | ||
| &:active { | ||
| border: none; | ||
| outline: none; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .modal-buttons { | ||
| display: flex; | ||
| justify-content: flex-end; | ||
|
|
||
| button:nth-child(1) { | ||
| margin-right: 15px; | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
src/app/components/modals/modal-information-generic/modal-information-generic.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,34 @@ | ||
| import { Component, EventEmitter, Output } from '@angular/core'; | ||
| import { BsModalRef } from 'ngx-bootstrap/modal'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-modal-information-generic', | ||
| templateUrl: './modal-information-generic.component.html', | ||
| styleUrls: ['./modal-information-generic.component.scss'] | ||
| }) | ||
| export class ModalInformationGenericComponent { | ||
|
|
||
| @Output() cta = new EventEmitter<boolean>(true); | ||
|
|
||
| public readonly titleText = ''; | ||
| public readonly mainText = ''; | ||
| public readonly ctaButtonText = ''; | ||
| public readonly secondaryButtonText = ''; | ||
|
|
||
| constructor( | ||
| public bsModalRef: BsModalRef, | ||
| ) { } | ||
|
|
||
| ngOnInit(): void { | ||
| } | ||
|
|
||
| /** | ||
| * Method which triggers when remove is confirmed. | ||
| * Emits true via the output property and closes the modal. | ||
| */ | ||
| public onClickCta(): void { | ||
| this.cta.emit(true); | ||
| this.bsModalRef.hide(); | ||
| } | ||
|
|
||
| } |
31 changes: 31 additions & 0 deletions
31
...-user-email-confirmation/modal-potential-new-owner-user-email-confirmation.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,31 @@ | ||
| <!-- | ||
| Digital Excellence Copyright (C) 2020 Brend Smits | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU Lesser General Public License as published | ||
| by the Free Software Foundation version 3 of the License. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty | ||
| of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| See the GNU Lesser General Public License for more details. | ||
| You can find a copy of the GNU Lesser General Public License | ||
| along with this program, in the LICENSE.md file in the root project directory. | ||
| If not, see https://www.gnu.org/licenses/lgpl-3.0.txt | ||
| --> | ||
| <div id="overlay" (click)="this.bsModalRef.hide();"></div> | ||
|
|
||
| <div class="modal-potential-new-owner-user-email-confirmation-container"> | ||
| <div class="modal-body"> | ||
| <h6>Are you sure you want to ask project transfership to {{email}}?</h6> | ||
| <div class="row"> | ||
| <div class="col-12 modal-buttons"> | ||
| <button type="button" class="cancel" (click)="bsModalRef.hide()">Cancel</button> | ||
| <button type="button" class="primary" (click)="onAcceptClicked()">Accept</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
29 changes: 29 additions & 0 deletions
29
...-user-email-confirmation/modal-potential-new-owner-user-email-confirmation.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,29 @@ | ||
| .modal-potential-new-owner-user-email-confirmation-container { | ||
| padding: 10px; | ||
| z-index: 1151; | ||
| position: relative; | ||
| background-color: #fff; | ||
|
|
||
| h6 { | ||
| width: 90%; | ||
| margin-bottom: 10px; | ||
| } | ||
|
|
||
| button { | ||
| margin-right: 10px; | ||
| } | ||
| } | ||
|
|
||
| #overlay { | ||
| position: fixed; | ||
| display: block; | ||
| width: 100%; | ||
| height: 100%; | ||
| top: 0; | ||
| left: 0; | ||
| background-color: #000; | ||
| opacity: 0.5; | ||
| z-index: 1150; | ||
| cursor: pointer; | ||
| transition: opacity .5s ease-in; | ||
| } |
Oops, something went wrong.