diff --git a/Base/universidad.sql b/Base/universidad.sql index 086dc25..7cfc73f 100644 --- a/Base/universidad.sql +++ b/Base/universidad.sql @@ -11,14 +11,16 @@ drop table alumno; create table alumno( id integer auto_increment primary key, nombre varchar(40), - apellidos varchar(100), + apellido varchar(100), fecha_nacimiento date, nacionalidad varchar(40), tipoSangre varchar(40), matricula varchar(40), - contraseña varchar(40) + password varchar(40), + correo varchar(40) ); + drop table examen; create table examen( id integer auto_increment primary key, @@ -95,13 +97,31 @@ matricula varchar(40), contraseña varchar(40) ); -INSERT INTO alumno (nombre, apellidos, fecha_nacimiento, nacionalidad, tipoSangre, matricula, contraseña, estado, municipio, dirreccion) +create table documentacion; +create table documentacion ( +id integer auto_increment primary key, +acta_nacimiento BLOB, +certificadoBachillerato BLOB, +curp BLOB, +ine_Alumno BLOB, +ine_Tutor BLOB, +certificado_Medico BLOB, +comprobante_Domicilio BLOB, +fotografia BLOB, +constancia BLOB, +municipio varchar(40), +estado varchar(40), +telefono varchar(40), +domicilio varchar(40) +); + +INSERT INTO alumno (nombre, apellidos, fecha_nacimiento, nacionalidad, tipoSangre, matricula, password) VALUES -('Juan', 'Pérez García', '2000-05-15', 'Mexicana', 'O+', '123ABC', 'contraseña123', 'Ciudad de México', 'Ciudad de México', 'Av. Insurgentes #123'), -('María', 'López Rodríguez', '1999-10-20', 'Mexicana', 'A-', '456DEF', 'maria123', 'Guadalajara', 'Jalisco', 'Calle Reforma #45'), -('Carlos', 'González Martínez', '2001-03-08', 'Mexicana', 'B+', '789GHI', 'carlos456', 'Monterrey', 'Nuevo León', 'Col. San Pedro #12'), -('Laura', 'Hernández Sánchez', '1998-12-03', 'Mexicana', 'AB-', '012JKL', 'laura789', 'Puebla', 'Puebla', 'Av. Juárez #67'), -('Pedro', 'Díaz Pérez', '2002-07-11', 'Mexicana', 'O-', '345MNO', 'pedro123', 'Tijuana', 'Baja California', 'Calle Revolución #89'); +('Juan', 'Pérez García', '2000-05-15', 'Mexicana', 'O+', '123ABC', 'contraseña123'), +('María', 'López Rodríguez', '1999-10-20', 'Mexicana', 'A-', '456DEF', 'maria123'), +('Carlos', 'González Martínez', '2001-03-08', 'Mexicana', 'B+', '789GHI', 'carlos456'), +('Laura', 'Hernández Sánchez', '1998-12-03', 'Mexicana', 'AB-', '012JKL', 'laura789'), +('Pedro', 'Díaz Pérez', '2002-07-11', 'Mexicana', 'O-', '345MNO', 'pedro123'); INSERT INTO examen (calificacion, derecho_inscripcion, id_alumno) VALUES diff --git a/backend/src/main/java/mx/uv/App.java b/backend/src/main/java/mx/uv/App.java index 16b2af1..f9a9b8e 100644 --- a/backend/src/main/java/mx/uv/App.java +++ b/backend/src/main/java/mx/uv/App.java @@ -2,27 +2,68 @@ package mx.uv; import static spark.Spark.*; import java.util.HashMap; -import java.util.UUID; import com.google.gson.*; + +import mx.uv.Controller.DAO; +import mx.uv.Model.*; + public class App { + static Gson gson = new Gson(); + static HashMap usuarios = new HashMap<>(); public static void main( String[] args ) { - System.out.println( "Hello World!" ); - //port(80); + //fuente:https://gist.github.com/saeidzebardast/e375b7d17be3e0f4dddf + options("/*",(request,response)->{ + String accessControlRequestHeaders=request.headers("Access-Control-Request-Headers"); + if(accessControlRequestHeaders!=null){ + response.header("Access-Control-Allow-Headers",accessControlRequestHeaders); + } + String accessControlRequestMethod=request.headers("Access-Control-Request-Method"); + if(accessControlRequestMethod!=null){ + response.header("Access-Control-Allow-Methods",accessControlRequestMethod); + } + return "OK"; + }); - get("/usuarios", (request, response) ->{ + before((request,response)->response.header("Access-Control-Allow-Origin","*")); + + get("/todosLosAlumnos", (request, response) ->{ response.type("application/json"); - JsonObject respuesta = new JsonObject(); - respuesta.addProperty("msj", "hola"); - return respuesta; + return gson.toJson(DAO.dameAlumnos()); }); - post("/usuarios", (request, response) ->{ + post("/agregarAlumno", (request, response) ->{ String payload = request.body(); + Alumno alumno = gson.fromJson(payload, Alumno.class); + + boolean msj = DAO.agregarAlumno(alumno); JsonObject respuesta = new JsonObject(); - respuesta.addProperty("msj", ""); + respuesta.addProperty("msj", msj); return respuesta; }); + put("/editarAlumno", (request, response) ->{ + String payload = request.body(); + Alumno alumno = gson.fromJson(payload, Alumno.class); + boolean verificado = DAO.editarAlumno(alumno); + JsonObject respuesta = new JsonObject(); + respuesta.addProperty("Editado", verificado); + return respuesta; + }); + delete("/eliminarAlumno", (request, response) ->{ + String payload = request.body(); + Alumno alumno = gson.fromJson(payload, Alumno.class); + boolean verificado = DAO.eliminarAlumno(alumno.getId()); + JsonObject respuesta = new JsonObject(); + respuesta.addProperty("existe", verificado); + return respuesta; + }); + get("/alumnoIniciado", (request, response) ->{ + response.type("application/json"); + String payload = request.body(); + Alumno alumno = gson.fromJson(payload, Alumno.class); + return gson.toJson(DAO.alumnoIniciado(alumno.getMatricula(),alumno.getContrasena())); + }); + } -} +} \ No newline at end of file diff --git a/backend/src/main/java/mx/uv/Controller/Conexion.java b/backend/src/main/java/mx/uv/Controller/Conexion.java new file mode 100644 index 0000000..8537309 --- /dev/null +++ b/backend/src/main/java/mx/uv/Controller/Conexion.java @@ -0,0 +1,56 @@ +package mx.uv.Controller; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.logging.Logger; + +public class Conexion { + + private static Connection conexion; + private static Conexion instancia; + private static final String url = "jdbc:mysql://localhost:3306/universidad"; + private static final String user = "root"; + private static final String password = "Perro16tonto"; + private static final Logger logger = Logger.getLogger(Conexion.class.getName()); + + private Conexion() {} + + public static Conexion getInstance() { + if (instancia == null) { + synchronized (Conexion.class) { + if (instancia == null) { + instancia = new Conexion(); + } + } + } + return instancia; + } + + public Connection conectar() { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + conexion = DriverManager.getConnection(url, user, password); + if (conexion != null) { + logger.info("Conexión exitosa"); + return conexion; + } else { + logger.severe("ERROR: No se pudo conectar"); + } + } catch (Exception e) { + logger.severe("ERROR: " + e.getMessage()); + } + return null; + } + + public void cerrarConexion() { + try { + if (conexion != null && !conexion.isClosed()) { + conexion.close(); + logger.info("Se desconectó de la base de datos"); + } + } catch (SQLException e) { + logger.severe("ERROR: " + e.getMessage()); + } + } +} diff --git a/backend/src/main/java/mx/uv/Controller/DAO.java b/backend/src/main/java/mx/uv/Controller/DAO.java new file mode 100644 index 0000000..3b39d7f --- /dev/null +++ b/backend/src/main/java/mx/uv/Controller/DAO.java @@ -0,0 +1,148 @@ +package mx.uv.Controller; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + + +import mx.uv.Model.Alumno; + +public class DAO { + private static Conexion cn = Conexion.getInstance(); + + public static List dameAlumnos() { + Statement stm = null; + ResultSet rs = null; + Connection conn = null; + List resultado = new ArrayList<>(); + + conn = cn.conectar(); + + try { + String sql = "SELECT * from alumno"; + stm = conn.createStatement(); + rs = stm.executeQuery(sql); + while (rs.next()) { + Alumno u = new Alumno(rs.getInt(1), rs.getString(2), rs.getString(3),rs.getString(4), rs.getString(5),rs.getString(6),rs.getString(7),rs.getString(8)); + resultado.add(u); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return resultado; + } + public static boolean validarAlumno(Alumno alumno) { + Statement stm = null; + Connection conn = null; + boolean verificacion =false; + ResultSet rs = null; + conn = cn.conectar(); + try { + String sql ="select * from usuarios " + + "where matricula= '"+alumno.getMatricula()+"' and contrasena='"+alumno.getContrasena()+"'"; + stm = (Statement) conn.createStatement(); + rs = stm.executeQuery(sql); + if(rs.next()){ + verificacion = true; + }else{ + verificacion = false; + } + conn.close(); + } catch (SQLException ex) { + System.err.println(ex); + } + return verificacion; + } + + public static boolean agregarAlumno(Alumno alumno) { + PreparedStatement stm = null; + Connection conn = null; + boolean msj= false; + + conn = cn.conectar(); + try { + String sql = "INSERT INTO `alumno`(`nombre`,`apellido`,`nacionalidad`,`matricula`,`contrasena`)VALUES(?,?,?,?,?);"; + stm = (PreparedStatement) conn.prepareStatement(sql); + stm.setString(1, alumno.getNombre()); + stm.setString(2, alumno.getApellido()); + stm.setString(3, alumno.getNacionalidad()); + stm.setString(4, alumno.getMatricula()); + stm.setString(5, alumno.getContrasena()); + if (stm.executeUpdate() > 0) + msj = true; + else + msj = false; + + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(stm,conn); + } + return msj; + } + + private static void cerrarConexiones(PreparedStatement stm,Connection conn) { + if (stm != null) { + try { + stm.close(); + } catch (Exception e) { + System.out.println(e); + } + stm = null; + } + try { + conn.close(); + cn.cerrarConexion(); + } catch (Exception e) { + System.out.println(e); + } + } + public static boolean eliminarAlumno(int idAlumno) { + + return false; + } + public static boolean editarAlumno(Alumno alumno) { + PreparedStatement stm = null; + Connection conn = null; + boolean verificacion =false; + conn = cn.conectar(); + try { + String sql ="UPDATE `alumno` SET `nombre` = '"+alumno.getNombre()+"',`apellido` = '"+alumno.getApellido()+"',`fecha_nacimiento` = '"+alumno.getFechaNacimiento()+"',`nacionalidad` = '"+alumno.getNacionalidad()+"', `tipoSangre` = '"+alumno.getTipoDeSangre()+"', `contrasena`= '"+alumno.getContrasena()+"' WHERE `id` = '"+alumno.getId()+"';"; + stm = conn.prepareStatement(sql); + stm.executeUpdate(); + verificacion = true; + } catch (SQLException ex) { + System.err.println(ex); + }finally{ + cerrarConexiones(stm, conn); + cn.cerrarConexion(); + } + return verificacion; + } + + public static Alumno alumnoIniciado(String matricula, String contrasena) { + ResultSet rs = null; + Connection conn = null; + Alumno alumno =null; + + conn = cn.conectar(); + + try { + String sql = "SELECT * FROM alumno WHERE matricula = ? AND contrasena = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, matricula); + stmt.setString(2, contrasena); + rs = stmt.executeQuery(); + while (rs.next()) { + alumno = new Alumno(rs.getInt(1), rs.getString(2), rs.getString(3),rs.getString(4), rs.getString(5),rs.getString(6),rs.getString(7),rs.getString(8)); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return alumno; + } +} diff --git a/backend/src/main/java/mx/uv/Controller/DAOTutor.java b/backend/src/main/java/mx/uv/Controller/DAOTutor.java new file mode 100644 index 0000000..c9278ce --- /dev/null +++ b/backend/src/main/java/mx/uv/Controller/DAOTutor.java @@ -0,0 +1,127 @@ +package mx.uv.Controller; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; + +import mx.uv.Model.Tutor; + + +public class DAOTutor { + + private static Conexion cn = Conexion.getInstance(); + + public static List dameTutores() { + Statement stm = null; + ResultSet rs = null; + Connection conn = null; + List resultado = new ArrayList<>(); + + conn = cn.conectar(); + + try { + String sql = "SELECT * from tutor"; + stm = conn.createStatement(); + rs = stm.executeQuery(sql); + while (rs.next()) { + Tutor u = new Tutor(rs.getInt(1), rs.getString(2), rs.getString(3),rs.getString(4), rs.getString(5),rs.getString(6)); + resultado.add(u); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return resultado; + } + + public static boolean validarTutor(Tutor tutor){ + Statement stm = null; + Connection conn = null; + boolean verificacion =false; + ResultSet rs = null; + conn = cn.conectar(); + try { + String sql ="select * from tutor " + + "where id= '"+tutor.getId()+"' and nombre='"+tutor.getNombre()+"'"; + stm = (Statement) conn.createStatement(); + rs = stm.executeQuery(sql); + if(rs.next()){ + verificacion = true; + }else{ + verificacion = false; + } + conn.close(); + } catch (Exception ex) { + System.err.println(ex); + } + return verificacion; + } + + public static boolean agregarTutor(Tutor tutor) { + PreparedStatement stm = null; + Connection conn = null; + boolean msj = false; + + conn = cn.conectar(); + try { + String sql = "INSERT INTO `tutor`(`nombre`,`apellido`,`parentesco`,`ocupacion`,`telefono`)VALUES(?,?,?,?,?);"; + stm = (PreparedStatement) conn.prepareStatement(sql); + stm.setString(1, tutor.getNombre()); + stm.setString(2, tutor.getApellido()); + stm.setString(3, tutor.getParentesco()); + stm.setString(4, tutor.getOcupacion()); + stm.setString(5, tutor.getTelefono()); + } catch (Exception e) { + System.out.println(e); + } finally { + //cerrarConexiones(stm, conn); + } + return msj; + } + + private static void cerrarConexiones(PreparedStatement stm, Connection conn){ + if(stm != null){ + try { + stm.close(); + } catch (Exception e) { + System.out.println(e); + } + stm = null; + } + try{ + conn.close(); + cn.cerrarConexion(); + } catch (Exception e) { + System.out.println(e); + } + } + + public static boolean eliminarTutor(Tutor tutor) { + return false; + } + + public static boolean editarTutor(Tutor tutor) { + PreparedStatement stm = null; + Connection conn = null; + boolean verificacion = false; + conn = cn.conectar(); + try{ + String sql ="UPDATE `tutor` SET `nombre` = '"+tutor.getNombre()+"',`apellido` = '"+tutor.getApellido()+"',`parentesco` = '"+tutor.getParentesco()+"',`ocupacion` = '"+tutor.getOcupacion()+"', `telefono` = '"+tutor.getTelefono()+"';"; + stm = conn.prepareStatement(sql); + stm.executeQuery(); + verificacion = true; + } catch (SQLException ex){ + System.out.println(ex); + } finally { + cerrarConexiones(stm, conn); + cn.cerrarConexion(); + } + return verificacion; + } + +} diff --git a/backend/src/main/java/mx/uv/Controller/DAO_Administrador.java b/backend/src/main/java/mx/uv/Controller/DAO_Administrador.java new file mode 100644 index 0000000..0816966 --- /dev/null +++ b/backend/src/main/java/mx/uv/Controller/DAO_Administrador.java @@ -0,0 +1,129 @@ +package mx.uv.Controller; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + +import mx.uv.Model.Administrador; + + + + +public class DAO_Administrador{ + private static Conexion cn = Conexion.getInstance(); + + public static List dameAministradores(){ + Statement stm = null; + ResultSet rs = null; + Connection conn = null; + List resultado = new ArrayList<>(); + + conn = cn.conectar(); + + try { + String sql = "SELECT * from administrador"; + stm = conn.createStatement(); + rs = stm.executeQuery(sql); + while (rs.next()) { + Administrador u = new Administrador(rs.getInt(1), rs.getString(2), rs.getString(3),rs.getString(4),rs.getString(5)); + resultado.add(u); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return resultado; + } + + public boolean agregarAdministrador(Administrador administrador){ + PreparedStatement stm = null; + Connection conn = null; + boolean msj= false; + + conn = cn.conectar(); + + try{ + String sql ="INSERT INTO `administrador` (`matricula`,`contrasena`, `nombre`, `apellido`) VALUES(?,?,?,?);"; + stm = (PreparedStatement) conn.prepareStatement(sql); + stm.setString(1, administrador.getMatricula()); + stm.setString(2, administrador.getContrasena()); + stm.setString(3, administrador.getNombre()); + stm.setString(4, administrador.getNombre()); + stm.setString(5, administrador.getApellido()); + + + + }catch(Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(stm,conn); + } + return msj; + } + + private static void cerrarConexiones(PreparedStatement stm,Connection conn) { + if (stm != null) { + try { + stm.close(); + } catch (Exception e) { + System.out.println(e); + } + stm = null; + } + try { + conn.close(); + cn.cerrarConexion(); + } catch (Exception e) { + System.out.println(e); + } + } + + public static boolean eliminarAdministrador(int idAdministrador){ + return false; + } + + public static boolean editarAdministrador(Administrador administrador){ + PreparedStatement stm = null; + Connection conn = null; + boolean verificacion =false; + conn = cn.conectar(); + + try{ + String sql ="UPDATE `administrador` SET `matricula` = '"+administrador.getMatricula()+"',`contrasena` = '"+administrador.getContrasena()+"',`nombre` = '"+administrador.getNombre()+"',`apellido` = '"+administrador.getApellido()+"' WHERE `id` = '"+administrador.getId()+"';"; + stm = conn.prepareStatement(sql); + stm.executeUpdate(); + verificacion = true; + }catch (SQLException ex) { + System.err.println(ex); + }finally{ + cerrarConexiones(stm, conn); + cn.cerrarConexion(); + } + return verificacion; + } + + public static Administrador administradorIniciado(String matricula, String contrasena){ + ResultSet rs = null; + Connection conn = null; + Administrador administrador =null; + + conn = cn.conectar(); + + try { + String sql = "SELECT * FROM administrador WHERE matricula = ? AND contrasena = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, matricula); + stmt.setString(2, contrasena); + rs = stmt.executeQuery(); + while (rs.next()) { + administrador = new Administrador(rs.getInt(1),rs.getString(2),rs.getString(3),rs.getString(4),rs.getString(5)); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return administrador; + } +} \ No newline at end of file diff --git a/backend/src/main/java/mx/uv/Controller/DAO_Carrrera.java b/backend/src/main/java/mx/uv/Controller/DAO_Carrrera.java new file mode 100644 index 0000000..9df5267 --- /dev/null +++ b/backend/src/main/java/mx/uv/Controller/DAO_Carrrera.java @@ -0,0 +1,106 @@ +package mx.uv.Controller; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + + +import mx.uv.Model.Carrera; + +public class DAO_Carrrera{ + private static Conexion cn = Conexion.getInstance(); + + public static List dameCarreras(){ + Statement stm = null; + ResultSet rs = null; + Connection conn = null; + List resultado = new ArrayList<>(); + + conn = cn.conectar(); + + try { + String sql = "SELECT * from carrera"; + stm = conn.createStatement(); + rs = stm.executeQuery(sql); + while (rs.next()) { + Carrera u = new Carrera(rs.getInt(1), rs.getString(2), rs.getString(3),rs.getString(4), rs.getString(5),rs.getDouble(6)); + resultado.add(u); + } + } catch (Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(null, conn); + } + return resultado; + + } + + public static boolean agregarCarrera(Carrera carrera){ + PreparedStatement stm = null; + Connection conn = null; + boolean msj= false; + + conn = cn.conectar(); + + try{ + String sql ="INSERT INTO `carrera` (`area`,`nombre`, `modalidad`, `campus`, `costo`) VALUES(?,?,?,?,?);"; + stm = (PreparedStatement) conn.prepareStatement(sql); + stm.setString(1, carrera.getArea()); + stm.setString(2, carrera.getNombre()); + stm.setString(3, carrera.getModalidad()); + stm.setString(4, carrera.getCampus()); + stm.setDouble(5, carrera.getCosto()); + + + + }catch(Exception e) { + System.out.println(e); + } finally { + cerrarConexiones(stm,conn); + } + return msj; + } + + private static void cerrarConexiones(PreparedStatement stm,Connection conn) { + if (stm != null) { + try { + stm.close(); + } catch (Exception e) { + System.out.println(e); + } + stm = null; + } + try { + conn.close(); + cn.cerrarConexion(); + } catch (Exception e) { + System.out.println(e); + } + } + + public static boolean eliminarCarrera(int idCarrera){ + return false; + } + + public static boolean editarCarrera(Carrera carrera){ + PreparedStatement stm = null; + Connection conn = null; + boolean verificacion =false; + conn = cn.conectar(); + + try{ + String sql ="UPDATE `alumno` SET `area` = '"+carrera.getArea()+"',`nombre` = '"+carrera.getNombre()+"',`modalidad` = '"+carrera.getModalidad()+"',`campus` = '"+carrera.getCampus()+"', `costo` = '"+carrera.getCosto()+"' WHERE `id` = '"+carrera.getId()+"';"; + stm = conn.prepareStatement(sql); + stm.executeUpdate(); + verificacion = true; + }catch (SQLException ex) { + System.err.println(ex); + }finally{ + cerrarConexiones(stm, conn); + cn.cerrarConexion(); + } + return verificacion; + } + + +} \ No newline at end of file diff --git a/backend/model/Administrador.java b/backend/src/main/java/mx/uv/Model/Administrador.java similarity index 98% rename from backend/model/Administrador.java rename to backend/src/main/java/mx/uv/Model/Administrador.java index a400694..4d2ba05 100644 --- a/backend/model/Administrador.java +++ b/backend/src/main/java/mx/uv/Model/Administrador.java @@ -1,3 +1,5 @@ +package mx.uv.Model; + public class Administrador { private int id; private String matricula; diff --git a/backend/model/Alumno.java b/backend/src/main/java/mx/uv/Model/Alumno.java similarity index 92% rename from backend/model/Alumno.java rename to backend/src/main/java/mx/uv/Model/Alumno.java index d7a0f0e..7ab862b 100644 --- a/backend/model/Alumno.java +++ b/backend/src/main/java/mx/uv/Model/Alumno.java @@ -1,4 +1,4 @@ -package model; +package mx.uv.Model; // * Clase Alumno que servira para comunicarse con el controlador. public class Alumno { private int id; @@ -25,23 +25,21 @@ public class Alumno { public Alumno() { } - public Alumno(int id, String nombre, String apellido, String nacionalidad) { - this.id = id; + public Alumno(String nombre, String apellido, String nacionalidad, String matricula, String contrasena) { this.nombre = nombre; this.apellido = apellido; this.nacionalidad = nacionalidad; - } - - public Alumno(int id, String matricula, String contrasena) { - this.id = id; this.matricula = matricula; this.contrasena = contrasena; } + public Alumno(String matricula, String contrasena) { this.matricula = matricula; this.contrasena = contrasena; } + + public void setId(int id) { this.id = id; } diff --git a/backend/src/main/java/mx/uv/Model/Carrera.java b/backend/src/main/java/mx/uv/Model/Carrera.java new file mode 100644 index 0000000..394512a --- /dev/null +++ b/backend/src/main/java/mx/uv/Model/Carrera.java @@ -0,0 +1,70 @@ +package mx.uv.Model; + +public class Carrera { + private int id; + private String area; + private String nombre; + private String modalidad; + private String campus; + private Double costo; + + public Carrera(int id,String area, String nombre, String modalidad, String campus, double costo){ + this.id=id; + this.area=area; + this.nombre=nombre; + this.modalidad=modalidad; + this.campus=campus; + this.costo=costo; + } + + public void setId(int id){ + this.id=id; + } + + public void setArea(String area){ + this.area=area; + } + + public void setNombre(String nombre){ + this.nombre=nombre; + } + + public void setModalidad(String modalidad){ + this.modalidad=modalidad; + } + + public void setCampus(String campus){ + this.campus=campus; + } + + public void setCosto(double costo){ + this.costo=costo; + } + + public int getId(){ + return id; + } + + public String getArea(){ + return area; + } + + public String getNombre(){ + return nombre; + } + + public String getModalidad(){ + return modalidad; + } + + public String getCampus(){ + return campus; + } + + public double getCosto(){ + return costo; + } + + + +} diff --git a/backend/model/Tutor.java b/backend/src/main/java/mx/uv/Model/Tutor.java similarity index 98% rename from backend/model/Tutor.java rename to backend/src/main/java/mx/uv/Model/Tutor.java index 117ff18..b410300 100644 --- a/backend/model/Tutor.java +++ b/backend/src/main/java/mx/uv/Model/Tutor.java @@ -1,3 +1,4 @@ +package mx.uv.Model; public class Tutor { private int id; private String nombre; diff --git a/frontend/index.html b/frontend/index.html index 5e538a2..c933b91 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -8,7 +8,6 @@
-
diff --git a/frontend/src/Encabezado.jsx b/frontend/src/Encabezado.jsx index 580a506..16f1d2d 100644 --- a/frontend/src/Encabezado.jsx +++ b/frontend/src/Encabezado.jsx @@ -1,7 +1,7 @@ import React from "react"; import './Encabezado.css'; -const Encabezado = () => { +function Encabezado(){ return (