From 289617b9b7e16b348d087787e6e769d58739e742 Mon Sep 17 00:00:00 2001
From: Johannes Kantz <67144859+JohannesKantz@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:55:54 +0100
Subject: [PATCH] fix: remove .idea folder
---
.gitignore | 1 +
.idea/encodings.xml | 7 -
.idea/misc.xml | 12 -
.../shelved.patch | 425 ------------------
...e_Update_at_30_01_2023_14_48__Changes_.xml | 4 -
.idea/uiDesigner.xml | 124 -----
.idea/vcs.xml | 6 -
.idea/workspace.xml | 144 ------
8 files changed, 1 insertion(+), 722 deletions(-)
delete mode 100644 .idea/encodings.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch
delete mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml
delete mode 100644 .idea/uiDesigner.xml
delete mode 100644 .idea/vcs.xml
delete mode 100644 .idea/workspace.xml
diff --git a/.gitignore b/.gitignore
index 5ff6309..8534072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ target/
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
+.idea
*.iws
*.iml
*.ipr
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index aa00ffa..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 2738f8e..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch
deleted file mode 100644
index 1845221..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch
+++ /dev/null
@@ -1,425 +0,0 @@
-Index: src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java b/src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java
-deleted file mode 100644
---- a/src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ /dev/null (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-@@ -1,4 +0,0 @@
--package com.bib.essensbestellungsverwaltung;
--
--public class StartPageController {
--}
-Index: src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java b/src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java
-deleted file mode 100644
---- a/src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ /dev/null (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-@@ -1,12 +0,0 @@
--package com.bib.essensbestellungsverwaltung;
--
--import javafx.fxml.FXMLLoader;
--import javafx.scene.Parent;
--import javafx.scene.Scene;
--
--import java.io.IOException;
--import java.util.Objects;
--
--public class SceneController {
--
--}
-Index: src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java b/src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java
-deleted file mode 100644
---- a/src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ /dev/null (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-@@ -1,34 +0,0 @@
--package com.bib.essensbestellungsverwaltung;
--
--import javafx.fxml.FXML;
--import javafx.scene.control.Alert;
--import javafx.scene.control.Label;
--import javafx.scene.control.TextField;
--
--public class HelloController {
-- /**
-- * @autor: Reshad Meher
-- * Username, Passwort , login
-- */
--
-- @FXML
-- private TextField unsernameEingabe;
-- @FXML
-- private TextField passwortEingabe;
-- @FXML
-- private Label lblAusgabe;
-- @FXML
-- protected void onLoginButtonClick() {
-- String benutzerEingabe = unsernameEingabe.getText();
-- String kennwortEingabe = passwortEingabe.getText();
-- if(benutzerEingabe.contains("Reshad") && kennwortEingabe.contains("test123")){
-- lblAusgabe.setText("Herzlich Willkommen, " + benutzerEingabe + "!");
-- }else {
-- Alert alert = new Alert(Alert.AlertType.ERROR,
-- "Die Benutzername oder Passwort ist falsch");
-- alert.showAndWait();
-- }
-- unsernameEingabe.setText("");
-- passwortEingabe.setText("");
-- }
--}
-\ No newline at end of file
-Index: src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml b/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
---- a/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml (date 1675084399131)
-@@ -29,72 +29,112 @@
-
-
-
--
-+
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-
-
--
--
--
--
--
--
--
-+
-+
-+
-+
-+
-+
-
-
-
-Index: src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>/*Richard Reiswich*/\r\npackage com.bib.essensbestellungsverwaltung;\r\n\r\nimport javafx.fxml.FXML;\r\nimport javafx.fxml.FXMLLoader;\r\nimport javafx.scene.Scene;\r\nimport javafx.scene.control.Alert;\r\nimport javafx.scene.control.PasswordField;\r\nimport javafx.scene.control.TextField;\r\nimport javafx.stage.Stage;\r\n\r\nimport java.io.IOException;\r\nimport java.util.HashMap;\r\n\r\npublic class LoginController {\r\n @FXML\r\n private TextField tfEmail;\r\n\r\n @FXML\r\n private PasswordField pfPassword;\r\n\r\n HashMap benutzerMap = new HashMap();\r\n @FXML\r\n protected void onBtLoginClick() throws IOException {\r\n benutzerMap.put(\"Reshad\",\"1234\");\r\n String email = tfEmail.getText();\r\n String password = pfPassword.getText();\r\n if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){\r\n FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource(\"menue-view.fxml\"));\r\n Scene scene = new Scene(fxmlLoader.load(), 950,480);\r\n Stage stage = new Stage();\r\n stage.setTitle(\"Essen Bestellung im Kindergarten\");\r\n stage.setScene(scene);\r\n stage.show();\r\n }else {\r\n Alert alert = new Alert(Alert.AlertType.ERROR,\"Email oder Passwort ist falsch\");\r\n alert.showAndWait();\r\n }\r\n\r\n tfEmail.setText(\"\");\r\n pfPassword.setText(\"\");\r\n }\r\n @FXML\r\n protected void changeToSignUp() throws IOException {\r\n FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource(\"signUp-view.fxml\"));\r\n Scene scene = new Scene(fxmlLoader.load(), 950,480);\r\n Stage stage = new Stage();\r\n stage.setTitle(\"Essen Bestellung im Kindergarten\");\r\n stage.setScene(scene);\r\n stage.show();\r\n\r\n }\r\n}\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java b/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
---- a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ b/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java (date 1675086360119)
-@@ -1,4 +1,4 @@
--/*Richard Reiswich*/
-+/*Reshad Meher*/
- package com.bib.essensbestellungsverwaltung;
-
- import javafx.fxml.FXML;
-@@ -19,19 +19,17 @@
- @FXML
- private PasswordField pfPassword;
-
-+ AccountMgr accountMgr = new AccountMgr();
- HashMap benutzerMap = new HashMap();
- @FXML
- protected void onBtLoginClick() throws IOException {
-- benutzerMap.put("Reshad","1234");
- String email = tfEmail.getText();
- String password = pfPassword.getText();
-- if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
-+ long loginPrüfen = AccountMgr.login(email,password);
-+ if(loginPrüfen > 0){
- FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
- Scene scene = new Scene(fxmlLoader.load(), 950,480);
-- Stage stage = new Stage();
-- stage.setTitle("Essen Bestellung im Kindergarten");
-- stage.setScene(scene);
-- stage.show();
-+ StartViewApplication.primary.setScene(scene);
- }else {
- Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
- alert.showAndWait();
-@@ -41,13 +39,10 @@
- pfPassword.setText("");
- }
- @FXML
-- protected void changeToSignUp() throws IOException {
-+ protected void onBtSingnupClick() throws IOException {
- FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
- Scene scene = new Scene(fxmlLoader.load(), 950,480);
-- Stage stage = new Stage();
-- stage.setTitle("Essen Bestellung im Kindergarten");
-- stage.setScene(scene);
-- stage.show();
-+ StartViewApplication.primary.setScene(scene);
-
- }
- }
-Index: src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml b/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml
---- a/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml (date 1675084574525)
-@@ -56,7 +56,7 @@
-
-
-
--
-+
-
-
-
-Index: src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java b/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
-new file mode 100644
---- /dev/null (date 1675085098078)
-+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java (date 1675085098078)
-@@ -0,0 +1,62 @@
-+package com.bib.essensbestellungsverwaltung;
-+
-+import javafx.fxml.FXML;
-+import javafx.fxml.FXMLLoader;
-+import javafx.scene.Scene;
-+import javafx.scene.control.Alert;
-+import javafx.scene.control.PasswordField;
-+import javafx.scene.control.TextField;
-+
-+import java.io.IOException;
-+import java.util.HashMap;
-+
-+public class SingUpController {
-+ @FXML
-+ private TextField tfEmail;
-+ @FXML
-+ private TextField tfBestätigungEmail;
-+ @FXML
-+ private PasswordField pfPasswort;
-+ @FXML
-+ private PasswordField pfBestätigungPassowrt;
-+
-+ private HashMap benutzermap = new HashMap<>();
-+ @FXML
-+ private void onKontoErstellenBtClick(){
-+ String email = tfEmail.getText();
-+ String bestätigungEmail = tfBestätigungEmail.getText();
-+ String passwort = pfPasswort.getText();
-+ String bestätigungPasswort = pfBestätigungPassowrt.getText();
-+ if(!(email.isEmpty() || bestätigungEmail.isEmpty() || passwort.isEmpty() && bestätigungEmail.isEmpty() || bestätigungPasswort.isEmpty())){
-+
-+ Alert alert;
-+ if(bestätigungEmail.equals(email) && bestätigungPasswort.equals(passwort)){
-+ alert = new Alert(Alert.AlertType.CONFIRMATION,"okay");
-+ alert.showAndWait();
-+ benutzermap.put(email,passwort);
-+ System.out.println(benutzermap);
-+ }else {
-+ alert = new Alert(Alert.AlertType.ERROR,"Die Eingabe passt nicht.");
-+ alert.showAndWait();
-+ }
-+ tfEmail.setText("");
-+ tfBestätigungEmail.setText("");
-+ pfPasswort.setText("");
-+ pfBestätigungPassowrt.setText("");
-+ }
-+ else {
-+ Alert alert = new Alert(Alert.AlertType.ERROR,"Eingabefield sind leer");
-+ alert.showAndWait();
-+ }
-+ }
-+
-+ @FXML
-+ private void onAnmeldenBtClick() throws IOException {
-+ FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
-+ Scene scene = new Scene(fxmlLoader.load(), 950,480);
-+ StartViewApplication.primary.setScene(scene);
-+ }
-+ public HashMap getBenutzermap() {
-+ return benutzermap;
-+ }
-+}
-Index: src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>/**\r\n * @autor: Reshad Meher\r\n * Fenstergrößer\r\n * Fenstertitle\r\n */\r\npackage com.bib.essensbestellungsverwaltung;\r\n\r\nimport javafx.application.Application;\r\nimport javafx.fxml.FXMLLoader;\r\nimport javafx.scene.Scene;\r\nimport javafx.stage.Stage;\r\n\r\nimport java.io.IOException;\r\n\r\npublic class StartViewApplication extends Application {\r\n public static Stage primary;\r\n @Override\r\n public void start(Stage stage) throws IOException {\r\n FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource(\"login-view.fxml\"));\r\n Scene scene = new Scene(fxmlLoader.load(), 950,480);\r\n //stage = primary;\r\n stage.setTitle(\"Essen Bestellung im Kindergarten\");\r\n stage.setScene(scene);\r\n stage.show();\r\n\r\n\r\n }\r\n\r\n public static void main(String[] args) {\r\n Database.init();\r\n Database.createDb();\r\n Database.fillDb();\r\n //Database.printSampleQuery();\r\n //Database.deleteSample();\r\n launch();\r\n }\r\n}
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java b/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
---- a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java (revision 2d91259953b2b5b95141325e59a25e080e54a5a1)
-+++ b/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java (date 1675084231696)
-@@ -18,12 +18,10 @@
- public void start(Stage stage) throws IOException {
- FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
- Scene scene = new Scene(fxmlLoader.load(), 950,480);
-- //stage = primary;
-+ primary = stage;
- stage.setTitle("Essen Bestellung im Kindergarten");
- stage.setScene(scene);
- stage.show();
--
--
- }
-
- public static void main(String[] args) {
diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml
deleted file mode 100644
index cd7daf5..0000000
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 2b63946..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 0322475..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "keyToString": {
- "ASKED_ADD_EXTERNAL_FILES": "true",
- "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true"
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1675083287293
-
-
- 1675083287293
-
-
- 1675083679870
-
-
-
- 1675083679870
-
-
- 1675083693484
-
-
-
- 1675083693484
-
-
- 1675241335793
-
-
-
- 1675241335793
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file