Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

14 implement edit student #13

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

14 implement edit student #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
441a3e4
Implementation of the Edit Student feature
saraivamarco Sep 8, 2021
875bf3f
*Edit form*
saraivamarco Sep 8, 2021
55cb1fd
*Test properties*
saraivamarco Sep 8, 2021
b7c079f
*Test properties*
saraivamarco Sep 8, 2021
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
32 changes: 28 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>demo</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>15</java.version>
<java.version>11</java.version>
<app.image.name>springboot-react-fullstack</app.image.name>
<app.image.tag/>
</properties>
Expand All @@ -27,6 +27,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -35,6 +36,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
Expand All @@ -50,10 +57,27 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<dependency>
<groupId>com.github.javafaker</groupId>
<artifactId>javafaker</artifactId>
<version>1.0.2</version>
</dependency>

<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<type>maven-plugin</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand All @@ -72,7 +96,7 @@
<version>2.5.2</version>
<configuration>
<from>
<image>openjdk:15</image>
<image>openjdk:11</image>
</from>
<container>
<ports>
Expand All @@ -98,7 +122,7 @@
<version>2.5.2</version>
<configuration>
<from>
<image>openjdk:15</image>
<image>openjdk:11</image>
</from>
<container>
<ports>
Expand Down Expand Up @@ -150,7 +174,7 @@
<version>2.5.2</version>
<configuration>
<from>
<image>openjdk:15</image>
<image>openjdk:11</image>
</from>
<container>
<ports>
Expand Down
141 changes: 74 additions & 67 deletions src/frontend/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
Badge,
Tag,
Avatar,
Radio, Popconfirm, Image, Divider
Radio, Popconfirm
} from 'antd';

import {
Expand All @@ -24,6 +24,7 @@ import {
PlusOutlined
} from '@ant-design/icons';
import StudentDrawerForm from "./StudentDrawerForm";
import StudentDrawerEditForm from "./StudentDrawerEditForm";

import './App.css';
import {errorNotification, successNotification} from "./Notification";
Expand Down Expand Up @@ -61,58 +62,14 @@ const removeStudent = (studentId, callback) => {
})
}

const columns = fetchStudents => [
{
title: '',
dataIndex: 'avatar',
key: 'avatar',
render: (text, student) =>
<TheAvatar name={student.name}/>
},
{
title: 'Id',
dataIndex: 'id',
key: 'id',
},
{
title: 'Name',
dataIndex: 'name',
key: 'name',
},
{
title: 'Email',
dataIndex: 'email',
key: 'email',
},
{
title: 'Gender',
dataIndex: 'gender',
key: 'gender',
},
{
title: 'Actions',
key: 'actions',
render: (text, student) =>
<Radio.Group>
<Popconfirm
placement='topRight'
title={`Are you sure to delete ${student.name}`}
onConfirm={() => removeStudent(student.id, fetchStudents)}
okText='Yes'
cancelText='No'>
<Radio.Button value="small">Delete</Radio.Button>
</Popconfirm>
<Radio.Button onClick={() => alert("TODO: Implement edit student")} value="small">Edit</Radio.Button>
</Radio.Group>
}
];

const antIcon = <LoadingOutlined style={{fontSize: 24}} spin/>;

function App() {
const [students, setStudents] = useState([]);
const [student, setStudent] = useState("");
const [collapsed, setCollapsed] = useState(false);
const [fetching, setFetching] = useState(true);
const [showEditDrawer, setShowEditDrawer] = useState(false);
const [showDrawer, setShowDrawer] = useState(false);

const fetchStudents = () =>
Expand All @@ -121,7 +78,7 @@ function App() {
.then(data => {
console.log(data);
setStudents(data);
}).catch(err => {
}).catch(err => {
console.log(err.response)
err.response.json().then(res => {
console.log(res);
Expand All @@ -130,12 +87,12 @@ function App() {
`${res.message} [${res.status}] [${res.error}]`
)
});
}).finally(() => setFetching(false))
}).finally(() => setFetching(false));

useEffect(() => {
console.log("component is mounted");
fetchStudents();
}, []);
useEffect(() => {
console.log("component is mounted");
fetchStudents();
}, []);

const renderStudents = () => {
if (fetching) {
Expand All @@ -148,6 +105,12 @@ function App() {
type="primary" shape="round" icon={<PlusOutlined/>} size="small">
Add New Student
</Button>
<StudentDrawerEditForm
showDrawer={showEditDrawer}
setShowDrawer={setShowEditDrawer}
student={student}
fetchStudents={fetchStudents}
/>
<StudentDrawerForm
showDrawer={showDrawer}
setShowDrawer={setShowDrawer}
Expand All @@ -157,6 +120,12 @@ function App() {
</>
}
return <>
<StudentDrawerEditForm
showDrawer={showEditDrawer}
setShowDrawer={setShowEditDrawer}
student={student}
fetchStudents={fetchStudents}
/>
<StudentDrawerForm
showDrawer={showDrawer}
setShowDrawer={setShowDrawer}
Expand Down Expand Up @@ -185,6 +154,57 @@ function App() {
</>
}

const columns = fetchStudents => [
{
title: '',
dataIndex: 'avatar',
key: 'avatar',
render: (text, student) =>
<TheAvatar name={student.name}/>
},
{
title: 'Id',
dataIndex: 'id',
key: 'id',
},
{
title: 'Name',
dataIndex: 'name',
key: 'name',
},
{
title: 'Email',
dataIndex: 'email',
key: 'email',
},
{
title: 'Gender',
dataIndex: 'gender',
key: 'gender',
},
{
title: 'Actions',
key: 'actions',
render: (text, student) =>
<Radio.Group>
<Popconfirm
placement='topRight'
title={`Are you sure to delete ${student.name}`}
onConfirm={() => removeStudent(student.id, fetchStudents)}
okText='Yes'
cancelText='No'>
<Radio.Button value="small">Delete</Radio.Button>
</Popconfirm>
<Radio.Button onClick={() =>
setShowEditDrawer(!showEditDrawer)
+ setStudent(student)
+ console.log("Student ID: ", student.id)}
value="small">Edit
</Radio.Button>
</Radio.Group>
}
];

return <Layout style={{minHeight: '100vh'}}>
<Sider collapsible collapsed={collapsed}
onCollapse={setCollapsed}>
Expand Down Expand Up @@ -221,20 +241,7 @@ function App() {
{renderStudents()}
</div>
</Content>
<Footer style={{textAlign: 'center'}}>
<Image
width={75}
src="https://user-images.githubusercontent.com/40702606/110871298-0ab98d00-82c6-11eb-88e8-20c4d5c9ded5.png"
/>
<Divider>
<a
rel="noopener noreferrer"
target="_blank"
href="https://amigoscode.com/p/full-stack-spring-boot-react">
Click here to access Fullstack Spring Boot & React for professionals
</a>
</Divider>
</Footer>
<Footer style={{textAlign: 'center'}}>By Amigoscode</Footer>
</Layout>
</Layout>
}
Expand Down
Loading