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

Compare commits

base: MAM:22618081ee4578286e61413704e82bb57abeaffb
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:dcf8749a436c9a9c24d5f434f557b1fc479b3429
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. "22618081ee4578286e61413704e82bb57abeaffb" and "dcf8749a436c9a9c24d5f434f557b1fc479b3429" have entirely different histories.
22618081ee ... dcf8749a43

12 changed files with 14 additions and 173 deletions
Show Stats Expand all files Collapse all files

78
.gitignore vendored
View File

@ -1,78 +0,0 @@
### Java template
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
*.iml
## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:
# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml
# Gradle:
# .idea/gradle.xml
# .idea/libraries
# Mongo Explorer plugin:
# .idea/mongoSettings.xml
## File-based project format:
*.ipr
*.iws
## Plugin-specific files:
# IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
# Created by .ignore support plugin (hsz.mobi)
# Compiled class file
*.class
# Log file
*.log
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# by github https://github.com/github/gitignore/blob/master/Java.gitignore
client/.gradle/
client/.idea/
client/build/

BIN
client/.gradle/7.1.1/dependencies-accessors/dependencies-accessors.lock Normal file
View File

Binary file not shown.

0
client/.gradle/7.1.1/dependencies-accessors/gc.properties Normal file
View File

BIN
client/.gradle/7.1.1/executionHistory/executionHistory.lock Normal file
View File

Binary file not shown.

BIN
client/.gradle/7.1.1/fileChanges/last-build.bin Normal file
View File

Binary file not shown.

BIN
client/.gradle/7.1.1/fileHashes/fileHashes.lock Normal file
View File

Binary file not shown.

0
client/.gradle/7.1.1/gc.properties Normal file
View File

BIN
client/.gradle/buildOutputCleanup/buildOutputCleanup.lock Normal file
View File

Binary file not shown.

2
client/.gradle/buildOutputCleanup/cache.properties Normal file
View File

@ -0,0 +1,2 @@
#Sat Nov 13 20:08:41 CET 2021
gradle.version=7.1.1

BIN
client/.gradle/checksums/checksums.lock Normal file
View File

Binary file not shown.

0
client/.gradle/vcs-1/gc.properties Normal file
View File

105
client/src/main/resources/com/vpr/client/hello-view.fxml
View File

@ -1,99 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.layout.*?> <?import javafx.scene.control.Label?>
<?import javafx.scene.image.*?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.*?>
<GridPane gridLinesVisible="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"> <?import javafx.scene.control.Button?>
<columnConstraints> <VBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml"
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" /> fx:controller="com.vpr.client.HelloController">
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <padding>
</columnConstraints> <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
<rowConstraints> </padding>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints> <Label fx:id="welcomeText"/>
<children> <Button text="Hello!" onAction="#onHelloButtonClick"/>
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #333333;">
<children>
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
</ImageView>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
ADD
</Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
ADD
</Button>
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
ADD
</Button>
</children>
</VBox> </VBox>
<GridPane gridLinesVisible="true" GridPane.columnIndex="1">
<columnConstraints>
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
<ColumnConstraints hgrow="ALWAYS" />
</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>
</children>
</GridPane>
</children>
</GridPane>