{{html-safe this.theme.provider.advisoryBoard}}
diff --git a/app/preprints/select/route.ts b/app/preprints/select/route.ts
new file mode 100644
index 00000000000..6942843fddc
--- /dev/null
+++ b/app/preprints/select/route.ts
@@ -0,0 +1,26 @@
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import Store from '@ember-data/store';
+import PreprintProviderModel from 'ember-osf-web/models/preprint-provider';
+import requireAuth from 'ember-osf-web/decorators/require-auth';
+import Theme from 'ember-osf-web/services/theme';
+import config from 'ember-osf-web/config/environment';
+
+@requireAuth()
+export default class PreprintSelectRoute extends Route {
+ @service store!: Store;
+ @service theme!: Theme;
+
+ async model(){
+ const submissionProviders: PreprintProviderModel[] = await this.store.findAll('preprint-provider', {
+ reload: true,
+ adapterOptions: { 'filter[allowSubmissions]': 'true' },
+ });
+
+ this.theme.set('id', config.defaultProvider);
+
+ return {
+ submissionProviders,
+ };
+ }
+}
diff --git a/app/preprints/select/styles.scss b/app/preprints/select/styles.scss
new file mode 100644
index 00000000000..083f8f071e6
--- /dev/null
+++ b/app/preprints/select/styles.scss
@@ -0,0 +1,43 @@
+// stylelint-disable max-nesting-depth, selector-max-compound-selectors
+
+@import 'app/styles/layout';
+
+.select-page-container {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ .header-container {
+ padding: 30px 0;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-start;
+ background: url('assets/images/default-brand/bg-dark.jpg') top center $color-bg-color-grey;
+
+ .header-clamp-width-container {
+ @include clamp-width;
+
+ .header {
+ margin: 5px 10px;
+ font-size: 48px;
+ color: $color-text-white;
+ }
+ }
+ }
+
+ &.mobile {
+ .header-container {
+ text-align: center;
+
+ .header-clamp-width-container {
+ .header {
+ font-size: 36px;
+ }
+ }
+ }
+ }
+}
diff --git a/app/preprints/select/template.hbs b/app/preprints/select/template.hbs
new file mode 100644
index 00000000000..def36ced049
--- /dev/null
+++ b/app/preprints/select/template.hbs
@@ -0,0 +1,15 @@
+{{page-title (t 'preprints.select.page-title')}}
+
+
+
+
+
+ {{t 'preprints.select.title'}}
+
+
+
+
+
diff --git a/app/preprints/submit/controller.ts b/app/preprints/submit/controller.ts
new file mode 100644
index 00000000000..729bb2a2b6b
--- /dev/null
+++ b/app/preprints/submit/controller.ts
@@ -0,0 +1,17 @@
+import Controller from '@ember/controller';
+import { action} from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+export default class PreprintSubmit extends Controller {
+ @tracked isPageDirty = false;
+
+ @action
+ setPageDirty() {
+ this.isPageDirty = true;
+ }
+
+ @action
+ resetPageDirty() {
+ this.isPageDirty = false;
+ }
+}
diff --git a/app/preprints/submit/route.ts b/app/preprints/submit/route.ts
new file mode 100644
index 00000000000..feeeac02215
--- /dev/null
+++ b/app/preprints/submit/route.ts
@@ -0,0 +1,84 @@
+import Store from '@ember-data/store';
+import Route from '@ember/routing/route';
+import RouterService from '@ember/routing/router-service';
+import { inject as service } from '@ember/service';
+import PreprintProviderModel from 'ember-osf-web/models/preprint-provider';
+import MetaTags, { HeadTagDef } from 'ember-osf-web/services/meta-tags';
+import Theme from 'ember-osf-web/services/theme';
+import requireAuth from 'ember-osf-web/decorators/require-auth';
+// eslint-disable-next-line ember/no-mixins
+import ConfirmationMixin from 'ember-onbeforeunload/mixins/confirmation';
+import { action, computed } from '@ember/object';
+import PreprintSubmit from 'ember-osf-web/preprints/submit/controller';
+import Intl from 'ember-intl/services/intl';
+import Transition from '@ember/routing/-private/transition';
+
+@requireAuth()
+export default class PreprintSubmitRoute extends Route.extend(ConfirmationMixin, {}) {
+ @service store!: Store;
+ @service intl!: Intl;
+ @service theme!: Theme;
+ @service router!: RouterService;
+ @service metaTags!: MetaTags;
+ headTags?: HeadTagDef[];
+
+ // This does NOT work on chrome and I'm going to leave it just in case
+ confirmationMessage = this.intl.t('preprints.submit.action-flow.save-before-exit');
+
+ buildRouteInfoMetadata() {
+ return {
+ osfMetrics: {
+ providerId: this.theme.id,
+ },
+ };
+ }
+
+ async model(args: any) {
+ try {
+ const provider = await this.store.findRecord('preprint-provider', args.provider_id);
+ this.theme.providerType = 'preprint';
+ this.theme.id = args.provider_id;
+ return {
+ provider,
+ brand: provider.brand.content,
+ displayDialog: this.displayDialog,
+ };
+ } catch (e) {
+
+ this.router.transitionTo('not-found', `preprints/${args.provider_id}/submit`);
+ return null;
+ }
+ }
+
+ afterModel(model: PreprintProviderModel) {
+ if (model && model.assets && model.assets.favicon) {
+ const headTags = [{
+ type: 'link',
+ attrs: {
+ rel: 'icon',
+ href: model.assets.favicon,
+ },
+ }];
+ this.set('headTags', headTags);
+ }
+ }
+
+ // This tells ember-onbeforeunload's ConfirmationMixin whether or not to stop transitions
+ // This is for when the user leaves the site or does a full app reload
+ @computed('controller.isPageDirty')
+ get isPageDirty() {
+ const controller = this.controller as PreprintSubmit;
+ return () => controller.isPageDirty;
+ }
+
+ // This is for when the user leaves the page via the router
+ @action
+ willTransition(transition: Transition) {
+ const controller = this.controller as PreprintSubmit;
+ if (controller.isPageDirty) {
+ if (!window.confirm(this.intl.t('preprints.submit.action-flow.save-before-exit'))) {
+ transition.abort();
+ }
+ }
+ }
+}
diff --git a/app/preprints/submit/template.hbs b/app/preprints/submit/template.hbs
new file mode 100644
index 00000000000..5e535341e87
--- /dev/null
+++ b/app/preprints/submit/template.hbs
@@ -0,0 +1,11 @@
+{{#if this.model.provider}}
+
+{{else}}
+
+{{/if}}
\ No newline at end of file
diff --git a/app/router.ts b/app/router.ts
index 3af5e49cc9f..099d5179d8f 100644
--- a/app/router.ts
+++ b/app/router.ts
@@ -31,6 +31,9 @@ Router.map(function() {
this.route('index', { path: '/' });
this.route('discover', { path: '/:provider_id/discover' });
this.route('detail', { path: '/:provider_id/:guid' });
+ this.route('submit', { path: '/:provider_id/submit' });
+ this.route('edit', { path: '/:provider_id/edit/:guid' });
+ this.route('select');
});
diff --git a/app/serializers/contributor.ts b/app/serializers/contributor.ts
index bedeeb1301f..6f8bea9c988 100644
--- a/app/serializers/contributor.ts
+++ b/app/serializers/contributor.ts
@@ -6,6 +6,7 @@ export default class ContributorSerializer extends OsfSerializer {
const serialized = super.serialize(snapshot, options);
delete serialized!.data!.relationships!.node;
delete serialized!.data!.relationships!.draft_registration;
+ delete serialized!.data!.relationships!.preprint;
return serialized;
}
diff --git a/app/services/theme.ts b/app/services/theme.ts
index 679c52503aa..1df05939904 100644
--- a/app/services/theme.ts
+++ b/app/services/theme.ts
@@ -86,16 +86,12 @@ export default class Theme extends Service {
return this.isProvider && !this.isDomain;
}
- @computed('id', 'isDomain', 'isProvider', 'settings.routePath')
+ @computed('id', 'isDomain', 'settings.routePath')
get pathPrefix(): string {
let pathPrefix = '/';
if (!this.isDomain) {
- pathPrefix += `${this.settings.routePath}/`;
-
- if (this.isProvider) {
- pathPrefix += `${this.id}/`;
- }
+ pathPrefix += `${this.settings.routePath}/${this.id}/`;
}
return pathPrefix;
diff --git a/app/styles/_accessibility.scss b/app/styles/_accessibility.scss
index a3236b239c3..c905a0d2075 100644
--- a/app/styles/_accessibility.scss
+++ b/app/styles/_accessibility.scss
@@ -1,4 +1,95 @@
// stylelint-disable selector-class-pattern
+
+.btn {
+ display: inline-block;
+ margin-bottom: 0;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ touch-action: manipulation;
+ cursor: pointer;
+ border: 1px solid transparent;
+ font-size: 14px;
+ line-height: $tall-line-height;
+ border-radius: 2px;
+ user-select: none;
+ color: $color-text-white;
+
+ &:active {
+ // TODO: color variable
+ box-shadow: inset 0 1px 2px rgba(38, 57, 71, 0.2);
+ }
+
+ &:disabled {
+ cursor: not-allowed;
+ filter: alpha(opacity=65);
+ opacity: 0.65;
+ }
+}
+
+.btn-small {
+ padding: 2px 10px;
+}
+
+.btn-medium {
+ padding: 6px 12px;
+}
+
+.btn-large {
+ padding: 15px 20px;
+}
+
+.btn-primary {
+ background-color: var(--primary-color);
+ color: $color-text-white;
+ font-weight: bold;
+
+ &:hover:not([disabled]) {
+ background-color: var(--secondary-color);
+ }
+}
+
+// This should only be used in preprint branding as we move away from using custom CSS
+// Please don't rely on this class for new brands
+.DarkText {
+ color: $color-text-black;
+}
+
+.btn-secondary {
+ background-color: $color-bg-white;
+ border: 1px solid $color-border-gray-light;
+ color: $color-text-black;
+
+ &:hover:not([disabled]) {
+ border: 1px solid $color-bg-gray-blue;
+ background-color: $color-bg-gray-blue-light;
+ }
+}
+
+.btn-create {
+ background-color: darken($brand-success, 10%);
+ color: $color-text-white;
+
+ &:hover:not([disabled]) {
+ background-color: darken($brand-success, 25%);
+ }
+}
+
+.btn-default {
+ color: $color-text-black;
+}
+
+.btn-destroy {
+ background-color: $color-text-white;
+ color: $brand-danger;
+ border: 1px solid $color-border-gray-darker;
+
+ &:hover:not([disabled]) {
+ background-color: $brand-danger;
+ color: $color-text-white;
+ }
+}
+
.btn-success {
color: $btn-success-high-contrast-color;
background-color: $brand-success;
@@ -9,6 +100,7 @@
border-color: darken($brand-success, 15%);
}
+
&[disabled],
&[disabled]:hover,
:global(&.disabled),
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
index fac0785e012..adcc9ab19ff 100644
--- a/app/styles/_variables.scss
+++ b/app/styles/_variables.scss
@@ -48,6 +48,7 @@ $color-border-gray-dark: #e5e5e5;
$color-border-gray: #ddd;
$color-border-gray-light: #d9d9d9;
$color-border-gray-cool: #d6dbdc;
+$color-border-blue-dark: #263947;
$color-gradient-primary: #eee;
$color-gradient-secondary: #ccc;
@@ -84,6 +85,7 @@ $color-bg-blue-dark: #337ab7;
$color-bg-blue-darker: #214661;
$color-bg-blue-light: #def;
$color-bg-blue-lighter: rgba($color-bg-blue-dark, 0.2);
+$color-bg-blue-highlight: #15a5eb;
$color-bg-red: #a00;
$color-bg-white-transparent: rgba(255, 255, 255, 0.49);
diff --git a/lib/app-components/addon/components/branded-navbar/component.ts b/lib/app-components/addon/components/branded-navbar/component.ts
index ce62cde5e4d..02c916d1e96 100644
--- a/lib/app-components/addon/components/branded-navbar/component.ts
+++ b/lib/app-components/addon/components/branded-navbar/component.ts
@@ -49,10 +49,6 @@ export default class BrandedNavbar extends Component {
return `${osfURL}reviews`;
}
- get submitPreprintUrl() {
- return this.theme.isProvider ? `${osfURL}preprints/${this.theme.id}/submit/` : `${osfURL}preprints/submit/`;
- }
-
@alias('theme.provider') provider!: ProviderModel;
@alias('theme.provider.id') providerId!: string;
@alias('theme.provider.brand.primaryColor') brandPrimaryColor!: BrandModel;
diff --git a/lib/app-components/addon/components/branded-navbar/template.hbs b/lib/app-components/addon/components/branded-navbar/template.hbs
index f754bd92761..02d542fe42b 100644
--- a/lib/app-components/addon/components/branded-navbar/template.hbs
+++ b/lib/app-components/addon/components/branded-navbar/template.hbs
@@ -9,7 +9,7 @@
>