Skip to content

logica y JavaFX implementado y fusionado #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Saamu844 merged 1 commit into from
May 19, 2026
Merged

logica y JavaFX implementado y fusionado #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions .idea/copilotDiffState.xml
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions src/main/java/es/iesquevedo/MainGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package es.iesquevedo;

import es.iesquevedo.config.AppConfig;
import es.iesquevedo.service.impl.MainServiceImpl;
import es.iesquevedo.ui.MainScreenController;
import es.iesquevedo.controller.LoginController;
import es.iesquevedo.service.auth.AuthServiceMock;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
Expand All @@ -18,23 +17,23 @@ public class MainGUI extends Application {
@Override
public void start(Stage primaryStage) {
try {
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainScreen.fxml"));
// Cargar pantalla de login
FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Login.fxml"));
Parent root = loader.load();

MainScreenController controller = loader.getController();
String firebaseUrl = System.getenv("FIREBASE_URL");
var repository = AppConfig.createMainRepository(firebaseUrl);
var mainService = new MainServiceImpl(repository);
controller.setService(mainService);
// Configurar LoginController
LoginController controller = loader.getController();
controller.setAuthService(new AuthServiceMock());

Scene scene = new Scene(root, 700, 500);
primaryStage.setTitle("InazumaGo - Pantalla Principal");
Scene scene = new Scene(root, 500, 400);
primaryStage.setTitle("InazumaGo - Login");
primaryStage.setScene(scene);
primaryStage.show();

LOGGER.log(Level.INFO, "Aplicación JavaFX iniciada - Pantalla principal cargada");
LOGGER.log(Level.INFO, "Aplicación JavaFX iniciada - Pantalla de login cargada");
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Error al iniciar la aplicación", e);
e.printStackTrace();
}
}

Expand Down
Loading
Loading