changed base url

lib/core/const.dart

@@ -1,4 +1,5 @@
 String baseUrl = 'https://eatvio.ru';
+// String baseUrl = 'https://dev2.eatvio.com';
 
 const List<int> durationValues = [7, 14, 21];
 

lib/features/diary/presentation/pages/diary_screen.dart

@@ -24,8 +24,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class DiaryScreen extends StatelessWidget {
-  const DiaryScreen({super.key});
+  const DiaryScreen({super.key, this.date});
-
+  final DateTime? date;
   @override
   Widget build(BuildContext context) {
     return const DiaryScreenContent();
@@ -52,9 +52,10 @@ class UserDiaryScreen extends StatelessWidget {
 }
 
 class DiaryScreenContent extends StatelessWidget {
-  const DiaryScreenContent({super.key, this.diaryId, this.currentPlanDay});
+  const DiaryScreenContent({super.key, this.diaryId, this.currentPlanDay, this.date});
   final int? diaryId;
   final int? currentPlanDay;
+  final DateTime? date;
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);

lib/features/diary/presentation/widgets/calendar_widget.dart

@@ -8,8 +8,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:table_calendar/table_calendar.dart';
 
 class CalendarWidget extends StatefulWidget {
-  const CalendarWidget({super.key});
+  const CalendarWidget({super.key,});  
-
   @override
   State<CalendarWidget> createState() => _CalendarWidgetState();
 }

lib/features/notifications/models/notification_model.dart

@@ -106,12 +106,16 @@ class DiaryReminderNotification implements BaseNotificationModel {
   final NotificationType type;
   @override
   final bool isRead;
-  
+  final DateTime date;
-    
+
-  DiaryReminderNotification({required this.type, required this.isRead});
+  DiaryReminderNotification({
+    required this.type,
+    required this.isRead,
+    required this.date,
+  });
 
   factory DiaryReminderNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
-    return DiaryReminderNotification(type: type, isRead: isRead ?? false);
+    return DiaryReminderNotification(type: type, isRead: isRead ?? false, date: parseDate(json['date']));
   }
 }
 

lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart

@@ -21,7 +21,8 @@ class NotificationsCubit extends Cubit<NotificationsState> {
   Future<void> connectToWebSocket() async {
     await _newNotificationsSubscription?.cancel();
     _newNotificationsSubscription = wsManager.newNotificationsStream?.listen((event) {
-      _handleNotification(event.data);
+      
+      _handleNotification(event.data, event.rootObject['created_at']);
     });
   }
 
@@ -49,8 +50,9 @@ class NotificationsCubit extends Cubit<NotificationsState> {
     }
   }
 
-  void _handleNotification(String notificationData) {
+  void _handleNotification(String notificationData, String createdAt) {
     final json = jsonDecode(notificationData) as Map<String, dynamic>;
+    json.addAll({'date': createdAt});
     final stringifiedType = json['notification_class_name'];
     final type = NotificationType.getTypeFromString(stringifiedType);
     final notification = _parseNotification(json, type);

lib/features/notifications/presentation/widgets/notification_widget.dart

@@ -27,7 +27,7 @@ class NotificationWidget extends StatelessWidget {
           notification: notification as ChosenPlanTomorrowReminderToClientNotification,
         ),
       DiaryReminderNotification() => _DiaryReminderWidget(
-          notification: notification as DiaryReminderNotification,
+          notification: notification as DiaryReminderNotification,          
         ),
       ConsultantLeftCommentNotification() => _ConsultantLeftCommentWidget(
           notification: notification as ConsultantLeftCommentNotification,
@@ -121,6 +121,9 @@ class _DiaryReminderWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     final s = S.of(context);
     return _BaseNotificationWidget(
+      onTap: () {
+        GoRouter.of(context).go('/diary');
+      },
       isRead: notification.isRead,
       notificationsText: s.fillYasterday,
     );
@@ -252,32 +255,36 @@ class _ChosenPlanFinishedToConsultantWidget extends StatelessWidget {
 
 // CardSettingsScreen
 class _BaseNotificationWidget extends StatelessWidget {
-  const _BaseNotificationWidget({required this.notificationsText, required this.isRead});
+  const _BaseNotificationWidget({required this.notificationsText, required this.isRead, this.onTap});
   final String notificationsText;
   final bool isRead;
+  final Function()? onTap;
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return GestureDetector(
-      children: [
+      onTap: onTap,
-        SizedBox(
+      child: Row(
-          width: MediaQuery.sizeOf(context).width * 0.6,
+        children: [
-          child: Text(
+          SizedBox(
-            notificationsText,
+            width: MediaQuery.sizeOf(context).width * 0.6,
-            style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+            child: Text(
-          ),
+              notificationsText,
-        ),
+              style: TextStyles.textMMedium.copyWith(color: appTheme.black),
-        if (!isRead) ...[
-          const Spacer(),
-          Container(
-            decoration: BoxDecoration(
-              color: appTheme.blueA400,
-              shape: BoxShape.circle,
             ),
-            width: 8,
+          ),
-            height: 8,
+          if (!isRead) ...[
-          )
+            const Spacer(),
-        ]
+            Container(
-      ],
+              decoration: BoxDecoration(
+                color: appTheme.blueA400,
+                shape: BoxShape.circle,
+              ),
+              width: 8,
+              height: 8,
+            )
+          ]
+        ],
+      ),
     );
   }
 }

lib/features/notifications/service/notifications_service.dart

@@ -24,7 +24,9 @@ class NotificationsService {
                 ChosenPlanStartedToClientNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
               NotificationType.chosenPlanTomorrowReminderToClientNotification =>
                 ChosenPlanTomorrowReminderToClientNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
+              NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(
+                  (notificationJson['data'] as Map<String, dynamic>).putIfAbsent('date', () => notificationJson['created_at']), type,
+                  isRead: readDate != null),
               NotificationType.consultantLeftComment => ConsultantLeftCommentNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
               NotificationType.personalizedDietIsDefined =>
                 PersonalizedDietIsDefinedNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),