Skip to content

Commit 2b693f9

Browse files
JohnsoctJohnsoct
committed
pulled and conflicts fixed
2 parents 8f5ccaa + 074c032 commit 2b693f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2223
-4745
lines changed

‎cypress.config.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { defineConfig } from "cypress";
22

33
export default defineConfig({
4-
component: {
5-
devServer: {
6-
bundler: "vite",
7-
framework: "vue",
4+
component: {
5+
devServer: {
6+
bundler: "vite",
7+
framework: "vue",
8+
},
89
},
9-
},
1010

11-
e2e: {
12-
baseUrl: "http://localhost:4173",
13-
specPattern: "cypress/e2e/**/*.{cy,spec}.{js,jsx,ts,tsx}",
14-
},
11+
e2e: {
12+
baseUrl: "http://localhost:4173",
13+
specPattern: "cypress/e2e/**/*.{cy,spec}.{js,jsx,ts,tsx}",
14+
},
1515
});

‎cypress.d.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Packages
22
import {
3-
type CyMountOptions,
43
mount,
54
} from 'cypress/vue';
65
import {

‎cypress/fixtures/example.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Using fixtures to represent data",
3-
"email": "[email protected]",
4-
"body": "Fixtures are a great way to mock data for responses to routes"
2+
"name": "Using fixtures to represent data",
3+
"email": "[email protected]",
4+
"body": "Fixtures are a great way to mock data for responses to routes"
55
}

‎cypress/support/commands/select.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
const enterValueForSelectInput = (id: string, text: string) => {
2-
cy
3-
.get(id)
4-
.find('.vs__search')
5-
.clear()
6-
.type(text)
7-
.type('{enter}')
8-
.trigger('input');
2+
cy
3+
.get(id)
4+
.find('.vs__search')
5+
.clear()
6+
.type(text)
7+
.type('{enter}')
8+
.trigger('input');
99
};
1010

1111
Cypress.Commands.add('enterValueForSelectInput', enterValueForSelectInput);
1212

1313
const selectFirstElementInVSelect = (id: string) => {
14-
cy
15-
.get(id)
16-
.click();
14+
cy
15+
.get(id)
16+
.click();
1717

18-
cy
19-
.get('li.vs__dropdown-option')
20-
.first()
21-
.click();
18+
cy
19+
.get('li.vs__dropdown-option')
20+
.first()
21+
.click();
2222
};
2323

2424
Cypress.Commands.add('selectFirstElementInVSelect', selectFirstElementInVSelect);

‎cypress/support/commands/vue.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
// Packages
2-
import { mount } from 'cypress/vue';
32
import { type VueWrapper } from '@vue/test-utils';
3+
import { mount } from 'cypress/vue';
44
// Plugins
55
import { ToastrPlugin } from '@src/utils/plugins/toastr';
66

77
Cypress.Commands.add('getMounted', () => {
8-
return cy
9-
.get<VueWrapper<unknown>>('@vue')
10-
.then(($wrapper) => {
11-
cy.wrap($wrapper);
12-
});
8+
return cy
9+
.get<VueWrapper<unknown>>('@vue')
10+
.then(($wrapper) => {
11+
cy.wrap($wrapper);
12+
});
1313
});
1414

1515
Cypress.Commands.add('mount', (component, options = {}) => {
16-
const defaultOptions = {
17-
global: {
18-
plugins: [
19-
ToastrPlugin,
20-
],
21-
stubs: {
22-
transition: false,
23-
'transition-group': false,
24-
},
25-
},
26-
};
16+
const defaultOptions = {
17+
global: {
18+
plugins: [
19+
ToastrPlugin,
20+
],
21+
stubs: {
22+
transition: false,
23+
'transition-group': false,
24+
},
25+
},
26+
};
2727

28-
const mountOptions = { ...defaultOptions, ...options };
28+
const mountOptions = { ...defaultOptions, ...options };
2929

30-
return mount(component, mountOptions).then(({ wrapper }) => {
31-
cy
32-
.wrap(wrapper)
33-
.as('vue');
34-
});
30+
return mount(component, mountOptions).then(({ wrapper }) => {
31+
cy
32+
.wrap(wrapper)
33+
.as('vue');
34+
});
3535
});

‎cypress/support/component-index.html‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
<!-- eslint-disable @html-eslint/require-meta-description -->
12
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width,initial-scale=1.0">
7-
<title>Components App</title>
8-
</head>
9-
<body>
10-
<div data-cy-root></div>
11-
</body>
12-
</html>
3+
<html lang="en-US">
4+
<head>
5+
<meta charset="utf-8">
6+
<meta
7+
content="IE=edge"
8+
http-equiv="X-UA-Compatible"
9+
>
10+
<meta
11+
content="width=device-width,initial-scale=1.0"
12+
name="viewport"
13+
>
14+
<title>Components App</title>
15+
</head>
16+
<body>
17+
<!-- eslint-disable-next-line @html-eslint/require-attrs -->
18+
<div data-cy-root></div>
19+
</body>
20+
</html>

‎cypress/support/component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
// ***********************************************************
1515

1616
import '@src/styles/base/_index.scss';
17-
1817
// Import commands.js using ES2015 syntax:
1918
import './commands/vue';
2019
import './commands/select';

‎cypress/support/constants/helpers.ts‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
11
export const hexTransparencies: { alpha: string, hex: string }[] = [
2-
{ alpha: '0', hex: '00' },
3-
{ alpha: '.01', hex: '03' },
4-
{ alpha: '.02', hex: '05' },
5-
{ alpha: '.03', hex: '08' },
6-
{ alpha: '.04', hex: '0A' },
7-
{ alpha: '.05', hex: '0D' },
8-
{ alpha: '.06', hex: '0F' },
9-
{ alpha: '.07', hex: '12' },
10-
{ alpha: '.08', hex: '14' },
11-
{ alpha: '.09', hex: '17' },
12-
{ alpha: '.10', hex: '1A' },
13-
{ alpha: '.11', hex: '1C' },
14-
{ alpha: '.12', hex: '1F' },
15-
{ alpha: '.13', hex: '21' },
16-
{ alpha: '.14', hex: '24' },
17-
{ alpha: '.15', hex: '26' },
18-
{ alpha: '.16', hex: '29' },
19-
{ alpha: '.17', hex: '2B' },
20-
{ alpha: '.18', hex: '2E' },
21-
{ alpha: '.19', hex: '30' },
22-
{ alpha: '.20', hex: '33' },
23-
{ alpha: '.21', hex: '36' },
24-
{ alpha: '.22', hex: '38' },
25-
{ alpha: '.23', hex: '3B' },
26-
{ alpha: '.24', hex: '3D' },
27-
{ alpha: '.25', hex: '40' },
28-
{ alpha: '.26', hex: '42' },
29-
{ alpha: '.27', hex: '45' },
30-
{ alpha: '.28', hex: '47' },
31-
{ alpha: '.29', hex: '4A' },
32-
{ alpha: '.30', hex: '4D' },
33-
{ alpha: '.31', hex: '4F' },
34-
{ alpha: '.32', hex: '52' },
35-
{ alpha: '.33', hex: '54' },
36-
{ alpha: '.34', hex: '57' },
37-
{ alpha: '.35', hex: '59' },
38-
{ alpha: '.36', hex: '5C' },
39-
{ alpha: '.37', hex: '5E' },
40-
{ alpha: '.38', hex: '61' },
41-
{ alpha: '.39', hex: '63' },
42-
{ alpha: '.40', hex: '66' },
43-
{ alpha: '.41', hex: '69' },
44-
{ alpha: '.42', hex: '6B' },
45-
{ alpha: '.43', hex: '6E' },
46-
{ alpha: '.44', hex: '70' },
47-
{ alpha: '.45', hex: '73' },
48-
{ alpha: '.46', hex: '75' },
49-
{ alpha: '.47', hex: '78' },
50-
{ alpha: '.48', hex: '7A' },
51-
{ alpha: '.49', hex: '7D' },
52-
{ alpha: '.50', hex: '80' },
53-
{ alpha: '.51', hex: '82' },
54-
{ alpha: '.52', hex: '85' },
55-
{ alpha: '.53', hex: '87' },
56-
{ alpha: '.54', hex: '8A' },
57-
{ alpha: '.55', hex: '8C' },
58-
{ alpha: '.56', hex: '8F' },
59-
{ alpha: '.57', hex: '91' },
60-
{ alpha: '.58', hex: '94' },
61-
{ alpha: '.59', hex: '96' },
62-
{ alpha: '.60', hex: '99' },
63-
{ alpha: '.61', hex: '9C' },
64-
{ alpha: '.62', hex: '9E' },
65-
{ alpha: '.63', hex: 'A1' },
66-
{ alpha: '.64', hex: 'A3' },
67-
{ alpha: '.65', hex: 'A6' },
68-
{ alpha: '.66', hex: 'A8' },
69-
{ alpha: '.67', hex: 'AB' },
70-
{ alpha: '.68', hex: 'AD' },
71-
{ alpha: '.69', hex: 'B0' },
72-
{ alpha: '.70', hex: 'B3' },
73-
{ alpha: '.71', hex: 'B5' },
74-
{ alpha: '.72', hex: 'B8' },
75-
{ alpha: '.73', hex: 'BA' },
76-
{ alpha: '.74', hex: 'BD' },
77-
{ alpha: '.75', hex: 'BF' },
78-
{ alpha: '.76', hex: 'C2' },
79-
{ alpha: '.77', hex: 'C4' },
80-
{ alpha: '.78', hex: 'C7' },
81-
{ alpha: '.79', hex: 'C9' },
82-
{ alpha: '.80', hex: 'CC' },
83-
{ alpha: '.81', hex: 'CF' },
84-
{ alpha: '.82', hex: 'D1' },
85-
{ alpha: '.83', hex: 'D4' },
86-
{ alpha: '.84', hex: 'D6' },
87-
{ alpha: '.85', hex: 'D9' },
88-
{ alpha: '.86', hex: 'DB' },
89-
{ alpha: '.87', hex: 'DE' },
90-
{ alpha: '.88', hex: 'E0' },
91-
{ alpha: '.89', hex: 'E3' },
92-
{ alpha: '.90', hex: 'E6' },
93-
{ alpha: '.91', hex: 'E8' },
94-
{ alpha: '.92', hex: 'EB' },
95-
{ alpha: '.93', hex: 'ED' },
96-
{ alpha: '.94', hex: 'F0' },
97-
{ alpha: '.95', hex: 'F2' },
98-
{ alpha: '.96', hex: 'F5' },
99-
{ alpha: '.97', hex: 'F7' },
100-
{ alpha: '.98', hex: 'FA' },
101-
{ alpha: '.99', hex: 'FC' },
102-
{ alpha: '1', hex: 'FF' },
2+
{ alpha: '0', hex: '00' },
3+
{ alpha: '.01', hex: '03' },
4+
{ alpha: '.02', hex: '05' },
5+
{ alpha: '.03', hex: '08' },
6+
{ alpha: '.04', hex: '0A' },
7+
{ alpha: '.05', hex: '0D' },
8+
{ alpha: '.06', hex: '0F' },
9+
{ alpha: '.07', hex: '12' },
10+
{ alpha: '.08', hex: '14' },
11+
{ alpha: '.09', hex: '17' },
12+
{ alpha: '.10', hex: '1A' },
13+
{ alpha: '.11', hex: '1C' },
14+
{ alpha: '.12', hex: '1F' },
15+
{ alpha: '.13', hex: '21' },
16+
{ alpha: '.14', hex: '24' },
17+
{ alpha: '.15', hex: '26' },
18+
{ alpha: '.16', hex: '29' },
19+
{ alpha: '.17', hex: '2B' },
20+
{ alpha: '.18', hex: '2E' },
21+
{ alpha: '.19', hex: '30' },
22+
{ alpha: '.20', hex: '33' },
23+
{ alpha: '.21', hex: '36' },
24+
{ alpha: '.22', hex: '38' },
25+
{ alpha: '.23', hex: '3B' },
26+
{ alpha: '.24', hex: '3D' },
27+
{ alpha: '.25', hex: '40' },
28+
{ alpha: '.26', hex: '42' },
29+
{ alpha: '.27', hex: '45' },
30+
{ alpha: '.28', hex: '47' },
31+
{ alpha: '.29', hex: '4A' },
32+
{ alpha: '.30', hex: '4D' },
33+
{ alpha: '.31', hex: '4F' },
34+
{ alpha: '.32', hex: '52' },
35+
{ alpha: '.33', hex: '54' },
36+
{ alpha: '.34', hex: '57' },
37+
{ alpha: '.35', hex: '59' },
38+
{ alpha: '.36', hex: '5C' },
39+
{ alpha: '.37', hex: '5E' },
40+
{ alpha: '.38', hex: '61' },
41+
{ alpha: '.39', hex: '63' },
42+
{ alpha: '.40', hex: '66' },
43+
{ alpha: '.41', hex: '69' },
44+
{ alpha: '.42', hex: '6B' },
45+
{ alpha: '.43', hex: '6E' },
46+
{ alpha: '.44', hex: '70' },
47+
{ alpha: '.45', hex: '73' },
48+
{ alpha: '.46', hex: '75' },
49+
{ alpha: '.47', hex: '78' },
50+
{ alpha: '.48', hex: '7A' },
51+
{ alpha: '.49', hex: '7D' },
52+
{ alpha: '.50', hex: '80' },
53+
{ alpha: '.51', hex: '82' },
54+
{ alpha: '.52', hex: '85' },
55+
{ alpha: '.53', hex: '87' },
56+
{ alpha: '.54', hex: '8A' },
57+
{ alpha: '.55', hex: '8C' },
58+
{ alpha: '.56', hex: '8F' },
59+
{ alpha: '.57', hex: '91' },
60+
{ alpha: '.58', hex: '94' },
61+
{ alpha: '.59', hex: '96' },
62+
{ alpha: '.60', hex: '99' },
63+
{ alpha: '.61', hex: '9C' },
64+
{ alpha: '.62', hex: '9E' },
65+
{ alpha: '.63', hex: 'A1' },
66+
{ alpha: '.64', hex: 'A3' },
67+
{ alpha: '.65', hex: 'A6' },
68+
{ alpha: '.66', hex: 'A8' },
69+
{ alpha: '.67', hex: 'AB' },
70+
{ alpha: '.68', hex: 'AD' },
71+
{ alpha: '.69', hex: 'B0' },
72+
{ alpha: '.70', hex: 'B3' },
73+
{ alpha: '.71', hex: 'B5' },
74+
{ alpha: '.72', hex: 'B8' },
75+
{ alpha: '.73', hex: 'BA' },
76+
{ alpha: '.74', hex: 'BD' },
77+
{ alpha: '.75', hex: 'BF' },
78+
{ alpha: '.76', hex: 'C2' },
79+
{ alpha: '.77', hex: 'C4' },
80+
{ alpha: '.78', hex: 'C7' },
81+
{ alpha: '.79', hex: 'C9' },
82+
{ alpha: '.80', hex: 'CC' },
83+
{ alpha: '.81', hex: 'CF' },
84+
{ alpha: '.82', hex: 'D1' },
85+
{ alpha: '.83', hex: 'D4' },
86+
{ alpha: '.84', hex: 'D6' },
87+
{ alpha: '.85', hex: 'D9' },
88+
{ alpha: '.86', hex: 'DB' },
89+
{ alpha: '.87', hex: 'DE' },
90+
{ alpha: '.88', hex: 'E0' },
91+
{ alpha: '.89', hex: 'E3' },
92+
{ alpha: '.90', hex: 'E6' },
93+
{ alpha: '.91', hex: 'E8' },
94+
{ alpha: '.92', hex: 'EB' },
95+
{ alpha: '.93', hex: 'ED' },
96+
{ alpha: '.94', hex: 'F0' },
97+
{ alpha: '.95', hex: 'F2' },
98+
{ alpha: '.96', hex: 'F5' },
99+
{ alpha: '.97', hex: 'F7' },
100+
{ alpha: '.98', hex: 'FA' },
101+
{ alpha: '.99', hex: 'FC' },
102+
{ alpha: '1', hex: 'FF' },
103103
];

0 commit comments

Comments
 (0)