[ADD] Hotfix for WEB DEMO

H-chauvet · Nov 21, 2024 · 562875d · 562875d
1 parent b1c1502
commit 562875d
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 26 deletions.
diff --git a/Configurateur/front/lib/components/dialog/handle_member/handle_member.dart b/Configurateur/front/lib/components/dialog/handle_member/handle_member.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:front/components/custom_toast.dart';
 import 'package:front/components/dialog/confirmation_dialog.dart';
 import 'package:front/components/dialog/handle_member/handle_member_style.dart';
 import 'package:front/network/informations.dart';
@@ -181,9 +182,8 @@ class HandleMemberState extends State<HandleMember> {
                     key: const Key('send-button'),
                     onPressed: () {
                       if (formKey.currentState!.validate()) {
-                        // Le formulaire est valide
                         addMember();
-                        // Réinitialiser le champ
+                        showCustomToast(context, AppLocalizations.of(context)!.handleAddMember , true);
                         _controller.clear();
                         setState(() {
                           collaboratorContact = '';

diff --git a/Configurateur/front/lib/components/dialog/rating_dialog_content/rating_dialog_content.dart b/Configurateur/front/lib/components/dialog/rating_dialog_content/rating_dialog_content.dart
@@ -156,13 +156,10 @@ class RatingDialogContent extends StatelessWidget {
                 Navigator.of(context).pop();
               },
               style: ElevatedButton.styleFrom(
-                backgroundColor: Provider.of<ThemeService>(context).isDark
-                    ? darkTheme.primaryColor
-                    : lightTheme.primaryColor,
                 padding:
                     const EdgeInsets.symmetric(horizontal: 30, vertical: 20),
                 shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(20.0),
+                  borderRadius: BorderRadius.circular(30.0),
                 ),
               ),
               child: Text(
@@ -172,8 +169,8 @@ class RatingDialogContent extends StatelessWidget {
                       ? desktopFontSize
                       : tabletFontSize,
                   color: Provider.of<ThemeService>(context).isDark
-                      ? lightTheme.primaryColor
-                      : darkTheme.primaryColor,
+                      ? darkTheme.primaryColor
+                      : lightTheme.primaryColor,
                 ),
               ),
             ),

diff --git a/Configurateur/front/lib/l10n/app_en.arb b/Configurateur/front/lib/l10n/app_en.arb
@@ -402,5 +402,6 @@
 	"objectSharing": "Object Sharing",
 	"objectSharingDescription": "Promoting renting and sharing reduces excessive production of objects and encourages more responsible consumption.",
 	"accessibility": "Accessibility",
-	"accessibilityDescription": "Our containers and application make objects accessible to everyone, strengthening communities and supporting the circular economy."
+	"accessibilityDescription": "Our containers and application make objects accessible to everyone, strengthening communities and supporting the circular economy.",
+	"handleAddMember": "Invitation has been sent by mail!"
 }
diff --git a/Configurateur/front/lib/l10n/app_fr.arb b/Configurateur/front/lib/l10n/app_fr.arb
@@ -401,5 +401,6 @@
 	"objectSharing": "Partage d'Objets",
 	"objectSharingDescription": "Favoriser la location et le partage réduit la production excessive d'objets et encourage une consommation plus responsable.",
 	"accessibility": "Accessibilité",
-	"accessibilityDescription": "Nos conteneurs et l'application rendent les objets accessibles à tous, renforçant la communauté et soutenant l'économie circulaire."
+	"accessibilityDescription": "Nos conteneurs et l'application rendent les objets accessibles à tous, renforçant la communauté et soutenant l'économie circulaire.",
+	"handleAddMember": "L'invitation a bien été envoyée par mail !"
 }
diff --git a/Configurateur/front/lib/screens/company-creation/company-creation.dart b/Configurateur/front/lib/screens/company-creation/company-creation.dart
@@ -116,8 +116,9 @@ class CompanyCreationPageState extends State<CompanyCreationPage> {
 
     return Scaffold(
       body: FooterView(
-        flex: 10,
+        flex: 6,
         footer: Footer(
+          padding: EdgeInsets.zero,
           child: CustomFooter(),
         ),
         children: [

diff --git a/Configurateur/front/lib/screens/feedbacks/feedbacks.dart b/Configurateur/front/lib/screens/feedbacks/feedbacks.dart
@@ -88,7 +88,7 @@ class _FeedbacksPageState extends State<FeedbacksPage> {
           flex: 10,
           footer: Footer(
             padding: EdgeInsets.zero,
-            child: const CustomFooter(),
+            child: CustomFooter(),
           ),
           children: [
             Column(

diff --git a/Configurateur/front/lib/screens/register-confirmation/register_confirmation.dart b/Configurateur/front/lib/screens/register-confirmation/register_confirmation.dart
@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:footer/footer.dart';
+import 'package:footer/footer_view.dart';
 import 'package:front/components/custom_app_bar.dart';
+import 'package:front/components/custom_footer.dart';
+import 'package:front/components/custom_header.dart';
 import 'package:front/components/custom_toast.dart';
 import 'package:front/network/informations.dart';
 import 'package:front/services/size_service.dart';
@@ -56,24 +60,46 @@ class RegisterConfirmationState extends State<RegisterConfirmation> {
     DateTime lastClicked = DateTime.parse("1969-07-20 20:18:04Z");
     DateTime now = DateTime.now();
     return Scaffold(
-      appBar: CustomAppBar(
-        AppLocalizations.of(context)!.registerComfirmed,
-        context: context,
-      ),
-      body: Center(
-        child: FractionallySizedBox(
-          widthFactor: screenFormat == ScreenFormat.desktop
-              ? desktopWidthFactor
-              : tabletWidthFactor,
-          heightFactor: 0.7,
-          child: Column(
+      body: FooterView(
+        flex: 6,
+        footer: Footer(
+          padding: EdgeInsets.zero,
+          child: CustomFooter(),
+        ),
+        children: [
+          LandingAppBar(context: context),
+          Text(
+            AppLocalizations.of(context)!.registerComfirmed,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: screenFormat == ScreenFormat.desktop
+                  ? desktopBigFontSize
+                  : tabletBigFontSize,
+              fontFamily: 'Inter',
+              fontWeight: FontWeight.bold,
+              color: Provider.of<ThemeService>(context).isDark
+                  ? darkTheme.secondaryHeaderColor
+                  : lightTheme.secondaryHeaderColor,
+              shadows: [
+                Shadow(
+                  color: Provider.of<ThemeService>(context).isDark
+                      ? darkTheme.secondaryHeaderColor
+                      : lightTheme.secondaryHeaderColor,
+                  offset: const Offset(0.75, 0.75),
+                  blurRadius: 1.5,
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(height: 50),
+          Column(
             children: [
               Text(
                 AppLocalizations.of(context)!.registerMessage,
                 style: TextStyle(
                     fontSize: screenFormat == ScreenFormat.desktop
-                        ? desktopBigFontSize
-                        : tabletBigFontSize),
+                        ? desktopFontSize
+                        : tabletFontSize),
                 textAlign: TextAlign.center,
               ),
               const SizedBox(
@@ -164,7 +190,7 @@ class RegisterConfirmationState extends State<RegisterConfirmation> {
               ),
             ],
           ),
-        ),
+        ],
       ),
     );
   }