Skip to content

Commit 308d77d

Browse files
Merge pull request #8 from DuckTieCorpMember/25.1.3+
Fix lint issues on platforms and build projects
2 parents edc3e60 + b313b27 commit 308d77d

20 files changed

+18942
-14977
lines changed

Angular/package-lock.json

Lines changed: 12836 additions & 10750 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"@angular/platform-browser": "^18.0.3",
2323
"@angular/platform-browser-dynamic": "^18.0.3",
2424
"@angular/router": "^18.0.3",
25-
"devextreme": "24.2.3",
26-
"devextreme-angular": "24.2.3",
25+
"devextreme": "25.1.3",
26+
"devextreme-angular": "25.1.3",
2727
"rxjs": "~7.8.0",
2828
"tslib": "^2.3.0",
2929
"zone.js": "~0.14.7"

React/package-lock.json

Lines changed: 861 additions & 694 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

React/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@
1313
"lint": "npm-run-all -p -c lint-ts lint-css",
1414
"preview": "vite preview"
1515
},
16-
1716
"dependencies": {
17+
"devexpress-gantt": "^4.1.62",
1818
"devextreme": "25.1.3",
1919
"devextreme-react": "25.1.3",
2020
"react": "^18.2.0",
2121
"react-dom": "^18.2.0"
2222
},
23-
"eslintConfig": {
23+
"eslintConfig": {
2424
"extends": [
2525
"react-app",
2626
"react-app/jest"
2727
]
2828
},
2929
"devDependencies": {
30+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
3031
"@testing-library/jest-dom": "^5.16.5",
3132
"@testing-library/react": "^14.1.2",
3233
"@testing-library/user-event": "^14.4.3",
3334
"@types/react": "^18.2.47",
3435
"@types/react-dom": "^18.2.17",
3536
"@vitejs/plugin-react": "^4.4.1",
3637
"@vitest/coverage-v8": "^1.5.0",
37-
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
3838
"eslint": "^8.35.0",
3939
"eslint-config-devextreme": "^1.1.4",
4040
"eslint-plugin-no-only-tests": "2.6.0",
@@ -46,10 +46,10 @@
4646
"npm-run-all": "^4.1.5",
4747
"stylelint": "^15.6.1",
4848
"stylelint-config-standard": "^33.0.0",
49+
"ts-node": "10.9.2",
4950
"typescript": "~5.8.2",
5051
"typescript-eslint": "^8.18.2",
5152
"vite": "^6.3.5",
52-
"ts-node": "10.9.2",
5353
"vitest": "^1.5.0"
5454
}
55-
}
55+
}

React/src/App.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.main {
22
margin: 50px;
33
width: 90vw;
4-
}
4+
}

React/src/App.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import 'devextreme/dist/css/dx.light.css';
22
import 'devexpress-gantt/dist/dx-gantt.min.css';
33

44
import Gantt, {
5-
Tasks, Dependencies, Resources, ResourceAssignments, Column,
5+
Tasks,
6+
Dependencies,
7+
Resources,
8+
ResourceAssignments,
9+
Column,
610
} from 'devextreme-react/gantt';
711

812
import {
913
tasks, dependencies, resources, resourceAssignments,
10-
} from './data.js';
14+
} from './data.ts';
1115

12-
function App() {
16+
function App(): JSX.Element {
1317
return (
14-
<Gantt
15-
height={250}
16-
width={800}
17-
rootValue={-1}>
18-
18+
<Gantt height={250} width={800} rootValue={-1}>
1919
<Tasks dataSource={tasks} />
2020
<Dependencies dataSource={dependencies} />
2121
<Resources dataSource={resources} />
Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,56 @@
1-
export const tasks = [{
1+
export const tasks = [
2+
{
23
id: 1,
34
parentId: -1,
45
title: 'Software Development',
56
start: new Date('2019-02-21T05:00:00.000Z'),
67
end: new Date('2019-07-04T12:00:00.000Z'),
78
progress: 31,
8-
}, {
9+
},
10+
{
911
id: 2,
1012
parentId: 1,
1113
title: 'Scope',
1214
start: new Date('2019-02-21T05:00:00.000Z'),
1315
end: new Date('2019-02-26T09:00:00.000Z'),
1416
progress: 60,
15-
}, {
17+
},
18+
{
1619
id: 3,
1720
parentId: 2,
1821
title: 'Determine project scope',
1922
start: new Date('2019-02-21T05:00:00.000Z'),
2023
end: new Date('2019-02-21T09:00:00.000Z'),
2124
progress: 100,
22-
}];
25+
},
26+
];
2327

24-
export const dependencies = [{
28+
export const dependencies = [
29+
{
2530
id: 1,
2631
predecessorId: 1,
2732
successorId: 2,
2833
type: 0,
29-
}, {
34+
},
35+
{
3036
id: 2,
3137
predecessorId: 2,
3238
successorId: 3,
3339
type: 0,
34-
}];
40+
},
41+
];
3542

36-
export const resources = [{
43+
export const resources = [
44+
{
3745
id: 1,
3846
text: 'Management',
39-
}];
40-
41-
export const resourceAssignments = [{
47+
},
48+
];
49+
50+
export const resourceAssignments = [
51+
{
4252
id: 0,
4353
taskId: 3,
4454
resourceId: 1,
45-
}];
55+
},
56+
];

React/src/index.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
body {
22
margin: 0;
3-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
4-
Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
5-
sans-serif;
3+
font-family:
4+
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
5+
Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
66
-webkit-font-smoothing: antialiased;
77
-moz-osx-font-smoothing: grayscale;
88
}
99

1010
code {
11-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
12-
monospace;
13-
}
11+
font-family:
12+
source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
13+
}

React/tsconfig.node.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
"noFallthroughCasesInSwitch": true,
2525
"noUncheckedSideEffectImports": true
2626
},
27-
"include": ["vite.config.ts","vitest.config.ts", "*.test.tsx"],
27+
"include": ["vite.config.ts", "vitest.config.ts", "*.test.tsx"]
2828
}

0 commit comments

Comments
 (0)