Skip to content

Commit

Permalink
Merge branch 'release/23.08.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
adlius committed Jul 13, 2023
2 parents eb27042 + 52e8fd3 commit 68c3f0f
Show file tree
Hide file tree
Showing 423 changed files with 8,356 additions and 6,616 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [23.08.0] - 2023-07-13
### Changed
- Removed remaining Bootstrap components
- Added JSON-LD metadata to registration overview page for Google structured data markup

## [23.07.0] - 2023-05-01
### Changed
- Fix some deprecations
Expand Down Expand Up @@ -1927,6 +1932,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Quick Files

[23.08.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.08.0
[23.07.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.07.0
[23.06.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.1
[23.06.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
Expand Down
4 changes: 4 additions & 0 deletions app/application/-components/verify-email-modal/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.modal-title {
margin: 0;
line-height: $tall-line-height;
}
67 changes: 33 additions & 34 deletions app/application/-components/verify-email-modal/template.hbs
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
{{#if (and this.shouldShowModal this.userEmail)}}
<BsModal
@backdropClose={{false}}
as |modal|
>
<modal.header @closeButton={{false}}>
<h3 class='modal-title'>{{t this.translationKeys.header}}</h3>
</modal.header>
<modal.body>
<p data-test-verify-email-prompt>
{{t this.translationKeys.body email=this.userEmail.emailAddress htmlSafe=true}}
</p>
</modal.body>
<modal.footer data-analytics-scope='Verify email modal'>
<BsButton
data-test-deny-email
data-analytics-name='Deny'
disabled={{this.disableButtons}}
@onClick={{action this.deny}}
>
{{t this.translationKeys.denyButton}}
</BsButton>
<BsButton
data-test-verify-email
data-analytics-name='Verify'
disabled={{this.disableButtons}}
@type='primary'
@onClick={{action this.verify}}
>
{{t this.translationKeys.verifyButton}}
</BsButton>
</modal.footer>
</BsModal>
{{/if}}
<OsfDialog
@closeOnOutsideClick={{false}}
@isOpen={{and this.shouldShowModal this.userEmail}}
as |dialog|
>
<dialog.heading>
<h3 local-class='modal-title'>{{t this.translationKeys.header}}</h3>
</dialog.heading>
<dialog.main>
<p data-test-verify-email-prompt>
{{t this.translationKeys.body email=this.userEmail.emailAddress htmlSafe=true}}
</p>
</dialog.main>
<dialog.footer data-analytics-scope='Verify email modal'>
<Button
data-test-deny-email
data-analytics-name='Deny'
disabled={{this.disableButtons}}
{{on 'click' (action this.deny)}}
>
{{t this.translationKeys.denyButton}}
</Button>
<Button
data-test-verify-email
data-analytics-name='Verify'
disabled={{this.disableButtons}}
@type='primary'
{{on 'click' (action this.verify)}}
>
{{t this.translationKeys.verifyButton}}
</Button>
</dialog.footer>
</OsfDialog>
13 changes: 11 additions & 2 deletions app/dashboard/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { all, restartableTask, task, timeout } from 'ember-concurrency';
import { taskFor } from 'ember-concurrency-ts';
import config from 'ember-get-config';
import $ from 'jquery';
import Media from 'ember-responsive';

import Institution from 'ember-osf-web/models/institution';
import Node from 'ember-osf-web/models/node';
Expand All @@ -29,6 +30,7 @@ export default class Dashboard extends Controller {
@service analytics!: Analytics;
@service currentUser!: CurrentUser;
@service store!: Store;
@service media!: Media;

page = 1;
loading = false;
Expand Down Expand Up @@ -155,9 +157,16 @@ export default class Dashboard extends Controller {
taskFor(this.findNodes).perform();
}

@action
projectCreated(newNode: Node) {
@task
async projectCreated(newNode: Node) {
this.set('modalOpen', false);
await timeout(1);
this.set('newNode', newNode);
this.set('showNewNodeNavigation', true);
this.set('modalOpen', true);
}

get isMobile() {
return this.media.isMobile;
}
}
Loading

0 comments on commit 68c3f0f

Please sign in to comment.