Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 0 additions & 27 deletions .eslintignore

This file was deleted.

56 changes: 0 additions & 56 deletions .eslintrc.js

This file was deleted.

3 changes: 1 addition & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
Expand All @@ -21,6 +19,7 @@
/.watchmanconfig
/CONTRIBUTING.md
/ember-cli-build.js
/eslint.config.mjs
/testem.js
/tests/
/tsconfig.declarations.json
Expand Down
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
/coverage/
!.*
.*/
/pnpm-lock.yaml
ember-cli-update.json
*.html
*.hbs
*.md


# ember-try
/.node_modules.ember-try/
4 changes: 3 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
'use strict';

module.exports = {
plugins: ['prettier-plugin-ember-template-tag'],
overrides: [
{
files: '*.{js,ts}',
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
options: {
singleQuote: true,
templateSingleQuote: false,
},
},
],
Expand Down
14 changes: 4 additions & 10 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
/* eslint-disable prettier/prettier */
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
plugins: [
'stylelint-declaration-strict-value',
'stylelint-order'
],
extends: ['stylelint-config-standard'],
plugins: ['stylelint-declaration-strict-value', 'stylelint-order'],
rules: {
// Disables this rule to allow case agnostic color hex values
'color-hex-case': null,
// Require the long version of hex colors
'color-hex-length': 'long',
// Disallow ids
'selector-max-id': 0,
// Require that color, background-color, etc use variables for colors, instead of direct values
'scale-unlimited/declaration-strict-value': [
['/color/'] // We can enforce variables for font-size, margin, etc as well by adding here
['/color/'], // We can enforce variables for font-size, margin, etc as well by adding here
],
}
},
};
16 changes: 8 additions & 8 deletions addon/components/es-button.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';
import { action } from '@ember/object';

export default class EsButtonComponent extends Component {
// default value
_onClicked = () => {};
_type = "button";
_type = 'button';

constructor() {
super(...arguments);


if(!this.args.onClicked) {
// eslint-disable-next-line no-console
if (!this.args.onClicked) {
console.warn(new Error('Button created with no onClicked'));
} else {
this._onClicked = this.args.onClicked;
}

if(!this.args.type) {
// eslint-disable-next-line no-console
console.warn(new Error('Button created with no @type defined - defaulting to `type="button"`'));
if (!this.args.type) {
console.warn(
new Error(
'Button created with no @type defined - defaulting to `type="button"`',
),
);
} else {
this._type = this.args.type;
}
Expand Down
5 changes: 2 additions & 3 deletions addon/components/es-card-content.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable ember/no-empty-glimmer-component-classes, prettier/prettier */
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';

export default class EsCardContentComponent extends Component {
}
export default class EsCardContentComponent extends Component {}
5 changes: 2 additions & 3 deletions addon/components/es-card.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable ember/no-empty-glimmer-component-classes, prettier/prettier */
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';

export default class EsCardComponent extends Component {
}
export default class EsCardComponent extends Component {}
5 changes: 2 additions & 3 deletions addon/components/es-footer-contributions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable ember/no-empty-glimmer-component-classes, prettier/prettier */
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';

export default class EsFooterContributionsComponent extends Component {
}
export default class EsFooterContributionsComponent extends Component {}
10 changes: 5 additions & 5 deletions addon/components/es-footer-help.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';

export default class EsFooterHelpComponent extends Component {

get linkUrl() {
return this.args.contributeLink || 'https://github.com/ember-learn/ember-website';
}
get linkUrl() {
return (
this.args.contributeLink || 'https://github.com/ember-learn/ember-website'
);
}
}
5 changes: 2 additions & 3 deletions addon/components/es-footer-info.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable ember/no-empty-glimmer-component-classes, prettier/prettier */
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';

export default class EsFooterInfoComponent extends Component {
}
export default class EsFooterInfoComponent extends Component {}
3 changes: 1 addition & 2 deletions addon/components/es-footer-statement.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';

export default class EsFooterStatementComponent extends Component {
constructor() {
super(...arguments)
super(...arguments);

this.currentYear = new Date().getUTCFullYear();
}
Expand Down
5 changes: 2 additions & 3 deletions addon/components/es-footer.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';

import {
socialLinks,
infoLinks,
contributorLinks,
tagline
tagline,
} from '../constants/es-footer';

export default class EsFooterComponent extends Component {
Expand Down Expand Up @@ -34,7 +33,7 @@ export default class EsFooterComponent extends Component {
}

get currentYear() {
return new Date().getUTCFullYear()
return new Date().getUTCFullYear();
}

get infoLinks() {
Expand Down
32 changes: 21 additions & 11 deletions addon/components/es-header-navbar-link.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable ember/no-classic-classes, ember/no-classic-components, ember/no-component-lifecycle-hooks, ember/no-get, ember/no-runloop, ember/no-tracked-properties-from-args, ember/require-super-in-lifecycle-hooks, ember/require-tagless-components, prettier/prettier */
/* eslint-disable ember/no-runloop, ember/no-tracked-properties-from-args */
import Component from '@glimmer/component';
import { inject as service } from '@ember/service';
import { schedule, next } from '@ember/runloop';
Expand Down Expand Up @@ -32,9 +32,11 @@ export default class EsHeaderNavbarLink extends Component {
}

this.linkBlursActive = true;
let links = Array.from(this.element.querySelectorAll('.navbar-dropdown-list-item-link'));
let links = Array.from(
this.element.querySelectorAll('.navbar-dropdown-list-item-link'),
);

links.forEach(anchor => {
links.forEach((anchor) => {
anchor.addEventListener('blur', () => this.processBlur());
});
}
Expand All @@ -51,7 +53,7 @@ export default class EsHeaderNavbarLink extends Component {

if (this.isDropdownOpen) {
// if it's open, let's make sure it can do some things
schedule('afterRender', this, function() {
schedule('afterRender', this, function () {
this.setupLinkBlurs();

// move focus to the first item in the dropdown only when opened with keyboard
Expand All @@ -67,9 +69,13 @@ export default class EsHeaderNavbarLink extends Component {

@action
processBlur() {
next(this, function() {
let subItems = Array.from(this.element.querySelectorAll('.navbar-dropdown-list li'));
let focused = subItems.find(item => document.activeElement === item.querySelector('a'));
next(this, function () {
let subItems = Array.from(
this.element.querySelectorAll('.navbar-dropdown-list li'),
);
let focused = subItems.find(
(item) => document.activeElement === item.querySelector('a'),
);

//if the dropdown isn't focused, close it
if (!focused) {
Expand Down Expand Up @@ -102,7 +108,9 @@ export default class EsHeaderNavbarLink extends Component {

processFirstElementFocus() {
// Identify the first item in the dropdown list & set focus on it
let firstFocusable = this.element.querySelector('.navbar-dropdown-list li:first-of-type a');
let firstFocusable = this.element.querySelector(
'.navbar-dropdown-list li:first-of-type a',
);
firstFocusable.focus();
}

Expand All @@ -111,7 +119,7 @@ export default class EsHeaderNavbarLink extends Component {
let dropdownList = this.element.querySelector('.navbar-dropdown-list');

//...for certain keypress events
dropdownList.addEventListener('keydown', event => {
dropdownList.addEventListener('keydown', (event) => {
// ESC key should close the dropdown and return focus to the toggle
if (event.keyCode === 27 && this.isDropdownOpen) {
this.closeDropdown();
Expand All @@ -128,8 +136,10 @@ export default class EsHeaderNavbarLink extends Component {

returnFocus() {
// after that rendering bit happens, we need to return the focus to the trigger
schedule('afterRender', this, function() {
let dropdownTrigger = this.element.querySelector('.navbar-list-item-dropdown-toggle');
schedule('afterRender', this, function () {
let dropdownTrigger = this.element.querySelector(
'.navbar-list-item-dropdown-toggle',
);
dropdownTrigger.focus();
});
}
Expand Down
7 changes: 3 additions & 4 deletions addon/components/es-icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';
import { assert } from '@ember/debug';

Expand All @@ -11,8 +10,8 @@ export default class EsIconComponent extends Component {
`${
this.args.icon
} isn't a supported icon. We no longer support dynamid svg lookup and can only support the following icons: ${Object.keys(
icons
).join(', ')}`
icons,
).join(', ')}`,
);
}

Expand All @@ -22,7 +21,7 @@ export default class EsIconComponent extends Component {

return icons[this.args.icon].replace(
'<svg ',
`<svg class="${this.args.class}"`
`<svg class="${this.args.class}"`,
);
}
}
5 changes: 2 additions & 3 deletions addon/components/es-link-card.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-disable ember/no-empty-glimmer-component-classes, prettier/prettier */
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';

export default class EsLinkCardComponent extends Component {
}
export default class EsLinkCardComponent extends Component {}
3 changes: 1 addition & 2 deletions addon/components/es-note.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/* eslint-disable prettier/prettier */
import Component from '@glimmer/component';

const Mascots = {
tomster: { image: '/images/mascots/tomster.png', name: 'Tomster' },
zoey: { image: '/images/mascots/zoey.png', name: 'Zoey' },
}
};

function randomMascot() {
let mascotKeys = Object.keys(Mascots);
Expand Down
Loading
Loading