diff --git a/Base/cocina.sql b/Base/cocina.sql index b5b9f22..b179c15 100644 --- a/Base/cocina.sql +++ b/Base/cocina.sql @@ -1,7 +1,11 @@ create database cocina; +drop database cocina; CREATE USER 'UserRemoto' @'localhost' IDENTIFIED BY 'password123'; +DROP USER 'UserRemoto'@'localhost'; GRANT ALL PRIVILEGES ON cocina TO 'UserRemoto' @'localhost'; FLUSH PRIVILEGES; + + use cocina; drop table usuarios; @@ -56,6 +60,9 @@ INSERT INTO `zona`(`precio`)VALUES INSERT INTO `usuarios`(`nombreUsuario`, `correo`, `password`, `tipo`) VALUES(?,?,?,?); select * from zona; +select * from asiento; +select * from compra; + INSERT INTO `asiento`(`nombre_asiento`, `estado`, `zona_id`) VALUES diff --git a/nbproject/project.properties b/nbproject/project.properties index 2eb6d74..3eeb8f7 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -56,8 +56,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=21 -javac.target=21 +javac.source=20 +javac.target=20 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/src/Main/Main.java b/src/Main/Main.java index 3c1260c..809216e 100644 --- a/src/Main/Main.java +++ b/src/Main/Main.java @@ -1,13 +1,14 @@ package Main; import Vista.Login; +import Vista.SalaPrincipal; public class Main { public static void main(String[] args) { Login login = new Login(); login.setLocationRelativeTo(null); - login.setVisible(true); + login.setVisible(true); } } \ No newline at end of file diff --git a/src/Vista/ConfirmacionPago.java b/src/Vista/ConfirmacionPago.java index 7657f95..e8d59b3 100644 --- a/src/Vista/ConfirmacionPago.java +++ b/src/Vista/ConfirmacionPago.java @@ -10,6 +10,7 @@ import Modelo.EnviarCorreo; import Modelo.Tarjeta; import Modelo.Usuario; import Modelo.Zona; +import java.awt.Image; import java.util.logging.Level; import java.util.logging.Logger; import javax.mail.MessagingException; @@ -36,6 +37,8 @@ public class ConfirmacionPago extends javax.swing.JFrame { this.setResizable(false); setTitle("Confirmacion Pago"); this.setLocationRelativeTo(null); + ImageIcon icon = new ImageIcon("src\\Images\\music.png"); + Image image = icon.getImage(); slogan(); this.zona = zona; this.asiento = asiento; diff --git a/src/Vista/Login.form b/src/Vista/Login.form index 23d1030..1624ef5 100644 --- a/src/Vista/Login.form +++ b/src/Vista/Login.form @@ -85,36 +85,39 @@ + + - - - - + - - - - - - - - + + + + + + + + + + + + + @@ -125,7 +128,7 @@ - + @@ -214,10 +217,7 @@ - - - - + diff --git a/src/Vista/Login.java b/src/Vista/Login.java index 9a45128..00a9e33 100644 --- a/src/Vista/Login.java +++ b/src/Vista/Login.java @@ -5,6 +5,8 @@ package Vista; import Controlador.ControladorLogin; +import java.awt.Image; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JPasswordField; import javax.swing.JTextField; @@ -18,15 +20,32 @@ public class Login extends javax.swing.JFrame { /** * Creates new form login */ + + ImageIcon imagen; + + ControladorLogin contorlador = new ControladorLogin(this); public Login() { initComponents(); setTitle("Inicio Sesion"); setResizable(false); + ImageIcon icon = new ImageIcon("src//Images//musica.png"); + Image image = icon.getImage(); + this.setIconImage(image); + slogan(); btnLogin.addActionListener(contorlador); btnRegistrarse.addActionListener(contorlador); } + public void slogan() { + ImageIcon imagenIcon = new ImageIcon("src\\Images\\music.png"); + Image imagenOriginal = imagenIcon.getImage(); + Image imagenEscalada = imagenOriginal.getScaledInstance(60,60, Image.SCALE_SMOOTH); // Ajusta el tamaño a 300x300 píxeles + ImageIcon imagenFinal = new ImageIcon(imagenEscalada); + imagenlogo.setIcon(imagenFinal); + } + + public JButton getBtnLogin() { return btnLogin; } @@ -62,7 +81,7 @@ public class Login extends javax.swing.JFrame { jLabel5 = new javax.swing.JLabel(); jLabel6 = new javax.swing.JLabel(); jLabel7 = new javax.swing.JLabel(); - jLabel8 = new javax.swing.JLabel(); + imagenlogo = new javax.swing.JLabel(); btnRegistrarse = new javax.swing.JButton(); txtContraseñaLogin = new javax.swing.JPasswordField(); @@ -100,8 +119,6 @@ public class Login extends javax.swing.JFrame { jLabel7.setText("Contraseña:"); - jLabel8.setText("Icono"); - btnRegistrarse.setBackground(new java.awt.Color(51, 51, 51)); btnRegistrarse.setForeground(new java.awt.Color(255, 255, 255)); btnRegistrarse.setText("Registrarse"); @@ -134,30 +151,31 @@ public class Login extends javax.swing.JFrame { .addGap(22, 22, 22))) .addGap(168, 168, 168)) .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(22, 22, 22) + .addComponent(imagenlogo, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(120, 120, 120) + .addGap(22, 22, 22) .addComponent(jLabel2)) .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(197, 197, 197) + .addGap(105, 105, 105) .addComponent(jLabel1))) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(22, 22, 22) - .addComponent(jLabel8) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(0, 22, Short.MAX_VALUE)) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(14, 14, 14) - .addComponent(jLabel8) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel2) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jLabel6) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(20, 20, 20) + .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jLabel2) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jLabel6)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() + .addGap(14, 14, 14) + .addComponent(imagenlogo, javax.swing.GroupLayout.PREFERRED_SIZE, 77, javax.swing.GroupLayout.PREFERRED_SIZE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(txtNombreUsuario, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) @@ -168,7 +186,7 @@ public class Login extends javax.swing.JFrame { .addComponent(btnLogin) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(btnRegistrarse) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 34, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 50, Short.MAX_VALUE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel3) .addComponent(jLabel4) @@ -204,6 +222,7 @@ public class Login extends javax.swing.JFrame { // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnLogin; private javax.swing.JButton btnRegistrarse; + private javax.swing.JLabel imagenlogo; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; @@ -211,7 +230,6 @@ public class Login extends javax.swing.JFrame { private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; private javax.swing.JPanel jPanel1; private javax.swing.JPasswordField txtContraseñaLogin; private javax.swing.JTextField txtNombreUsuario; diff --git a/src/Vista/Registro.form b/src/Vista/Registro.form index 8ff9830..19303c5 100644 --- a/src/Vista/Registro.form +++ b/src/Vista/Registro.form @@ -51,7 +51,7 @@ - + @@ -59,15 +59,10 @@ + - - - - - - - + + @@ -83,7 +78,7 @@ - + @@ -92,15 +87,14 @@ - + + - - - + diff --git a/src/Vista/Registro.java b/src/Vista/Registro.java index 0b5a27f..4e33ec8 100644 --- a/src/Vista/Registro.java +++ b/src/Vista/Registro.java @@ -25,7 +25,7 @@ public class Registro extends javax.swing.JFrame { public Registro() { setTitle("Registro"); - ImageIcon icon = new ImageIcon("src\\Images\\music.png"); + ImageIcon icon = new ImageIcon("src\\Images\\musica.png"); Image image = icon.getImage(); this.setIconImage(image); this.setResizable(false); @@ -125,20 +125,17 @@ public class Registro extends javax.swing.JFrame { panelRegistroLayout.setHorizontalGroup( panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelRegistroLayout.createSequentialGroup() - .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelRegistroLayout.createSequentialGroup() .addGap(66, 66, 66) .addComponent(btnRegistrar, javax.swing.GroupLayout.PREFERRED_SIZE, 147, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(panelRegistroLayout.createSequentialGroup() .addGap(18, 18, 18) .addComponent(logoimagen, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelRegistroLayout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel3)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelRegistroLayout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(logo)))) + .addComponent(jLabel3) + .addComponent(logo))) .addGroup(panelRegistroLayout.createSequentialGroup() .addGap(30, 30, 30) .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) @@ -149,20 +146,20 @@ public class Registro extends javax.swing.JFrame { .addComponent(txtCorreoRegistro) .addComponent(txtPassword) .addComponent(labelName, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addContainerGap(24, Short.MAX_VALUE)) + .addContainerGap(18, Short.MAX_VALUE)) ); panelRegistroLayout.setVerticalGroup( panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelRegistroLayout.createSequentialGroup() .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(panelRegistroLayout.createSequentialGroup() - .addGap(72, 72, 72) + .addGap(22, 22, 22) + .addComponent(logo) + .addGap(27, 27, 27) .addComponent(jLabel3)) .addGroup(panelRegistroLayout.createSequentialGroup() .addContainerGap() - .addGroup(panelRegistroLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(logoimagen, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(logo)))) + .addComponent(logoimagen, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE))) .addGap(29, 29, 29) .addComponent(jLabel7) .addGap(18, 18, 18)