Skip to content
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

Test #244

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Test #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcdc9cd
Fix Journeys search bar bug
shah-esha Oct 28, 2024
4b03dd2
Add necessary documentation for 'journeys_page.dart'
shah-esha Oct 28, 2024
ca8f8f1
Add checking against Journey event name and simplifying code
shah-esha Nov 5, 2024
3148e8d
test
shah-esha Jan 4, 2025
9d566bb
test
shah-esha Jan 22, 2025
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
1 change: 1 addition & 0 deletions admin/src/components/Achievements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,3 +341,4 @@ export function Achievements() {
</>
);
}
//test
1 change: 1 addition & 0 deletions game/lib/challenges/challenges_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import 'package:velocity_x/velocity_x.dart';
import 'challenge_cell.dart';
import 'package:game/journeys/filter_form.dart';

//this is a test
class ChallengeCellDto {
ChallengeCellDto({
required this.location,
Expand Down
78 changes: 47 additions & 31 deletions game/lib/journeys/journeys_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import 'package:game/utils/utility_functions.dart';
import 'package:provider/provider.dart';
import 'package:velocity_x/velocity_x.dart';

/** A Data Transfer Object that holds information about a challenge
* cell in the UI */
class JourneyCellDto {
JourneyCellDto({
required this.location,
Expand Down Expand Up @@ -67,6 +69,14 @@ class JourneysPage extends StatefulWidget {
State<JourneysPage> createState() => _JourneysPageState();
}

/**
* '_JourneysPageState' - Manages and displays a list of journeys, filtered by criteria such as difficulty, name, and more.
*
* @remarks
* This class handles the layout and logic for displaying journeys on the Journeys page.
* It builds `Journey` widgets and applies any filters set by the search bar
* or user selections to show only the relevant journeys.
*/
class _JourneysPageState extends State<JourneysPage> {
List<String> selectedCategories = [];
List<String> selectedLocations = [];
Expand Down Expand Up @@ -160,51 +170,57 @@ class _JourneysPageState extends State<JourneysPage> {

final challengeLocation = challenge.location?.name ?? "";
final challengeName = challenge.name ?? "";
final String eventName = event.name ?? "";

bool eventMatchesDifficultySelection = true;
bool eventMatchesCategorySelection = true;
bool eventMatchesLocationSelection = true;
bool eventMatchesSearchText = true;
String? searchTerm = widget.mySearchText;
String searchTerm = widget.mySearchText ?? "";

if (searchTerm?.length == 0) {
eventMatchesSearchText = true;
if (widget.myDifficulty?.length == 0 ||
widget.myDifficulty == event.difficulty?.name)
eventMatchesDifficultySelection = true;
else
eventMatchesDifficultySelection = false;
if (widget.myDifficulty?.length == 0 ||
widget.myDifficulty == event.difficulty?.name)
eventMatchesDifficultySelection = true;
else
eventMatchesDifficultySelection = false;

if (widget.myLocations?.isNotEmpty ?? false) {
if (widget.myLocations?.contains(challengeLocation) ??
false)
eventMatchesLocationSelection = true;
else
eventMatchesLocationSelection = false;
} else
if (widget.myLocations?.isNotEmpty ?? false) {
if (widget.myLocations?.contains(challengeLocation) ??
false)
eventMatchesLocationSelection = true;
else
eventMatchesLocationSelection = false;
} else
eventMatchesLocationSelection = true;

if (widget.myCategories?.isNotEmpty ?? false) {
if (widget.myCategories
?.contains(event.category?.name) ??
false)
eventMatchesCategorySelection = true;
else
eventMatchesCategorySelection = false;
} else
if (widget.myCategories?.isNotEmpty ?? false) {
if (widget.myCategories
?.contains(event.category?.name) ??
false)
eventMatchesCategorySelection = true;
else
eventMatchesCategorySelection = false;
} else
eventMatchesCategorySelection = true;

if (searchTerm.length == 0) {
eventMatchesSearchText = true;
} else {
if (searchTerm != null &&
challengeLocation
.toLowerCase()
.contains(searchTerm.toLowerCase())) {
if (challengeLocation
.toLowerCase()
.contains(searchTerm.toLowerCase())) {
eventMatchesSearchText = true;
} else {
eventMatchesSearchText = false;
if (searchTerm != null &&
challengeName
.toLowerCase()
.contains(searchTerm.toLowerCase())) {
if (challengeName
.toLowerCase()
.contains(searchTerm.toLowerCase())) {
eventMatchesSearchText = true;
} else
eventMatchesSearchText = false;
if (eventName
.toLowerCase()
.contains(searchTerm.toLowerCase())) {
eventMatchesSearchText = true;
} else
eventMatchesSearchText = false;
Expand Down
36 changes: 18 additions & 18 deletions game/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
url: "https://pub.dev"
source: hosted
version: "0.18.1"
version: "0.19.0"
js:
dependency: transitive
description:
Expand Down Expand Up @@ -593,26 +593,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "3.0.1"
linkify:
dependency: transitive
description:
Expand Down Expand Up @@ -681,18 +681,18 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.15.0"
mgrs_dart:
dependency: transitive
description:
Expand Down Expand Up @@ -1078,10 +1078,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.7.2"
tuple:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1214,18 +1214,18 @@ packages:
dependency: "direct main"
description:
name: velocity_x
sha256: "38585b8ed87c17ccb42a5c13d55bdafdc65e7cd3f41dceb61c38714c758fa228"
sha256: "99b910c80cc2010b184ef921f0af6894a8d632e13169cf77e6f6cb5a7f310698"
url: "https://pub.dev"
source: hosted
version: "4.1.2"
version: "4.2.1"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "13.0.0"
version: "14.2.5"
vxstate:
dependency: transitive
description:
Expand Down
Loading