Merge branch 'release/19.5.1'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,58 @@ 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).
 
+## [19.5.1] - 2019-06-24
+### Added
+- Tests:
+ - Integration:
+ - `meetings`
+ - `detail`
+ - `meeting-detail-header` - add tests for location and dates
+- Components:
+ - `new-home`
+ - `testimonials` - A section for the testimonials carousel
+ - `integrations versions A/B` - A list of all supported integrations
+ - `carousel`
+
+### Changed
+- Components:
+ - `meetings`
+ - `index`
+ - `meetings-list` - sort by submission count (descending) by default
+ - `detail`
+ - `meeting-submissions-list` - removed download count sorting
+- Tests:
+ - Acceptance:
+ - `new-home` - Added tests to support integrations section
+ - Integration:
+ - `meetings`
+ - `detail`
+ - `meeting-submissions-list` - removed checking of download count sorting
+ - Acceptance:
+ - `meetings`
+ - `detail` - add submission with long title
+ - `index` - add meeting with long name
+
+### Fixed
+- Models:
+ - `meeting-submission` - renamed `created` to `dateCreated` to match API
+- Components:
+ - `meetings`
+ - `detail`
+ - `meeting-submissions-list`
+ - renamed `created` to `dateCreated` to match API
+ - applied `table-layout: fixed` to force truncating of long submission titles
+ - `meeting-detail-header` - only attempt to display dates when defined
+ - `index`
+ - `meetings-list` - applied `table-layout: fixed` to force truncating of long meeting names
+- Tests:
+ - Integration:
+ - `meetings`
+ - `detail`
+ - `meeting-submissions-list` - renamed `created` to `dateCreated` to match API
+- Mirage:
+ - `meeting-submission` factory - renamed `created` to `dateCreated` to match API
+
 ## [19.5.0] - 2019-06-07
 ### Added
 - Models:
@@ -901,7 +953,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.5.0...HEAD
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.5.1...HEAD
+[19.5.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.5.1
 [19.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.5.0
 [19.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.4.0
 [19.3.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.3.0

app/locales/en/translations.ts

@@ -477,6 +477,51 @@ export default {
  description: 'Share papers in OSF Preprints or a community-based preprint provider, so others can find and cite your work. Track impact with metrics like downloads and view counts.',
  },
  },
+ testimonials: {
+ heading: 'What others are saying',
+ see_her_research: 'See her research',
+ see_his_research: 'See his research',
+ carousel_heading: 'User testimonials',
+ slide_1: {
+ text: 'OSF is a game changer for those wanting to effectively share their research process in the spirit of collaboration.',
+ alt: 'Patricia Ayala testimonial',
+ description: {
+ name: 'Patricia Ayala',
+ position: 'Research Services Librarian<br>University of Toronto',
+ },
+ },
+ slide_2: {
+ text: 'OSF is indispensable in helping me create reproducible research pipelines from preregistration through data collection and analysis. Its versatility makes it my one-stop shop for projects. The Dropbox integration effortlessly transforms my existing local workflow to public repository.',
+ alt: 'Maya testimonial',
+ description: {
+ name: 'Maya Mathur',
+ position: 'Department of Epidemiology<br>Harvard University',
+ },
+ },
+ slide_3: {
+ text: 'Because SocArXiv is a not-for-profit organization, researchers can be assured that they are sharing their research in an environment where access, inclusivity, and preservation, rather than profit, will remain at the heart of the mission. A great benefit of partnering with OSF is that this application is a free public good.',
+ alt: 'Philip Cohen testimonial',
+ description: {
+ name: 'Philip Cohen',
+ position: 'SocArXiv papers',
+ },
+ },
+ },
+ 'integrations-section': {
+ header: 'OSF integrations make your workflow more efficient',
+ authentication: 'Authentication',
+ discovery: 'Discovery',
+ references: 'References',
+ storage: 'Storage',
+ incommon: 'Incommon logo',
+ sso: 'SSO logo',
+ google_scholar: 'Google Scholar logo',
+ orcid: 'Orcid logo',
+ mendeley: 'Mendeley logo',
+ zotero: 'Zotero logo',
+ dropbox: 'Dropbox logo',
+ google_drive: 'Google Drive logo',
+ },
  },
  tos_consent: {
  paragraph: 'We\'ve updated our <a href="{{link1}}">Terms of Use</a> and <a href="{{link2}}">Privacy Policy</a>. Please read them carefully.',
@@ -1469,6 +1514,12 @@ export default {
  subheading: 'Labs and teams across the globe use OSF to open their projects up to the scientific community.',
  },
  },
+ carousel: {
+ current_slide: '(Current Slide)',
+ previous_slide: 'Previous slide',
+ next_slide: 'Next slide',
+ go_to_slide: 'Go to slide {{slideIndex}}',
+ },
  },
  settings: {
  toggleNav: 'Toggle navigation',

app/meetings/detail/-components/meeting-detail-header/template.hbs

@@ -1,9 +1,11 @@
 <h1 data-test-meeting-name>{{this.meeting.name}}</h1>
 
 <div data-test-meeting-location-and-date local-class='location-and-date-text'>
- {{if this.meeting.location (concat this.meeting.location ' | ')}}
- {{moment-format this.meeting.startDate 'MMM DD, YYYY'}}
- {{if this.meeting.endDate (concat ' - ' (moment-format this.meeting.endDate 'MMM DD, YYYY'))}}
+ {{if this.meeting.location this.meeting.location}}
+ {{if (and this.meeting.location (or this.meeting.startDate this.meeting.endDate)) ' | '}}
+ {{if this.meeting.startDate (moment-format this.meeting.startDate 'MMM DD, YYYY')}}
+ {{if (or this.meeting.startDate this.meeting.endDate) ' - '}}
+ {{if this.meeting.endDate (moment-format this.meeting.endDate 'MMM DD, YYYY')}}
 </div>
 
 {{#if this.meeting.logoUrl}}

app/meetings/detail/-components/meeting-submissions-list/styles.scss

@@ -1,6 +1,7 @@
 .table {
  ul {
  display: table;
+ table-layout: fixed;
  width: 100%;
  border: 1px solid #eee;
  margin: 0;

app/meetings/detail/-components/meeting-submissions-list/template.hbs

@@ -41,7 +41,6 @@
  </div>
  <div data-test-submissions-list-header-download style='width: 15%'>
  {{t 'meetings.detail.meeting-submissions-list.downloads'}}
- <SortButton @sortBy='download_count' />
  </div>
  {{/let}}
  </list.header>
@@ -59,7 +58,7 @@
  {{submission.meetingCategory}}
  </div>
  <div data-test-submissions-list-item-date>
- {{moment-format submission.created 'YYYY-MM-DD hh:mm A'}}
+ {{moment-format submission.dateCreated 'YYYY-MM-DD hh:mm A'}}
  </div>
  <div data-test-submissions-list-item-download>
  {{#if submission.links.download}}

app/meetings/index/-components/meetings-list/component.ts

@@ -10,7 +10,7 @@ export default class MeetingsList extends Component.extend({
 }) {
  // Private properties
  search?: string;
- sort?: string;
+ sort = '-submissions_count';
 
  @computed('search', 'sort')
  get query() {

app/meetings/index/-components/meetings-list/styles.scss

@@ -5,6 +5,7 @@
 .table {
  ul {
  display: table;
+ table-layout: fixed;
  width: 100%;
  border: 1px solid #eee;
  margin: 0;

app/models/meeting-submission.ts

@@ -15,7 +15,7 @@ export default class MeetingSubmissionModel extends OsfModel {
  @attr('string') meetingCategory!: string;
  @attr('string') authorName!: string;
  @attr('number') downloadCount!: number;
- @attr('date') created!: Date;
+ @attr('date') dateCreated!: Date;
  @attr() links!: MeetingSubmissionLinks;
 
  @belongsTo('user', { inverse: null })

app/new-home/-components/integrations-section/component.ts

@@ -0,0 +1,23 @@
+import { tagName } from '@ember-decorators/component';
+import { alias } from '@ember-decorators/object/computed';
+import { service } from '@ember-decorators/service';
+import Component from '@ember/component';
+import { camelize } from '@ember/string';
+import Features from 'ember-feature-flags/services/features';
+import config from 'ember-get-config';
+
+import { layout } from 'ember-osf-web/decorators/component';
+
+import styles from './styles';
+import template from './template';
+
+const { featureFlagNames: { ABTesting } } = config;
+
+@layout(template, styles)
+@tagName('')
+export default class IntegrationsSection extends Component {
+ @service features!: Features;
+
+ @alias(`features.${camelize(ABTesting.homePageVersionB)}`)
+ shouldShowVersionB!: boolean;
+}

app/new-home/-components/integrations-section/styles.scss

@@ -0,0 +1,122 @@
+$font-color: #263947;
+$border: 1px solid #ddd;
+
+.container {
+ margin-top: 42px;
+}
+
+.integrationsHeader {
+ text-align: center;
+ padding: 0 20px;
+}
+
+.integrationsHeading {
+ font-size: 32px;
+ color: $font-color;
+ font-weight: 600;
+}
+
+.flexContainer {
+ display: flex;
+ justify-content: center;
+ padding: 35px 20px 43px;
+}
+
+.flexRow {
+ display: inline-flex;
+
+ &:not(:last-of-type) {
+ border-right: $border;
+ }
+}
+
+.flexColumn {
+ text-align: center;
+ width: 255px;
+
+ &:not(:last-of-type) {
+ border-right: $border;
+ }
+}
+
+.logoImg {
+ height: 32px;
+ margin: 15px;
+
+ &.logoTall {
+ height: 50px;
+ }
+}
+
+.columnHeader {
+ font-size: 24px;
+ font-weight: normal;
+ color: $font-color;
+}
+
+.buttonContainer {
+ margin-bottom: 53px;
+ text-align: center;
+}
+
+@media (max-width: 1025px) {
+ .logoImg {
+ height: 25px;
+ }
+
+ .columnHeader {
+ font-size: 20px;
+ }
+
+ .flexRow {
+ width: 50%;
+ }
+}
+
+@media (max-width: 736px) {
+ .flexColumn {
+ width: 100%;
+ }
+
+ .flexContainer {
+ width: 75%;
+ margin: auto;
+ flex-wrap: wrap;
+ }
+
+ .flexRow {
+ width: 100%;
+ justify-content: center;
+
+ &:not(:last-of-type) {
+ border-right: 0;
+ border-bottom: $border;
+ }
+ }
+}
+
+@media (max-width: 613px) {
+ .flexRow {
+ display: block;
+ width: 70%;
+ }
+
+ .flexColumn {
+ margin: 0 auto;
+ border-right: 0;
+
+ &:not(:last-of-type) {
+ border-right: 0;
+ border-bottom: $border;
+ }
+ }
+
+ .logoImg {
+ margin: 40px auto;
+ display: block;
+ }
+
+ .columnHeader {
+ font-size: 16px;
+ }
+}