Skip to content

Commit a28b3b9

Browse files
authored
Merge pull request #3 from peterrsongg/main
Updated packages, dependencies, javascript to reflect updates
2 parents 0945588 + 79b0149 commit a28b3b9

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

mtdrworkshop/backend/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>io.helidon.applications</groupId>
1515
<artifactId>helidon-se</artifactId>
16-
<version>2.2.0</version>
16+
<version>2.4.2</version>
1717
<relativePath/>
1818
</parent>
1919

@@ -24,7 +24,7 @@
2424
<name>${project.artifactId}</name>
2525

2626
<properties>
27-
<helidon.version>2.0.0</helidon.version>
27+
<helidon.version>2.4.2</helidon.version>
2828
<mainClass>com.oracle.todoapp.Main</mainClass>
2929
<libs.classpath.prefix>libs</libs.classpath.prefix>
3030
<copied.libs.dir>${project.build.directory}/${libs.classpath.prefix}</copied.libs.dir>

mtdrworkshop/frontend/package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@material-ui/core": "^4.11.0",
7-
"@material-ui/icons": "^4.9.1",
6+
"@emotion/react": "^11.8.1",
7+
"@emotion/styled": "^11.8.1",
8+
"@mui/icons-material": "^5.4.4",
9+
"@mui/material": "^5.4.4",
10+
"@mui/styles": "^5.4.4",
811
"moment": "^2.29.1",
9-
"react": "^16.13.1",
10-
"react-dom": "^16.13.1",
12+
"react": "^17.0.2",
13+
"react-dom": "^17.0.2",
1114
"react-moment": "^1.0.0",
12-
"react-scripts": "3.4.3"
15+
"react-scripts": "5.0.0"
1316
},
1417
"scripts": {
1518
"start": "react-scripts start",

mtdrworkshop/frontend/src/API.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717
// Copy from the endpoint from the API Gateway Deployment
1818
// Example: const API_LIST = 'https://di2eyonlz5s7kmuektcddaw5zq.apigateway.<region>.oci.customer-oci.com/todolist';
1919
const API_LIST = 'https://di2eyonlz5s7kmuektcddaw5zq.apigateway.eu-frankfurt-1.oci.customer-oci.com/todolist';
20+
2021
export default API_LIST;

mtdrworkshop/frontend/src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import React, { useState, useEffect } from 'react';
1414
import NewItem from './NewItem';
1515
import API_LIST from './API';
16-
import DeleteIcon from '@material-ui/icons/Delete';
17-
import { Button, TableBody, CircularProgress } from '@material-ui/core';
16+
import DeleteIcon from '@mui/icons-material/Delete';
17+
import { Button, TableBody, CircularProgress } from '@mui/material';
1818
import Moment from 'react-moment';
1919

2020
/* In this application we're using Function Components with the State Hooks

mtdrworkshop/frontend/src/NewItem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
*/
1111

1212
import React, { useState } from "react";
13-
import Button from '@material-ui/core/Button';
13+
import Button from '@mui/material/Button';
14+
1415

1516
function NewItem(props) {
1617
const [item, setItem] = useState('');

mtdrworkshop/frontend/src/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ button.AddButton,
109109
button.DoneButton {
110110
font-size: max(8px,min(2vw, 12px));
111111
padding: 0.35em 0.5em;
112+
color:#161513;
112113
}
113114
/* from the redwood theme */
114115
button.AddButton {

0 commit comments

Comments
 (0)