nothing

Spring boot code/Tutor_Adda_project/src/main/java/project/code/dao/CourseDAO.java

@@ -131,4 +131,15 @@ public List<Courses> coursesbystudentid(int id)  //get all courses by student id
 		return courses;
 	}
 
+
+	public Courses studentupcommingcourse(int sid) //gives upcoming one course lecture for particular student 
+	{
+		Courses course;
+		course=coursesRepository.upcomming_course_student(sid);
+
+		return course;
+
+	}
+
+
 }

Spring boot code/Tutor_Adda_project/src/main/java/project/code/dao/TeacherDAO.java

@@ -46,6 +46,7 @@ public void deleteTeacher(int id) {
 
 	public boolean updateteacher(Teacher teacher)
 	{
+<<<<<<< HEAD
 		Optional<Teacher> updateT= teacherRepository.findById(teacher.getTeacher_id());
 
 
@@ -63,6 +64,16 @@ public boolean updateteacher(Teacher teacher)
 		System.out.print(teacher.getTeacher_qualification());
 		System.out.print(teacher.getTeacher_username());
 		System.out.print(teacher.getAddress());
+=======
+
+	Optional<Teacher> updateT= teacherRepository.findById(teacher.getTeacher_id());
+
+
+//		Teacher updateTeacher = teacherRepository.findteach(teacher.getTeacher_id());
+
+
+
+>>>>>>> e67b7e69fca232248617bf3370f713d5440fbc9a
 
 		if(updateT.isPresent())
 		{

Spring boot code/Tutor_Adda_project/src/main/java/project/code/entity/Registration.java

@@ -13,8 +13,7 @@
 
 @Entity
 @Data
-//@AllArgsConstructor
-//@NoArgsConstructor
+
 @IdClass(CompositeRegister.class)
 public class Registration 
 {

Spring boot code/Tutor_Adda_project/src/main/resources/application.properties

@@ -19,7 +19,7 @@ spring.jpa.show-sql=true
 
 #hibernate properties
 spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=create
 
 spring.session.jdbc.initialize-schema: always
 spring.main.allow-bean-definition-overriding=true 

react-ui/dependices.txt

@@ -0,0 +1,58 @@
+
+first command :--
+
+	npm install 
+
+
+if some dependecies not found or gives error while running projects ...
+---------------------------------------------------------------
+
+dependencies to run projects:--
+
+
+/* ----for routing---*/
+
+npm install react-router-dom
+
+
+/* ----for api integration---*/
+
+npm install axios
+
+
+/* ----for bootstrap css---*/
+
+npm install react-bootstrap bootstrap
+
+
+/*---- for social icons in footer---- */
+
+npm install react-social-icons
+
+
+/*----- for redux storage -----
+
+npm install react-redux --save
+
+/*----- for react icons
+
+npm install react-icons --save
+
+/*--- for react calendar 
+
+npm install react-calendar
+
+
+/*-----
+
+npm install react-hook-form
+
+
+/*--- for email validator
+
+npm install validator
+
+
+/*-- for sweetalert 
+
+npm install sweetalert --save