-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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 pr #241
Open
shah-esha
wants to merge
308
commits into
master
Choose a base branch
from
test_pr
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…when panel slides up. - Switched to Material Icons from Cupertino Icons. - Removed Floating Action Button for opening side menu from the body. This allows it to retain its opacity when the sliding panel slides up. - Also fixed README markdown syntax.
* Improved docker behavior. * Added URL capability to database. * Fixed readme. * Added SSL. * Allow self-signed certs. * Fix style. * Added admin page hosting.
Created empty screens for Leaderboard, Suggestions, Visited places, Feedback, and Settings. Implemented navigation routes to the home screen from these screens. Added a back button widget.
Implemented Leaderboard cells. Populated screen with dummy data.
Fixed error for 'bolt_rounded' not found. Changed position of FAB button.
* Added authentication. * Fixed env file. * Added default event. * Added default event and fixed auth. * Guarded all user gateways. * Migrated from TypeORM to MikroORM. * Fixed UserGuard and query. * Fixed some errors. * Fixed build error.
Added FAB animation for navigation. Tested on 2 viewports - iPhone 13 Pro Max and iPhone SE.
Removed Cupertino Icons, changed menu FAB, added animations b/w navigation.
Fix android pixel build error
Require all non-dev auth to be @cornell.edu
* Add google sign in. * Fixed plists. * Added google signin and started to add the api. * Added access refreshing and fixed warnings. * Added flutter ci. * Added github workflow for ci. * Try fix ci. * Add sudo. * Added sudo command. * Change ci back. * Changed ls command. * Check lib folder. * Check widgets. * Check deep ls. * Test dockerignore fix. * Full ls command. * Attempting to fix ci with path renaming.
Added requestGroupData in GroupGateway and getGroupForUser in GroupService
Added Chris to readme
Finished leaderboard page.
* Added models, set up api. * Finished flutter model. * Fixed DTO error. * Added leaders. * Fixed length of 0 case. * Added getting challenge by id. * Added url runner to README.md * Added more declarative api. * fixed plist Co-authored-by: Nirbhay Singh Narang <[email protected]>
…m-socket.io, @nestjs/serve-static, @nestjs/websockets and @nestjs/testing in /server (#197) * Bump express, @nestjs/core, @nestjs/platform-express, @nestjs/platform-socket.io, @nestjs/serve-static, @nestjs/websockets and @nestjs/testing Bumps [express](https://github.com/expressjs/express) to 4.19.2 and updates ancestor dependencies [express](https://github.com/expressjs/express), [@nestjs/core](https://github.com/nestjs/nest/tree/HEAD/packages/core), [@nestjs/platform-express](https://github.com/nestjs/nest/tree/HEAD/packages/platform-express), [@nestjs/platform-socket.io](https://github.com/nestjs/nest/tree/HEAD/packages/platform-socket.io), [@nestjs/serve-static](https://github.com/nestjs/serve-static), [@nestjs/websockets](https://github.com/nestjs/nest/tree/HEAD/packages/websockets) and [@nestjs/testing](https://github.com/nestjs/nest/tree/HEAD/packages/testing). These dependencies need to be updated together. Updates `express` from 4.18.2 to 4.19.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) Updates `@nestjs/core` from 9.4.3 to 10.3.8 - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v10.3.8/packages/core) Updates `@nestjs/platform-express` from 9.4.3 to 10.3.8 - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v10.3.8/packages/platform-express) Updates `@nestjs/platform-socket.io` from 9.4.3 to 10.3.8 - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v10.3.8/packages/platform-socket.io) Updates `@nestjs/serve-static` from 3.0.1 to 4.0.2 - [Release notes](https://github.com/nestjs/serve-static/releases) - [Changelog](https://github.com/nestjs/serve-static/blob/master/.release-it.json) - [Commits](nestjs/serve-static@3.0.1...4.0.2) Updates `@nestjs/websockets` from 9.4.3 to 10.3.8 - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v10.3.8/packages/websockets) Updates `@nestjs/testing` from 9.4.3 to 10.3.8 - [Release notes](https://github.com/nestjs/nest/releases) - [Commits](https://github.com/nestjs/nest/commits/v10.3.8/packages/testing) --- updated-dependencies: - dependency-name: express dependency-type: indirect - dependency-name: "@nestjs/core" dependency-type: direct:production - dependency-name: "@nestjs/platform-express" dependency-type: direct:production - dependency-name: "@nestjs/platform-socket.io" dependency-type: direct:production - dependency-name: "@nestjs/serve-static" dependency-type: direct:production - dependency-name: "@nestjs/websockets" dependency-type: direct:production - dependency-name: "@nestjs/testing" dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Fixed dependencies --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: neketka <[email protected]>
* EventId instead of challengeId * Testing gameplay page and implemented updated UI changes * Documentation on challenge.e2e-spec.ts * Revert details page * Working on preview * working on challenge complete page * completing challenge page work * fixed setcurrentevent in preview * Challenges completed and journeys page frontend done * added more documentation to map * gameplay challenge flow complete * completed journey flow in gameplay * changed icon color, animated picture * added hints to backend - wip * implemented using hints in backend (untested) * hints fully connected * added prevchallengedto * final updates to hints in backend + gameplay page * fixed outdated usage of eventtrackerdto and indexing in completed cell * removed user arg from emitUpdateEventTracker * removed UseEventTrackerHintDto and fixed minor issues * fixed requested changes + admin frontend bugs * fixed formatting --------- Co-authored-by: cathli66 <[email protected]> Co-authored-by: cathli66 <[email protected]>
* Fixed script * Fix admin error
* Initial commit (untested) * Connected to back end * Fix flutter format * fix challenge name * Remove print statements * Fix merge mistake
* Implement achievements backend * Linting * Implement achievements backend * Linting * Enhance documentation for DTO, gateway, service files; remove duplicate code error * Fixed bugs -Modified prisma schema to link achievements to organizations -Fixed bugs in achievement DTO, service, gateway -Fixed logic in updateEventData, updateChallengeData, updateAchievementData -Removed old code from faulty merge * Fixed build error * Fix failing build * Fix code-style * Fix dtos * Fixed bugs in achievement * Fixed code style across entire codebase * Revert "Fixed code style across entire codebase" This reverts commit bc318b8. * Fix code style * Added documentation, added afterAll to achievements e2e, removed debug lines * Fixed naming * Fix admin errors --------- Co-authored-by: neketka <[email protected]>
* Relax first challenge restriction * Fix rule again * Fixed failing test
* Mark potential locations of bug * Attempt fix * Remove comments
* Added debugging functionality * Attempt to fix repeated disconnects * Move code around * Fixed glitchiness
* Initial commit (untested) * Connected to back end * Fix flutter format * fix challenge name * Remove print statements * Fix merge mistake * Added images * Connected images to backend * Fix profile image + weird flutter style * fixed UI with completed challenges page --------- Co-authored-by: cathli66 <[email protected]>
* fixed preview and challenge cell * UI edits to journey cell + various others * deleted old journey cell code * Fixed Back Button --------- Co-authored-by: Chris Gu <[email protected]>
* Initial Page Setup * UI Setup and Fields/Menus Working * finalize edit profile ui * username + year updates * completed edit profile * tested registration flow * restrict edit profile to cornell users * fixed server e2e tests --------- Co-authored-by: cathli66 <[email protected]> Co-authored-by: cathli66 <[email protected]>
* beginning structure, wip * Filters mostly working now (except Category) Filters mostly working now (except Category) * removed commented code removed commented code * Implemented Filtering changes (except for categories) Implemented Filtering changes (except for categories) * removed api keys from server env * fixed filtering bugs after merging * added friendly names, fixed category filtering * fixed miles away value in preview * fix bug where listview breaks * fix formatting * rule allows reading lat long of first chal * attempt to fix server test * Updated org e2e tests * fixed formatting * fix minor ui bugs * removed logs, protected some null asserts, added missing image link --------- Co-authored-by: nit0107 <[email protected]> Co-authored-by: Nitya <[email protected]>
* beginning structure, wip * Filters mostly working now (except Category) Filters mostly working now (except Category) * removed commented code removed commented code * Implemented Filtering changes (except for categories) Implemented Filtering changes (except for categories) * removed api keys from server env * Enrollment type enum * fixed filtering bugs after merging * added friendly names, fixed category filtering * Achievements Page UI work * fixed miles away value in preview * fix bug where listview breaks * fix formatting * Achievements UI no backend * Achievement model blocked by achievementTracker\ * UI adjustments * Achievements UI completed, Hint icon fixed * fixed issues caused by conflict, edited cells on profile page * removed some old print statements --------- Co-authored-by: nit0107 <[email protected]> Co-authored-by: Nitya <[email protected]> Co-authored-by: cathli66 <[email protected]> Co-authored-by: neketka <[email protected]> Co-authored-by: cathli66 <[email protected]>
* Initial Trophy Image Setup * Finished design with new Podium widget implementation * Modular implementation of pdoiums and oragnge border added * Minor positioning changes * Unused images deleted * consolidated consumers --------- Co-authored-by: cathli66 <[email protected]>
* Remove useless if * Skip register * Fix device login url * Fix flutter warnings * Comment out useless code * Update api key * Fixed room leaks * Fix failing test * Added formatting * fix bool * Real time leaderboard * Fixed loading issue * Ran flutter fix * Fixed formatting * Fixed message * Fix test failures * Fix formatting * New google services * Fix loading for leaderboard * Fix navigator issues * Fixed spam updates * Launcher icons * Set favicon * Fix icon stretch * Fix favicon * Update username leaderboard * Change naming
* beginning structure, wip * Filters mostly working now (except Category) Filters mostly working now (except Category) * removed commented code removed commented code * Implemented Filtering changes (except for categories) Implemented Filtering changes (except for categories) * removed api keys from server env * fixed filtering bugs after merging * added friendly names, fixed category filtering * partial checkin for search/filter change partial checkin for search/filter change * partial checkin...search bar implementation partial checkin...search bar implementation * now the old filtering works now the old filtering works * Searching by challenge name and location now work from search bar Searching by challenge name and location now work from search bar * Fixed issue with filters not filtering correctly Fixed issue with filters not filtering correctly * font * Filter UI changes * Now journeys also do filtering Now journeys also do filtering * search bar ui fixed * ran formatting commands * tab bar matches figma * fixed ui * minor changes * minor UI fixes and filter logic fixes --------- Co-authored-by: cathli66 <[email protected]> Co-authored-by: cathli66 <[email protected]>
* implement achievements tracking logic * Fix achievement service import * Add cascading delete to achievement tracker * implement event lists from org * Made achievement admin frontend * Bug fixes * fixed bugs, still need to pass tests * Fix event trackers * Fix flutter build * Finish achievement tracking * Fix emit order * Fix other emit error * Fix build errors * Connected achievements to backend * Fix inconsistencies * Complete integration * Remove hardcoded complete * Comment failing tests * Attempt to fix tests * Fix more e2e failures * Add exception for e2e tests in client service * Added extra logging * Fix incorrect nextChallenge * Fix tests * Fix nulls in test * Set progress limit * Add manager rule for achievements * Achivement trackers are made for all * Clarified prisma query * Fix underflow error + journeys --------- Co-authored-by: Jasmine Li <[email protected]>
* updates to gameplay map, app icon, location types * fix initial hint radius * fix accidentally reverting icon change * resizing userlocation marker * initialized hint circle + current points based on hints used * fixed name not showing up upon arriving * server format * fix build issues and formatting * fix event tracking logic in flutter + upon event update --------- Co-authored-by: Chris Gu <[email protected]>
…ons (#215) * Add acknowledgements * Fix build error * Step 1 towards ack generator * Finished flutter acks * Added copy modal * Fixed copy logic * Finished duplications * Remove useless code * Added text dialog * Add join org * Added emit * users are allowed to see their own auth type * fix formatting --------- Co-authored-by: cathli66 <[email protected]>
* filter form height decrease * line under search gone + minor ui changes * Filter form - sticky header and swiping down closes it Filter form - sticky header and swiping down closes it * center filters and x button * filter form height * no more line under search * keyboard nomove
* Header updates to pages * also changed edit profile header * edited profile page to match designs --------- Co-authored-by: cathli66 <[email protected]>
* ui fixes * fix joining orgs * fix completer bug * Fix events issues * fix challenge completed page ui * Delete cascades * fix i've arrived race condition and reversed copied event * fix more ui * updated progress bars * Fix tests + launcher * edit color of challenge completed progress bar --------- Co-authored-by: neketka <[email protected]>
* Fixed admin front end * Xcode builds * Geolocation works * Track pubspec.lock * Updated carousel version * Added comments to splash page
* fixing race conditions * update casl rule to always allow reading challenge name * added in the casl rule again * fixed adding achievement tracker bug * check achievement tracker undefined * remove null check in completed challenge * fix server format * Attempt achievement tracker fix * Remove logging * Fix achievement tracker accessibilty check * Attempt closest challenge fix * Fixed per-point achievements * Update podfile.lock --------- Co-authored-by: Sarah Young <[email protected]> Co-authored-by: neketka <[email protected]> Co-authored-by: Brian La <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Test