Skip to content

First Merge DEV to MAIN#45

Merged
LucasVaugrente merged 75 commits into
mainfrom
dev
Mar 7, 2026
Merged

First Merge DEV to MAIN#45
LucasVaugrente merged 75 commits into
mainfrom
dev

Conversation

@LucasVaugrente

Copy link
Copy Markdown
Owner

No description provided.

Lejusdepom and others added 30 commits November 3, 2025 10:14
…noms de fichiers

Renomme le projet de "seriouse_game" à "factoscope" à travers toute l'application, y compris dans les fichiers de configuration (pubspec, Android, iOS, Windows, Linux, web).

Standardise les noms de fichiers et de classes pour utiliser le style `snake_case` pour les fichiers et `PascalCase` pour les classes, améliorant ainsi la cohérence du code. Met également à jour les imports correspondants.

Ajoute la configuration pour les icônes de lancement de l'application.
…tive into Jules

# Conflicts:
#	lib/data_initializer.dart
#	lib/ui/App.dart

Base propre prête pour modif BDD
…e download logic

Structural Changes:
- Relocated `database_helper.dart` to the project root and refactored the schema for better consistency.
- Reorganized assets by moving images and branding from `lib/data/AppData/CharteFactoscope/` to a centralized `lib/assets/` directory.
- Updated `pubspec.yaml` to reflect the new asset paths.
- Added `AppConfig` in `lib/config.dart` for API management.

Feature & Logic Updates:
- Implemented course download and media persistence logic in `ListCoursViewModel`.
- Added JSON serialization support (`fromJson`) across models (`Cours`, `Module`, `Page`, `MediaCours`, `ObjectifCours`).
- Enhanced `CoursRepository` with methods for updating records, marking downloads, and managing media.
- Refactored `DataInitializer` to load module metadata from local JSON files.

UI & Navigation:
- Updated `GoRouter` configuration in `lib/ui/app.dart` to support dynamic course parameters.
- Translated various UI labels to French (e.g., "Tableau de bord", "Accueil", "Formation").
- Created `AllCoursView` to display a global list of courses.
- Cleaned up `ContenuCoursView` by removing unused audio widget references and improving media type handling.

Cleanup:
- Deleted obsolete text data files and old QCM/media samples from `lib/data/`.
- Removed unused imports and commented-out code in `lib/ui/app.dart`.
- Déplacement de qcm_controller.dart vers lib/repositories/QCM/
- Déplacement de qcm_game_page.dart vers lib/ui/QCM/
- Nettoyage des anciens chemins
Objectif : structurer le module QCM de manière plus cohérente (models, repositories, UI).
Lejusdepom and others added 27 commits February 19, 2026 09:41
# Conflicts:
#	lib/database_helper.dart
#	pubspec.lock
 into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@LucasVaugrente LucasVaugrente self-assigned this Mar 7, 2026
@LucasVaugrente LucasVaugrente merged commit d1b61b5 into main Mar 7, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants