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

Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix

Browse Source 
# Conflicts:
#	client/app/src/main/java/main/CreateEventController.java
This commit is contained in:
Marco Kühn 2022-01-18 09:48:22 +01:00
commit 521b1cb2f7
6 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/app/src/main/java/main/CreateEventController.java
View File

@ -21,11 +21,11 @@ public class CreateEventController {
@FXML
public GridPane mainGrid;
@FXML
public DatePicker datePickerDate;
public JFXDatePicker datePickerDate;
@FXML
public JFXTextField textName;
@FXML
public ComboBox<String> ComboBoxPriotity;
public JFXComboBox<String> ComboBoxPriotity;
@FXML
public JFXToggleButton toggleBtnIsFullDay;
@FXML
@ -38,7 +38,6 @@ public class CreateEventController {
public JFXTimePicker timeEnd;
public CreateEventController() {
}

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

@ -1,18 +1,18 @@
package users;
import com.jfoenix.controls.*;
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;
public JFXTextField userField;
@FXML
public TextField passField;
public JFXPasswordField passField;
@FXML
public Label userErrLabel;
@FXML

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

@ -72,3 +72,7 @@ Label{
-fx-max-height: 40px;
}
.navButtnon{
-fx-background-color: white;
}

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

@ -4,6 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import com.jfoenix.controls.*?>
<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="main.MainController">
@ -19,15 +20,15 @@
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
</ImageView>
<Button onAction="#onAddBtnClick" styleClass="main-btn">
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
ADD
</Button>
<Button onAction="#onAddBtnClick" styleClass="main-btn">
</JFXButton>
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
ADD
</Button>
<Button onAction="#onAddBtnClick" styleClass="main-btn">
</JFXButton>
<JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
ADD
</Button>
</JFXButton>
</VBox>
<GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
<columnConstraints>
@ -48,9 +49,9 @@
<Insets left="5"/>
</padding>
</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>
<JFXButton styleClass="navButton" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
<JFXButton styleClass="navButton" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
<JFXButton styleClass="navButton" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
GridPane.columnIndex="0" GridPane.rowIndex="1">

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

@ -34,4 +34,12 @@ Label{
-fx-max-height: 400px;
-fx-wrap-text: true;
-fx-font-size: 16px;
}
.userField{
-fx-background-color: white;
}
.passField{
-fx-background-color: white;
}

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

@ -2,6 +2,8 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import com.jfoenix.controls.*?>
<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
<columnConstraints>
@ -19,11 +21,11 @@
<Label GridPane.columnIndex="1">Anmelden</Label>
<Label GridPane.rowIndex="1">Username</Label>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
<JFXTextField 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">Paswort</Label>
<PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
<JFXPasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
<Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>