Skip to content

Develop into main #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Develop into main #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
253b462
fixed grey block on upcoming event release version and null error
MonikaTheiss Sep 29, 2024
3709e74
hotfix on Develop to fix GameyCon
pieryvdl Sep 29, 2024
b1d230c
Merge pull request #644 from COS301-SE-2024/fix/upcomingEvents
MonikaTheiss Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 assets/images/sad_icon.svg → assets/icons/sad_icon.svg
View file
Open in desktop
File renamed without changes
0 assets/images/start_hearts.svg → assets/icons/start_hearts.svg
View file
Open in desktop
File renamed without changes
44 changes: 23 additions & 21 deletions assets/tiles/GameyCon.tiled-session
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
"expandedProjectPaths": [
"."
],
"file.lastUsedOpenFilter": "All Files (*)",
"fileStates": {
"GameyCon.tsx": {
"scaleInDock": 1
"scaleInDock": 1,
"scaleInEditor": 1
},
"Level-1.tmx": {
"expandedObjectLayers": [
Expand All @@ -18,56 +20,56 @@
"scale": 1.3240625,
"selectedLayer": 1,
"viewCenter": {
"x": 191.45621902289358,
"y": 320.2265754071277
"x": 184.658956809063,
"y": 221.2886476280387
}
},
"Level-2.tmx": {
"expandedObjectLayers": [
2,
3
3,
2
],
"scale": 1.3240625,
"selectedLayer": 1,
"viewCenter": {
"x": 259.42884116119893,
"y": 320.2265754071277
"x": 183.90370545197072,
"y": 319.84894972858154
}
},
"Level-3.tmx": {
"expandedObjectLayers": [
2,
3
3,
2
],
"scale": 1.3240625,
"selectedLayer": 1,
"viewCenter": {
"x": 183.90370545197072,
"y": 320.2265754071277
"y": 319.84894972858154
}
},
"Level-4.tmx": {
"expandedObjectLayers": [
2,
3
3,
2
],
"scale": 1.3240625,
"selectedLayer": 1,
"viewCenter": {
"x": 249.61057351899927,
"y": 320.2265754071277
"x": 183.90370545197072,
"y": 319.84894972858154
}
},
"Level-5.tmx": {
"expandedObjectLayers": [
2,
3
3,
2
],
"scale": 1.3240625,
"selectedLayer": 1,
"viewCenter": {
"x": 183.90370545197072,
"y": 320.2265754071277
"x": 175.5959405239556,
"y": 529.4312013216899
}
},
"Level-6.tmx": {
Expand Down Expand Up @@ -95,14 +97,14 @@
"project": "GameyCon.tiled-project",
"property.type": "string",
"recentFiles": [
"Level-6.tmx",
"Level-5.tmx",
"Level-1.tmx",
"Level-2.tmx",
"Level-3.tmx",
"Level-4.tmx",
"level-1.tmx",
"Level-5.tmx",
"GameyCon.tsx",
"Level-6.tmx",
"level-1.tmx",
"level-2.tmx"
],
"tileset.lastUsedFormat": "tsx",
Expand Down
4 changes: 2 additions & 2 deletions lib/services/events_S/event_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
}
}

List<Event> getPublicEvents(List<Event> e) {
List<Event> getPublicEvents(List<Event>? e) {

Check warning on line 41 in lib/services/events_S/event_service.dart

View check run for this annotation

Codecov / codecov/patch

lib/services/events_S/event_service.dart#L41 

Added line #L41 was not covered by tests
List<Event> all = [];
for (var x in e) {
for (var x in e!) {

Check warning on line 43 in lib/services/events_S/event_service.dart

View check run for this annotation

Codecov / codecov/patch

lib/services/events_S/event_service.dart#L43 

Added line #L43 was not covered by tests
if (x.privacy == true && !DateTime.now().isAfter(x.endDate)) {
all.add(x);
}
Expand Down
4 changes: 3 additions & 1 deletion lib/view/components/events/joined_event_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
child: Padding(
padding: EdgeInsetsDirectional.fromSTEB(
11.61.pixelScale(context), 11.61.pixelScale(context), 11.61.pixelScale(context), 11.61.pixelScale(context)),
child: Expanded(
child: Flex(direction: Axis.horizontal,children: [Expanded(

Check warning on line 87 in lib/view/components/events/joined_event_card.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/components/events/joined_event_card.dart#L87 

Added line #L87 was not covered by tests
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -154,6 +154,8 @@
],
),
),
],
),
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/view/components/home/event_invite_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class _EventInvitesListState extends State<EventInvitesList> {
fontSize: 20,
fontWeight: FontWeight.bold)),
SvgPicture.asset(
'assets/images/sad_icon.svg',
'assets/icons/sad_icon.svg',
height: 75,
fit: BoxFit.contain,
)
Expand Down
10 changes: 5 additions & 5 deletions lib/view/pages/events/view_events_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
final BadgeService _badgeService = BadgeService();
final scaffoldKey = GlobalKey<ScaffoldState>();
EventsService events = EventsService();
List<Event>? allEvents;
List<Event> allEvents =[] ;
List<Event>? publicAllEvents;
List<Event>? subscribedEvents;
List<Event>? myEvents;
Expand All @@ -45,7 +45,7 @@
}

void getAllEvents() async {
publicAllEvents = events.getPublicEvents(allEvents!);
publicAllEvents = events.getPublicEvents(allEvents);

Check warning on line 48 in lib/view/pages/events/view_events_page.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/pages/events/view_events_page.dart#L48 

Added line #L48 was not covered by tests
subscribedEvents = events.getSubscribedEvents(allEvents);
myEvents = events.getMyEvents(allEvents);
joinedEvents = events.getJoinedEvents(allEvents);
Expand Down Expand Up @@ -96,7 +96,7 @@
.orderBy('start_date', descending: false)
.snapshots(),
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
if (snapshot.connectionState == ConnectionState.waiting ) {

Check warning on line 99 in lib/view/pages/events/view_events_page.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/pages/events/view_events_page.dart#L99 

Added line #L99 was not covered by tests
return Center(
child: LoadingAnimationWidget.halfTriangleDot(
color: Theme.of(context).colorScheme.primary,
Expand All @@ -105,12 +105,12 @@
);
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error}');
} else if (snapshot.hasData) {
} else if (snapshot.hasData ) {

Check warning on line 108 in lib/view/pages/events/view_events_page.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/pages/events/view_events_page.dart#L108 

Added line #L108 was not covered by tests
allEvents = [];
for (var x in snapshot.data!.docs) {
var data = x.data() as Map<String, dynamic>;
Event event = Event.fromMap(data, x.id);
allEvents?.add(event);
allEvents.add(event);

Check warning on line 113 in lib/view/pages/events/view_events_page.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/pages/events/view_events_page.dart#L113 

Added line #L113 was not covered by tests
}
getAllEvents();
return DefaultTabController(
Expand Down
6 changes: 3 additions & 3 deletions lib/view/pages/home/home_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,11 @@
),
Row(
children: [
SvgPicture.asset(
'assets/images/start_hearts.svg',
SvgPicture.asset(

Check warning on line 387 in lib/view/pages/home/home_page.dart

View check run for this annotation

Codecov / codecov/patch

lib/view/pages/home/home_page.dart#L387 

Added line #L387 was not covered by tests
'assets/icons/start_hearts.svg',
width: 110,
fit: BoxFit.contain,
),
),
SizedBox(width: 10),
Icon(
Icons.arrow_forward_ios,
Expand Down
Loading