Skip to content

Clean up logo code #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 27, 2018
Merged

Clean up logo code #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5604298
Unify `addonLogo` implementation
alexlafroscia Mar 26, 2018
19e6076
Make `logo` setting API of docs-header more consistent
alexlafroscia Mar 26, 2018
8233707
Switch `addonName` to `name`
alexlafroscia Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions addon/components/docs-header/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import layout from './template';
import config from 'dummy/config/environment';
import { computed } from '@ember/object';
import { classify } from '@ember/string';
import { addonLogo } from 'ember-cli-addon-docs/utils/computed';

const packageJson = config['ember-cli-addon-docs'].packageJson;

Expand Down Expand Up @@ -32,22 +33,9 @@ export default Component.extend({

packageJson: packageJson,

addonLogo: computed(function() {
let name = packageJson.name;
let logo;

if (name.match('ember-cli-')) {
logo = 'ember-cli';
} else if (name.match('ember-data-')) {
logo = 'ember-data';
} else if (name.match('ember-data-')) {
Copy link
Contributor Author

@alexlafroscia alexlafroscia Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was using ember-data- twice which didn't make sense

logo = 'ember';
}

return logo;
}),
logo: addonLogo(packageJson),

addonName: computed(function() {
name: computed(function() {
let name = packageJson.name;
name = name.replace('ember-data-', '');
name = name.replace('ember-cli-', '');
Expand Down
4 changes: 2 additions & 2 deletions addon/components/docs-header/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<div class="text-center text-xs">
{{#if logo}}
<div class='h-4 pb-1'>
{{docs-logo logo=addonLogo}}
{{docs-logo logo=logo}}
</div>
{{/if}}
<span class='font-medium normal-case block -mt-2px'>{{addonName}}</span>
<span class='font-medium normal-case block -mt-2px'>{{name}}</span>
</div>
{{/docs-header/link}}

Expand Down
15 changes: 2 additions & 13 deletions addon/components/docs-viewer/x-nav/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Component from '@ember/component';
import layout from './template';
import config from 'dummy/config/environment';
import { classify } from '@ember/string';
import { addonLogo } from 'ember-cli-addon-docs/utils/computed';

const packageJson = config['ember-cli-addon-docs'].packageJson;

Expand All @@ -17,19 +18,7 @@ export default Component.extend({
store: service(),
packageJson,

addonLogo: computed(function() {
let name = packageJson.name;
let logo;
if (name.match(/ember-cli/)) {
logo = 'ember-cli';
} else if (name.match(/ember-data/)) {
logo = 'ember-data';
} else {
logo = 'ember';
}

return logo;
}),
addonLogo: addonLogo(packageJson),
Copy link
Contributor Author

@alexlafroscia alexlafroscia Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unsure if you prefer passing packageJson into the CP macro or would rather this.get('packageJson') within the CP definition. I like this API better since it makes less assumptions about that packgeJson property being available.


addonTitle: computed('addonLogo', function() {
let logo = this.get('addonLogo');
Expand Down
18 changes: 18 additions & 0 deletions addon/utils/computed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,21 @@ export function hasMemberType(...memberKeys) {
});
}

/**
@hide
*/
export function addonLogo(packageJson) {
return computed(function() {
let name = packageJson.name;
let logo;
if (name.match(/ember-cli/)) {
logo = 'ember-cli';
} else if (name.match(/ember-data/)) {
logo = 'ember-data';
} else {
logo = 'ember';
}

return logo;
});
}