Skip to content
Draft
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
17 changes: 0 additions & 17 deletions .eslintignore

This file was deleted.

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

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v3
Expand All @@ -37,7 +37,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion app/components/ask-question-modal.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
@variant="dark btn--sm btn-pink ask-question-modal__submit-button"
@test="question-modal-cancel"
@onClick={{@onSubmit}}
@disabled={{(or @isSubmitButtonDisabled @isQuestionApiLoading)}}
@disabled={{or @isSubmitButtonDisabled @isQuestionApiLoading}}
@isLoading={{@isQuestionApiLoading}}
/>
</div>
Expand Down
4 changes: 1 addition & 3 deletions app/components/events/survey-page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
/>
<div class="survey-page__recent-question">
<h3 class="survey-page__recent-question-heading">Recent Question</h3>
<p class="survey-page__recent-question-text">{{(or
@questionAsked.question "No recent question"
)}}</p>
<p class="survey-page__recent-question-text">{{or @questionAsked.question "No recent question"}}</p>
</div>
</div>
<div class="survey-page__answers-container">
Expand Down
2 changes: 1 addition & 1 deletion app/components/header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<img
data-test-user-image
class="user__pic"
src={{(or @profilePicture "/assets/images/profile.png")}}
src={{or @profilePicture "/assets/images/profile.png"}}
alt="User"
/>
<Fa-Icon data-test-icon @icon="chevron-down" />
Expand Down
2 changes: 1 addition & 1 deletion app/components/live-participants.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
>{{@user}} (<span>{{this.participantsCount}}</span>) </p>
<ul>
{{#if (not-eq @minimumParticipants @role)}}
<li data-test-sidebar-user={{'peer.id'}} class='user'>
<li data-test-sidebar-user='peer.id' class='user'>
<p>No {{@user}} in the stream</p>
</li>
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/live-roles.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@type='button'
@variant='dark'
@text={{role}}
@onClick={{(fn @clickHandler role)}}
@onClick={{fn @clickHandler role}}
/>
{{/each-in}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/login.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="login__container">
<LinkTo data-test-home-link @route={{"index"}}>
<LinkTo data-test-home-link @route="index">
<img
class="logo__img"
src="assets/images/rds-logo.png"
Expand Down
2 changes: 1 addition & 1 deletion app/components/room-code.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@id='copy-code'
@class='icon-button--md'
@title='copy'
@onClick={{(fn this.copyHandler @code)}}
@onClick={{fn this.copyHandler @code}}
@icon={{if
this.isCopied
'material-symbols:done'
Expand Down
4 changes: 2 additions & 2 deletions app/components/wheel-animations.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
data-test-wheel-animation-member-link
>
<img
style={{(this.memberStyle index)}}
style={{this.memberStyle index}}
class='circle member__img'
src='{{(this.resizeImageUrl member.picture.publicId 150 150)}}'
src='{{this.resizeImageUrl member.picture.publicId 150 150}}'
alt='{{member.first_name}} {{member.last_name}}'
data-test-wheel-animation-member-image
/>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/live.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
@message="Are you sure to end this event?"
@closeText="Cancel"
@confirmText="End"
@confirmHandler={{(fn this.buttonClickHandler "leave-room")}}
@confirmHandler={{fn this.buttonClickHandler "leave-room"}}
/>
</BaseModal>
{{#if (eq this.activeTab "Screenshare")}}
Expand Down
101 changes: 101 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
"use strict";

const {
defineConfig,
globalIgnores,
} = require("eslint/config");

const {
includeIgnoreFile,
} = require("@eslint/compat");

const path = require("node:path");
const babelParser = require("@babel/eslint-parser");
const ember = require("eslint-plugin-ember");
const globals = require("globals");
const js = require("@eslint/js");

const {
FlatCompat,
} = require("@eslint/eslintrc");

const gitignorePath = path.resolve(__dirname, ".gitignore");
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

module.exports = defineConfig([includeIgnoreFile(gitignorePath), {
languageOptions: {
parser: babelParser,
ecmaVersion: "latest",
sourceType: "module",

parserOptions: {
requireConfigFile: false,

babelOptions: {
plugins: [["@babel/plugin-proposal-decorators", {
decoratorsBeforeExport: true,
}]],
},
},

globals: {
...globals.browser,
},
},

plugins: {
ember,
},

extends: compat.extends(
"eslint:recommended",
"plugin:ember/recommended",
"plugin:prettier/recommended",
),

rules: {
"qunit/require-expect": [1, "except-simple"],
"no-self-assign": ["warn"],
},
}, {
files: [
"./.eslintrc.js",
"./.prettierrc.js",
"./.stylelintrc.js",
"./.template-lintrc.js",
"./ember-cli-build.js",
"./testem.js",
"./blueprints/*/index.js",
"./config/**/*.js",
"./lib/*/index.js",
"./server/**/*.js",
],

languageOptions: {
sourceType: "script",
parserOptions: {},

globals: {
...Object.fromEntries(Object.entries(globals.browser).map(([key]) => [key, "off"])),
...globals.node,
},
},

extends: compat.extends("plugin:n/recommended"),
}, {
files: ["tests/**/*-test.{js,ts}"],
extends: compat.extends("plugin:qunit/recommended"),
}, globalIgnores([
"node_modules/",
"blueprints/*/files/",
"declarations/",
"dist/",
"coverage/",
"!**/.*",
"**/.*/",
".node_modules.ember-try/",
])]);
Loading
Loading