Skip to content

Commit

Permalink
Merge pull request #28 from nypublicradio/rename
Browse files Browse the repository at this point in the history
renames app from overhaul to wnyc-web-client
  • Loading branch information
Brian Whitton authored Jan 10, 2017
2 parents d10ea12 + 707e0a1 commit 0875da9
Show file tree
Hide file tree
Showing 118 changed files with 203 additions and 203 deletions.
2 changes: 1 addition & 1 deletion app/adapters/django-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import DS from 'ember-data';
import fetch from 'fetch';
import ENV from '../config/environment';
import { isInDom } from '../lib/alien-dom';
import { canonicalize } from 'overhaul/services/script-loader';
import { canonicalize } from 'wnyc-web-client/services/script-loader';

export default DS.Adapter.extend({
findRecord(store, type, id /*, snapshot */) {
Expand Down
2 changes: 1 addition & 1 deletion app/authenticators/nypr.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';
import Base from 'ember-simple-auth/authenticators/base';
import $ from 'jquery';
import RSVP from 'rsvp';
Expand Down
4 changes: 2 additions & 2 deletions app/bucket/adapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ApplicationAdapter from 'overhaul/adapters/application';
import config from 'overhaul/config/environment';
import ApplicationAdapter from 'wnyc-web-client/adapters/application';
import config from 'wnyc-web-client/config/environment';

export default ApplicationAdapter.extend({
pathForType: 'bucket',
Expand Down
2 changes: 1 addition & 1 deletion app/channel/index/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
import Route from 'ember-route';
import get from 'ember-metal/get';
import set from 'ember-metal/set';
import ListingRouteMixin from 'overhaul/mixins/listing-route';
import ListingRouteMixin from 'wnyc-web-client/mixins/listing-route';
const { Inflector } = Ember;

const inflect = new Inflector(Inflector.defaultRules);
Expand Down
2 changes: 1 addition & 1 deletion app/channel/page/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import set from 'ember-metal/set';
const { Inflector } = Ember;

const inflect = new Inflector(Inflector.defaultRules);
import ListingRouteMixin from 'overhaul/mixins/listing-route';
import ListingRouteMixin from 'wnyc-web-client/mixins/listing-route';

export default Route.extend(ListingRouteMixin, {
model({ page_params }) {
Expand Down
4 changes: 2 additions & 2 deletions app/channel/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const {
} = Ember;
const { hash: waitFor } = Ember.RSVP;
const inflector = new Inflector(Inflector.defaultRules);
import { retryFromServer } from 'overhaul/lib/compat-hooks';
import PlayParamMixin from 'overhaul/mixins/play-param';
import { retryFromServer } from 'wnyc-web-client/lib/compat-hooks';
import PlayParamMixin from 'wnyc-web-client/mixins/play-param';

export default Route.extend(PlayParamMixin, {
session: service(),
Expand Down
4 changes: 2 additions & 2 deletions app/components/beta-trial/component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';
import { addAlienLanding } from 'overhaul/lib/alien-dom';
import config from 'overhaul/config/environment';
import { addAlienLanding } from 'wnyc-web-client/lib/alien-dom';
import config from 'wnyc-web-client/config/environment';

const { betaTrials: { betaInviteLanding, legacyNavLinkLanding } } = config;

Expand Down
2 changes: 1 addition & 1 deletion app/components/comments-admin/component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

export default Ember.Component.extend({
cmsUrl: ENV.wnycAccountRoot,
Expand Down
2 changes: 1 addition & 1 deletion app/components/comments-form/component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
import fetch from 'fetch';

export default Ember.Component.extend({
Expand Down
6 changes: 3 additions & 3 deletions app/components/django-page/component.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Ember from 'ember';
import service from 'ember-service/inject';
import ENV from '../../config/environment';
import LegacySupportMixin from 'overhaul/mixins/legacy-support';
import BetaActionsMixin from 'overhaul/mixins/beta-actions';
import { canonicalize } from 'overhaul/services/script-loader';
import LegacySupportMixin from 'wnyc-web-client/mixins/legacy-support';
import BetaActionsMixin from 'wnyc-web-client/mixins/beta-actions';
import { canonicalize } from 'wnyc-web-client/services/script-loader';
import {
isInDom,
embeddedComponentSetup,
Expand Down
2 changes: 1 addition & 1 deletion app/components/forgot-pw/component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

export default Ember.Component.extend({
ENV: ENV
Expand Down
2 changes: 1 addition & 1 deletion app/components/google-ad/component.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*global wnyc*/
import Ember from 'ember';
import service from 'ember-service/inject';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
const {
get,
set,
Expand Down
2 changes: 1 addition & 1 deletion app/components/listen-button/embedded/component.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ListenButton from 'overhaul/components/listen-button/component';
import ListenButton from 'wnyc-web-client/components/listen-button/component';
import computed from 'ember-computed';
import get from 'ember-metal/get';
import hbs from 'htmlbars-inline-precompile';
Expand Down
4 changes: 2 additions & 2 deletions app/components/nav-links/component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';
import config from 'overhaul/config/environment';
import { canonicalize } from 'overhaul/services/script-loader';
import config from 'wnyc-web-client/config/environment';
import { canonicalize } from 'wnyc-web-client/services/script-loader';

const {
get,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import { findTouchById, isSimulatedMouseEvent } from 'overhaul/lib/touch-utils';
import { findTouchById, isSimulatedMouseEvent } from 'wnyc-web-client/lib/touch-utils';
const { Component, computed, get, set } = Ember;
const { htmlSafe } = Ember.String;

Expand Down
4 changes: 2 additions & 2 deletions app/components/queue-button/embedded/component.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import QueueButton from 'overhaul/components/queue-button/component';
import QueueButton from 'wnyc-web-client/components/queue-button/component';
import computed from 'ember-computed';
import get from 'ember-metal/get';
import layout from 'overhaul/components/queue-button/template';
import layout from 'wnyc-web-client/components/queue-button/template';

function wnycEmbeddedAttr() {
return computed('embeddedAttrs', {
Expand Down
2 changes: 1 addition & 1 deletion app/components/search-box/component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';

export default Ember.Component.extend({
svgURL: config.wnycSvgURL
Expand Down
4 changes: 2 additions & 2 deletions app/components/site-chrome/component.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from 'ember-component';
import service from 'ember-service/inject';
import BetaActionsMixin from 'overhaul/mixins/beta-actions';
import config from 'overhaul/config/environment';
import BetaActionsMixin from 'wnyc-web-client/mixins/beta-actions';
import config from 'wnyc-web-client/config/environment';
import { or } from 'ember-computed';

export default Component.extend(BetaActionsMixin, {
Expand Down
2 changes: 1 addition & 1 deletion app/components/x-marquee/component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from 'ember-component';
import { imageTemplate } from 'overhaul/helpers/image-template';
import { imageTemplate } from 'wnyc-web-client/helpers/image-template';
import { htmlSafe } from 'ember-string';
import get from 'ember-metal/get';
import set from 'ember-metal/set';
Expand Down
2 changes: 1 addition & 1 deletion app/discover/edit/topics/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';

export default Ember.Route.extend({
discoverPrefs: Ember.inject.service(),
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/is-external.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
import { helper } from 'ember-helper';
import { canonicalize } from 'overhaul/services/script-loader';
import { canonicalize } from 'wnyc-web-client/services/script-loader';
let { wnycURL } = ENV;
wnycURL = canonicalize(wnycURL);

Expand Down
2 changes: 1 addition & 1 deletion app/helpers/share-url.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { helper } from 'ember-helper';
import { urlEncode } from 'overhaul/helpers/url-encode';
import { urlEncode } from 'wnyc-web-client/helpers/url-encode';

export function shareUrl([destination, metadata]) {
metadata = metadata || {};
Expand Down
4 changes: 2 additions & 2 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
{{content-for "head"}}

<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/overhaul.css">
<link rel="stylesheet" href="{{rootURL}}assets/wnyc-web-client.css">

{{content-for "head-footer"}}
</head>
<body>
{{content-for "body"}}

<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/overhaul.js"></script>
<script src="{{rootURL}}assets/wnyc-web-client.js"></script>

{{content-for "body-footer"}}
</body>
Expand Down
2 changes: 1 addition & 1 deletion app/instance-initializers/beta-trial.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';

export function chooseBetaPayload() {
let beta;
Expand Down
4 changes: 2 additions & 2 deletions app/instance-initializers/link-handler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// based on https://github.com/intercom/ember-href-to/blob/master/app/instance-initializers/browser/ember-href-to.js
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
import Ember from 'ember';
import { canonicalize } from 'overhaul/services/script-loader';
import { canonicalize } from 'wnyc-web-client/services/script-loader';
const { $ } = Ember;
let { wnycURL } = ENV;
wnycURL = canonicalize(wnycURL);
Expand Down
2 changes: 1 addition & 1 deletion app/instance-initializers/metrics.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

const {
googleAnalyticsKey,
Expand Down
2 changes: 1 addition & 1 deletion app/lib/alien-dom.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';
import Ember from 'ember';

// The Alien DOM is a DOM that exists beyond the reaches of an Ember app's
Expand Down
12 changes: 6 additions & 6 deletions app/lib/compat-hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
out of the old JS.
*/
import Ember from 'ember';
import config from 'overhaul/config/environment';
import { removeAlienListeners, assign } from 'overhaul/lib/alien-dom';
import { runOnce } from 'overhaul/services/legacy-loader';
import { canonicalize } from 'overhaul/services/script-loader';
import config from 'wnyc-web-client/config/environment';
import { removeAlienListeners, assign } from 'wnyc-web-client/lib/alien-dom';
import { runOnce } from 'wnyc-web-client/services/legacy-loader';
import { canonicalize } from 'wnyc-web-client/services/script-loader';
const { $, get } = Ember;

export function homepageCleanup(element = document.body) {
Expand Down Expand Up @@ -129,9 +129,9 @@ export function serializeInlineDoc(inlineDoc) {
// we get problems from recursive ember views and ember trying to boot again
toClean.push(...inlineDoc.querySelectorAll('.ember-view'));
toClean.push(inlineDoc.querySelector('script[src*="assets/vendor"]'));
toClean.push(inlineDoc.querySelector('script[src*="assets/overhaul"]'));
toClean.push(inlineDoc.querySelector('script[src*="assets/wnyc-web-client"]'));
toClean.push(inlineDoc.querySelector('link[href*="assets/vendor"]'));
toClean.push(inlineDoc.querySelector('link[href*="assets/overhaul"]'));
toClean.push(inlineDoc.querySelector('link[href*="assets/wnyc-web-client"]'));
// any included google ad scripts have also already run, so clean them out so
// see errors from intializing ads in occupied divs
toClean.push(...inlineDoc.querySelectorAll('.google-ads'));
Expand Down
2 changes: 1 addition & 1 deletion app/metrics-adapters/npr-analytics.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BaseAdapter from 'ember-metrics/metrics-adapters/base';
import { siteName } from 'overhaul/config/environment';
import { siteName } from 'wnyc-web-client/config/environment';
import $ from 'jquery';

const DEFAULT_NPR_VALS = ['NYPR', ...Array(7), siteName, null, document.title, ...Array(3)];
Expand Down
2 changes: 1 addition & 1 deletion app/mixins/beta-actions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';

let { wnycURL } = config;

Expand Down
2 changes: 1 addition & 1 deletion app/routes/application.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from 'ember-route';
import get from 'ember-metal/get';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';
import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
import service from 'ember-service/inject';

Expand Down
2 changes: 1 addition & 1 deletion app/routes/archived-shows.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from 'ember-route';
//import RSVP from 'rsvp';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

export default Route.extend({
titleToken: 'More Shows',
Expand Down
8 changes: 4 additions & 4 deletions app/routes/djangorendered.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
import Route from 'ember-route';
import get from 'ember-metal/get';
import service from 'ember-service/inject';
import { retryFromServer } from 'overhaul/lib/compat-hooks';
import { beforeTeardown } from 'overhaul/lib/compat-hooks';
import PlayParamMixin from 'overhaul/mixins/play-param';
import { retryFromServer } from 'wnyc-web-client/lib/compat-hooks';
import { beforeTeardown } from 'wnyc-web-client/lib/compat-hooks';
import PlayParamMixin from 'wnyc-web-client/mixins/play-param';

export default Route.extend(PlayParamMixin, {
queryParams: {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';
import service from 'ember-service/inject';
import PlayParamMixin from 'overhaul/mixins/play-param';
import PlayParamMixin from 'wnyc-web-client/mixins/play-param';
import rsvp from 'rsvp';
const { hash } = rsvp;
const { get } = Ember;
Expand Down
2 changes: 1 addition & 1 deletion app/serializers/django-page.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DS from 'ember-data';
import Ember from 'ember';
import { serializeInlineDoc } from 'overhaul/lib/compat-hooks';
import { serializeInlineDoc } from 'wnyc-web-client/lib/compat-hooks';

export default DS.Serializer.extend({
normalizeResponse(store, primaryModelClass, payload, id /*, requestType */) {
Expand Down
2 changes: 1 addition & 1 deletion app/services/bumper-state.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Ember from 'ember';
import service from 'ember-service/inject';
import computed, { readOnly, not } from 'ember-computed';
import get, { getProperties } from 'ember-metal/get';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

export default Ember.Service.extend({
init() {
Expand Down
2 changes: 1 addition & 1 deletion app/services/session.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SessionService from 'ember-simple-auth/services/session';
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';
import RSVP from 'rsvp';
import fetch from 'fetch';

Expand Down
4 changes: 2 additions & 2 deletions app/services/whats-on.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';
import $ from 'jquery';
import Service from 'ember-service';
import get from 'ember-metal/get';
import { canonicalize } from 'overhaul/services/script-loader';
import { canonicalize } from 'wnyc-web-client/services/script-loader';

let { wnycURL } = ENV;
wnycURL = canonicalize(wnycURL);
Expand Down
2 changes: 1 addition & 1 deletion app/shows/adapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ApplicationAdapter from 'overhaul/adapters/application';
import ApplicationAdapter from 'wnyc-web-client/adapters/application';

export default ApplicationAdapter.extend({
buildURL() {
Expand Down
2 changes: 1 addition & 1 deletion app/shows/model.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ChannelModel from 'overhaul/channel/model';
import ChannelModel from 'wnyc-web-client/channel/model';

export default ChannelModel;

2 changes: 1 addition & 1 deletion app/shows/route.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Route from 'ember-route';
import RSVP from 'rsvp';
import ENV from 'overhaul/config/environment';
import ENV from 'wnyc-web-client/config/environment';

export default Route.extend({
titleToken: 'All Shows, Podcasts and Programs',
Expand Down
2 changes: 1 addition & 1 deletion app/story/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ENV from '../config/environment';
import get from 'ember-metal/get';
import computed from 'ember-computed';
import parseAnalyticsCode from '../utils/analytics-code-parser';
import { shareMetadata } from 'overhaul/helpers/share-metadata';
import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata';
const { attr, Model } = DS;

export default Model.extend({
Expand Down
2 changes: 1 addition & 1 deletion app/story/route.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Ember from 'ember';
import service from 'ember-service/inject';
import PlayParamMixin from 'overhaul/mixins/play-param';
import PlayParamMixin from 'wnyc-web-client/mixins/play-param';
const { get } = Ember;
const { hash: waitFor } = Ember.RSVP;

Expand Down
2 changes: 1 addition & 1 deletion app/stream/adapter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from 'overhaul/config/environment';
import config from 'wnyc-web-client/config/environment';
import DS from 'ember-data';
import Ember from 'ember';
const { hash } = Ember.RSVP;
Expand Down
2 changes: 1 addition & 1 deletion app/stream/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import { belongsTo } from 'ember-data/relationships';
import computed, { readOnly } from 'ember-computed';
import { shareMetadata } from 'overhaul/helpers/share-metadata';
import { shareMetadata } from 'wnyc-web-client/helpers/share-metadata';

export default Model.extend({
audioType: 'stream',
Expand Down
Loading

0 comments on commit 0875da9

Please sign in to comment.