MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MAM:master
Branches Tags
MAM:master
MAM:merge
MAM:1720-UI-User-anlegen
MAM:CSS-Refactor
MAM:Comments
MAM:1800-UI-User-bearbeiten
MAM:utf-8_refactor
MAM:option-ui
MAM:2410-develop
MAM:Add-SVGs
MAM:Update-components-to-JFoenix
MAM:Update_create_and_edit_event_ui
MAM:0610-Timepicker
MAM:1210-UI-Termine-bearbeiten
MAM:2310-Login
MAM:0410-Switch-weeks
MAM:0510-Validierung
MAM:1710-UI-anmelden
MAM:refactor
MAM:0120-UI-Termine-erstellen
MAM:0300-Kalender
MAM:0100-Termine_anzeigen
..
compare: MAM:utf-8_refactor
Branches Tags
MAM:master
MAM:merge
MAM:1720-UI-User-anlegen
MAM:CSS-Refactor
MAM:Comments
MAM:1800-UI-User-bearbeiten
MAM:utf-8_refactor
MAM:option-ui
MAM:2410-develop
MAM:Add-SVGs
MAM:Update-components-to-JFoenix
MAM:Update_create_and_edit_event_ui
MAM:0610-Timepicker
MAM:1210-UI-Termine-bearbeiten
MAM:2310-Login
MAM:0410-Switch-weeks
MAM:0510-Validierung
MAM:1710-UI-anmelden
MAM:refactor
MAM:0120-UI-Termine-erstellen
MAM:0300-Kalender
MAM:0100-Termine_anzeigen

No commits in common. "master" and "utf-8_refactor" have entirely different histories.
master ... utf-8_refa

32 changed files with 493 additions and 669 deletions
Show Stats Expand all files Collapse all files

66
client/app/src/main/java/helper/SvgBtnCreator.java Normal file
View File

@ -0,0 +1,66 @@
package helper;
import javafx.geometry.Bounds;
import javafx.scene.Group;
import javafx.scene.control.*;
import javafx.scene.shape.SVGPath;
public class SvgBtnCreator {
public static Button createBtn(Group group, int svgSize) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
return btn;
}
public static Button createBtn(Group group, int svgSize, String styleClass) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.getStyleClass().add(styleClass);
return btn;
}
public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
btn.getStyleClass().add(styleClass);
Tooltip tooltip = new Tooltip(toolTip);
btn.setTooltip(tooltip);
return btn;
}
public static SVGPath createPath(String d, String fill, String hoverFill) {
SVGPath path = new SVGPath();
path.getStyleClass().add("svg");
path.setContent(d);
path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
return path;
}
}

27
client/app/src/main/java/events/CreateEventController.java → client/app/src/main/java/main/CreateEventController.java
View File

@ -1,4 +1,4 @@
package events;
package main;
import com.jfoenix.controls.*;
import helper.HttpRequestException;
@ -20,29 +20,28 @@ import java.util.Locale;
public class CreateEventController {
@FXML
private GridPane mainGrid;
public GridPane mainGrid;
@FXML
protected JFXDatePicker datePickerDate;
public JFXDatePicker datePickerDate;
@FXML
protected JFXTextField textName;
public JFXTextField textName;
@FXML
protected JFXComboBox<String> comboBoxPriority;
public JFXComboBox<String> ComboBoxPriotity;
@FXML
protected JFXToggleButton toggleBtnIsFullDay;
public JFXToggleButton toggleBtnIsFullDay;
@FXML
protected JFXToggleButton toggleBtnIsPrivate;
public JFXToggleButton toggleBtnIsPrivate;
@FXML
private Label labelError;
public Label labelError;
@FXML
protected JFXTimePicker timeStart;
public JFXTimePicker timeStart;
@FXML
protected JFXTimePicker timeEnd;
public JFXTimePicker timeEnd;
public CreateEventController() {
}
//Marco Kühn//
@FXML
public void initialize() {
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@ -53,7 +52,7 @@ public class CreateEventController {
timeEnd.setConverter(defaultConverter);
}
//Marc Beyer//
@FXML
protected void createBtnClick(ActionEvent actionEvent) {
try {
@ -65,7 +64,7 @@ public class CreateEventController {
Event event = new Event(
textName.getText(),
comboBoxPriority.getSelectionModel().getSelectedIndex(),
ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
toggleBtnIsFullDay.isSelected(),
toggleBtnIsPrivate.isSelected(),
timeStart.getValue(),
@ -85,13 +84,11 @@ public class CreateEventController {
}
}
//Marc Beyer//
protected void sendHttpRequest(Event event) throws HttpRequestException {
DataController dataController = new DataController();
dataController.createEvent(event);
}
//Marco Kühn//
@FXML
protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

19
client/app/src/main/java/events/EditEventController.java → client/app/src/main/java/main/EditEventController.java
View File

@ -1,12 +1,9 @@
//Marc Beyer//
package events;
package main;
import helper.HttpRequestException;
import container.DataController;
import container.Event;
import java.time.LocalTime;
public class EditEventController extends CreateEventController{
private Event currentEvent;
@ -20,19 +17,9 @@ public class EditEventController extends CreateEventController{
textName.setText(currentEvent.getName());
datePickerDate.setValue(currentEvent.getDate().toLocalDate());
comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());
ComboBoxPriotity.getSelectionModel().select(currentEvent.getPriority());
try{
timeStart.setValue(LocalTime.parse(currentEvent.getStart()));
}catch (Exception e){}
try{
timeEnd.setValue(LocalTime.parse(currentEvent.getEnd()));
}catch (Exception e){}
toggleBtnIsFullDay.setSelected(currentEvent.isFullDay());
toggleBtnIsPrivate.setSelected(currentEvent.isPrivate());
//timeEnd.setValue(currentEvent.getEnd());
}
@Override

67
client/app/src/main/java/main/MainApplication.java
View File

@ -1,20 +1,16 @@
//Marc Beyer//
package main;
import config.Config;
import config.ConfigLoader;
import container.DataController;
import container.HttpRequest;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.stage.Modality;
import javafx.stage.Stage;
import container.DataController;
import container.HttpRequest;
import java.io.IOException;
import java.util.Objects;
import java.util.function.Consumer;
public class MainApplication extends Application {
@Override
@ -24,8 +20,6 @@ public class MainApplication extends Application {
config = new Config(false, -1, "");
}
DataController.SERVER_URL = config.toServerUrl();
System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
if(
@ -42,7 +36,6 @@ public class MainApplication extends Application {
config.setToken(HttpRequest.TOKEN);
ConfigLoader.save(config);
}
// Load main-scene
loadMainScene(stage);
@ -57,60 +50,24 @@ public class MainApplication extends Application {
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("main-view.css")).toExternalForm()
);
stage.setTitle("SharePlanner");
stage.setTitle("SharePlaner");
stage.setScene(scene);
stage.show();
}
private void loadLoginScene() {
loadScene(
"Anmelden",
"../users/login.fxml",
"../users/login.css",
650,
500
private void loadLoginScene() throws IOException {
FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
sceneLogin.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("../users/login.css")).toExternalForm()
);
Stage stageLogin = new Stage();
stageLogin.setTitle("Anmelden");
stageLogin.setScene(sceneLogin);
stageLogin.showAndWait();
}
public static void main(String[] args) {
launch();
}
public static void loadScene(
String title,
String fxml,
String css,
int width,
int height
) {
loadScene(title, fxml, css, width, height, null);
}
public static void loadScene(
String title,
String fxml,
String css,
int width,
int height,
Consumer<FXMLLoader> method
) {
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource(fxml));
try {
Scene scene = new Scene(fxmlLoader.load(), width, height);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource(css)).toExternalForm());
Stage stage = new Stage();
stage.setTitle(title);
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
if(method != null)method.accept(fxmlLoader);
stage.showAndWait();
} catch (IOException e) {
e.printStackTrace();
}
}
}

246
client/app/src/main/java/main/MainController.java
View File

@ -1,42 +1,45 @@
// Marco Kühn, Marc Beyer //
package main;
import config.Config;
import config.ConfigLoader;
import container.DataController;
import container.Event;
import container.HttpRequest;
import events.EditEventController;
import helper.SvgBtnCreator;
import helper.HttpRequestException;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.control.Alert;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.Scene;
import javafx.scene.control.*;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
import ui.DayPane;
import ui.EventPane;
import ui.SvgBtnCreator;
import container.DataController;
import container.Event;
import javafx.event.ActionEvent;
import container.HttpRequest;
import java.io.IOException;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Objects;
public class MainController {
@FXML
private VBox leftNav;
public VBox leftNav;
@FXML
private GridPane mainGridPane;
public GridPane mainGridPane;
@FXML
private HBox buttonBox;
public HBox buttonBox;
@FXML
private GridPane calendarGrid;
@FXML
private javafx.scene.control.Label LabelMonth;
@ -101,24 +104,41 @@ public class MainController {
@FXML
protected void onAddBtnClick() {
MainApplication.loadScene(
"Termin erstellen",
"create-event.fxml",
"create-event.css",
650,
650
);
try {
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource("create-event.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("create-event.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle("Termin erstellen");
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
//stage.initStyle(StageStyle.UNDECORATED);
stage.showAndWait();
} catch (IOException e) {
e.printStackTrace();
}
updateEvents();
}
protected void onSettingBtnClick(){
MainApplication.loadScene(
"Einstellungen",
"option-view.fxml",
"option-view.css",
650,
600
);
try{
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource("option-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("option-view.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle("Einstellungen");
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
stage.showAndWait();
} catch (IOException e) {
e.printStackTrace();
}
}
protected void onLogoutBtnClick(ActionEvent event){
@ -131,50 +151,130 @@ public class MainController {
private void createWeek() {
for (int i = 0; i < 7; i++) {
DayPane dayPane = new DayPane();
this.dayLabel[i] = dayPane.getDayLabel();
calendarGrid.add(dayPane.getDayLabel(), i, 0);
dayVBoxes[i] = dayPane.getDayVBox();
calendarGrid.add(dayPane, i, 1);
Label label = new Label();
label.setText(dayNames[i]);
label.setMaxHeight(Double.MAX_VALUE);
label.setMaxWidth(Double.MAX_VALUE);
label.getStyleClass().add("labelDays");
dayLabel[i] = label;
calendarGrid.add(label, i, 0);
ScrollPane scrollPane = new ScrollPane();
VBox vBox = new VBox();
vBox.getStyleClass().add("vBoxDays");
vBox.setSpacing(10);
dayVBoxes[i] = vBox;
scrollPane.setContent(vBox);
scrollPane.setFitToWidth(true);
scrollPane.setFitToHeight(true);
scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
scrollPane.getStyleClass().add("scrollDays");
calendarGrid.add(scrollPane, i, 1);
}
}
private void addEvent(Event event) {
EventPane eventPane = new EventPane(event);
eventPane.getEditBtn().setOnAction(event1 -> {
MainApplication.loadScene(
"Termin bearbeiten",
"edit-event.fxml",
"create-event.css",
650,
650,
fxmlLoader -> {
EditEventController editEventController = fxmlLoader.getController();
editEventController.setCurrentEvent(event);
}
);
updateEvents();
});
VBox vBox = new VBox();
vBox.getStyleClass().add("event");
vBox.setSpacing(5);
eventPane.getDeleteBtn().setOnAction(e -> {
HBox btnHBox = new HBox();
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
Group svgDel = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
"white", "gray")
);
Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
deleteBtn.getStyleClass().add("deleteEventBtn");
deleteBtn.setOnAction(e -> {
DataController dataController = new DataController();
try {
dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
} catch (HttpRequestException ex) {
new Alert(Alert.AlertType.ERROR, ex.getMessage()).showAndWait();
ex.printStackTrace();
}
updateEvents();
});
Group svgEdit = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
"white", "gray")
);
Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
editBtn.getStyleClass().add("editEventBtn");
editBtn.setOnAction(event1 -> {
try {
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource("edit-event.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 650, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("create-event.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle("Termin bearbeiten");
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
EditEventController editEventController = fxmlLoader.getController();
editEventController.setCurrentEvent(event);
stage.showAndWait();
updateEvents();
} catch (IOException e) {
e.printStackTrace();
}
});
btnHBox.getChildren().add(editBtn);
btnHBox.getChildren().add(deleteBtn);
vBox.getChildren().add(btnHBox);
Label nameLabel = new Label(event.getName());
nameLabel.setWrapText(true);
vBox.getChildren().add(nameLabel);
if (event.getStart() != null || event.getEnd() != null) {
String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
+ (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
Label timeLabel = new Label(timeStr);
vBox.getChildren().add(timeLabel);
}
Label typeLabel = new Label("Wer: " + event.getOwnerName());
vBox.getChildren().add(typeLabel);
Label prioLabel = new Label("Priorität: " + event.getPriority());
vBox.getChildren().add(prioLabel);
if (event.isFullDay()) {
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
fullDayLabel.setWrapText(true);
vBox.getChildren().add(fullDayLabel);
}
LocalDateTime eventDate = event.getDate();
int day = (int) Duration.between(
weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
if (day >= 0 && day < 7) {
dayVBoxes[day].getChildren().add(eventPane);
dayVBoxes[day].getChildren().add(vBox);
}
}
private String formatTime(String time) {
String[] timeArr = time.split(":");
if (timeArr.length > 2) {
return timeArr[0] + ":" + timeArr[1];
}
return time;
}
private void setDates() {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@ -194,34 +294,64 @@ public class MainController {
}
private void createBtns(){
Button addBtn = SvgBtnCreator.createAddBtn();
Group svgAdd = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
"white", "gray")
);
Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
addBtn.setOnAction(e -> onAddBtnClick());
addBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(addBtn);
Button settingsBtn = SvgBtnCreator.createSettingBtn();
Group svgSettings = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
"white", "gray")
);
Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
settingsBtn.setOnAction(e -> onSettingBtnClick());
settingsBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(settingsBtn);
Button logoutBtn = SvgBtnCreator.createLogoutBtn();
Group svgLogout = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
"white", "gray")
);
Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
logoutBtn.setOnAction(this::onLogoutBtnClick);
logoutBtn.getStyleClass().add("main-btn");
leftNav.getChildren().add(logoutBtn);
Button backBtn = SvgBtnCreator.createBackBtn();
Group svgBack = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
"white", "lightgray")
);
Button backBtn = SvgBtnCreator.createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
backBtn.setOnAction(e -> onBackClick());
backBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(backBtn, 1);
buttonBox.getChildren().add(backBtn);
Button todayBtn = SvgBtnCreator.createTodayBtn();
Group svgToday = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
"white", "lightgray")
);
Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
todayBtn.setOnAction(e -> onTodayClick());
todayBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(todayBtn, 2);
buttonBox.getChildren().add(todayBtn);
Button nextBtn = SvgBtnCreator.createNextBtn();
Group svgNext = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
"white", "lightgray")
);
Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
nextBtn.setOnAction(e -> onNextClick());
nextBtn.getStyleClass().add("navBtn");
GridPane.setColumnIndex(nextBtn, 3);

63
client/app/src/main/java/main/OptionController.java
View File

@ -1,4 +1,3 @@
// Marco Kühn //
package main;
import com.jfoenix.controls.*;
@ -12,33 +11,39 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Label;
import javafx.scene.layout.GridPane;
import javafx.stage.Modality;
import javafx.stage.Stage;
import container.DataController;
import container.User;
import users.EditUserController;
import java.awt.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Consumer;
public class OptionController {
@FXML
private JFXButton updateUserBtn;
public JFXButton updateUserBtn;
@FXML
private JFXButton deleteUserBtn;
public JFXButton deleteUserBtn;
@FXML
private JFXButton createUserBtn;
public JFXButton createUserBtn;
@FXML
private JFXToggleButton saveLoginTBtn;
public JFXToggleButton saveLoginTBtn;
@FXML
private Label labelError;
public Label labelError;
@FXML
private GridPane mainGrid;
public GridPane mainGrid;
private JFXComboBox<String> comboBox;
private DataController dataController;
@ -75,13 +80,7 @@ public class OptionController {
}
public void onCreateBtnClick(ActionEvent actionEvent) {
MainApplication.loadScene(
"User erstellen",
"../users/create-user.fxml",
"../users/create-user.css",
800,
650
);
loadUserScene(actionEvent, "User erstellen", "../users/create-user.fxml", null);
}
public void onUpdateBtnClick(ActionEvent actionEvent) {
@ -89,16 +88,11 @@ public class OptionController {
if(editIndex < 0 || editIndex >= users.size()) return;
MainApplication.loadScene(
FXMLLoader fxmlLoader = loadUserScene(
actionEvent,
"User bearbeiten",
"../users/edit-user.fxml",
"../users/create-user.css",
800,
650,
fxmlLoader -> {
EditUserController editUserController = fxmlLoader.getController();
editUserController.setCurrentUser(users.get(editIndex));
}
this::setUserAtController
);
}
@ -119,6 +113,31 @@ public class OptionController {
}
}
private FXMLLoader loadUserScene(ActionEvent actionEvent, String title, String fxml, Consumer<FXMLLoader> method) {
FXMLLoader fxmlLoader = new FXMLLoader(
MainApplication.class.getResource(fxml));
try {
Scene scene = new Scene(fxmlLoader.load(), 800, 650);
scene.getStylesheets().add(Objects.requireNonNull(
MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
Stage stage = new Stage();
stage.setTitle(title);
stage.setScene(scene);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setResizable(false);
if(method != null)method.accept(fxmlLoader);
stage.showAndWait();
Stage stageOld = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
stageOld.close();
} catch (IOException e) {
e.printStackTrace();
e.printStackTrace();
}
return fxmlLoader;
}
private void setUserAtController(FXMLLoader fxmlLoader){
int editIndex = comboBox.getSelectionModel().getSelectedIndex();
EditUserController editUserController = fxmlLoader.getController();

39
client/app/src/main/java/ui/DayPane.java
View File

@ -1,39 +0,0 @@
//Marc Beyer//
package ui;
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.VBox;
public class DayPane extends ScrollPane {
private final Label dayLabel;
private final VBox dayVBox;
public DayPane() {
dayLabel = new Label();
dayLabel.setMaxHeight(Double.MAX_VALUE);
dayLabel.setMaxWidth(Double.MAX_VALUE);
dayLabel.getStyleClass().add("labelDays");
dayVBox = new VBox();
dayVBox.getStyleClass().add("vBoxDays");
dayVBox.setSpacing(10);
setContent(dayVBox);
setFitToWidth(true);
setFitToHeight(true);
setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
getStyleClass().add("scrollDays");
getStyleClass().add("scrollDays");
}
public Label getDayLabel() {
return dayLabel;
}
public VBox getDayVBox() {
return dayVBox;
}
}

84
client/app/src/main/java/ui/EventPane.java
View File

@ -1,84 +0,0 @@
//Marc Beyer, Marco Kühn//
package ui;
import container.Event;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
public class EventPane extends VBox {
private Button deleteBtn;
private Button editBtn;
public EventPane(Event event) {
this.getStyleClass().add("event");
this.setSpacing(5);
HBox btnHBox = new HBox();
btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
Group svgDel = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
"white", "gray")
);
deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
deleteBtn.getStyleClass().add("deleteEventBtn");
Group svgEdit = new Group(
SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
"white", "gray")
);
editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
editBtn.getStyleClass().add("editEventBtn");
btnHBox.getChildren().add(editBtn);
btnHBox.getChildren().add(deleteBtn);
this.getChildren().add(btnHBox);
Label nameLabel = new Label(event.getName());
nameLabel.setWrapText(true);
this.getChildren().add(nameLabel);
if (event.getStart() != null || event.getEnd() != null) {
String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
+ (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
Label timeLabel = new Label(timeStr);
this.getChildren().add(timeLabel);
}
Label typeLabel = new Label("Wer: " + event.getOwnerName());
this.getChildren().add(typeLabel);
Label prioLabel = new Label("Priorität: " + event.getPriority());
this.getChildren().add(prioLabel);
if (event.isFullDay()) {
Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
fullDayLabel.setWrapText(true);
this.getChildren().add(fullDayLabel);
}
}
public Button getDeleteBtn() {
return deleteBtn;
}
public Button getEditBtn() {
return editBtn;
}
private String formatTime(String time) {
String[] timeArr = time.split(":");
if (timeArr.length > 2) {
return timeArr[0] + ":" + timeArr[1];
}
return time;
}
}

92
client/app/src/main/java/ui/SvgBtnCreator.java
View File

@ -1,92 +0,0 @@
//Marco Kühn//
package ui;
import javafx.geometry.Bounds;
import javafx.scene.Group;
import javafx.scene.control.*;
import javafx.scene.shape.SVGPath;
public class SvgBtnCreator {
public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
Button btn = new Button();
Bounds boundsDel = group.getBoundsInParent();
double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
group.setScaleX(scaleDel);
group.setScaleY(scaleDel);
btn.setGraphic(group);
btn.setMaxSize(svgSize, svgSize);
btn.setMinSize(svgSize, svgSize);
btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
btn.getStyleClass().add(styleClass);
Tooltip tooltip = new Tooltip(toolTip);
btn.setTooltip(tooltip);
return btn;
}
public static SVGPath createPath(String d, String fill, String hoverFill) {
SVGPath path = new SVGPath();
path.getStyleClass().add("svg");
path.setContent(d);
path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
return path;
}
public static Button createAddBtn(){
Group svgAdd = new Group(
createPath("M0 0h24v24H0z", "transparent", "transparent"),
createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
"white", "gray")
);
return createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
}
public static Button createSettingBtn(){
Group svgSettings = new Group(
createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
"white", "gray")
);
return createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
}
public static Button createLogoutBtn(){
Group svgLogout = new Group(
createPath("M0 0h24v24H0z", "transparent", "transparent"),
createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
"white", "gray")
);
return createBtn(svgLogout, 40, "main-btn", "Abmelden");
}
public static Button createBackBtn(){
Group svgBack = new Group(
createPath("M0 0h24v24H0z", "transparent", "transparent"),
createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
"white", "lightgray")
);
return createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
}
public static Button createTodayBtn(){
Group svgToday = new Group(
createPath("M0 0h24v24H0z", "transparent", "transparent"),
createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
"white", "lightgray")
);
return createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
}
public static Button createNextBtn(){
Group svgNext = new Group(
createPath("M0 0h24v24H0z", "transparent", "transparent"),
createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
"white", "lightgray")
);
return createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
}
}

85
client/app/src/main/java/users/CreateUserController.java
View File

@ -1,14 +1,13 @@
//Alex Rechtin//
package users;
import com.jfoenix.controls.JFXPasswordField;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;
import helper.HttpRequestException;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleButton;
import javafx.stage.Stage;
import container.DataController;
import container.User;
@ -17,24 +16,40 @@ import java.util.Objects;
public class CreateUserController {
@FXML
protected JFXTextField textName;
@FXML
protected JFXPasswordField textPassword;
@FXML
protected JFXPasswordField textPasswordSecond;
@FXML
protected JFXToggleButton checkButtonIsAdmin;
@FXML
protected JFXTextField textLogin;
@FXML
protected JFXTextField textForename;
@FXML
protected Label labelError;
public TextField textName;
public PasswordField textPassword;
public PasswordField textPasswordSecond;
public ToggleButton checkButtonIsAdmin;
public TextField textLogin;
public TextField textForename;
public Label labelError;
@FXML
protected void createUser(ActionEvent event) {
if (validateNameAndLogin() || validatePassword()) return;
if (textLogin.getText().trim().isEmpty()){
labelError.setText("Bitte Login Namen angeben");
return;
}
if (textForename.getText().trim().isEmpty()) {
labelError.setText("Bitte Vornamen eingeben!");
return;
}
if (textName.getText().trim().isEmpty()) {
labelError.setText("Bitte Nachnamen eingeben!");
return;
}
if (textPassword.getText().trim().isEmpty()) {
labelError.setText("Bitte Passwort eingeben!");
return;
}
if (textPassword.getText().trim().length() < 8) {
labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
return;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return;
}
User user = new User();
user.setLogin(textLogin.getText().trim());
@ -54,38 +69,6 @@ public class CreateUserController {
stage.close();
}
protected boolean validatePassword() {
if (textPassword.getText().trim().isEmpty()) {
labelError.setText("Bitte Passwort eingeben!");
return true;
}
if (textPassword.getText().trim().length() < 8) {
labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
return true;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return true;
}
return false;
}
protected boolean validateNameAndLogin() {
if (textLogin.getText().trim().isEmpty()){
labelError.setText("Bitte Login Namen angeben");
return true;
}
if (textForename.getText().trim().isEmpty()) {
labelError.setText("Bitte Vornamen eingeben!");
return true;
}
if (textName.getText().trim().isEmpty()) {
labelError.setText("Bitte Nachnamen eingeben!");
return true;
}
return false;
}
protected void sendHttpRequest(User user) throws HttpRequestException {
DataController dataController = new DataController();
dataController.createUser(user);

29
client/app/src/main/java/users/EditUserController.java
View File

@ -1,4 +1,3 @@
// Marc Beyer //
package users;
import container.DataController;
@ -9,6 +8,8 @@ import javafx.scene.Node;
import javafx.scene.control.Alert;
import javafx.stage.Stage;
import java.util.Objects;
public class EditUserController extends CreateUserController{
private User currentUser;
@ -27,12 +28,34 @@ public class EditUserController extends CreateUserController{
@Override
protected void createUser(ActionEvent event){
if (validateNameAndLogin()) return;
if (textLogin.getText().trim().isEmpty()){
labelError.setText("Bitte Login Namen angeben");
return;
}
if (textForename.getText().trim().isEmpty()) {
labelError.setText("Bitte Vornamen eingeben!");
return;
}
if (textName.getText().trim().isEmpty()) {
labelError.setText("Bitte Nachnamen eingeben!");
return;
}
User user = new User();
if(!textPassword.getText().trim().isEmpty() || !textPasswordSecond.getText().trim().isEmpty()){
if (validatePassword()) return;
if (textPassword.getText().trim().isEmpty()) {
labelError.setText("Bitte Passwort eingeben!");
return;
}
if (textPassword.getText().trim().length() < 8) {
labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
return;
}
if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
labelError.setText("Passwörter stimmen nicht überein!");
return;
}
user.setPassword(textPassword.getText().trim());
}

9
client/app/src/main/java/users/LoginController.java
View File

@ -1,4 +1,3 @@
//Alex Rechtin//
package users;
import com.jfoenix.controls.*;
@ -11,13 +10,13 @@ import container.DataController;
public class LoginController {
@FXML
private JFXTextField userField;
public JFXTextField userField;
@FXML
private JFXPasswordField passField;
public JFXPasswordField passField;
@FXML
private Label userErrLabel;
public Label userErrLabel;
@FXML
private Label passErrLabel;
public Label passErrLabel;
@FXML
protected void login(ActionEvent event) {

53
client/app/src/main/resources/main/create-event.css
View File

@ -1,38 +1,24 @@
/*Marco Kühn*/
* {
-fx-dark-background-color: #3E415F;
-fx-darkest-background-color: #2B2D42;
-fx-bright-background-color: #8D99AE;
-fx-brighter-background-color: #ff5555;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: #B0B0B0;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.mainLabel{
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #8D99AE;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@ -42,22 +28,22 @@ Label{
.inputField{
-fx-padding: 10px;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.mainButton{
-fx-font-weight: bold;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
JFXButton{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: -fx-brighter-background-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -66,28 +52,13 @@ JFXButton{
}
.inputDate{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.comboBox{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.timePicker{
-fx-background-color: -fx-brightest-background-color;
}
.jfx-time-picker .date-picker-popup{
-fx-max-width: 230px;
-fx-min-width: 230px;
}
.jfx-time-picker .date-picker-popup > * > .spinner > .label {
-fx-max-width: 55px;
-fx-min-width: 55px;
}
.jfx-date-picker .date-picker-popup > * > .spinner > .label {
-fx-max-width: 300px;
-fx-min-width: 300px;
}
-fx-background-color: white;
}

6
client/app/src/main/resources/main/create-event.fxml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
@ -10,7 +8,7 @@
<?import com.jfoenix.controls.*?>
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="events.CreateEventController">
fx:controller="main.CreateEventController">
<columnConstraints>
<ColumnConstraints/>
@ -45,7 +43,7 @@
<JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
<JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
<JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
<JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="gering"/>

6
client/app/src/main/resources/main/edit-event.fxml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
@ -10,7 +8,7 @@
<?import com.jfoenix.controls.*?>
<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="events.EditEventController">
fx:controller="main.EditEventController">
<columnConstraints>
<ColumnConstraints/>
@ -45,7 +43,7 @@
<JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
<JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
<JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
<JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
<items>
<FXCollections fx:factory="observableArrayList">
<String fx:value="gering"/>

41
client/app/src/main/resources/main/main-view.css
View File

@ -1,70 +1,65 @@
/*Alex Rechtin, Marco Kühn*/
* {
-fx-dark-background-color: #525E74;
-fx-darkest-background-color: #2B2D42;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-bright-background-color: #77859E;
-fx-brighter-background-color: #282C34 ;
-fx-brightest-background-color: #333333 ;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
}
.main-panel{
-fx-background-color: -fx-brighter-background-color;
-fx-background-color: #282C34;
}
.vbox-main{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: #333333;
-fx-alignment: top-center;
}
.gridCalendar Line{
-fx-stroke: -fx-bright-border-color;
-fx-stroke: -fx-main-border-color;
}
.gridCalender{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
-fx-min-height: 80px;
-fx-max-height: 80px;
}
.labelMonth{
-fx-padding: 0 0 0 20;
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #77859E;
-fx-font-size: 35px;
-fx-font-weight: bold;
}
.scrollDays{
-fx-background-color: -fx-darkest-background-color;
-fx-border-color: -fx-bright-border-color;
-fx-background-color: -fx-base-background-color;
-fx-border-color: -fx-main-border-color;
}
.vBoxDays{
-fx-background-color: -fx-darkest-background-color;
-fx-background-color: -fx-base-background-color;
}
.labelDays{
-fx-alignment: center;
-fx-background-color: -fx-dark-background-color;
-fx-background-color: -fx-base1-background-color;
-fx-font-size: 25px;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: -fx-main-border-color;
}
Label{
-fx-text-fill: -fx-brighter-text-color;
-fx-text-fill: -fx-main-text-color;
}
.event{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: -fx-base1-background-color;
}
.main-btn{
@ -81,7 +76,7 @@ Label{
}
.buttonBox{
-fx-background-color: -fx-bright-background-color;
-fx-background-color: #77859E;
}
.navBtn{

2
client/app/src/main/resources/main/main-view.fxml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin, Marco Kühn -->
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>

27
client/app/src/main/resources/main/option-view.css
View File

@ -1,35 +1,24 @@
/* Marco Kühn */
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ff5555;
-fx-brighter-background-color: #8D99AE;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: #B0B0B0;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
}
.mainLabel{
-fx-background-color: -fx-brighter-background-color;
-fx-background-color: #8D99AE;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@ -39,17 +28,17 @@ Label{
.mainButton{
-fx-font-weight: bold;
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
JFXButton{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: -fx-bright-background-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -58,7 +47,7 @@ JFXButton{
}
.comboBox{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
-fx-max-width: 200px;
-fx-min-width: 200px;
}

1
client/app/src/main/resources/main/option-view.fxml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

22
client/app/src/main/resources/users/create-user.css
View File

@ -1,21 +1,20 @@
/*Alex Rechtin*/
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ff5555;
-fx-brightest-text-color: #ffffff;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: #B0B0B0;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
@ -31,13 +30,12 @@ GridPane{
Label{
-fx-text-fill: -fx-brightest-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.textField{
-fx-background-color: -fx-bright-background-color;
-fx-max-width: 400px;
-fx-min-width: 400px;
}
@ -45,11 +43,9 @@ Label{
.errorMessage{
-fx-max-width: 400px;
-fx-min-width: 400px;
-fx-text-fill: -fx-brighter-text-color;
}
JFXButton{
-fx-background-color: -fx-bright-background-color;
Button{
-fx-max-width: 150px;
-fx-min-width: 150px;
}

23
client/app/src/main/resources/users/create-user.fxml
View File

@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin -->
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXPasswordField?>
<?import com.jfoenix.controls.JFXTextField?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.CreateUserController">
@ -36,15 +31,15 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
<Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -54,8 +49,8 @@
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
</HBox>
</GridPane>

22
client/app/src/main/resources/users/edit-user.fxml
View File

@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin-->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?>
<?import com.jfoenix.controls.JFXTextField?>
<?import com.jfoenix.controls.JFXPasswordField?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.scene.control.Label?>
<GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="users.EditUserController">
@ -35,15 +31,15 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
<Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -53,8 +49,8 @@
<HBox.margin>
<Insets right="100" left="100"/>
</HBox.margin>
<JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
<Button onAction="#abortBtnClick">Abbrechen</Button>
<Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
</HBox>
</GridPane>

28
client/app/src/main/resources/users/login.css
View File

@ -1,30 +1,26 @@
/* Marco Kühn*/
* {
-fx-dark-background-color: #3E415F;
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-bright-text-color: #ff5555;
-fx-brighter-text-color: #ffffff;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-dark-background-color;
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: -fx-bright-border-color;
-fx-border-color: #B0B0B0;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: -fx-brighter-text-color;
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
@ -32,7 +28,7 @@ Label{
.errorLbl{
-fx-font-weight: bold;
-fx-max-width: 200px;
-fx-text-fill: -fx-bright-text-color;
-fx-text-fill: #ff5555;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@ -41,17 +37,17 @@ Label{
}
.userField{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.passField{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.quitBtn{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}
.loginBtn{
-fx-background-color: -fx-brightest-background-color;
-fx-background-color: white;
}

4
client/app/src/main/resources/users/login.fxml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import com.jfoenix.controls.*?>
@ -26,7 +24,7 @@
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
<Label GridPane.rowIndex="2">Passwort</Label>
<Label GridPane.rowIndex="2">Paswort</Label>
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>

42
client/data/src/main/java/config/Config.java
View File

@ -1,30 +1,18 @@
//Marc Beyer//
package config;
public class Config {
private boolean saveLogin;
private long id;
private String token;
private String connectionMethod;
private String hostAddress;
private int port;
public Config(){
saveLogin = false;
id = -1;
token = "";
connectionMethod = "http";
hostAddress = "localhost";
port = 8080;
}
public Config(boolean saveLogin, long id, String token) {
this.saveLogin = saveLogin;
this.id = id;
this.token = token;
connectionMethod = "http";
hostAddress = "localhost";
port = 8080;
}
public boolean isSaveLogin() {
@ -50,32 +38,4 @@ public class Config {
public void setToken(String token) {
this.token = token;
}
public String getConnectionMethod() {
return connectionMethod;
}
public void setConnectionMethod(String connectionMethod) {
this.connectionMethod = connectionMethod;
}
public String getHostAddress() {
return hostAddress;
}
public void setHostAddress(String hostAddress) {
this.hostAddress = hostAddress;
}
public int getPort() {
return port;
}
public void setPort(int port) {
this.port = port;
}
public String toServerUrl(){
return getConnectionMethod() + "://" + getHostAddress() + ":" + getPort();
}
}

8
client/data/src/main/java/config/ConfigLoader.java
View File

@ -1,4 +1,3 @@
//Marc Beyer//
package config;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -29,12 +28,9 @@ public class ConfigLoader {
objectMapper.findAndRegisterModules();
try {
Files.writeString(
Paths.get("config.json"),
Files.writeString(Paths.get(
"config.json"),
objectMapper.writeValueAsString(config)
.replace(",", ",\n\t")
.replace("{", "{\n\t")
.replace("}", "\n}")
);
} catch (IOException e) {
e.printStackTrace();

44
client/data/src/main/java/container/DataController.java
View File

@ -1,4 +1,3 @@
//Marc Beyer//
package container;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -13,21 +12,20 @@ import java.util.*;
public class DataController {
public static long USER_ID = -1;
public static String SERVER_URL = "http://localhost:8080";
private static final String ALL_EVENTS_ENDPOINT = "/event/all";
private static final String ADD_EVENT_ENDPOINT = "/event/add";
private static final String DELETE_EVENT_ENDPOINT = "/event/del";
private static final String EDIT_EVENT_ENDPOINT = "/event/edit";
private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
private static final String EDIT_EVENT_ENDPOINT = "http://localhost:8080/event/edit";
private static final String ALL_USER_ENDPOINT = "/user/all";
private static final String ADD_USER_ENDPOINT = "/user/add";
private static final String DELETE_USER_ENDPOINT = "/user/del";
private static final String EDIT_USER_ENDPOINT = "/user/edit";
private static final String ALL_USER_ENDPOINT = "http://localhost:8080/user/all";
private static final String ADD_USER_ENDPOINT = "http://localhost:8080/user/add";
private static final String DELETE_USER_ENDPOINT = "http://localhost:8080/user/del";
private static final String EDIT_USER_ENDPOINT = "http://localhost:8080/user/edit";
private static final String LOGIN_ENDPOINT = "/user/login";
private static final String LOGIN_WITH_TOKEN_ENDPOINT = "/user/login-with-token";
private static final String HEADER_TEST_ENDPOINT = "/vpr/header-test";
private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
private final HttpRequest httpRequest;
@ -38,7 +36,7 @@ public class DataController {
public boolean login(String username, String password) {
try {
Tuple<Integer, String> response = httpRequest.sendPostRequest(
SERVER_URL + LOGIN_ENDPOINT,
LOGIN_ENDPOINT,
"login=" + username
+ "&password=" + password,
false
@ -59,7 +57,7 @@ public class DataController {
try {
HttpRequest.TOKEN = token;
Tuple<Integer, String> response = httpRequest.sendPostRequest(
SERVER_URL + LOGIN_WITH_TOKEN_ENDPOINT,
LOGIN_WITH_TOKEN_ENDPOINT,
"userId=" + userId,
true
);
@ -81,7 +79,7 @@ public class DataController {
*********/
public void createEvent(Event event) throws HttpRequestException {
sendBasicHttpRequest(
SERVER_URL + ADD_EVENT_ENDPOINT,
ADD_EVENT_ENDPOINT,
event.getAsUrlParam(),
true
);
@ -89,7 +87,7 @@ public class DataController {
public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
sendBasicHttpRequest(
SERVER_URL + DELETE_EVENT_ENDPOINT,
DELETE_EVENT_ENDPOINT,
"userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
true
);
@ -97,7 +95,7 @@ public class DataController {
public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
sendBasicHttpRequest(
SERVER_URL + EDIT_EVENT_ENDPOINT,
EDIT_EVENT_ENDPOINT,
"eventId=" + oldEvent.getId() +
"&userId=" + oldEvent.getOwnerId() +
"&date=" + oldEvent.getDate().toLocalDate() +
@ -115,7 +113,7 @@ public class DataController {
public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
try {
Tuple<Integer, String> response = httpRequest.sendPostRequest(
SERVER_URL + ALL_EVENTS_ENDPOINT,
ALL_EVENTS_ENDPOINT,
"userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
true
);
@ -143,7 +141,7 @@ public class DataController {
public List<User> getAllUser() throws HttpRequestException {
String userJSON = sendBasicHttpRequest(
SERVER_URL + ALL_USER_ENDPOINT,
ALL_USER_ENDPOINT,
"",
true
);
@ -166,7 +164,7 @@ public class DataController {
public void createUser(User user) throws HttpRequestException {
sendBasicHttpRequest(
SERVER_URL + ADD_USER_ENDPOINT,
ADD_USER_ENDPOINT,
"name=" + user.getName() +
"&forename=" + user.getForename() +
"&login=" + user.getLogin() +
@ -178,7 +176,7 @@ public class DataController {
public void deleteUser(User user) throws HttpRequestException {
sendBasicHttpRequest(
SERVER_URL + DELETE_USER_ENDPOINT,
DELETE_USER_ENDPOINT,
"userId=" + user.getUserId(),
true
);
@ -194,7 +192,7 @@ public class DataController {
System.out.println(urlParam);
sendBasicHttpRequest(
SERVER_URL + EDIT_USER_ENDPOINT,
EDIT_USER_ENDPOINT,
urlParam,
true
);

3
client/data/src/main/java/container/Event.java
View File

@ -1,4 +1,3 @@
//Marco Kühn//
package container;
import java.time.Duration;
@ -57,7 +56,7 @@ public class Event {
this.isFullDay = isFullDay;
this.isPrivate = isPrivate;
if (start != null) this.start = start.toString();
if (end != null) this.end = end.toString();
if (start != null) this.end = end.toString();
this.date = date;
this.ownerId = ownerId;
}

1
client/data/src/main/java/container/HttpRequest.java
View File

@ -1,4 +1,3 @@
//Marc Beyer//
package container;
import helper.Tuple;

1
client/data/src/main/java/container/User.java
View File

@ -1,4 +1,3 @@
//Marco Kühn//
package container;
public class User {

1
client/data/src/main/java/helper/HttpRequestException.java
View File

@ -1,4 +1,3 @@
//Marc Beyer//
package helper;
public class HttpRequestException extends Exception{

1
client/data/src/main/java/helper/Tuple.java
View File

@ -1,4 +1,3 @@
//Marc Beyer//
package helper;
public class Tuple<X, Y> {