Skip to content

Commit 3ab1cb7

Browse files
committed
start to cleanup with eslint
1 parent 39c6e63 commit 3ab1cb7

File tree

13 files changed

+44
-50
lines changed

13 files changed

+44
-50
lines changed

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ module.exports = {
2828
'no-debugger': 'warn',
2929
'prefer-const': 'error',
3030
'no-var': 'error',
31-
31+
"prefer-destructuring": "off",
32+
3233
// Cypress specific rules
3334
'cypress/no-unnecessary-waiting': 'warn',
3435
'cypress/assertion-before-screenshot': 'warn',

cypress.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@ module.exports = defineConfig({
2222
openMode: 0,
2323
},
2424
setupNodeEvents(on, config) {
25-
on("dev-server:start", (options) => {
26-
return startDevServer({
25+
on("dev-server:start", (options) => startDevServer({
2726
options,
2827
viteConfig: {
2928
configFile: "vite.config.js", // Path to your Vite config file
3029
},
31-
});
32-
});
30+
}));
3331

3432
return config;
3533
},

cypress/e2e/e2e_tests.cy.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ describe('E2E Tests', () => {
55
let demURL;
66
let repURL;
77
// Set indices for Leaders used in tests
8-
let demIndex = 22;
9-
let repIndex = 46;
8+
const demIndex = 22;
9+
const repIndex = 46;
1010

1111
describe('Ward Leaders List', () => {
1212
beforeEach(() => {
@@ -120,9 +120,9 @@ describe('E2E Tests', () => {
120120
});
121121

122122
it('should display placeholders when information is missing', () => {
123-
let missingData = Object.keys(demLeader).filter(key => demLeader[key] === null || demLeader[key] === undefined);
123+
const missingData = Object.keys(demLeader).filter(key => demLeader[key] === null || demLeader[key] === undefined);
124124
// Look for missing data in fields besides subward and photo
125-
let filteredMissingData = missingData.filter(item => !['subWard','photo'].includes(item))
125+
const filteredMissingData = missingData.filter(item => !['subWard','photo'].includes(item))
126126
if (filteredMissingData.length > 0) {
127127
cy.get('.unknown').should('have.length.at.least', 1);
128128
}

cypress/support/e2e.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { mount } from 'cypress/vue';
22
import Api from '../../src/api';
33
import { CONTENTFUL_SPACE_ID, CONTENTFUL_ACCESS_TOKEN } from '../../src/config'
4+
45
const api = new Api(CONTENTFUL_SPACE_ID, CONTENTFUL_ACCESS_TOKEN)
56

67
Cypress.Commands.add('mount', mount);
7-
Cypress.Commands.add('fetchLeaders', () => {
8-
return cy.wrap(api.fetchLeaders());
9-
});
8+
Cypress.Commands.add('fetchLeaders', () => cy.wrap(api.fetchLeaders()));

src/api/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ export default class Api {
4444
return this.client.getEntries(requestOpts).then((response) => {
4545
if (response.items.length > 0) {
4646
return simplifyLinkedItems(getFieldsAndId(response.items[0]));
47-
} else {
47+
}
4848
throw new Error("Ward leader was not found");
49-
}
49+
5050
});
5151
}
5252

@@ -85,9 +85,9 @@ export default class Api {
8585
.then((response) => {
8686
if (response.items.length > 0) {
8787
return getFieldsAndId(response.items[0]);
88-
} else {
88+
}
8989
throw new Error("Page not found");
90-
}
90+
9191
});
9292
}
9393

src/components/geocoder.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default {
6363
"expanded",
6464
"position",
6565
]);
66-
const opts = Object.assign({}, this.options, overrides);
66+
const opts = { ...this.options, ...overrides};
6767
6868
this.geocoder = L.control.geocoder(this.apikey, opts);
6969
eventsBinder(this, this.geocoder, events);
@@ -75,7 +75,7 @@ export default {
7575
deferredMountedTo(parent) {
7676
this.parent = parent;
7777
this.geocoder.addTo(parent);
78-
for (var i = 0; i < this.$children.lenth; i++) {
78+
for (let i = 0; i < this.$children.lenth; i++) {
7979
this.$children[i].deferredMountedTo(parent);
8080
}
8181
},
@@ -93,8 +93,8 @@ export default {
9393
// Copied from vue2-leaflet/src/utils/eventsBinder.js
9494
// Can't import it because babel won't transpile files from node_modules
9595
function eventsBinder(vueElement, leaflet, events) {
96-
for (var i = 0; i < events.length; i++) {
97-
const exposedName = "l-" + events[i];
96+
for (let i = 0; i < events.length; i++) {
97+
const exposedName = `l-${ events[i]}`;
9898
const eventName = events[i];
9999
leaflet.on(eventName, (ev) => {
100100
vueElement.$emit(exposedName, ev);

src/components/links-list.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ export default {
1717
links: {
1818
type: Array,
1919
required: true,
20-
validator: (links) => {
21-
return links.every((link) => "title" in link && "url" in link);
22-
},
20+
validator: (links) => links.every((link) => "title" in link && "url" in link),
2321
},
2422
},
2523
};

src/router/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ const router = createRouter({
5656
function scrollBehavior(to, from, savedPosition) {
5757
if (savedPosition) {
5858
return savedPosition;
59-
} else {
59+
}
6060
return { x: 0, y: 0 };
61-
}
61+
6262
}
6363

6464
export default router;

src/store/getters.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export function partyPlural(state) {
22
const party = state.currentLeader.leader.party;
33
if (party === "democratic") {
44
return "democrats";
5-
} else if (party === "republican") {
5+
} if (party === "republican") {
66
return "republicans";
77
}
88
}
@@ -16,7 +16,7 @@ export function partyTitle(state) {
1616
const party = state.currentLeader.leader.party;
1717
if (party === "democratic") {
1818
return "Democratic";
19-
} else if (party === "republican") {
19+
} if (party === "republican") {
2020
return "Republican";
2121
}
2222
}

src/views/feedback.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103

104104
<script>
105105
import axios from "axios";
106+
106107
export default {
107108
name: "Feedback",
108109
data() {
@@ -181,7 +182,7 @@ export default {
181182
Object.entries(this.formParams).forEach(([key, value]) => {
182183
bodyFormData.append(key, value);
183184
});
184-
axios.post(this.formUrl, bodyFormData).catch(function (error) {
185+
axios.post(this.formUrl, bodyFormData).catch((error) => {
185186
console.log(error);
186187
});
187188
this.submitted = true;

0 commit comments

Comments
 (0)