diff --git a/app/models/collection-provider.ts b/app/models/collection-provider.ts index ed47a31397..223cea0d0b 100644 --- a/app/models/collection-provider.ts +++ b/app/models/collection-provider.ts @@ -1,5 +1,5 @@ import { computed } from '@ember/object'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model'; import CollectionModel from './collection'; diff --git a/app/models/institution.ts b/app/models/institution.ts index 4713036dcc..1afb7c4c90 100644 --- a/app/models/institution.ts +++ b/app/models/institution.ts @@ -1,6 +1,6 @@ import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model'; import { computed } from '@ember/object'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import InstitutionSummaryMetricModel from 'ember-osf-web/models/institution-summary-metric'; import InstitutionDepartmentsModel from './institution-department'; diff --git a/app/models/node.ts b/app/models/node.ts index 6123450c9b..6619372031 100644 --- a/app/models/node.ts +++ b/app/models/node.ts @@ -3,7 +3,7 @@ import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-d import { computed } from '@ember/object'; import { alias, bool, equal, not } from '@ember/object/computed'; import { inject as service } from '@ember/service'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { buildValidations, validator } from 'ember-cp-validations'; import Intl from 'ember-intl/services/intl'; diff --git a/app/models/registration-provider.ts b/app/models/registration-provider.ts index ea2dbc6174..26ae3debbf 100644 --- a/app/models/registration-provider.ts +++ b/app/models/registration-provider.ts @@ -1,4 +1,4 @@ -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { attr, belongsTo, hasMany, AsyncBelongsTo, AsyncHasMany } from '@ember-data/model'; import ReviewActionModel from 'ember-osf-web/models/review-action'; diff --git a/app/validators/-messages.ts b/app/validators/-messages.ts index 931efca8c6..f3ae25f9eb 100644 --- a/app/validators/-messages.ts +++ b/app/validators/-messages.ts @@ -1,4 +1,4 @@ -import ValidatorsMessages from 'ember-intl-cp-validations/validators/messages'; +import ValidatorsMessages from '@ember-intl/cp-validations/validators/messages'; export default class Messages extends ValidatorsMessages { prefix = 'validationErrors'; diff --git a/ember-cli-build.js b/ember-cli-build.js index 6fd5949707..f873c2db0d 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,6 +1,5 @@ /* eslint-env node */ -const nodeSass = require('node-sass'); const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const broccoliAssetRevDefaults = require('broccoli-asset-rev/lib/default-options'); @@ -49,7 +48,6 @@ module.exports = function(defaults) { prepend: config.assetsPrefix, }, sassOptions: { - implementation: nodeSass, includePaths: [ 'app/styles/', ], diff --git a/lib/app-components/addon/helpers/math.ts b/lib/app-components/addon/helpers/math.ts index e0da4799ba..686950f675 100644 --- a/lib/app-components/addon/helpers/math.ts +++ b/lib/app-components/addon/helpers/math.ts @@ -1,5 +1,5 @@ import Helper from '@ember/component/helper'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import katex, { KatexRenderOptions } from 'katex'; export interface Delimiter { diff --git a/lib/app-components/package.json b/lib/app-components/package.json index b5e84f8405..1a65f76c40 100644 --- a/lib/app-components/package.json +++ b/lib/app-components/package.json @@ -10,7 +10,6 @@ "ember-auto-import": "*", "ember-cli-babel": "*", "ember-cli-htmlbars": "*", - "ember-cli-sanitize-html": "*", "ember-cli-sass": "*", "ember-cli-template-lint": "*", "ember-cli-typescript": "*", diff --git a/lib/collections/package.json b/lib/collections/package.json index 9d913d55de..f227d11406 100644 --- a/lib/collections/package.json +++ b/lib/collections/package.json @@ -13,7 +13,6 @@ "ember-auto-import": "*", "ember-cli-babel": "*", "ember-cli-htmlbars": "*", - "ember-cli-sanitize-html": "*", "ember-cli-sass": "*", "ember-cli-template-lint": "*", "ember-cli-typescript": "*", diff --git a/lib/osf-components/addon/components/osf-logo/component.ts b/lib/osf-components/addon/components/osf-logo/component.ts deleted file mode 100644 index 89263de5ba..0000000000 --- a/lib/osf-components/addon/components/osf-logo/component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import Component from '@ember/component'; - -import { layout } from 'ember-osf-web/decorators/component'; -import styles from './styles'; -import template from './template'; - -@layout(template, styles) -export default class OsfLogo extends Component { - double = false; - animate = false; -} diff --git a/lib/osf-components/addon/components/osf-logo/styles.scss b/lib/osf-components/addon/components/osf-logo/styles.scss deleted file mode 100644 index 1b26f2ba5e..0000000000 --- a/lib/osf-components/addon/components/osf-logo/styles.scss +++ /dev/null @@ -1,105 +0,0 @@ -.OsfLogo { - width: 200px; - height: 200px; - margin: 30px auto; - position: relative; - transition: all 1s ease-in-out; - - @for $i from 1 through 8 { - :nth-child(#{$i}) { - transform: translate(75px, 75px) - rotate(#{($i - 1) / 8}turn) - translate(0, -75px); - } - } - - :nth-child(even)::after { - z-index: -1; - } - - > div { - position: absolute; - width: 50px; - height: 50px; - - &::before { - content: ''; - width: 50px; - height: 50px; - background: #fff; - border-radius: 50%; - position: absolute; - left: 0; - top: 0; - transition: all 0.4s ease-in-out; - opacity: 1; - } - - &::after { - content: ''; - width: 30px; - height: 30px; - background: #38b9eb; - border-radius: 50%; - position: absolute; - bottom: -10px; - left: 10px; - transition: all 0.6s ease-in-out; - opacity: 1; - } - - &:hover::before { - transform: translate(0, -15px); - } - - &:hover::after { - transform: translate(0, -5px); - } - } -} - -.Double { - transform: scale(2); -} - -.Animate { - animation: rotateHalf 1s ease-in-out 0s 1; - - div::before { - animation: slideFade 0.4s ease-in-out 0s 1; - } - - div::after { - animation: slideFade 0.6s ease-in-out 0s 1; - } - - @media (prefers-reduced-motion: reduce) { - animation: none; - - div::before, - div::after { - animation: none; - } - } -} - -@keyframes rotateHalf { - 0% { - transform: rotateZ(0.5turn); - } - - 100% { - transform: rotateZ(0); - } -} - -@keyframes slideFade { - 0% { - opacity: 0; - transform: translate(0, -200px); - } - - 100% { - opacity: 1; - } -} diff --git a/lib/osf-components/addon/components/osf-logo/template.hbs b/lib/osf-components/addon/components/osf-logo/template.hbs deleted file mode 100644 index 50ab5340c6..0000000000 --- a/lib/osf-components/addon/components/osf-logo/template.hbs +++ /dev/null @@ -1,5 +0,0 @@ -
- {{#each (range 0 8)}} -
- {{/each}} -
diff --git a/lib/osf-components/addon/components/sign-up-form/template.hbs b/lib/osf-components/addon/components/sign-up-form/template.hbs index 82baf27eaf..0c81393846 100644 --- a/lib/osf-components/addon/components/sign-up-form/template.hbs +++ b/lib/osf-components/addon/components/sign-up-form/template.hbs @@ -3,44 +3,44 @@ local-class='sign-up-form' {{action 'submit' on='submit'}} > - {{validated-input/text - (html-attributes data-test-sign-up-full-name=true) - model=this.userRegistration - valuePath='fullName' - shouldShowMessages=this.didValidate - disabled=this.hasSubmitted - placeholder=(t 'osf-components.sign-up-form.full_name') - ariaLabel=(t 'osf-components.sign-up-form.full_name') - }} - {{validated-input/text - (html-attributes data-test-sign-up-email-1=true) - model=this.userRegistration - valuePath='email1' - shouldShowMessages=this.didValidate - disabled=this.hasSubmitted - placeholder=(t 'osf-components.sign-up-form.contact_email') - ariaLabel=(t 'osf-components.sign-up-form.contact_email') - }} - {{validated-input/text - (html-attributes data-test-sign-up-email-2=true) - model=this.userRegistration - valuePath='email2' - shouldShowMessages=this.didValidate - disabled=this.hasSubmitted - placeholder=(t 'osf-components.sign-up-form.confirm_email') - ariaLabel=(t 'osf-components.sign-up-form.confirm_email') - }} - {{validated-input/text - (html-attributes data-test-sign-up-password=true) - password=true - model=this.userRegistration - valuePath='password' - shouldShowMessages=this.didValidate - disabled=this.hasSubmitted - onKeyUp=(perform this.strength this.userRegistration.password) - placeholder=(t 'osf-components.sign-up-form.password') - ariaLabel=(t 'osf-components.sign-up-form.password') - }} + + + +