Compare commits

...

2 Commits

Author SHA1 Message Date
cb6c55a639 Added user login 2021-12-20 19:26:07 +01:00
60be6933be Added back, today and next button 2021-12-20 16:56:58 +01:00
7 changed files with 108 additions and 20 deletions

View File

@ -4,6 +4,7 @@ import javafx.application.Application;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.stage.Stage; import javafx.stage.Stage;
import res.DataController;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
@ -17,7 +18,6 @@ public class MainApplication extends Application {
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm()); scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
stage.setTitle("SharePlaner"); stage.setTitle("SharePlaner");
stage.setScene(scene); stage.setScene(scene);
stage.show();
FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml")); FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500); Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
@ -25,8 +25,11 @@ public class MainApplication extends Application {
Stage stageLogin = new Stage(); Stage stageLogin = new Stage();
stageLogin.setTitle("Anmelden"); stageLogin.setTitle("Anmelden");
stageLogin.setScene(sceneLogin); stageLogin.setScene(sceneLogin);
stageLogin.show(); stageLogin.showAndWait();
if(DataController.USER_ID >= 0){
stage.show();
}
} }
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -65,6 +65,27 @@ public class MainController {
} }
} }
@FXML
protected void onBackClick() {
weekOffset--;
setDates();
updateEvents();
}
@FXML
protected void onTodayClick(){
weekOffset = 0;
setDates();
updateEvents();
}
@FXML
protected void onNextClick() {
weekOffset++;
setDates();
updateEvents();
}
@FXML @FXML
protected void onAddBtnClick() { protected void onAddBtnClick() {
try { try {

View File

@ -1,4 +0,0 @@
package users;
public class LoginControler {
}

View File

@ -0,0 +1,49 @@
package users;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.stage.Stage;
import res.DataController;
public class LoginController {
@FXML
public TextField userField;
@FXML
public TextField passField;
@FXML
public Label userErrLabel;
@FXML
public Label passErrLabel;
@FXML
protected void login(ActionEvent event){
if(userField.getText().trim().isEmpty()){
userErrLabel.setText("Bitte laginnamen eingeben!");
return;
}
if(passField.getText().trim().isEmpty()){
userErrLabel.setText("");
passErrLabel.setText("Bitte passwort eingeben!");
return;
}
DataController dataController = new DataController();
if(!dataController.login(userField.getText(), passField.getText())){
userErrLabel.setText("Name und Passwort passen nicht zueinander!");
passErrLabel.setText("Name und Passwort passen nicht zueinander!");
return;
}
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
}
@FXML
protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
stage.close();
}
}

View File

@ -30,7 +30,10 @@
<GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0"> <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" /> <ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints /> <ColumnConstraints />
<ColumnConstraints />
<ColumnConstraints />
<ColumnConstraints />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints /> <RowConstraints />
@ -42,8 +45,11 @@
<Insets left="5" /> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
<Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
<Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1"> <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4" GridPane.columnIndex="0" GridPane.rowIndex="1">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" /> <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" /> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />

View File

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginControler">
<columnConstraints> <columnConstraints>
<ColumnConstraints/> <ColumnConstraints/>
@ -23,14 +19,14 @@
<Label GridPane.columnIndex="1">Anmelden</Label> <Label GridPane.columnIndex="1">Anmelden</Label>
<Label GridPane.rowIndex="1">Username</Label> <Label GridPane.rowIndex="1">Username</Label>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"></TextField> <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField" />
<Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel">Error</Label> <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
<Label GridPane.rowIndex="2">Paswort</Label> <Label GridPane.rowIndex="2">Paswort</Label>
<PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"></PasswordField> <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField" />
<Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel">Error</Label> <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
<Button GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button> <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
<Button GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button> <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
</GridPane> </GridPane>

View File

@ -14,10 +14,13 @@ import java.util.*;
public class DataController { public class DataController {
public static long USER_ID = -1;
private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events"; private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events";
private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users"; private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";
private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event"; private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event";
private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event"; private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event";
private static final String LOGIN_ENDPOINT = "http://localhost:8080/vpr/login";
private final HttpRequest httpRequest; private final HttpRequest httpRequest;
@ -25,6 +28,20 @@ public class DataController {
httpRequest = new HttpRequest(); httpRequest = new HttpRequest();
} }
public boolean login(String username, String password){
try {
USER_ID = Long.parseLong(httpRequest.sendPostRequest(
LOGIN_ENDPOINT,
"login=" + username
+ "&password=" + password
));
} catch (Exception e) {
e.printStackTrace();
return false;
}
return USER_ID >= 0;
}
public void createEvent(Event event){ public void createEvent(Event event){
try { try {
System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam())); System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
@ -45,7 +62,7 @@ public class DataController {
ArrayList<Event> eventList = new ArrayList<>(); ArrayList<Event> eventList = new ArrayList<>();
try { try {
String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1"); String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
System.out.println(jsonResponse); System.out.println(jsonResponse);
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();