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.

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

Updating Admin User Page #238

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

Conversation

shah-esha
Copy link
Collaborator

@shah-esha shah-esha commented Dec 9, 2024

Adding columns to the User page to make it more informative

This pull request is the first step towards updating our Admin User page. This pull request adds columns to make our User page more informative. It also adds checking to see if a user is banned - a feature that will be implemented in another pull request.

  • Added additional columns such as "tracked events" and "year"

Remaining TODOs:

  • merge with pr implementing blocking
  • test new features through simulation

Depends on pr implementing blocking (to be opened)

Blockers

Issues with CGO login (Heroku) and Docker are making it difficult to test new features. You may also notice that this PR has a bunch of commits in it. The relevant commits to this PR are the last two. I am currently working on cleaning this PR up of the rest.

erichuang27 and others added 30 commits February 20, 2022 20:44
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 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]>
* Removed acknowledgements + asynched the api.

* Added testing ability for postman.

* Corrected google login.

* Changed small error.

* Added game widget.

* Changed name of app.

* Formatted everything.
3TTemi and others added 28 commits April 28, 2024 03:04
* 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]>
* Ranking List Names Updated with Ellipsis

* truncate with flutter ellipsis

* Removed Custom Function repalced with flutter ellipsis
* Added state to disable button after click

* Add documentation to GameplayMap Widget
* Fix Future Async conflict casuing app freeze

* Transition to MediaQuery for home page and challenge cells

* Implemented custom padding adjustments for Iphone and Android

* Add documentation for navigation between home, search bar/filtering, and challenges

* Add constant device varibales instead of MediaQuery Calls
* Fixed local machine dependency issues

* Fixed the issue of registering new users on simulator

* Added documentation for login related pages

* Fixed the wrong uri call for checking user existence

* Removeed loggings that are used for debugging

* Made check user existence logic concise
…to fix-journeys-and-challenges-search-bar
@Shengle-Dai
Copy link
Collaborator

Good job on adding more columns to the admin page! However, this PR has too many previous commits, which is not intended. I think you should probably rebase before PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.