Compare commits
	
		
			4 Commits
		
	
	
		
			0100-Termi
			...
			8980a95c25
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8980a95c25 | |||
| 68275e1830 | |||
| da7ff960e5 | |||
| 2537ca31ea | 
@@ -29,13 +29,13 @@ val jar by tasks.getting(Jar::class) {
 | 
			
		||||
    })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
tasks.register("rebuild and move", Copy::class) {
 | 
			
		||||
    group = "custom"
 | 
			
		||||
tasks.register("blabla", Copy::class) {
 | 
			
		||||
    group = "dasdas"
 | 
			
		||||
    dependsOn("clean")
 | 
			
		||||
    dependsOn("jar")
 | 
			
		||||
 | 
			
		||||
    from("$buildDir/libs/app.jar")
 | 
			
		||||
 | 
			
		||||
    mkdir("$buildDir/out/")
 | 
			
		||||
    into("$buildDir/out/")
 | 
			
		||||
    mkdir("$buildDir/newShit/")
 | 
			
		||||
    into("$buildDir/newShit/")
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +0,0 @@
 | 
			
		||||
 | 
			
		||||
.main-btn{
 | 
			
		||||
    -fx-background-color: #424242;
 | 
			
		||||
    -fx-text-fill: white;
 | 
			
		||||
    -fx-border-radius: 50em;
 | 
			
		||||
}
 | 
			
		||||
@@ -4,16 +4,15 @@ import javafx.application.Application;
 | 
			
		||||
import javafx.fxml.FXMLLoader;
 | 
			
		||||
import javafx.scene.Scene;
 | 
			
		||||
import javafx.stage.Stage;
 | 
			
		||||
import res.RestController;
 | 
			
		||||
 | 
			
		||||
import java.io.IOException;
 | 
			
		||||
import java.util.Objects;
 | 
			
		||||
 | 
			
		||||
public class MainApplication extends Application {
 | 
			
		||||
    @Override
 | 
			
		||||
    public void start(Stage stage) throws IOException {
 | 
			
		||||
        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
 | 
			
		||||
        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
 | 
			
		||||
        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("style.css")).toExternalForm());
 | 
			
		||||
        Scene scene = new Scene(fxmlLoader.load(), 1200, 800);
 | 
			
		||||
        stage.setTitle("Hello!");
 | 
			
		||||
        stage.setScene(scene);
 | 
			
		||||
        stage.show();
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ import javafx.scene.layout.GridPane;
 | 
			
		||||
import javafx.scene.layout.VBox;
 | 
			
		||||
import javafx.scene.paint.Color;
 | 
			
		||||
import res.Event;
 | 
			
		||||
import res.DataController;
 | 
			
		||||
import res.RestController;
 | 
			
		||||
 | 
			
		||||
public class MainController {
 | 
			
		||||
    @FXML
 | 
			
		||||
@@ -30,8 +30,8 @@ public class MainController {
 | 
			
		||||
 | 
			
		||||
    @FXML
 | 
			
		||||
    protected void onAddBtnClick(){
 | 
			
		||||
        DataController dataController = new DataController();
 | 
			
		||||
        Event[] eventList = dataController.getAllEvents();
 | 
			
		||||
        RestController restController = new RestController();
 | 
			
		||||
        Event[] eventList = restController.getAllEvents();
 | 
			
		||||
 | 
			
		||||
        for(Event event : eventList){
 | 
			
		||||
            Label label = new Label();
 | 
			
		||||
 
 | 
			
		||||
@@ -6,94 +6,103 @@
 | 
			
		||||
<?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">
 | 
			
		||||
<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="ALWAYS" />
 | 
			
		||||
        <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
 | 
			
		||||
        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
 | 
			
		||||
    </columnConstraints>
 | 
			
		||||
    <rowConstraints>
 | 
			
		||||
        <RowConstraints vgrow="SOMETIMES" />
 | 
			
		||||
        <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;">
 | 
			
		||||
    <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" styleClass="main-btn" text="ADD">
 | 
			
		||||
        </Button>
 | 
			
		||||
        <Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
 | 
			
		||||
            ADD
 | 
			
		||||
        <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 fx:constant="HAND"/>
 | 
			
		||||
            </cursor>
 | 
			
		||||
        </Button>
 | 
			
		||||
        <Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
 | 
			
		||||
        <Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
 | 
			
		||||
                textAlignment="CENTER" textFill="WHITE">
 | 
			
		||||
            ADD
 | 
			
		||||
            <cursor>
 | 
			
		||||
                <Cursor fx:constant="HAND" />
 | 
			
		||||
                <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 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 maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
 | 
			
		||||
            <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
 | 
			
		||||
            <RowConstraints vgrow="ALWAYS"/>
 | 
			
		||||
        </rowConstraints>
 | 
			
		||||
        <Label textFill="WHITE">
 | 
			
		||||
            Monat
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
 | 
			
		||||
            Mo
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
 | 
			
		||||
            Di
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
 | 
			
		||||
            Mi
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
 | 
			
		||||
            Do
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
 | 
			
		||||
            Fr
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
 | 
			
		||||
            Sa
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
        <Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
 | 
			
		||||
            So
 | 
			
		||||
            <padding>
 | 
			
		||||
                <Insets left="5" />
 | 
			
		||||
                <Insets left="5"/>
 | 
			
		||||
            </padding>
 | 
			
		||||
        </Label>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +0,0 @@
 | 
			
		||||
 | 
			
		||||
.main-btn{
 | 
			
		||||
    -fx-background-color: #424242;
 | 
			
		||||
    -fx-text-fill: white;
 | 
			
		||||
    -fx-border-radius: 50em;
 | 
			
		||||
}
 | 
			
		||||
@@ -9,7 +9,7 @@ import java.net.HttpURLConnection;
 | 
			
		||||
import java.net.URL;
 | 
			
		||||
import java.util.ArrayList;
 | 
			
		||||
 | 
			
		||||
public class DataController {
 | 
			
		||||
public class RestController {
 | 
			
		||||
 | 
			
		||||
    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";
 | 
			
		||||
		Reference in New Issue
	
	Block a user