diff --git a/src/netKnow/DatabaseConnection.java b/src/netKnow/DatabaseConnection.java
index 43cc674..546bc31 100644
--- a/src/netKnow/DatabaseConnection.java
+++ b/src/netKnow/DatabaseConnection.java
@@ -7,15 +7,15 @@
public class DatabaseConnection {
private final static String DBURL = "jdbc:mysql://sql.slowiak.nazwa.pl:3306/slowiak";
private final static String DBURL2 = "jdbc:mysql://127.0.0.1:3306/slowiak?serverTimezone=UTC";
- private final static String DBUSER = "slowiak";
- private final static String DBUSER2 = "root";
+ private final static String DBUSER = "slowiak";
+ private final static String DBUSER2 = "root";
private final static String DBPASS = "ZaQ1XsW2";
private static Connection connection = null;
public static Connection getConenction(){
try {
- //connection = DriverManager.getConnection(DBURL, DBUSER, DBPASS);
- connection = DriverManager.getConnection(DBURL2, DBUSER2, DBPASS);
+ connection = DriverManager.getConnection(DBURL, DBUSER, DBPASS);
+ //connection = DriverManager.getConnection(DBURL2, DBUSER2, DBPASS);
if(connection != null){
System.out.println("Connected to the datebase :D");
return connection;
diff --git a/src/netKnow/controller/CalculatorIPController.java b/src/netKnow/controller/CalculatorIPController.java
index ef60504..298bf6f 100644
--- a/src/netKnow/controller/CalculatorIPController.java
+++ b/src/netKnow/controller/CalculatorIPController.java
@@ -1,12 +1,14 @@
package netKnow.controller;
import javafx.fxml.FXML;
+import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.input.KeyCode;
import netKnow.Class.IP;
+import netKnow.scene.MainOptionsScene;
public class CalculatorIPController {
@@ -32,9 +34,11 @@ public class CalculatorIPController {
private TextArea minHostField;
@FXML
private TextArea maxHostField;
+ @FXML
+ private Button goBackButton;
-
- IP myIP;
+ private Scene scene;
+ private IP myIP;
@FXML
void initialize(){
@@ -55,6 +59,12 @@ void initialize(){
countButton.fire();
}
});
+ goBackButton.setOnAction(e -> {
+ new MainOptionsScene(scene);
+ });
}
+ public void setScene(Scene scene){
+ this.scene = scene;
+ }
}
diff --git a/src/netKnow/controller/HeaderController.java b/src/netKnow/controller/HeaderController.java
index 81386c3..cc1a027 100644
--- a/src/netKnow/controller/HeaderController.java
+++ b/src/netKnow/controller/HeaderController.java
@@ -32,7 +32,7 @@ private void setDates(){
String query = "SELECT login, registrationDate, lastVisitDate FROM Users" + " WHERE login='"+login+"'";
ResultSet rs = statement.executeQuery(query);
rs.next();
- userLoginLabel.setText(login);
+ userLoginLabel.setText(login + "!");
registrationDateLabel.setText(rs.getString("registrationDate"));
lastVisitDateLabel.setText(rs.getString("lastVisitDate"));
rs.close();
diff --git a/src/netKnow/controller/LoginController.java b/src/netKnow/controller/LoginController.java
index ae15a11..53a13a6 100644
--- a/src/netKnow/controller/LoginController.java
+++ b/src/netKnow/controller/LoginController.java
@@ -58,9 +58,7 @@ void initialize(){
}
});
- registerButton.setOnAction(e ->{
- new RegistrationScene(scene);
- });
+ registerButton.setOnAction(e -> new RegistrationScene(scene));
passwordField.setOnKeyPressed(e -> {
if(e.getCode() == KeyCode.ENTER){
@@ -86,7 +84,6 @@ private int loginUser(String login, String password){
while(rs.next()){
dbLogin = rs.getString("login");
dbPassword = rs.getString("password");
- System.out.println("xd: " + dbLogin + " " + dbPassword);
}
}
rs.close();
@@ -97,7 +94,6 @@ private int loginUser(String login, String password){
}
if(login == null || login.isEmpty()){
- System.out.println("puste");
return 4;
}else{
if(login.equals(dbLogin)){
@@ -128,10 +124,7 @@ private boolean validateLicenseKey(String userLogin){
DatabaseConnection.closeConnection();
}
- if(dbKey){
- return true;
- }
- return false;
+ return dbKey;
}
private void activateLicense(String userLogin){
diff --git a/src/netKnow/controller/RegistrationController.java b/src/netKnow/controller/RegistrationController.java
index f330fdf..c42bcad 100644
--- a/src/netKnow/controller/RegistrationController.java
+++ b/src/netKnow/controller/RegistrationController.java
@@ -58,9 +58,7 @@ public class RegistrationController {
@FXML
void initialize(){
- goBackButton.setOnAction(e ->{
- new LoginScene(scene);
- });
+ goBackButton.setOnAction(e -> new LoginScene(scene));
registerButton.setOnAction(e ->{
@@ -79,9 +77,7 @@ void initialize(){
if(!checkIfLoginExists()){
if(!checkIfEmailExists()){
if(checkIfPasswordMatch()){
- System.out.println("Przed kodowaniem: " + password);
encryptedPassword = PasswordEncrypter.encryptPassword(password);
- System.out.println("Po zakodowaniu: " + encryptedPassword);
registerUser(login, encryptedPassword, firstName, lastName, email);
MailSender mailSender = new MailSender(email, getMessageContent());
try {
@@ -115,7 +111,6 @@ private static void registerUser(String login, String password, String firstName
String date = dtf.format(now);
String query = "INSERT INTO `Users` (login, password, registrationDate, lastVisitDate, firstname, lastname, email, licenseKey) VALUES ('"+login+"', '"+password+"', '"+date+"', '"+date+"', '"+firstName+"', '"+lastName+"', '"+email+"', '"+licenseKey+"');";
- System.out.println(query);
statement.executeUpdate(query);
} catch (SQLException e) {
e.printStackTrace();
@@ -149,7 +144,7 @@ private String getMessageContent(){
return "Witaj " + firstName + " " + lastName + "!\n\n" +
"Dziękujemy za założenie konta.\nCieszymy się, że chcesz używać naszej aplikacji!\n\n" +
"Oto Twoje dane podane podczas rejestracji: \n\n"+
- "\nLoginScene: " + login +
+ "\nLogin: " + login +
"\nHasło: " + password +
"\nAdres email: " + email;
}
@@ -170,11 +165,7 @@ private boolean checkIfLoginExists(){
e1.printStackTrace();
}
- if(login.equals(dbLogin)){
- return true;
- }else{
- return false;
- }
+ return login.equals(dbLogin);
}
private boolean checkIfEmailExists(){
@@ -192,11 +183,7 @@ private boolean checkIfEmailExists(){
e1.printStackTrace();
}
- if(email.equals(dbEmail)){
- return true;
- }else{
- return false;
- }
+ return email.equals(dbEmail);
}
private boolean checkIfPasswordMatch(){
diff --git a/src/netKnow/fxml/calculator_ip.fxml b/src/netKnow/fxml/calculator_ip.fxml
index a59488a..4aec901 100644
--- a/src/netKnow/fxml/calculator_ip.fxml
+++ b/src/netKnow/fxml/calculator_ip.fxml
@@ -17,6 +17,14 @@
+
+
+
+
@@ -75,11 +86,11 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/netKnow/fxml/login_scene.fxml b/src/netKnow/fxml/login_scene.fxml
index b4bcddb..51ca794 100644
--- a/src/netKnow/fxml/login_scene.fxml
+++ b/src/netKnow/fxml/login_scene.fxml
@@ -29,19 +29,22 @@
-
-
+
@@ -29,7 +29,7 @@