mirror of
https://github.com/SyncrowIOT/web.git
synced 2025-08-26 08:09:41 +00:00
Compare commits
15 Commits
bugfix/ass
...
SP-1917-FE
Author | SHA1 | Date | |
---|---|---|---|
3859dc67d8 | |||
f1aab13263 | |||
a56e422bf5 | |||
8f71fcb96a | |||
c403048da7 | |||
8ae4e561c2 | |||
7f3dfebf15 | |||
59058cf2d2 | |||
b738596b50 | |||
995ce480cb | |||
b41733ee40 | |||
fe090175e3 | |||
85544c69f8 | |||
9f71bbff63 | |||
deb227034a |
@ -1,4 +1,3 @@
|
||||
// booking_page.dart
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:calendar_view/calendar_view.dart';
|
||||
@ -20,7 +19,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
|
||||
import 'package:syncrow_web/utils/constants/assets.dart';
|
||||
|
||||
class BookingPage extends StatefulWidget {
|
||||
const BookingPage({super.key});
|
||||
final PageController? pageController;
|
||||
const BookingPage({super.key, this.pageController});
|
||||
|
||||
@override
|
||||
State<BookingPage> createState() => _BookingPageState();
|
||||
@ -42,12 +42,15 @@ class _BookingPageState extends State<BookingPage> {
|
||||
),
|
||||
),
|
||||
],
|
||||
child: _BookingPageContent(),
|
||||
child: _BookingPageContent(widget.pageController),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _BookingPageContent extends StatefulWidget {
|
||||
final PageController? pageController;
|
||||
const _BookingPageContent(this.pageController);
|
||||
|
||||
@override
|
||||
State<_BookingPageContent> createState() => _BookingPageContentState();
|
||||
}
|
||||
@ -90,8 +93,7 @@ class _BookingPageContentState extends State<_BookingPageContent> {
|
||||
return BlocListener<SelectedBookableSpaceBloc, SelectedBookableSpaceState>(
|
||||
listener: (context, state) {
|
||||
if (state.selectedBookableSpace != null) {
|
||||
// Reset events and clear cache when room changes
|
||||
context.read<CalendarEventsBloc>().add(ResetEvents());
|
||||
context.read<CalendarEventsBloc>().add(const ResetEvents());
|
||||
_loadEvents(context);
|
||||
}
|
||||
},
|
||||
@ -176,7 +178,9 @@ class _BookingPageContentState extends State<_BookingPageContent> {
|
||||
SvgTextButton(
|
||||
svgAsset: Assets.homeIcon,
|
||||
label: 'Manage Bookable Spaces',
|
||||
onPressed: () {},
|
||||
onPressed: () {
|
||||
widget.pageController!.jumpToPage(2);
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
SvgTextButton(
|
||||
@ -237,7 +241,6 @@ class _BookingPageContentState extends State<_BookingPageContent> {
|
||||
.watch<DateSelectionBloc>()
|
||||
.state
|
||||
.selectedDateFromSideBarCalender,
|
||||
// isLoading: eventState is EventsLoading,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
@ -19,6 +19,7 @@ class WeekNavigation extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
width: 250,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
|
||||
decoration: BoxDecoration(
|
||||
color: ColorsManager.circleRolesBackground,
|
||||
@ -32,6 +33,8 @@ class WeekNavigation extends StatelessWidget {
|
||||
],
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
IconButton(
|
||||
iconSize: 15,
|
||||
@ -40,12 +43,16 @@ class WeekNavigation extends StatelessWidget {
|
||||
onPressed: onPreviousWeek,
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Text(
|
||||
_getMonthYearText(weekStart, weekEnd),
|
||||
style: const TextStyle(
|
||||
color: ColorsManager.lightGrayColor,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w400,
|
||||
SizedBox(
|
||||
width: 120,
|
||||
child: Text(
|
||||
_getMonthYearText(weekStart, weekEnd),
|
||||
style: const TextStyle(
|
||||
color: ColorsManager.lightGrayColor,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
|
@ -1,57 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/icon_text_button.dart';
|
||||
|
||||
import 'package:syncrow_web/utils/constants/assets.dart';
|
||||
|
||||
class BookingPage extends StatelessWidget {
|
||||
final PageController pageController;
|
||||
const BookingPage({
|
||||
super.key,
|
||||
required this.pageController,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Container(
|
||||
color: Colors.blueGrey[100],
|
||||
child: const Center(
|
||||
child: Text(
|
||||
'Side bar',
|
||||
style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
|
||||
),
|
||||
),
|
||||
)),
|
||||
Expanded(
|
||||
flex: 4,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: SizedBox(
|
||||
child: Column(
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
SvgTextButton(
|
||||
svgAsset: Assets.homeIcon,
|
||||
label: 'Manage Bookable Spaces',
|
||||
onPressed: () {
|
||||
pageController.jumpToPage(2);
|
||||
}),
|
||||
const SizedBox(width: 20),
|
||||
SvgTextButton(
|
||||
svgAsset: Assets.groupIcon,
|
||||
label: 'Manage Users',
|
||||
onPressed: () {})
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
))
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
@ -2,9 +2,8 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
|
||||
import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
|
||||
import 'package:syncrow_web/pages/access_management/booking_system/view/booking_page.dart';
|
||||
import 'package:syncrow_web/pages/access_management/manage_bookable_spaces/presentation/screens/manage_bookable_spaces_screen.dart';
|
||||
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/booking_page.dart' hide BookingPage;
|
||||
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/booking_page.dart';
|
||||
import 'package:syncrow_web/pages/access_management/view/access_overview_content.dart';
|
||||
import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
|
||||
import 'package:syncrow_web/utils/extension/build_context_x.dart';
|
||||
|
@ -1,6 +1,7 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:syncrow_web/utils/color_manager.dart';
|
||||
import 'space_tree_dropdown_bloc.dart';
|
||||
|
||||
class DropdownMenuContent extends StatefulWidget {
|
||||
@ -75,7 +76,8 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
|
||||
child: TextFormField(
|
||||
controller: _searchController,
|
||||
onChanged: _handleSearch,
|
||||
style: const TextStyle(fontSize: 14, color: Colors.black),
|
||||
style: const TextStyle(
|
||||
fontSize: 14, color: ColorsManager.blackColor),
|
||||
decoration: InputDecoration(
|
||||
hintText: 'Search for space...',
|
||||
prefixIcon: const Icon(Icons.search, size: 20),
|
||||
@ -84,6 +86,12 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
borderSide: const BorderSide(
|
||||
color: ColorsManager.dropDownSelectBlue,
|
||||
),
|
||||
),
|
||||
isDense: true,
|
||||
),
|
||||
),
|
||||
@ -117,7 +125,9 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
|
||||
title: Text(
|
||||
community.name,
|
||||
style: TextStyle(
|
||||
color: isSelected ? Colors.blue : Colors.black,
|
||||
color: isSelected
|
||||
? ColorsManager.dropDownSelectBlue
|
||||
: ColorsManager.blackColor,
|
||||
fontWeight:
|
||||
isSelected ? FontWeight.bold : FontWeight.normal,
|
||||
),
|
||||
|
@ -52,7 +52,7 @@ class SpaceDropdown extends StatelessWidget {
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: selectedValue == space.uuid
|
||||
? ColorsManager.dialogBlueTitle
|
||||
? ColorsManager.dropDownSelectBlue
|
||||
: ColorsManager.blackColor,
|
||||
),
|
||||
),
|
||||
@ -61,7 +61,7 @@ class SpaceDropdown extends StatelessWidget {
|
||||
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
||||
fontSize: 12,
|
||||
color: selectedValue == space.uuid
|
||||
? ColorsManager.dialogBlueTitle
|
||||
? ColorsManager.dropDownSelectBlue
|
||||
: ColorsManager.blackColor,
|
||||
),
|
||||
),
|
||||
|
@ -508,8 +508,8 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
|
||||
horizontal: context.screenWidth * 0.3,
|
||||
vertical: context.screenHeight * 0.3,
|
||||
),
|
||||
minScale: 0.5,
|
||||
maxScale: 3.0,
|
||||
minScale: 0.3,
|
||||
maxScale: 4.5,
|
||||
constrained: false,
|
||||
child: SizedBox(
|
||||
width: context.screenWidth * 5,
|
||||
|
@ -85,6 +85,8 @@ abstract class ColorsManager {
|
||||
static const Color minBlue = Color(0xFF93AAFD);
|
||||
static const Color minBlueDot = Color(0xFF023DFE);
|
||||
static const Color grey25 = Color(0xFFF9F9F9);
|
||||
static const Color dropDownSelectBlue = Color(0xFF2196F3);
|
||||
static const Color drpoDownSelectBlue = Color(0xFF2196F3);
|
||||
static const Color grey50 = Color(0xFF718096);
|
||||
static const Color red100 = Color(0xFFFE0202);
|
||||
static const Color grey800 = Color(0xffF8F8F8);
|
||||
@ -93,4 +95,5 @@ abstract class ColorsManager {
|
||||
static const Color shadowOfDetailsContainer = Color(0x40000000);
|
||||
static const Color checkBoxBorderGray = Color(0xffD0D0D0);
|
||||
static const Color timePickerColor = Color(0xff000000);
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user