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

Compare commits

base: MAM:8f3042c5f979755ceec45b33827324ff81026958
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:0100-Termine_anzeigen
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

6 Commits
8f3042c5f9 ... 0100-Termi

Author SHA1 Message Date
Marc Beyer
2944c44d1d Merge remote-tracking branch 'origin/0100-Termine_anzeigen' into 0100-Termine_anzeigen 
# Conflicts:
#	hellofx/app/build/resources/main/client/main-view.fxml
 2021-11-15 13:22:52 +01:00
Marc Beyer
e51ef5c49d added css 2021-11-15 13:21:46 +01:00
Marc Beyer
bab5ef0a93 added css 2021-11-15 13:17:43 +01:00
Marco Kühn
0303fcf467 fixed gitignore the second 2021-11-15 11:12:45 +01:00
Marco Kühn
d09d2baf42 fixed gitignore 2021-11-15 10:57:19 +01:00
Marco Kühn
adae09a1e9 updated gitignore 2021-11-15 10:56:10 +01:00
26 changed files with 55 additions and 186 deletions
Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -70,5 +70,7 @@ crashlytics-build.properties
# by github https://github.com/github/gitignore/blob/master/Java.gitignore # by github https://github.com/github/gitignore/blob/master/Java.gitignore
client/.gradle/ hellofx/.gradle/
client/build/ hellofx/app/build/
hellofx/data/build/
hellofx/.gradle/buildOutputCleanup/

BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/fileChanges/last-build.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/fileContent/fileContent.lock
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

0
hellofx/.gradle/6.0/gc.properties
View File

BIN
hellofx/.gradle/6.0/javaCompile/classAnalysis.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/javaCompile/javaCompile.lock
View File

Binary file not shown.

BIN
hellofx/.gradle/6.0/javaCompile/taskHistory.bin
View File

Binary file not shown.

BIN
hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

2
hellofx/.gradle/buildOutputCleanup/cache.properties
View File

@@ -1,2 +0,0 @@
#Sun Nov 14 15:59:12 CET 2021
gradle.version=6.0

BIN
hellofx/.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

0
hellofx/.gradle/vcs-1/gc.properties
View File

8
hellofx/app/build.gradle.kts
View File

@@ -29,13 +29,13 @@ val jar by tasks.getting(Jar::class) {
}) })
} }
tasks.register("blabla", Copy::class) { tasks.register("rebuild and move", Copy::class) {
group = "dasdas" group = "custom"
dependsOn("clean") dependsOn("clean")
dependsOn("jar") dependsOn("jar")
from("$buildDir/libs/app.jar") from("$buildDir/libs/app.jar")
mkdir("$buildDir/newShit/") mkdir("$buildDir/out/")
into("$buildDir/newShit/") into("$buildDir/out/")
} }

133
hellofx/app/build/resources/main/client/main-view.fxml
View File

@@ -1,133 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;"
xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="client.MainController">
<columnConstraints>
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
</rowConstraints>
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
style="-fx-background-color: #333333;">
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
</ImageView>
<Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50"
style="-fx-background-color: #424242;" text="ADD" textAlignment="CENTER" textFill="WHITE">
<cursor>
<Cursor fx:constant="HAND"/>
</cursor>
</Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
textAlignment="CENTER" textFill="WHITE">
ADD
<cursor>
<Cursor fx:constant="HAND"/>
</cursor>
</Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
textAlignment="CENTER" textFill="WHITE">
ADD
<cursor>
<Cursor fx:constant="HAND"/>
</cursor>
</Button>
</VBox>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
<columnConstraints>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>
<children>
<Label textFill="WHITE">
Monat
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
Mo
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
Di
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
Mi
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
Do
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
Fr
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
Sa
<padding>
<Insets left="5"/>
</padding>
</Label>
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
So
<padding>
<Insets left="5"/>
</padding>
</Label>
<VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
</VBox>
<VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
</VBox>
</children>
</GridPane>
</GridPane>

6
hellofx/app/build/resources/main/client/style.css Normal file
View File

@@ -0,0 +1,6 @@
.main-btn{
-fx-background-color: #424242;
-fx-text-fill: white;
-fx-border-radius: 50em;
}

5
hellofx/app/src/main/java/client/MainApplication.java
View File

@@ -4,15 +4,16 @@ 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.RestController;
import java.io.IOException; import java.io.IOException;
import java.util.Objects;
public class MainApplication extends Application { public class MainApplication extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 1200, 800); Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("style.css")).toExternalForm());
stage.setTitle("Hello!"); stage.setTitle("Hello!");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();

6
hellofx/app/src/main/java/client/MainController.java
View File

@@ -6,7 +6,7 @@ import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import res.Event; import res.Event;
import res.RestController; import res.DataController;
public class MainController { public class MainController {
@FXML @FXML
@@ -30,8 +30,8 @@ public class MainController {
@FXML @FXML
protected void onAddBtnClick(){ protected void onAddBtnClick(){
RestController restController = new RestController(); DataController dataController = new DataController();
Event[] eventList = restController.getAllEvents(); Event[] eventList = dataController.getAllEvents();
for(Event event : eventList){ for(Event event : eventList){
Label label = new Label(); Label label = new Label();

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

@@ -6,103 +6,94 @@
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" <GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="client.MainController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/> <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/> <ColumnConstraints hgrow="ALWAYS" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/> <RowConstraints vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #333333;">
style="-fx-background-color: #333333;">
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
</ImageView> </ImageView>
<Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50" <Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50" styleClass="main-btn" text="ADD">
style="-fx-background-color: #424242;" text="ADD" textAlignment="CENTER" textFill="WHITE">
<cursor>
<Cursor fx:constant="HAND"/>
</cursor>
</Button> </Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" <Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
textAlignment="CENTER" textFill="WHITE">
ADD ADD
<cursor> <cursor>
<Cursor fx:constant="HAND"/> <Cursor fx:constant="HAND" />
</cursor> </cursor>
</Button> </Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" <Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
textAlignment="CENTER" textFill="WHITE">
ADD ADD
<cursor> <cursor>
<Cursor fx:constant="HAND"/> <Cursor fx:constant="HAND" />
</cursor> </cursor>
</Button> </Button>
</VBox> </VBox>
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1"> <GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/> <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/> <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/> <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
<RowConstraints vgrow="ALWAYS"/> <RowConstraints vgrow="ALWAYS" />
</rowConstraints> </rowConstraints>
<Label textFill="WHITE"> <Label textFill="WHITE">
Monat Monat
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
Mo Mo
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
Di Di
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
Mi Mi
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
Do Do
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
Fr Fr
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
Sa Sa
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1"> <Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
So So
<padding> <padding>
<Insets left="5"/> <Insets left="5" />
</padding> </padding>
</Label> </Label>

6
hellofx/app/src/main/resources/client/style.css Normal file
View File

@@ -0,0 +1,6 @@
.main-btn{
-fx-background-color: #424242;
-fx-text-fill: white;
-fx-border-radius: 50em;
}

2
hellofx/data/build/tmp/jar/MANIFEST.MF
View File

@@ -1,2 +0,0 @@
Manifest-Version: 1.0

2
hellofx/data/src/main/java/res/RestController.java → hellofx/data/src/main/java/res/DataController.java
View File

@@ -9,7 +9,7 @@ import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
public class RestController { public class DataController {
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";