Skip to content

Commit

Permalink
Merge pull request #30 from B3-3iL-DLW/feat/user-cache
Browse files Browse the repository at this point in the history
Feat/user cache
  • Loading branch information
julesartd authored Mar 13, 2024
2 parents 8c97906 + a706dd7 commit 8441e2c
Show file tree
Hide file tree
Showing 26 changed files with 461 additions and 183 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/app_student/assets/images/3il-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
143 changes: 143 additions & 0 deletions frontend/app_student/flutter_native_splash.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
flutter_native_splash:
# This package generates native code to customize Flutter's default white native splash screen
# with background color and splash image.
# Customize the parameters below, and run the following command in the terminal:
# dart run flutter_native_splash:create
# To restore Flutter's default white splash screen, run the following command in the terminal:
# dart run flutter_native_splash:remove

# IMPORTANT NOTE: These parameter do not affect the configuration of Android 12 and later, which
# handle splash screens differently that prior versions of Android. Android 12 and later must be
# configured specifically in the android_12 section below.

# color or background_image is the only required parameter. Use color to set the background
# of your splash screen to a solid color. Use background_image to set the background of your
# splash screen to a png image. This is useful for gradients. The image will be stretch to the
# size of the app. Only one parameter can be used, color and background_image cannot both be set.
color: "#42a5f5"
#background_image: "assets/background.png"

# Optional parameters are listed below. To enable a parameter, uncomment the line by removing
# the leading # character.

# The image parameter allows you to specify an image used in the splash screen. It must be a
# png file and should be sized for 4x pixel density.
#image: assets/images/3il-logo-white.jpeg

# The branding property allows you to specify an image used as branding in the splash screen.
# It must be a png file. It is supported for Android, iOS and the Web. For Android 12,
# see the Android 12 section below.
branding: assets/images/3il-logo-white.jpeg
# To position the branding image at the bottom of the screen you can use bottom, bottomRight,
# and bottomLeft. The default values is bottom if not specified or specified something else.
#branding_mode: bottom

# The color_dark, background_image_dark, image_dark, branding_dark are parameters that set the background
# and image when the device is in dark mode. If they are not specified, the app will use the
# parameters from above. If the image_dark parameter is specified, color_dark or
# background_image_dark must be specified. color_dark and background_image_dark cannot both be
# set.
#color_dark: "#042a49"
#background_image_dark: "assets/dark-background.png"
#image_dark: assets/splash-invert.png
#branding_dark: assets/dart_dark.png

# From Android 12 onwards, the splash screen is handled differently than in previous versions.
# Please visit https://developer.android.com/guide/topics/ui/splash-screen
# Following are specific parameters for Android 12+.
android_12:
# The image parameter sets the splash screen icon image. If this parameter is not specified,
# the app's launcher icon will be used instead.
# Please note that the splash screen will be clipped to a circle on the center of the screen.
# App icon with an icon background: This should be 960×960 pixels, and fit within a circle
# 640 pixels in diameter.
# App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle
# 768 pixels in diameter.
#image: assets/android12splash.png

# Splash screen background color.
#color: "#42a5f5"

# App icon background color.
#icon_background_color: "#111111"

# The branding property allows you to specify an image used as branding in the splash screen.
branding: assets/images/3il-logo-white.jpeg

# The image_dark, color_dark, icon_background_color_dark, and branding_dark set values that
# apply when the device is in dark mode. If they are not specified, the app will use the
# parameters from above.
#image_dark: assets/android12splash-invert.png
#color_dark: "#042a49"
#icon_background_color_dark: "#eeeeee"

# The android, ios and web parameters can be used to disable generating a splash screen on a given
# platform.
#android: false
#ios: false
#web: false

# Platform specific images can be specified with the following parameters, which will override
# the respective parameter. You may specify all, selected, or none of these parameters:
#color_android: "#42a5f5"
#color_dark_android: "#042a49"
#color_ios: "#42a5f5"
#color_dark_ios: "#042a49"
#color_web: "#42a5f5"
#color_dark_web: "#042a49"
#image_android: assets/splash-android.png
#image_dark_android: assets/splash-invert-android.png
#image_ios: assets/splash-ios.png
#image_dark_ios: assets/splash-invert-ios.png
#image_web: assets/splash-web.gif
#image_dark_web: assets/splash-invert-web.gif
#background_image_android: "assets/background-android.png"
#background_image_dark_android: "assets/dark-background-android.png"
#background_image_ios: "assets/background-ios.png"
#background_image_dark_ios: "assets/dark-background-ios.png"
#background_image_web: "assets/background-web.png"
#background_image_dark_web: "assets/dark-background-web.png"
#branding_android: assets/brand-android.png
#branding_dark_android: assets/dart_dark-android.png
#branding_ios: assets/brand-ios.png
#branding_dark_ios: assets/dart_dark-ios.png
#branding_web: assets/brand-web.gif
#branding_dark_web: assets/dart_dark-web.gif

# The position of the splash image can be set with android_gravity, ios_content_mode, and
# web_image_mode parameters. All default to center.
#
# android_gravity can be one of the following Android Gravity (see
# https://developer.android.com/reference/android/view/Gravity): bottom, center,
# center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal,
# fill_vertical, left, right, start, or top.
#android_gravity: center
#
# ios_content_mode can be one of the following iOS UIView.ContentMode (see
# https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill,
# scaleAspectFit, scaleAspectFill, center, top, bottom, left, right, topLeft, topRight,
# bottomLeft, or bottomRight.
#ios_content_mode: center
#
# web_image_mode can be one of the following modes: center, contain, stretch, and cover.
#web_image_mode: center

# The screen orientation can be set in Android with the android_screen_orientation parameter.
# Valid parameters can be found here:
# https://developer.android.com/guide/topics/manifest/activity-element#screen
#android_screen_orientation: sensorLandscape

# To hide the notification bar, use the fullscreen parameter. Has no effect in web since web
# has no notification bar. Defaults to false.
# NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads.
# To show the notification bar, add the following code to your Flutter app:
# WidgetsFlutterBinding.ensureInitialized();
# SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: [SystemUiOverlay.bottom, SystemUiOverlay.top], );
#fullscreen: true

# If you have changed the name(s) of your info.plist file(s), you can specify the filename(s)
# with the info_plist_files parameter. Remove only the # characters in the three lines below,
# do not remove any spaces:
#info_plist_files:
# - 'ios/Runner/Info-Debug.plist'
# - 'ios/Runner/Info-Release.plist'
6 changes: 2 additions & 4 deletions frontend/app_student/lib/api/users/entities/user_entity.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import 'package:app_student/api/class_groups/entities/class_group_entity.dart';

class UserEntity {
final String ine;
final String firstName;
final DateTime birthDate;
final ClassGroupEntity? classGroup;
final String? className;

UserEntity(
{required this.ine,
required this.firstName,
required this.birthDate,
this.classGroup});
this.className = ''});
}
1 change: 1 addition & 0 deletions frontend/app_student/lib/api/users/models/user_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ class UserModel {
String get file => entity.ine;
String get name => entity.firstName;
DateTime get birthDate => entity.birthDate;
String? get className => entity.className ?? '';
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import 'package:app_student/api/users/models/user_model.dart';
import 'package:shared_preferences/shared_preferences.dart';

import '../entities/user_entity.dart';

class UserRepository {
Future<UserModel> getUser() async {
final SharedPreferences prefs = await SharedPreferences.getInstance();

String? ine = prefs.getString('ine');
String? name = prefs.getString('name');
String? birthDate = prefs.getString('birthDate');
String? className = prefs.getString('className');
if (ine != null && name != null && birthDate != null) {
return UserModel(
entity: UserEntity(
ine: ine,
firstName: name,
birthDate: DateTime.parse(birthDate),
className: className,
),
);
} else {
throw Exception('Utilisateur non trouvé');
}
}

Future<void> saveUserDetails(
String ine, String name, String birthDate, String className) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
UserModel(
entity: UserEntity(
ine: ine,
firstName: name,
birthDate: DateTime.parse(birthDate),
className: className,
),
);
await prefs.setString('ine', ine);
await prefs.setString('name', name);
await prefs.setString('birthDate', birthDate);
await prefs.setString('className', className);
}

Future<void> deleteUser() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.remove('ine');
await prefs.remove('name');
await prefs.remove('birthDate');
await prefs.remove('className');
}

Future<void> saveUserClass(String className) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString('className', className);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:app_student/api/week_schedule/models/week_schedule_model.dart';
class WeekScheduleRepository {
final ApiService apiService;

WeekScheduleRepository({required this.apiService, required String className});
WeekScheduleRepository({required this.apiService});

Future<List<WeekScheduleModel>> getWeeksSchedule(className) {
return apiService.getData('/api/timetable?class_param=$className', (item) {
Expand Down
19 changes: 17 additions & 2 deletions frontend/app_student/lib/class_groups/cubit/class_group_cubit.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,37 @@
import 'package:app_student/api/class_groups/models/class_group_model.dart';
import 'package:app_student/api/class_groups/repositories/class_group_repository.dart';
import 'package:app_student/api/users/models/user_model.dart';
import 'package:bloc/bloc.dart';
import 'package:meta/meta.dart';

import '../../api/class_groups/repositories/class_group_repository.dart';
import '../../api/users/repositories/user_repository.dart';

part 'class_group_state.dart';

class ClassGroupCubit extends Cubit<ClassGroupState> {
final ClassGroupRepository classRepository;
final UserRepository userRepository;

ClassGroupCubit({required this.classRepository}) : super(ClassGroupInitial());
ClassGroupCubit({required this.classRepository, required this.userRepository})
: super(ClassGroupInitial());

Future<void> fetchClasses() async {
try {
emit(ClassGroupLoading());
final classes = await classRepository.getClasses();

emit(ClassGroupLoaded(classes));
} catch (e) {
emit(ClassGroupError(e.toString()));
}
}

Future<UserModel> getConnectedUser() async {
return userRepository.getUser();
}

Future<void> saveClass(ClassGroupModel classGroup) async {
await userRepository.saveUserClass(classGroup.name.toString());
emit(ClassGroupSelected());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ class ClassGroupLoaded extends ClassGroupState {
class ClassGroupError extends ClassGroupState {
final String message;

ClassGroupError(this.message);
ClassGroupError([this.message = 'An error occurred']);
}

class ClassGroupSelected extends ClassGroupState {}
70 changes: 70 additions & 0 deletions frontend/app_student/lib/class_groups/views/class_group_page.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import 'package:app_student/api/class_groups/repositories/class_group_repository.dart';
import 'package:app_student/class_groups/cubit/class_group_cubit.dart';
import 'package:app_student/class_groups/views/widgets/card_list.dart';
import 'package:app_student/class_groups/views/widgets/header/header_logo.dart';
import 'package:app_student/class_groups/views/widgets/header/header_text.dart';
import 'package:app_student/class_groups/views/widgets/header/header_title.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';

import '../../api/users/models/user_model.dart';
import '../../api/users/repositories/user_repository.dart';

class ClassGroupPage extends StatelessWidget {
const ClassGroupPage({super.key});

@override
Widget build(BuildContext context) {
final classRepository =
RepositoryProvider.of<ClassGroupRepository>(context);
final userRepository = RepositoryProvider.of<UserRepository>(context);
final classCubit = ClassGroupCubit(
classRepository: classRepository, userRepository: userRepository);

return BlocProvider<ClassGroupCubit>(
create: (context) => classCubit..fetchClasses(),
child: FutureBuilder<UserModel>(
future: context.read<ClassGroupCubit>().getConnectedUser(),
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else if (snapshot.hasError) {
return Center(child: Text('Erreur: ${snapshot.error}'));
} else {
final user = snapshot.data;
return Scaffold(
body: BlocBuilder<ClassGroupCubit, ClassGroupState>(
builder: (context, state) {
if (state is ClassGroupLoading) {
return const Center(child: CircularProgressIndicator());
} else if (state is ClassGroupSelected) {
WidgetsBinding.instance.addPostFrameCallback((_) {
context.go('/schedule');
});
return const SizedBox.shrink();
} else if (state is ClassGroupLoaded) {
return Column(
children: [
const HeaderLogo(),
HeaderTitle('Bonjour, ${user?.name}'),
const HeaderText('Choisis ta promotion :'),
Expanded(
child: CardList(classesList: state.classes),
),
],
);
} else if (state is ClassGroupError) {
return Center(child: Text(state.message));
} else {
return const SizedBox.shrink();
}
},
),
);
}
},
),
);
}
}
Loading

0 comments on commit 8441e2c

Please sign in to comment.