From fbdf376f8f36f5dc4252e25c87e8421785636e01 Mon Sep 17 00:00:00 2001 From: zhangmx Date: Fri, 1 Jul 2022 17:25:45 +0800 Subject: [PATCH 1/2] updated java to 11;reorganize project files --- pom.xml | 102 ++++++++++++++++++ src/{ => main/java}/home/Main.java | 11 +- .../java}/home/controllers/Controller.java | 8 +- .../home/controllers/DashboardController.java | 0 .../home/controllers/StudentsController.java | 0 .../home/controllers/TimetableController.java | 0 .../java}/home/model/StudentsModel.java | 0 .../resources}/css/fullpackstyling.css | 0 .../resources}/fxml/Dashboard.fxml | 0 src/{home => main/resources}/fxml/Home.fxml | 0 .../resources}/fxml/Students.fxml | 0 .../resources}/fxml/Timetable.fxml | 0 src/{home => main/resources}/icons/icon.gif | Bin src/{home => main/resources}/icons/icon.png | Bin 14 files changed, 114 insertions(+), 7 deletions(-) create mode 100644 pom.xml rename src/{ => main/java}/home/Main.java (66%) rename src/{ => main/java}/home/controllers/Controller.java (86%) rename src/{ => main/java}/home/controllers/DashboardController.java (100%) rename src/{ => main/java}/home/controllers/StudentsController.java (100%) rename src/{ => main/java}/home/controllers/TimetableController.java (100%) rename src/{ => main/java}/home/model/StudentsModel.java (100%) rename src/{home => main/resources}/css/fullpackstyling.css (100%) rename src/{home => main/resources}/fxml/Dashboard.fxml (100%) rename src/{home => main/resources}/fxml/Home.fxml (100%) rename src/{home => main/resources}/fxml/Students.fxml (100%) rename src/{home => main/resources}/fxml/Timetable.fxml (100%) rename src/{home => main/resources}/icons/icon.gif (100%) rename src/{home => main/resources}/icons/icon.png (100%) diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3992aed --- /dev/null +++ b/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + + groupId + School-Management-System-JavaFX + 1.0-SNAPSHOT + + + 11 + 11 + + + + + + + + + + + + com.calendarfx + view + 11.8.3 + + + + + com.calendarfx + recurrence + 11.6.1 + + + + + + + + + + + + + + + + + + org.openjfx + javafx-controls + 14 + + + + de.jensd + fontawesomefx-materialdesignfont + 2.0.26-9.1.2 + + + de.jensd + fontawesomefx-commons + 9.1.2 + + + + org.openjfx + javafx-fxml + 14 + + + + de.jensd + fontawesomefx-fontawesome + 4.7.0-9.1.2 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + + + + org.openjfx + javafx-maven-plugin + 0.0.4 + + home.Main + + + + + + + \ No newline at end of file diff --git a/src/home/Main.java b/src/main/java/home/Main.java similarity index 66% rename from src/home/Main.java rename to src/main/java/home/Main.java index fbcfe19..ebf750f 100644 --- a/src/home/Main.java +++ b/src/main/java/home/Main.java @@ -6,15 +6,20 @@ import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.stage.Stage; -import jfxtras.styles.jmetro8.JMetro; + +import java.net.URL; +//import jfxtras.styles.jmetro8.JMetro; public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ - Parent root = FXMLLoader.load(getClass().getResource("fxml/Home.fxml")); + URL home = getClass().getResource("/fxml/Home.fxml"); + assert home != null; + System.out.println(home); + Parent root = FXMLLoader.load(home); primaryStage.setTitle("KeepToo SMSys"); - primaryStage.getIcons().add(new Image("/home/icons/icon.png")); + primaryStage.getIcons().add(new Image("/icons/icon.png")); primaryStage.setScene(new Scene(root)); primaryStage.show(); } diff --git a/src/home/controllers/Controller.java b/src/main/java/home/controllers/Controller.java similarity index 86% rename from src/home/controllers/Controller.java rename to src/main/java/home/controllers/Controller.java index 095d062..f0d69c3 100644 --- a/src/home/controllers/Controller.java +++ b/src/main/java/home/controllers/Controller.java @@ -37,11 +37,11 @@ public class Controller implements Initializable { @FXML private void handleButtonClicks(javafx.event.ActionEvent mouseEvent) { if (mouseEvent.getSource() == btnDashboard) { - loadStage("/home/fxml/Dashboard.fxml"); + loadStage("/fxml/Dashboard.fxml"); } else if (mouseEvent.getSource() == btnStudents) { - loadStage("/home/fxml/Students.fxml"); + loadStage("/fxml/Students.fxml"); } else if (mouseEvent.getSource() == btn_Timetable) { - loadStage("/home/fxml/Timetable.fxml"); + loadStage("/fxml/Timetable.fxml"); } } @@ -55,7 +55,7 @@ private void loadStage(String fxml) { Parent root = FXMLLoader.load(getClass().getResource(fxml)); Stage stage = new Stage(); stage.setScene(new Scene(root)); - stage.getIcons().add(new Image("/home/icons/icon.png")); + stage.getIcons().add(new Image("/icons/icon.png")); stage.initModality(Modality.APPLICATION_MODAL); stage.show(); } catch (IOException e) { diff --git a/src/home/controllers/DashboardController.java b/src/main/java/home/controllers/DashboardController.java similarity index 100% rename from src/home/controllers/DashboardController.java rename to src/main/java/home/controllers/DashboardController.java diff --git a/src/home/controllers/StudentsController.java b/src/main/java/home/controllers/StudentsController.java similarity index 100% rename from src/home/controllers/StudentsController.java rename to src/main/java/home/controllers/StudentsController.java diff --git a/src/home/controllers/TimetableController.java b/src/main/java/home/controllers/TimetableController.java similarity index 100% rename from src/home/controllers/TimetableController.java rename to src/main/java/home/controllers/TimetableController.java diff --git a/src/home/model/StudentsModel.java b/src/main/java/home/model/StudentsModel.java similarity index 100% rename from src/home/model/StudentsModel.java rename to src/main/java/home/model/StudentsModel.java diff --git a/src/home/css/fullpackstyling.css b/src/main/resources/css/fullpackstyling.css similarity index 100% rename from src/home/css/fullpackstyling.css rename to src/main/resources/css/fullpackstyling.css diff --git a/src/home/fxml/Dashboard.fxml b/src/main/resources/fxml/Dashboard.fxml similarity index 100% rename from src/home/fxml/Dashboard.fxml rename to src/main/resources/fxml/Dashboard.fxml diff --git a/src/home/fxml/Home.fxml b/src/main/resources/fxml/Home.fxml similarity index 100% rename from src/home/fxml/Home.fxml rename to src/main/resources/fxml/Home.fxml diff --git a/src/home/fxml/Students.fxml b/src/main/resources/fxml/Students.fxml similarity index 100% rename from src/home/fxml/Students.fxml rename to src/main/resources/fxml/Students.fxml diff --git a/src/home/fxml/Timetable.fxml b/src/main/resources/fxml/Timetable.fxml similarity index 100% rename from src/home/fxml/Timetable.fxml rename to src/main/resources/fxml/Timetable.fxml diff --git a/src/home/icons/icon.gif b/src/main/resources/icons/icon.gif similarity index 100% rename from src/home/icons/icon.gif rename to src/main/resources/icons/icon.gif diff --git a/src/home/icons/icon.png b/src/main/resources/icons/icon.png similarity index 100% rename from src/home/icons/icon.png rename to src/main/resources/icons/icon.png From 20ec9d8ab6e1780e93cb3ad9d6826b69cbc6f650 Mon Sep 17 00:00:00 2001 From: zhangmx Date: Fri, 1 Jul 2022 17:28:10 +0800 Subject: [PATCH 2/2] added info for maven --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 893f324..64e3bd1 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,11 @@ This project uses a number of libraries: **You can also check out a [Java Swing](https://github.com/k33ptoo/School-Management-System-Inspiration) version if you are interested or Watch the full video [here](https://youtu.be/YuiXnPefmhU). ** + +## Develop + +run with + +```shell +mvn javafx:run +``` \ No newline at end of file