merged 0300 and 0120

Merge branch '0300-Kalender' into merge
# Conflicts: # hellofx/app/build/resources/main/client/style.css # hellofx/app/src/main/resources/client/style.css
2021-11-26 13:30:51 +01:00 · 2021-11-26 13:25:05 +01:00 · 2021-11-26 13:01:08 +01:00 · 2021-11-25 14:47:25 +01:00 · 2021-11-22 13:37:46 +01:00 · 2021-11-17 21:32:04 +01:00
7 changed files with 119 additions and 119 deletions
--- a/.gitignore
+++ b/.gitignore
@ -70,7 +70,5 @@ crashlytics-build.properties

 #  by github https://github.com/github/gitignore/blob/master/Java.gitignore

-hellofx/.gradle/
-hellofx/app/build/
-hellofx/data/build/
-hellofx/.gradle/buildOutputCleanup/
+.gradle/
+build/
--- a/hellofx/app/build/resources/main/client/style.css
+++ b/hellofx/app/build/resources/main/client/style.css
@ -1,18 +0,0 @@
-GridPane{
-    -fx-background-color: #282C34;
-    -fx-margin: 10px;
-}
-
-Label{
-    -fx-text-fill: white;
-}
-
-.main-btn{
-    -fx-background-color: #ffffff;
-    -fx-text-fill: white;
-    -fx-background-radius: 5em;
-    -fx-min-width: 40px;
-    -fx-min-height: 40px;
-    -fx-max-width: 40px;
-    -fx-max-height: 40px;
-}
--- a/hellofx/app/src/main/java/client/MainApplication.java
+++ b/hellofx/app/src/main/java/client/MainApplication.java
@ -13,7 +13,7 @@ public class MainApplication extends Application {
    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.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
        stage.setTitle("Hello!");
        stage.setScene(scene);
        stage.show();
--- a/hellofx/app/src/main/resources/client/create-event.css
+++ b/hellofx/app/src/main/resources/client/create-event.css
@ -5,7 +5,7 @@ GridPane{
    -fx-font-family: Segoe UI;

    -fx-border-insets: 1;
-    -fx-border-color: white;
+    -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);
--- a/hellofx/app/src/main/resources/client/main-view.css
+++ b/hellofx/app/src/main/resources/client/main-view.css
@ -0,0 +1,51 @@
+GridPane{
+    -fx-background-color: #2B2D42;
+}
+
+.main-panel{
+    -fx-background-color: #282C34;
+}
+
+.vbox-main{
+    -fx-background-color: #333333;
+    -fx-alignment: top-center;
+
+}
+
+.gridCalendar Line{
+    -fx-stroke: #B0B0B0;
+}
+
+.gridCalender{
+        -fx-background-color: #2B2D42;
+        -fx-min-height: 80px;
+        -fx-max-height: 80px;
+}
+
+.labelMonth{
+    -fx-padding: 0 0 0 20;
+    -fx-background-color: #77859E;
+    -fx-font-size: 35px;
+    -fx-font-weight: bold;
+}
+
+.labelDays{
+    -fx-alignment: center;
+    -fx-background-color: #525E74;
+    -fx-font-size: 25px;
+}
+
+Label{
+    -fx-text-fill: white;
+}
+
+.main-btn{
+    -fx-background-color: #ffffff;
+    -fx-text-fill: white;
+    -fx-background-radius: 5em;
+    -fx-min-width: 40px;
+    -fx-min-height: 40px;
+    -fx-max-width: 40px;
+    -fx-max-height: 40px;
+}
+
--- a/hellofx/app/src/main/resources/client/main-view.fxml
+++ b/hellofx/app/src/main/resources/client/main-view.fxml
@ -5,7 +5,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>

-<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.MainController">
+<GridPane 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" />
@ -13,7 +13,7 @@
    <rowConstraints>
        <RowConstraints 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: #525E74;">
        <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">

        </ImageView>
@ -27,91 +27,78 @@
            ADD
        </Button>
    </VBox>
-    <GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
+    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
        <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" />
+         <ColumnConstraints />
        </columnConstraints>
        <rowConstraints>
-            <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
-            <RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
+            <RowConstraints />
            <RowConstraints vgrow="ALWAYS" />
        </rowConstraints>
-        <Label textFill="WHITE">
+        <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
            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>
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
+            <columnConstraints>
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" 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="55.0" minHeight="25.0" vgrow="NEVER" />
+                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
+            </rowConstraints>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
+                Montag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="0">
+                Dienstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="0">
+                Mittwoch
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="0">
+                Donnerstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="0">
+                Freitag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="0">
+                Samstag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+            <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelDays" textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="0">
+                Sonntag
+                <padding>
+                    <Insets left="5" />
+                </padding>
+            </Label>
+        </GridPane>
    </GridPane>
 </GridPane>
--- a/hellofx/app/src/main/resources/client/style.css
+++ b/hellofx/app/src/main/resources/client/style.css
@ -1,18 +0,0 @@
-GridPane{
-    -fx-background-color: #282C34;
-    -fx-margin: 10px;
-}
-
-Label{
-    -fx-text-fill: white;
-}
-
-.main-btn{
-    -fx-background-color: #ffffff;
-    -fx-text-fill: white;
-    -fx-background-radius: 5em;
-    -fx-min-width: 40px;
-    -fx-min-height: 40px;
-    -fx-max-width: 40px;
-    -fx-max-height: 40px;
-}
Author	SHA1	Message	Date
Marco Kühn	5a4a1e70e8	merged 0300 and 0120	2021-11-26 13:30:51 +01:00
Marco Kühn	dc1b1643d8	Merge branch '0300-Kalender' into merge # Conflicts: # hellofx/app/build/resources/main/client/style.css # hellofx/app/src/main/resources/client/style.css	2021-11-26 13:25:05 +01:00
Alex Rechtin	6a40ebfcfc	improved the main view and the main-view.css	2021-11-26 13:01:08 +01:00
Alex Rechtin	842a83af3b	changed the main view and the style.css	2021-11-25 14:47:25 +01:00
Alex Rechtin	18d5b528af	added class vbox-main and main- pannel in the css	2021-11-22 13:37:46 +01:00
Marc Beyer	af3ffe807c	removed buildfile	2021-11-17 21:32:04 +01:00
Marc Beyer	7b12642a66	Updated .gitignore ignore all ".gradle" and "build" folder	2021-11-17 21:27:01 +01:00