From 47bb3139e4ff697d7a6ca81c8146fc7372adafa9 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 24 Mar 2021 09:57:46 -0700 Subject: Added Cornell badges --- src/assets/images/badges/acapella.png | Bin 16688 -> 0 bytes src/assets/images/badges/alpha_chi_omega.png | Bin 11237 -> 0 bytes src/assets/images/badges/alpha_delta_phi.png | Bin 10962 -> 0 bytes src/assets/images/badges/baseball.png | Bin 18096 -> 0 bytes src/assets/images/badges/basketball.png | Bin 20516 -> 0 bytes src/assets/images/badges/beta_rho_pi.png | Bin 8682 -> 0 bytes src/assets/images/badges/black_in_business.png | Bin 7632 -> 0 bytes src/assets/images/badges/brown/acapella.png | Bin 0 -> 16688 bytes src/assets/images/badges/brown/alpha_chi_omega.png | Bin 0 -> 11237 bytes src/assets/images/badges/brown/alpha_delta_phi.png | Bin 0 -> 10962 bytes src/assets/images/badges/brown/baseball.png | Bin 0 -> 18096 bytes src/assets/images/badges/brown/basketball.png | Bin 0 -> 20516 bytes src/assets/images/badges/brown/beta_rho_pi.png | Bin 0 -> 8682 bytes .../images/badges/brown/black_in_business.png | Bin 0 -> 7632 bytes src/assets/images/badges/brown/brown_badge.png | Bin 0 -> 843 bytes src/assets/images/badges/brown/brown_band.png | Bin 0 -> 8388 bytes .../images/badges/brown/brown_class_board.png | Bin 0 -> 7095 bytes src/assets/images/badges/brown/brown_cs.png | Bin 0 -> 11517 bytes src/assets/images/badges/brown/brown_democrats.png | Bin 0 -> 7661 bytes src/assets/images/badges/brown/brown_ep.png | Bin 0 -> 15555 bytes .../badges/brown/brown_womens_collective.png | Bin 0 -> 16495 bytes src/assets/images/badges/brown/bsu.png | Bin 0 -> 9209 bytes .../images/badges/brown/buxton_international.png | Bin 0 -> 16050 bytes src/assets/images/badges/brown/delta_gamma.png | Bin 0 -> 7840 bytes src/assets/images/badges/brown/delta_tau.png | Bin 0 -> 7971 bytes .../images/badges/brown/fashion_at_brown.png | Bin 0 -> 10204 bytes src/assets/images/badges/brown/field_hockey.png | Bin 0 -> 16665 bytes src/assets/images/badges/brown/football.png | Bin 0 -> 19113 bytes src/assets/images/badges/brown/gymnastics.png | Bin 0 -> 25165 bytes src/assets/images/badges/brown/hockey.png | Bin 0 -> 16274 bytes src/assets/images/badges/brown/impulse.png | Bin 0 -> 20809 bytes src/assets/images/badges/brown/kappa_delta.png | Bin 0 -> 9561 bytes src/assets/images/badges/brown/lacrosse.png | Bin 0 -> 17631 bytes src/assets/images/badges/brown/latin_at_brown.png | Bin 0 -> 28842 bytes src/assets/images/badges/brown/soccer.png | Bin 0 -> 15982 bytes src/assets/images/badges/brown/softball.png | Bin 0 -> 18096 bytes src/assets/images/badges/brown/tap.png | Bin 0 -> 11489 bytes src/assets/images/badges/brown/tennis.png | Bin 0 -> 17695 bytes src/assets/images/badges/brown/theta_alpha.png | Bin 0 -> 12104 bytes src/assets/images/badges/brown/track.png | Bin 0 -> 17837 bytes src/assets/images/badges/brown/ucs.png | Bin 0 -> 10132 bytes src/assets/images/badges/brown/volleyball.png | Bin 0 -> 28161 bytes .../images/badges/brown/women_in_business.png | Bin 0 -> 14868 bytes src/assets/images/badges/brown/zeta_delta_xi.png | Bin 0 -> 8952 bytes src/assets/images/badges/brown_badge.png | Bin 843 -> 0 bytes src/assets/images/badges/brown_band.png | Bin 8388 -> 0 bytes src/assets/images/badges/brown_class_board.png | Bin 7095 -> 0 bytes src/assets/images/badges/brown_cs.png | Bin 11517 -> 0 bytes src/assets/images/badges/brown_democrats.png | Bin 7661 -> 0 bytes src/assets/images/badges/brown_ep.png | Bin 15555 -> 0 bytes .../images/badges/brown_womens_collective.png | Bin 16495 -> 0 bytes src/assets/images/badges/bsu.png | Bin 9209 -> 0 bytes src/assets/images/badges/buxton_international.png | Bin 16050 -> 0 bytes src/assets/images/badges/cornell/acacia.png | Bin 0 -> 19048 bytes src/assets/images/badges/cornell/acapella.png | Bin 0 -> 26719 bytes src/assets/images/badges/cornell/aeta_phi_beta.png | Bin 0 -> 19159 bytes .../images/badges/cornell/alpha_chi_omega.png | Bin 0 -> 18872 bytes .../images/badges/cornell/alpha_delta_phi.png | Bin 0 -> 19727 bytes .../images/badges/cornell/alpha_epsilon_phi.png | Bin 0 -> 18327 bytes .../images/badges/cornell/alpha_gamma_rho.png | Bin 0 -> 17347 bytes .../badges/cornell/alpha_kappa_delta_phi.png | Bin 0 -> 18926 bytes src/assets/images/badges/cornell/alpha_phi.png | Bin 0 -> 20092 bytes .../images/badges/cornell/alpha_phi_alpha.png | Bin 0 -> 19233 bytes .../images/badges/cornell/alpha_sigma_phi.png | Bin 0 -> 19506 bytes .../images/badges/cornell/alpha_xi_delta.png | Bin 0 -> 19590 bytes src/assets/images/badges/cornell/alpha_zeta.png | Bin 0 -> 19359 bytes .../images/badges/cornell/alphs_epsilon_pi.png | Bin 0 -> 17404 bytes src/assets/images/badges/cornell/baseball.png | Bin 0 -> 27181 bytes src/assets/images/badges/cornell/basketball.png | Bin 0 -> 29348 bytes src/assets/images/badges/cornell/beta_theta_pi.png | Bin 0 -> 16639 bytes src/assets/images/badges/cornell/chi_phi.png | Bin 0 -> 20638 bytes src/assets/images/badges/cornell/chi_psi.png | Bin 0 -> 19465 bytes src/assets/images/badges/cornell/delta_chi.png | Bin 0 -> 20580 bytes .../images/badges/cornell/delta_delta_delta.png | Bin 0 -> 18569 bytes src/assets/images/badges/cornell/delta_epsilon.png | Bin 0 -> 19017 bytes src/assets/images/badges/cornell/delta_gamma.png | Bin 0 -> 17937 bytes .../images/badges/cornell/delta_kappa_epsilon.png | Bin 0 -> 18423 bytes .../images/badges/cornell/delta_sigma_theta.png | Bin 0 -> 20685 bytes .../images/badges/cornell/delta_tau_delta.png | Bin 0 -> 19065 bytes src/assets/images/badges/cornell/fencing.png | Bin 0 -> 19601 bytes src/assets/images/badges/cornell/field_hockey.png | Bin 0 -> 25805 bytes src/assets/images/badges/cornell/football.png | Bin 0 -> 28256 bytes src/assets/images/badges/cornell/golf.png | Bin 0 -> 21766 bytes src/assets/images/badges/cornell/gymnastics.png | Bin 0 -> 32756 bytes src/assets/images/badges/cornell/hockey.png | Bin 0 -> 25486 bytes .../images/badges/cornell/kappa_alpha_theta.png | Bin 0 -> 19332 bytes src/assets/images/badges/cornell/kappa_delta.png | Bin 0 -> 18860 bytes .../images/badges/cornell/kappa_delta_rho.png | Bin 0 -> 18490 bytes .../images/badges/cornell/kappa_kappa_gamma.png | Bin 0 -> 16875 bytes .../images/badges/cornell/kappa_phi_lambda.png | Bin 0 -> 20095 bytes src/assets/images/badges/cornell/kappa_sigma.png | Bin 0 -> 19153 bytes .../badges/cornell/la_unidad_latina,_lambda.png | Bin 0 -> 19803 bytes src/assets/images/badges/cornell/lacrosse.png | Bin 0 -> 26596 bytes .../images/badges/cornell/lambda_chi_alpha.png | Bin 0 -> 19616 bytes .../cornell/lambda_phi_epsilon_international.png | Bin 0 -> 19131 bytes src/assets/images/badges/cornell/malik.png | Bin 0 -> 18061 bytes src/assets/images/badges/cornell/phi_beta_phi.png | Bin 0 -> 18760 bytes .../images/badges/cornell/phi_beta_sigma.png | Bin 0 -> 19401 bytes .../images/badges/cornell/phi_delta_theta.png | Bin 0 -> 18604 bytes src/assets/images/badges/cornell/phi_kappa_tau.png | Bin 0 -> 18109 bytes src/assets/images/badges/cornell/phi_mu.png | Bin 0 -> 19782 bytes .../images/badges/cornell/phi_sigma_kappa.png | Bin 0 -> 19139 bytes .../images/badges/cornell/phi_sigma_sigma.png | Bin 0 -> 19683 bytes src/assets/images/badges/cornell/pi_delta_psi.png | Bin 0 -> 17779 bytes .../images/badges/cornell/pi_kappa_alpha.png | Bin 0 -> 17333 bytes src/assets/images/badges/cornell/pi_kappa_phi.png | Bin 0 -> 17748 bytes src/assets/images/badges/cornell/polo.png | Bin 0 -> 23823 bytes src/assets/images/badges/cornell/rowing.png | Bin 0 -> 22766 bytes src/assets/images/badges/cornell/sailing.png | Bin 0 -> 27019 bytes .../images/badges/cornell/sigma_alpha_mu.png | Bin 0 -> 18971 bytes src/assets/images/badges/cornell/sigma_chi.png | Bin 0 -> 20542 bytes .../images/badges/cornell/sigma_delta_tau.png | Bin 0 -> 18832 bytes .../images/badges/cornell/sigma_phi_society.png | Bin 0 -> 20016 bytes src/assets/images/badges/cornell/sigma_pi.png | Bin 0 -> 17370 bytes src/assets/images/badges/cornell/soccer.png | Bin 0 -> 26884 bytes src/assets/images/badges/cornell/softball.png | Bin 0 -> 27201 bytes src/assets/images/badges/cornell/squash.png | Bin 0 -> 28525 bytes .../images/badges/cornell/swimming_&_diving.png | Bin 0 -> 23492 bytes src/assets/images/badges/cornell/tennis.png | Bin 0 -> 27249 bytes .../images/badges/cornell/theta_delta_chi.png | Bin 0 -> 20995 bytes src/assets/images/badges/cornell/track_&_field.png | Bin 0 -> 26490 bytes src/assets/images/badges/cornell/volleyball.png | Bin 0 -> 35938 bytes src/assets/images/badges/cornell/wrestling.png | Bin 0 -> 23457 bytes src/assets/images/badges/cornell/zeta_beta_tau.png | Bin 0 -> 17937 bytes src/assets/images/badges/cornell/zeta_psi.png | Bin 0 -> 19059 bytes src/assets/images/badges/delta_gamma.png | Bin 7840 -> 0 bytes src/assets/images/badges/delta_tau.png | Bin 7971 -> 0 bytes src/assets/images/badges/fashion_at_brown.png | Bin 10204 -> 0 bytes src/assets/images/badges/field_hockey.png | Bin 16665 -> 0 bytes src/assets/images/badges/football.png | Bin 19113 -> 0 bytes src/assets/images/badges/gymnastics.png | Bin 25165 -> 0 bytes src/assets/images/badges/hockey.png | Bin 16274 -> 0 bytes src/assets/images/badges/impulse.png | Bin 20809 -> 0 bytes src/assets/images/badges/kappa_delta.png | Bin 9561 -> 0 bytes src/assets/images/badges/lacrosse.png | Bin 17631 -> 0 bytes src/assets/images/badges/latin_at_brown.png | Bin 28842 -> 0 bytes src/assets/images/badges/soccer.png | Bin 15982 -> 0 bytes src/assets/images/badges/softball.png | Bin 18096 -> 0 bytes src/assets/images/badges/tap.png | Bin 11489 -> 0 bytes src/assets/images/badges/tennis.png | Bin 17695 -> 0 bytes src/assets/images/badges/theta_alpha.png | Bin 12104 -> 0 bytes src/assets/images/badges/track.png | Bin 17837 -> 0 bytes src/assets/images/badges/ucs.png | Bin 10132 -> 0 bytes src/assets/images/badges/volleyball.png | Bin 28161 -> 0 bytes src/assets/images/badges/women_in_business.png | Bin 14868 -> 0 bytes src/assets/images/badges/zeta_delta_xi.png | Bin 8952 -> 0 bytes src/components/profile/UniversityIcon.tsx | 3 + src/constants/badges.ts | 421 +++++++++++++++++---- src/screens/badge/BadgeScreenHeader.tsx | 12 +- src/screens/badge/BadgeSelection.tsx | 4 +- src/screens/suggestedPeople/SPBody.tsx | 2 +- src/utils/search.ts | 2 +- 152 files changed, 365 insertions(+), 79 deletions(-) delete mode 100644 src/assets/images/badges/acapella.png delete mode 100644 src/assets/images/badges/alpha_chi_omega.png delete mode 100644 src/assets/images/badges/alpha_delta_phi.png delete mode 100644 src/assets/images/badges/baseball.png delete mode 100644 src/assets/images/badges/basketball.png delete mode 100644 src/assets/images/badges/beta_rho_pi.png delete mode 100644 src/assets/images/badges/black_in_business.png create mode 100644 src/assets/images/badges/brown/acapella.png create mode 100644 src/assets/images/badges/brown/alpha_chi_omega.png create mode 100644 src/assets/images/badges/brown/alpha_delta_phi.png create mode 100644 src/assets/images/badges/brown/baseball.png create mode 100644 src/assets/images/badges/brown/basketball.png create mode 100644 src/assets/images/badges/brown/beta_rho_pi.png create mode 100644 src/assets/images/badges/brown/black_in_business.png create mode 100644 src/assets/images/badges/brown/brown_badge.png create mode 100644 src/assets/images/badges/brown/brown_band.png create mode 100644 src/assets/images/badges/brown/brown_class_board.png create mode 100644 src/assets/images/badges/brown/brown_cs.png create mode 100644 src/assets/images/badges/brown/brown_democrats.png create mode 100644 src/assets/images/badges/brown/brown_ep.png create mode 100644 src/assets/images/badges/brown/brown_womens_collective.png create mode 100644 src/assets/images/badges/brown/bsu.png create mode 100644 src/assets/images/badges/brown/buxton_international.png create mode 100644 src/assets/images/badges/brown/delta_gamma.png create mode 100644 src/assets/images/badges/brown/delta_tau.png create mode 100644 src/assets/images/badges/brown/fashion_at_brown.png create mode 100644 src/assets/images/badges/brown/field_hockey.png create mode 100644 src/assets/images/badges/brown/football.png create mode 100644 src/assets/images/badges/brown/gymnastics.png create mode 100644 src/assets/images/badges/brown/hockey.png create mode 100644 src/assets/images/badges/brown/impulse.png create mode 100644 src/assets/images/badges/brown/kappa_delta.png create mode 100644 src/assets/images/badges/brown/lacrosse.png create mode 100644 src/assets/images/badges/brown/latin_at_brown.png create mode 100644 src/assets/images/badges/brown/soccer.png create mode 100644 src/assets/images/badges/brown/softball.png create mode 100644 src/assets/images/badges/brown/tap.png create mode 100644 src/assets/images/badges/brown/tennis.png create mode 100644 src/assets/images/badges/brown/theta_alpha.png create mode 100644 src/assets/images/badges/brown/track.png create mode 100644 src/assets/images/badges/brown/ucs.png create mode 100644 src/assets/images/badges/brown/volleyball.png create mode 100644 src/assets/images/badges/brown/women_in_business.png create mode 100644 src/assets/images/badges/brown/zeta_delta_xi.png delete mode 100644 src/assets/images/badges/brown_badge.png delete mode 100644 src/assets/images/badges/brown_band.png delete mode 100644 src/assets/images/badges/brown_class_board.png delete mode 100644 src/assets/images/badges/brown_cs.png delete mode 100644 src/assets/images/badges/brown_democrats.png delete mode 100644 src/assets/images/badges/brown_ep.png delete mode 100644 src/assets/images/badges/brown_womens_collective.png delete mode 100644 src/assets/images/badges/bsu.png delete mode 100644 src/assets/images/badges/buxton_international.png create mode 100644 src/assets/images/badges/cornell/acacia.png create mode 100644 src/assets/images/badges/cornell/acapella.png create mode 100644 src/assets/images/badges/cornell/aeta_phi_beta.png create mode 100644 src/assets/images/badges/cornell/alpha_chi_omega.png create mode 100644 src/assets/images/badges/cornell/alpha_delta_phi.png create mode 100644 src/assets/images/badges/cornell/alpha_epsilon_phi.png create mode 100644 src/assets/images/badges/cornell/alpha_gamma_rho.png create mode 100644 src/assets/images/badges/cornell/alpha_kappa_delta_phi.png create mode 100644 src/assets/images/badges/cornell/alpha_phi.png create mode 100644 src/assets/images/badges/cornell/alpha_phi_alpha.png create mode 100644 src/assets/images/badges/cornell/alpha_sigma_phi.png create mode 100644 src/assets/images/badges/cornell/alpha_xi_delta.png create mode 100644 src/assets/images/badges/cornell/alpha_zeta.png create mode 100644 src/assets/images/badges/cornell/alphs_epsilon_pi.png create mode 100644 src/assets/images/badges/cornell/baseball.png create mode 100644 src/assets/images/badges/cornell/basketball.png create mode 100644 src/assets/images/badges/cornell/beta_theta_pi.png create mode 100644 src/assets/images/badges/cornell/chi_phi.png create mode 100644 src/assets/images/badges/cornell/chi_psi.png create mode 100644 src/assets/images/badges/cornell/delta_chi.png create mode 100644 src/assets/images/badges/cornell/delta_delta_delta.png create mode 100644 src/assets/images/badges/cornell/delta_epsilon.png create mode 100644 src/assets/images/badges/cornell/delta_gamma.png create mode 100644 src/assets/images/badges/cornell/delta_kappa_epsilon.png create mode 100644 src/assets/images/badges/cornell/delta_sigma_theta.png create mode 100644 src/assets/images/badges/cornell/delta_tau_delta.png create mode 100644 src/assets/images/badges/cornell/fencing.png create mode 100644 src/assets/images/badges/cornell/field_hockey.png create mode 100644 src/assets/images/badges/cornell/football.png create mode 100644 src/assets/images/badges/cornell/golf.png create mode 100644 src/assets/images/badges/cornell/gymnastics.png create mode 100644 src/assets/images/badges/cornell/hockey.png create mode 100644 src/assets/images/badges/cornell/kappa_alpha_theta.png create mode 100644 src/assets/images/badges/cornell/kappa_delta.png create mode 100644 src/assets/images/badges/cornell/kappa_delta_rho.png create mode 100644 src/assets/images/badges/cornell/kappa_kappa_gamma.png create mode 100644 src/assets/images/badges/cornell/kappa_phi_lambda.png create mode 100644 src/assets/images/badges/cornell/kappa_sigma.png create mode 100644 src/assets/images/badges/cornell/la_unidad_latina,_lambda.png create mode 100644 src/assets/images/badges/cornell/lacrosse.png create mode 100644 src/assets/images/badges/cornell/lambda_chi_alpha.png create mode 100644 src/assets/images/badges/cornell/lambda_phi_epsilon_international.png create mode 100644 src/assets/images/badges/cornell/malik.png create mode 100644 src/assets/images/badges/cornell/phi_beta_phi.png create mode 100644 src/assets/images/badges/cornell/phi_beta_sigma.png create mode 100644 src/assets/images/badges/cornell/phi_delta_theta.png create mode 100644 src/assets/images/badges/cornell/phi_kappa_tau.png create mode 100644 src/assets/images/badges/cornell/phi_mu.png create mode 100644 src/assets/images/badges/cornell/phi_sigma_kappa.png create mode 100644 src/assets/images/badges/cornell/phi_sigma_sigma.png create mode 100644 src/assets/images/badges/cornell/pi_delta_psi.png create mode 100644 src/assets/images/badges/cornell/pi_kappa_alpha.png create mode 100644 src/assets/images/badges/cornell/pi_kappa_phi.png create mode 100644 src/assets/images/badges/cornell/polo.png create mode 100644 src/assets/images/badges/cornell/rowing.png create mode 100644 src/assets/images/badges/cornell/sailing.png create mode 100644 src/assets/images/badges/cornell/sigma_alpha_mu.png create mode 100644 src/assets/images/badges/cornell/sigma_chi.png create mode 100644 src/assets/images/badges/cornell/sigma_delta_tau.png create mode 100644 src/assets/images/badges/cornell/sigma_phi_society.png create mode 100644 src/assets/images/badges/cornell/sigma_pi.png create mode 100644 src/assets/images/badges/cornell/soccer.png create mode 100644 src/assets/images/badges/cornell/softball.png create mode 100644 src/assets/images/badges/cornell/squash.png create mode 100644 src/assets/images/badges/cornell/swimming_&_diving.png create mode 100644 src/assets/images/badges/cornell/tennis.png create mode 100644 src/assets/images/badges/cornell/theta_delta_chi.png create mode 100644 src/assets/images/badges/cornell/track_&_field.png create mode 100644 src/assets/images/badges/cornell/volleyball.png create mode 100644 src/assets/images/badges/cornell/wrestling.png create mode 100644 src/assets/images/badges/cornell/zeta_beta_tau.png create mode 100644 src/assets/images/badges/cornell/zeta_psi.png delete mode 100644 src/assets/images/badges/delta_gamma.png delete mode 100644 src/assets/images/badges/delta_tau.png delete mode 100644 src/assets/images/badges/fashion_at_brown.png delete mode 100644 src/assets/images/badges/field_hockey.png delete mode 100644 src/assets/images/badges/football.png delete mode 100644 src/assets/images/badges/gymnastics.png delete mode 100644 src/assets/images/badges/hockey.png delete mode 100644 src/assets/images/badges/impulse.png delete mode 100644 src/assets/images/badges/kappa_delta.png delete mode 100644 src/assets/images/badges/lacrosse.png delete mode 100644 src/assets/images/badges/latin_at_brown.png delete mode 100644 src/assets/images/badges/soccer.png delete mode 100644 src/assets/images/badges/softball.png delete mode 100644 src/assets/images/badges/tap.png delete mode 100644 src/assets/images/badges/tennis.png delete mode 100644 src/assets/images/badges/theta_alpha.png delete mode 100644 src/assets/images/badges/track.png delete mode 100644 src/assets/images/badges/ucs.png delete mode 100644 src/assets/images/badges/volleyball.png delete mode 100644 src/assets/images/badges/women_in_business.png delete mode 100644 src/assets/images/badges/zeta_delta_xi.png (limited to 'src') diff --git a/src/assets/images/badges/acapella.png b/src/assets/images/badges/acapella.png deleted file mode 100644 index c0adb885..00000000 Binary files a/src/assets/images/badges/acapella.png and /dev/null differ diff --git a/src/assets/images/badges/alpha_chi_omega.png b/src/assets/images/badges/alpha_chi_omega.png deleted file mode 100644 index f6db85af..00000000 Binary files a/src/assets/images/badges/alpha_chi_omega.png and /dev/null differ diff --git a/src/assets/images/badges/alpha_delta_phi.png b/src/assets/images/badges/alpha_delta_phi.png deleted file mode 100644 index 51186468..00000000 Binary files a/src/assets/images/badges/alpha_delta_phi.png and /dev/null differ diff --git a/src/assets/images/badges/baseball.png b/src/assets/images/badges/baseball.png deleted file mode 100644 index 2a049c16..00000000 Binary files a/src/assets/images/badges/baseball.png and /dev/null differ diff --git a/src/assets/images/badges/basketball.png b/src/assets/images/badges/basketball.png deleted file mode 100644 index 43d08803..00000000 Binary files a/src/assets/images/badges/basketball.png and /dev/null differ diff --git a/src/assets/images/badges/beta_rho_pi.png b/src/assets/images/badges/beta_rho_pi.png deleted file mode 100644 index 490acebb..00000000 Binary files a/src/assets/images/badges/beta_rho_pi.png and /dev/null differ diff --git a/src/assets/images/badges/black_in_business.png b/src/assets/images/badges/black_in_business.png deleted file mode 100644 index 995ae652..00000000 Binary files a/src/assets/images/badges/black_in_business.png and /dev/null differ diff --git a/src/assets/images/badges/brown/acapella.png b/src/assets/images/badges/brown/acapella.png new file mode 100644 index 00000000..c0adb885 Binary files /dev/null and b/src/assets/images/badges/brown/acapella.png differ diff --git a/src/assets/images/badges/brown/alpha_chi_omega.png b/src/assets/images/badges/brown/alpha_chi_omega.png new file mode 100644 index 00000000..f6db85af Binary files /dev/null and b/src/assets/images/badges/brown/alpha_chi_omega.png differ diff --git a/src/assets/images/badges/brown/alpha_delta_phi.png b/src/assets/images/badges/brown/alpha_delta_phi.png new file mode 100644 index 00000000..51186468 Binary files /dev/null and b/src/assets/images/badges/brown/alpha_delta_phi.png differ diff --git a/src/assets/images/badges/brown/baseball.png b/src/assets/images/badges/brown/baseball.png new file mode 100644 index 00000000..2a049c16 Binary files /dev/null and b/src/assets/images/badges/brown/baseball.png differ diff --git a/src/assets/images/badges/brown/basketball.png b/src/assets/images/badges/brown/basketball.png new file mode 100644 index 00000000..43d08803 Binary files /dev/null and b/src/assets/images/badges/brown/basketball.png differ diff --git a/src/assets/images/badges/brown/beta_rho_pi.png b/src/assets/images/badges/brown/beta_rho_pi.png new file mode 100644 index 00000000..490acebb Binary files /dev/null and b/src/assets/images/badges/brown/beta_rho_pi.png differ diff --git a/src/assets/images/badges/brown/black_in_business.png b/src/assets/images/badges/brown/black_in_business.png new file mode 100644 index 00000000..995ae652 Binary files /dev/null and b/src/assets/images/badges/brown/black_in_business.png differ diff --git a/src/assets/images/badges/brown/brown_badge.png b/src/assets/images/badges/brown/brown_badge.png new file mode 100644 index 00000000..bcffb6e3 Binary files /dev/null and b/src/assets/images/badges/brown/brown_badge.png differ diff --git a/src/assets/images/badges/brown/brown_band.png b/src/assets/images/badges/brown/brown_band.png new file mode 100644 index 00000000..bb21bcde Binary files /dev/null and b/src/assets/images/badges/brown/brown_band.png differ diff --git a/src/assets/images/badges/brown/brown_class_board.png b/src/assets/images/badges/brown/brown_class_board.png new file mode 100644 index 00000000..a04e0a63 Binary files /dev/null and b/src/assets/images/badges/brown/brown_class_board.png differ diff --git a/src/assets/images/badges/brown/brown_cs.png b/src/assets/images/badges/brown/brown_cs.png new file mode 100644 index 00000000..18c7165a Binary files /dev/null and b/src/assets/images/badges/brown/brown_cs.png differ diff --git a/src/assets/images/badges/brown/brown_democrats.png b/src/assets/images/badges/brown/brown_democrats.png new file mode 100644 index 00000000..ba828a2a Binary files /dev/null and b/src/assets/images/badges/brown/brown_democrats.png differ diff --git a/src/assets/images/badges/brown/brown_ep.png b/src/assets/images/badges/brown/brown_ep.png new file mode 100644 index 00000000..c4f381b2 Binary files /dev/null and b/src/assets/images/badges/brown/brown_ep.png differ diff --git a/src/assets/images/badges/brown/brown_womens_collective.png b/src/assets/images/badges/brown/brown_womens_collective.png new file mode 100644 index 00000000..242188ab Binary files /dev/null and b/src/assets/images/badges/brown/brown_womens_collective.png differ diff --git a/src/assets/images/badges/brown/bsu.png b/src/assets/images/badges/brown/bsu.png new file mode 100644 index 00000000..13838f32 Binary files /dev/null and b/src/assets/images/badges/brown/bsu.png differ diff --git a/src/assets/images/badges/brown/buxton_international.png b/src/assets/images/badges/brown/buxton_international.png new file mode 100644 index 00000000..2b1d33a3 Binary files /dev/null and b/src/assets/images/badges/brown/buxton_international.png differ diff --git a/src/assets/images/badges/brown/delta_gamma.png b/src/assets/images/badges/brown/delta_gamma.png new file mode 100644 index 00000000..4f1aa675 Binary files /dev/null and b/src/assets/images/badges/brown/delta_gamma.png differ diff --git a/src/assets/images/badges/brown/delta_tau.png b/src/assets/images/badges/brown/delta_tau.png new file mode 100644 index 00000000..80d2a373 Binary files /dev/null and b/src/assets/images/badges/brown/delta_tau.png differ diff --git a/src/assets/images/badges/brown/fashion_at_brown.png b/src/assets/images/badges/brown/fashion_at_brown.png new file mode 100644 index 00000000..a60b65fc Binary files /dev/null and b/src/assets/images/badges/brown/fashion_at_brown.png differ diff --git a/src/assets/images/badges/brown/field_hockey.png b/src/assets/images/badges/brown/field_hockey.png new file mode 100644 index 00000000..7f08587e Binary files /dev/null and b/src/assets/images/badges/brown/field_hockey.png differ diff --git a/src/assets/images/badges/brown/football.png b/src/assets/images/badges/brown/football.png new file mode 100644 index 00000000..1a5c0f4f Binary files /dev/null and b/src/assets/images/badges/brown/football.png differ diff --git a/src/assets/images/badges/brown/gymnastics.png b/src/assets/images/badges/brown/gymnastics.png new file mode 100644 index 00000000..64735dd2 Binary files /dev/null and b/src/assets/images/badges/brown/gymnastics.png differ diff --git a/src/assets/images/badges/brown/hockey.png b/src/assets/images/badges/brown/hockey.png new file mode 100644 index 00000000..2cfd547e Binary files /dev/null and b/src/assets/images/badges/brown/hockey.png differ diff --git a/src/assets/images/badges/brown/impulse.png b/src/assets/images/badges/brown/impulse.png new file mode 100644 index 00000000..68a73028 Binary files /dev/null and b/src/assets/images/badges/brown/impulse.png differ diff --git a/src/assets/images/badges/brown/kappa_delta.png b/src/assets/images/badges/brown/kappa_delta.png new file mode 100644 index 00000000..7a3fdb25 Binary files /dev/null and b/src/assets/images/badges/brown/kappa_delta.png differ diff --git a/src/assets/images/badges/brown/lacrosse.png b/src/assets/images/badges/brown/lacrosse.png new file mode 100644 index 00000000..67ac8f5e Binary files /dev/null and b/src/assets/images/badges/brown/lacrosse.png differ diff --git a/src/assets/images/badges/brown/latin_at_brown.png b/src/assets/images/badges/brown/latin_at_brown.png new file mode 100644 index 00000000..515599f9 Binary files /dev/null and b/src/assets/images/badges/brown/latin_at_brown.png differ diff --git a/src/assets/images/badges/brown/soccer.png b/src/assets/images/badges/brown/soccer.png new file mode 100644 index 00000000..f2202510 Binary files /dev/null and b/src/assets/images/badges/brown/soccer.png differ diff --git a/src/assets/images/badges/brown/softball.png b/src/assets/images/badges/brown/softball.png new file mode 100644 index 00000000..2a049c16 Binary files /dev/null and b/src/assets/images/badges/brown/softball.png differ diff --git a/src/assets/images/badges/brown/tap.png b/src/assets/images/badges/brown/tap.png new file mode 100644 index 00000000..e6db8470 Binary files /dev/null and b/src/assets/images/badges/brown/tap.png differ diff --git a/src/assets/images/badges/brown/tennis.png b/src/assets/images/badges/brown/tennis.png new file mode 100644 index 00000000..358cb8c7 Binary files /dev/null and b/src/assets/images/badges/brown/tennis.png differ diff --git a/src/assets/images/badges/brown/theta_alpha.png b/src/assets/images/badges/brown/theta_alpha.png new file mode 100644 index 00000000..323b538e Binary files /dev/null and b/src/assets/images/badges/brown/theta_alpha.png differ diff --git a/src/assets/images/badges/brown/track.png b/src/assets/images/badges/brown/track.png new file mode 100644 index 00000000..5bcff810 Binary files /dev/null and b/src/assets/images/badges/brown/track.png differ diff --git a/src/assets/images/badges/brown/ucs.png b/src/assets/images/badges/brown/ucs.png new file mode 100644 index 00000000..1009dc9b Binary files /dev/null and b/src/assets/images/badges/brown/ucs.png differ diff --git a/src/assets/images/badges/brown/volleyball.png b/src/assets/images/badges/brown/volleyball.png new file mode 100644 index 00000000..915b467c Binary files /dev/null and b/src/assets/images/badges/brown/volleyball.png differ diff --git a/src/assets/images/badges/brown/women_in_business.png b/src/assets/images/badges/brown/women_in_business.png new file mode 100644 index 00000000..1a504676 Binary files /dev/null and b/src/assets/images/badges/brown/women_in_business.png differ diff --git a/src/assets/images/badges/brown/zeta_delta_xi.png b/src/assets/images/badges/brown/zeta_delta_xi.png new file mode 100644 index 00000000..7880d2b7 Binary files /dev/null and b/src/assets/images/badges/brown/zeta_delta_xi.png differ diff --git a/src/assets/images/badges/brown_badge.png b/src/assets/images/badges/brown_badge.png deleted file mode 100644 index bcffb6e3..00000000 Binary files a/src/assets/images/badges/brown_badge.png and /dev/null differ diff --git a/src/assets/images/badges/brown_band.png b/src/assets/images/badges/brown_band.png deleted file mode 100644 index bb21bcde..00000000 Binary files a/src/assets/images/badges/brown_band.png and /dev/null differ diff --git a/src/assets/images/badges/brown_class_board.png b/src/assets/images/badges/brown_class_board.png deleted file mode 100644 index a04e0a63..00000000 Binary files a/src/assets/images/badges/brown_class_board.png and /dev/null differ diff --git a/src/assets/images/badges/brown_cs.png b/src/assets/images/badges/brown_cs.png deleted file mode 100644 index 18c7165a..00000000 Binary files a/src/assets/images/badges/brown_cs.png and /dev/null differ diff --git a/src/assets/images/badges/brown_democrats.png b/src/assets/images/badges/brown_democrats.png deleted file mode 100644 index ba828a2a..00000000 Binary files a/src/assets/images/badges/brown_democrats.png and /dev/null differ diff --git a/src/assets/images/badges/brown_ep.png b/src/assets/images/badges/brown_ep.png deleted file mode 100644 index c4f381b2..00000000 Binary files a/src/assets/images/badges/brown_ep.png and /dev/null differ diff --git a/src/assets/images/badges/brown_womens_collective.png b/src/assets/images/badges/brown_womens_collective.png deleted file mode 100644 index 242188ab..00000000 Binary files a/src/assets/images/badges/brown_womens_collective.png and /dev/null differ diff --git a/src/assets/images/badges/bsu.png b/src/assets/images/badges/bsu.png deleted file mode 100644 index 13838f32..00000000 Binary files a/src/assets/images/badges/bsu.png and /dev/null differ diff --git a/src/assets/images/badges/buxton_international.png b/src/assets/images/badges/buxton_international.png deleted file mode 100644 index 2b1d33a3..00000000 Binary files a/src/assets/images/badges/buxton_international.png and /dev/null differ diff --git a/src/assets/images/badges/cornell/acacia.png b/src/assets/images/badges/cornell/acacia.png new file mode 100644 index 00000000..2dc2b383 Binary files /dev/null and b/src/assets/images/badges/cornell/acacia.png differ diff --git a/src/assets/images/badges/cornell/acapella.png b/src/assets/images/badges/cornell/acapella.png new file mode 100644 index 00000000..2b56c9ad Binary files /dev/null and b/src/assets/images/badges/cornell/acapella.png differ diff --git a/src/assets/images/badges/cornell/aeta_phi_beta.png b/src/assets/images/badges/cornell/aeta_phi_beta.png new file mode 100644 index 00000000..8816cac7 Binary files /dev/null and b/src/assets/images/badges/cornell/aeta_phi_beta.png differ diff --git a/src/assets/images/badges/cornell/alpha_chi_omega.png b/src/assets/images/badges/cornell/alpha_chi_omega.png new file mode 100644 index 00000000..304639ee Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_chi_omega.png differ diff --git a/src/assets/images/badges/cornell/alpha_delta_phi.png b/src/assets/images/badges/cornell/alpha_delta_phi.png new file mode 100644 index 00000000..89311e10 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_delta_phi.png differ diff --git a/src/assets/images/badges/cornell/alpha_epsilon_phi.png b/src/assets/images/badges/cornell/alpha_epsilon_phi.png new file mode 100644 index 00000000..e35d1b24 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_epsilon_phi.png differ diff --git a/src/assets/images/badges/cornell/alpha_gamma_rho.png b/src/assets/images/badges/cornell/alpha_gamma_rho.png new file mode 100644 index 00000000..1b1f88ae Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_gamma_rho.png differ diff --git a/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png b/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png new file mode 100644 index 00000000..cfc5b51c Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png differ diff --git a/src/assets/images/badges/cornell/alpha_phi.png b/src/assets/images/badges/cornell/alpha_phi.png new file mode 100644 index 00000000..dcf5d391 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_phi.png differ diff --git a/src/assets/images/badges/cornell/alpha_phi_alpha.png b/src/assets/images/badges/cornell/alpha_phi_alpha.png new file mode 100644 index 00000000..4dde66b3 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_phi_alpha.png differ diff --git a/src/assets/images/badges/cornell/alpha_sigma_phi.png b/src/assets/images/badges/cornell/alpha_sigma_phi.png new file mode 100644 index 00000000..a63a6850 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_sigma_phi.png differ diff --git a/src/assets/images/badges/cornell/alpha_xi_delta.png b/src/assets/images/badges/cornell/alpha_xi_delta.png new file mode 100644 index 00000000..47f8108c Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_xi_delta.png differ diff --git a/src/assets/images/badges/cornell/alpha_zeta.png b/src/assets/images/badges/cornell/alpha_zeta.png new file mode 100644 index 00000000..1942f775 Binary files /dev/null and b/src/assets/images/badges/cornell/alpha_zeta.png differ diff --git a/src/assets/images/badges/cornell/alphs_epsilon_pi.png b/src/assets/images/badges/cornell/alphs_epsilon_pi.png new file mode 100644 index 00000000..0480edc2 Binary files /dev/null and b/src/assets/images/badges/cornell/alphs_epsilon_pi.png differ diff --git a/src/assets/images/badges/cornell/baseball.png b/src/assets/images/badges/cornell/baseball.png new file mode 100644 index 00000000..5643f9b8 Binary files /dev/null and b/src/assets/images/badges/cornell/baseball.png differ diff --git a/src/assets/images/badges/cornell/basketball.png b/src/assets/images/badges/cornell/basketball.png new file mode 100644 index 00000000..d2a8f04a Binary files /dev/null and b/src/assets/images/badges/cornell/basketball.png differ diff --git a/src/assets/images/badges/cornell/beta_theta_pi.png b/src/assets/images/badges/cornell/beta_theta_pi.png new file mode 100644 index 00000000..ae09a5b6 Binary files /dev/null and b/src/assets/images/badges/cornell/beta_theta_pi.png differ diff --git a/src/assets/images/badges/cornell/chi_phi.png b/src/assets/images/badges/cornell/chi_phi.png new file mode 100644 index 00000000..199213c9 Binary files /dev/null and b/src/assets/images/badges/cornell/chi_phi.png differ diff --git a/src/assets/images/badges/cornell/chi_psi.png b/src/assets/images/badges/cornell/chi_psi.png new file mode 100644 index 00000000..e9ad6540 Binary files /dev/null and b/src/assets/images/badges/cornell/chi_psi.png differ diff --git a/src/assets/images/badges/cornell/delta_chi.png b/src/assets/images/badges/cornell/delta_chi.png new file mode 100644 index 00000000..116c1ae7 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_chi.png differ diff --git a/src/assets/images/badges/cornell/delta_delta_delta.png b/src/assets/images/badges/cornell/delta_delta_delta.png new file mode 100644 index 00000000..93d92ce3 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_delta_delta.png differ diff --git a/src/assets/images/badges/cornell/delta_epsilon.png b/src/assets/images/badges/cornell/delta_epsilon.png new file mode 100644 index 00000000..2f7ef7ca Binary files /dev/null and b/src/assets/images/badges/cornell/delta_epsilon.png differ diff --git a/src/assets/images/badges/cornell/delta_gamma.png b/src/assets/images/badges/cornell/delta_gamma.png new file mode 100644 index 00000000..218ac7a6 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_gamma.png differ diff --git a/src/assets/images/badges/cornell/delta_kappa_epsilon.png b/src/assets/images/badges/cornell/delta_kappa_epsilon.png new file mode 100644 index 00000000..12bd6e37 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_kappa_epsilon.png differ diff --git a/src/assets/images/badges/cornell/delta_sigma_theta.png b/src/assets/images/badges/cornell/delta_sigma_theta.png new file mode 100644 index 00000000..d70d4220 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_sigma_theta.png differ diff --git a/src/assets/images/badges/cornell/delta_tau_delta.png b/src/assets/images/badges/cornell/delta_tau_delta.png new file mode 100644 index 00000000..02011fc1 Binary files /dev/null and b/src/assets/images/badges/cornell/delta_tau_delta.png differ diff --git a/src/assets/images/badges/cornell/fencing.png b/src/assets/images/badges/cornell/fencing.png new file mode 100644 index 00000000..c2649533 Binary files /dev/null and b/src/assets/images/badges/cornell/fencing.png differ diff --git a/src/assets/images/badges/cornell/field_hockey.png b/src/assets/images/badges/cornell/field_hockey.png new file mode 100644 index 00000000..5405e392 Binary files /dev/null and b/src/assets/images/badges/cornell/field_hockey.png differ diff --git a/src/assets/images/badges/cornell/football.png b/src/assets/images/badges/cornell/football.png new file mode 100644 index 00000000..bcc44778 Binary files /dev/null and b/src/assets/images/badges/cornell/football.png differ diff --git a/src/assets/images/badges/cornell/golf.png b/src/assets/images/badges/cornell/golf.png new file mode 100644 index 00000000..92f8f394 Binary files /dev/null and b/src/assets/images/badges/cornell/golf.png differ diff --git a/src/assets/images/badges/cornell/gymnastics.png b/src/assets/images/badges/cornell/gymnastics.png new file mode 100644 index 00000000..2f6c4fae Binary files /dev/null and b/src/assets/images/badges/cornell/gymnastics.png differ diff --git a/src/assets/images/badges/cornell/hockey.png b/src/assets/images/badges/cornell/hockey.png new file mode 100644 index 00000000..0d1f1294 Binary files /dev/null and b/src/assets/images/badges/cornell/hockey.png differ diff --git a/src/assets/images/badges/cornell/kappa_alpha_theta.png b/src/assets/images/badges/cornell/kappa_alpha_theta.png new file mode 100644 index 00000000..dadc7f86 Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_alpha_theta.png differ diff --git a/src/assets/images/badges/cornell/kappa_delta.png b/src/assets/images/badges/cornell/kappa_delta.png new file mode 100644 index 00000000..1f9b4e06 Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_delta.png differ diff --git a/src/assets/images/badges/cornell/kappa_delta_rho.png b/src/assets/images/badges/cornell/kappa_delta_rho.png new file mode 100644 index 00000000..c32c7c70 Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_delta_rho.png differ diff --git a/src/assets/images/badges/cornell/kappa_kappa_gamma.png b/src/assets/images/badges/cornell/kappa_kappa_gamma.png new file mode 100644 index 00000000..7583ebfd Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_kappa_gamma.png differ diff --git a/src/assets/images/badges/cornell/kappa_phi_lambda.png b/src/assets/images/badges/cornell/kappa_phi_lambda.png new file mode 100644 index 00000000..f3dd4a49 Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_phi_lambda.png differ diff --git a/src/assets/images/badges/cornell/kappa_sigma.png b/src/assets/images/badges/cornell/kappa_sigma.png new file mode 100644 index 00000000..7df2efa5 Binary files /dev/null and b/src/assets/images/badges/cornell/kappa_sigma.png differ diff --git a/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png b/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png new file mode 100644 index 00000000..f8017b9f Binary files /dev/null and b/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png differ diff --git a/src/assets/images/badges/cornell/lacrosse.png b/src/assets/images/badges/cornell/lacrosse.png new file mode 100644 index 00000000..100ae33b Binary files /dev/null and b/src/assets/images/badges/cornell/lacrosse.png differ diff --git a/src/assets/images/badges/cornell/lambda_chi_alpha.png b/src/assets/images/badges/cornell/lambda_chi_alpha.png new file mode 100644 index 00000000..9360a226 Binary files /dev/null and b/src/assets/images/badges/cornell/lambda_chi_alpha.png differ diff --git a/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png b/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png new file mode 100644 index 00000000..f2721927 Binary files /dev/null and b/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png differ diff --git a/src/assets/images/badges/cornell/malik.png b/src/assets/images/badges/cornell/malik.png new file mode 100644 index 00000000..ac221d24 Binary files /dev/null and b/src/assets/images/badges/cornell/malik.png differ diff --git a/src/assets/images/badges/cornell/phi_beta_phi.png b/src/assets/images/badges/cornell/phi_beta_phi.png new file mode 100644 index 00000000..8d46dd2e Binary files /dev/null and b/src/assets/images/badges/cornell/phi_beta_phi.png differ diff --git a/src/assets/images/badges/cornell/phi_beta_sigma.png b/src/assets/images/badges/cornell/phi_beta_sigma.png new file mode 100644 index 00000000..49e636dc Binary files /dev/null and b/src/assets/images/badges/cornell/phi_beta_sigma.png differ diff --git a/src/assets/images/badges/cornell/phi_delta_theta.png b/src/assets/images/badges/cornell/phi_delta_theta.png new file mode 100644 index 00000000..55ff15dc Binary files /dev/null and b/src/assets/images/badges/cornell/phi_delta_theta.png differ diff --git a/src/assets/images/badges/cornell/phi_kappa_tau.png b/src/assets/images/badges/cornell/phi_kappa_tau.png new file mode 100644 index 00000000..b1c01ab1 Binary files /dev/null and b/src/assets/images/badges/cornell/phi_kappa_tau.png differ diff --git a/src/assets/images/badges/cornell/phi_mu.png b/src/assets/images/badges/cornell/phi_mu.png new file mode 100644 index 00000000..0049a584 Binary files /dev/null and b/src/assets/images/badges/cornell/phi_mu.png differ diff --git a/src/assets/images/badges/cornell/phi_sigma_kappa.png b/src/assets/images/badges/cornell/phi_sigma_kappa.png new file mode 100644 index 00000000..9249db92 Binary files /dev/null and b/src/assets/images/badges/cornell/phi_sigma_kappa.png differ diff --git a/src/assets/images/badges/cornell/phi_sigma_sigma.png b/src/assets/images/badges/cornell/phi_sigma_sigma.png new file mode 100644 index 00000000..889dc14f Binary files /dev/null and b/src/assets/images/badges/cornell/phi_sigma_sigma.png differ diff --git a/src/assets/images/badges/cornell/pi_delta_psi.png b/src/assets/images/badges/cornell/pi_delta_psi.png new file mode 100644 index 00000000..164c4483 Binary files /dev/null and b/src/assets/images/badges/cornell/pi_delta_psi.png differ diff --git a/src/assets/images/badges/cornell/pi_kappa_alpha.png b/src/assets/images/badges/cornell/pi_kappa_alpha.png new file mode 100644 index 00000000..08a3153e Binary files /dev/null and b/src/assets/images/badges/cornell/pi_kappa_alpha.png differ diff --git a/src/assets/images/badges/cornell/pi_kappa_phi.png b/src/assets/images/badges/cornell/pi_kappa_phi.png new file mode 100644 index 00000000..0a1dee58 Binary files /dev/null and b/src/assets/images/badges/cornell/pi_kappa_phi.png differ diff --git a/src/assets/images/badges/cornell/polo.png b/src/assets/images/badges/cornell/polo.png new file mode 100644 index 00000000..05758440 Binary files /dev/null and b/src/assets/images/badges/cornell/polo.png differ diff --git a/src/assets/images/badges/cornell/rowing.png b/src/assets/images/badges/cornell/rowing.png new file mode 100644 index 00000000..28e4436f Binary files /dev/null and b/src/assets/images/badges/cornell/rowing.png differ diff --git a/src/assets/images/badges/cornell/sailing.png b/src/assets/images/badges/cornell/sailing.png new file mode 100644 index 00000000..ea8d3a11 Binary files /dev/null and b/src/assets/images/badges/cornell/sailing.png differ diff --git a/src/assets/images/badges/cornell/sigma_alpha_mu.png b/src/assets/images/badges/cornell/sigma_alpha_mu.png new file mode 100644 index 00000000..d05a8fed Binary files /dev/null and b/src/assets/images/badges/cornell/sigma_alpha_mu.png differ diff --git a/src/assets/images/badges/cornell/sigma_chi.png b/src/assets/images/badges/cornell/sigma_chi.png new file mode 100644 index 00000000..0ca28bb3 Binary files /dev/null and b/src/assets/images/badges/cornell/sigma_chi.png differ diff --git a/src/assets/images/badges/cornell/sigma_delta_tau.png b/src/assets/images/badges/cornell/sigma_delta_tau.png new file mode 100644 index 00000000..f0863d8d Binary files /dev/null and b/src/assets/images/badges/cornell/sigma_delta_tau.png differ diff --git a/src/assets/images/badges/cornell/sigma_phi_society.png b/src/assets/images/badges/cornell/sigma_phi_society.png new file mode 100644 index 00000000..478922c8 Binary files /dev/null and b/src/assets/images/badges/cornell/sigma_phi_society.png differ diff --git a/src/assets/images/badges/cornell/sigma_pi.png b/src/assets/images/badges/cornell/sigma_pi.png new file mode 100644 index 00000000..c5cb5ce3 Binary files /dev/null and b/src/assets/images/badges/cornell/sigma_pi.png differ diff --git a/src/assets/images/badges/cornell/soccer.png b/src/assets/images/badges/cornell/soccer.png new file mode 100644 index 00000000..e17d76de Binary files /dev/null and b/src/assets/images/badges/cornell/soccer.png differ diff --git a/src/assets/images/badges/cornell/softball.png b/src/assets/images/badges/cornell/softball.png new file mode 100644 index 00000000..fda13c9a Binary files /dev/null and b/src/assets/images/badges/cornell/softball.png differ diff --git a/src/assets/images/badges/cornell/squash.png b/src/assets/images/badges/cornell/squash.png new file mode 100644 index 00000000..5d6c3f0e Binary files /dev/null and b/src/assets/images/badges/cornell/squash.png differ diff --git a/src/assets/images/badges/cornell/swimming_&_diving.png b/src/assets/images/badges/cornell/swimming_&_diving.png new file mode 100644 index 00000000..aed8f37e Binary files /dev/null and b/src/assets/images/badges/cornell/swimming_&_diving.png differ diff --git a/src/assets/images/badges/cornell/tennis.png b/src/assets/images/badges/cornell/tennis.png new file mode 100644 index 00000000..24ea81e4 Binary files /dev/null and b/src/assets/images/badges/cornell/tennis.png differ diff --git a/src/assets/images/badges/cornell/theta_delta_chi.png b/src/assets/images/badges/cornell/theta_delta_chi.png new file mode 100644 index 00000000..7a2bf4e8 Binary files /dev/null and b/src/assets/images/badges/cornell/theta_delta_chi.png differ diff --git a/src/assets/images/badges/cornell/track_&_field.png b/src/assets/images/badges/cornell/track_&_field.png new file mode 100644 index 00000000..05644dc4 Binary files /dev/null and b/src/assets/images/badges/cornell/track_&_field.png differ diff --git a/src/assets/images/badges/cornell/volleyball.png b/src/assets/images/badges/cornell/volleyball.png new file mode 100644 index 00000000..9ea08622 Binary files /dev/null and b/src/assets/images/badges/cornell/volleyball.png differ diff --git a/src/assets/images/badges/cornell/wrestling.png b/src/assets/images/badges/cornell/wrestling.png new file mode 100644 index 00000000..28892124 Binary files /dev/null and b/src/assets/images/badges/cornell/wrestling.png differ diff --git a/src/assets/images/badges/cornell/zeta_beta_tau.png b/src/assets/images/badges/cornell/zeta_beta_tau.png new file mode 100644 index 00000000..4572bf01 Binary files /dev/null and b/src/assets/images/badges/cornell/zeta_beta_tau.png differ diff --git a/src/assets/images/badges/cornell/zeta_psi.png b/src/assets/images/badges/cornell/zeta_psi.png new file mode 100644 index 00000000..ad245931 Binary files /dev/null and b/src/assets/images/badges/cornell/zeta_psi.png differ diff --git a/src/assets/images/badges/delta_gamma.png b/src/assets/images/badges/delta_gamma.png deleted file mode 100644 index 4f1aa675..00000000 Binary files a/src/assets/images/badges/delta_gamma.png and /dev/null differ diff --git a/src/assets/images/badges/delta_tau.png b/src/assets/images/badges/delta_tau.png deleted file mode 100644 index 80d2a373..00000000 Binary files a/src/assets/images/badges/delta_tau.png and /dev/null differ diff --git a/src/assets/images/badges/fashion_at_brown.png b/src/assets/images/badges/fashion_at_brown.png deleted file mode 100644 index a60b65fc..00000000 Binary files a/src/assets/images/badges/fashion_at_brown.png and /dev/null differ diff --git a/src/assets/images/badges/field_hockey.png b/src/assets/images/badges/field_hockey.png deleted file mode 100644 index 7f08587e..00000000 Binary files a/src/assets/images/badges/field_hockey.png and /dev/null differ diff --git a/src/assets/images/badges/football.png b/src/assets/images/badges/football.png deleted file mode 100644 index 1a5c0f4f..00000000 Binary files a/src/assets/images/badges/football.png and /dev/null differ diff --git a/src/assets/images/badges/gymnastics.png b/src/assets/images/badges/gymnastics.png deleted file mode 100644 index 64735dd2..00000000 Binary files a/src/assets/images/badges/gymnastics.png and /dev/null differ diff --git a/src/assets/images/badges/hockey.png b/src/assets/images/badges/hockey.png deleted file mode 100644 index 2cfd547e..00000000 Binary files a/src/assets/images/badges/hockey.png and /dev/null differ diff --git a/src/assets/images/badges/impulse.png b/src/assets/images/badges/impulse.png deleted file mode 100644 index 68a73028..00000000 Binary files a/src/assets/images/badges/impulse.png and /dev/null differ diff --git a/src/assets/images/badges/kappa_delta.png b/src/assets/images/badges/kappa_delta.png deleted file mode 100644 index 7a3fdb25..00000000 Binary files a/src/assets/images/badges/kappa_delta.png and /dev/null differ diff --git a/src/assets/images/badges/lacrosse.png b/src/assets/images/badges/lacrosse.png deleted file mode 100644 index 67ac8f5e..00000000 Binary files a/src/assets/images/badges/lacrosse.png and /dev/null differ diff --git a/src/assets/images/badges/latin_at_brown.png b/src/assets/images/badges/latin_at_brown.png deleted file mode 100644 index 515599f9..00000000 Binary files a/src/assets/images/badges/latin_at_brown.png and /dev/null differ diff --git a/src/assets/images/badges/soccer.png b/src/assets/images/badges/soccer.png deleted file mode 100644 index f2202510..00000000 Binary files a/src/assets/images/badges/soccer.png and /dev/null differ diff --git a/src/assets/images/badges/softball.png b/src/assets/images/badges/softball.png deleted file mode 100644 index 2a049c16..00000000 Binary files a/src/assets/images/badges/softball.png and /dev/null differ diff --git a/src/assets/images/badges/tap.png b/src/assets/images/badges/tap.png deleted file mode 100644 index e6db8470..00000000 Binary files a/src/assets/images/badges/tap.png and /dev/null differ diff --git a/src/assets/images/badges/tennis.png b/src/assets/images/badges/tennis.png deleted file mode 100644 index 358cb8c7..00000000 Binary files a/src/assets/images/badges/tennis.png and /dev/null differ diff --git a/src/assets/images/badges/theta_alpha.png b/src/assets/images/badges/theta_alpha.png deleted file mode 100644 index 323b538e..00000000 Binary files a/src/assets/images/badges/theta_alpha.png and /dev/null differ diff --git a/src/assets/images/badges/track.png b/src/assets/images/badges/track.png deleted file mode 100644 index 5bcff810..00000000 Binary files a/src/assets/images/badges/track.png and /dev/null differ diff --git a/src/assets/images/badges/ucs.png b/src/assets/images/badges/ucs.png deleted file mode 100644 index 1009dc9b..00000000 Binary files a/src/assets/images/badges/ucs.png and /dev/null differ diff --git a/src/assets/images/badges/volleyball.png b/src/assets/images/badges/volleyball.png deleted file mode 100644 index 915b467c..00000000 Binary files a/src/assets/images/badges/volleyball.png and /dev/null differ diff --git a/src/assets/images/badges/women_in_business.png b/src/assets/images/badges/women_in_business.png deleted file mode 100644 index 1a504676..00000000 Binary files a/src/assets/images/badges/women_in_business.png and /dev/null differ diff --git a/src/assets/images/badges/zeta_delta_xi.png b/src/assets/images/badges/zeta_delta_xi.png deleted file mode 100644 index 7880d2b7..00000000 Binary files a/src/assets/images/badges/zeta_delta_xi.png and /dev/null differ diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index 48cfe3dc..aef0de4f 100644 --- a/src/components/profile/UniversityIcon.tsx +++ b/src/components/profile/UniversityIcon.tsx @@ -20,6 +20,9 @@ const UniversityIcon: React.FC = ({ }) => { var universityIcon; switch (university) { + case 'cornell': + //TODO: + universityIcon = require('../../assets/universities/brown.png'); case 'brown': universityIcon = require('../../assets/universities/brown.png'); break; diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 6dc7ccf2..16843947 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -1,93 +1,168 @@ -export const _badgeImages = { - acapella: require('../assets/images/badges/acapella.png'), - alpha_chi_omega: require('../assets/images/badges/alpha_chi_omega.png'), - alpha_delta_phi: require('../assets/images/badges/alpha_delta_phi.png'), - baseball: require('../assets/images/badges/baseball.png'), - basketball: require('../assets/images/badges/basketball.png'), - beta_rho_pi: require('../assets/images/badges/beta_rho_pi.png'), - black_in_business: require('../assets/images/badges/black_in_business.png'), - brown_band: require('../assets/images/badges/brown_band.png'), - brown_class_board: require('../assets/images/badges/brown_class_board.png'), - brown_cs: require('../assets/images/badges/brown_cs.png'), - brown_democrats: require('../assets/images/badges/brown_democrats.png'), - brown_ep: require('../assets/images/badges/brown_ep.png'), - brown_womens_collective: require('../assets/images/badges/brown_womens_collective.png'), - bsu: require('../assets/images/badges/bsu.png'), - buxton_international: require('../assets/images/badges/buxton_international.png'), - delta_gamma: require('../assets/images/badges/delta_gamma.png'), - delta_tau: require('../assets/images/badges/delta_tau.png'), - fashion_at_brown: require('../assets/images/badges/fashion_at_brown.png'), - field_hockey: require('../assets/images/badges/field_hockey.png'), - football: require('../assets/images/badges/football.png'), - gymnastics: require('../assets/images/badges/gymnastics.png'), - hockey: require('../assets/images/badges/hockey.png'), - impulse: require('../assets/images/badges/impulse.png'), - kappa_delta: require('../assets/images/badges/kappa_delta.png'), - lacrosse: require('../assets/images/badges/lacrosse.png'), - latin_at_brown: require('../assets/images/badges/latin_at_brown.png'), - soccer: require('../assets/images/badges/soccer.png'), - softball: require('../assets/images/badges/softball.png'), - tap: require('../assets/images/badges/tap.png'), - tennis: require('../assets/images/badges/tennis.png'), - theta_alpha: require('../assets/images/badges/theta_alpha.png'), - track: require('../assets/images/badges/track.png'), - ucs: require('../assets/images/badges/ucs.png'), - volleyball: require('../assets/images/badges/volleyball.png'), - women_in_business: require('../assets/images/badges/women_in_business.png'), - zeta_delta_xi: require('../assets/images/badges/zeta_delta_xi.png'), +export const _brownBadgeImages = { + acapella: require('../assets/images/badges/brown/acapella.png'), + alpha_chi_omega: require('../assets/images/badges/brown/alpha_chi_omega.png'), + alpha_delta_phi: require('../assets/images/badges/brown/alpha_delta_phi.png'), + baseball: require('../assets/images/badges/brown/baseball.png'), + basketball: require('../assets/images/badges/brown/basketball.png'), + beta_rho_pi: require('../assets/images/badges/brown/beta_rho_pi.png'), + black_in_business: require('../assets/images/badges/brown/black_in_business.png'), + brown_band: require('../assets/images/badges/brown/brown_band.png'), + brown_class_board: require('../assets/images/badges/brown/brown_class_board.png'), + brown_cs: require('../assets/images/badges/brown/brown_cs.png'), + brown_democrats: require('../assets/images/badges/brown/brown_democrats.png'), + brown_ep: require('../assets/images/badges/brown/brown_ep.png'), + brown_womens_collective: require('../assets/images/badges/brown/brown_womens_collective.png'), + bsu: require('../assets/images/badges/brown/bsu.png'), + buxton_international: require('../assets/images/badges/brown/buxton_international.png'), + delta_gamma: require('../assets/images/badges/brown/delta_gamma.png'), + delta_tau: require('../assets/images/badges/brown/delta_tau.png'), + fashion_at_brown: require('../assets/images/badges/brown/fashion_at_brown.png'), + field_hockey: require('../assets/images/badges/brown/field_hockey.png'), + football: require('../assets/images/badges/brown/football.png'), + gymnastics: require('../assets/images/badges/brown/gymnastics.png'), + hockey: require('../assets/images/badges/brown/hockey.png'), + impulse: require('../assets/images/badges/brown/impulse.png'), + kappa_delta: require('../assets/images/badges/brown/kappa_delta.png'), + lacrosse: require('../assets/images/badges/brown/lacrosse.png'), + latin_at_brown: require('../assets/images/badges/brown/latin_at_brown.png'), + soccer: require('../assets/images/badges/brown/soccer.png'), + softball: require('../assets/images/badges/brown/softball.png'), + tap: require('../assets/images/badges/brown/tap.png'), + tennis: require('../assets/images/badges/brown/tennis.png'), + theta_alpha: require('../assets/images/badges/brown/theta_alpha.png'), + track: require('../assets/images/badges/brown/track.png'), + ucs: require('../assets/images/badges/brown/ucs.png'), + volleyball: require('../assets/images/badges/brown/volleyball.png'), + women_in_business: require('../assets/images/badges/brown/women_in_business.png'), + zeta_delta_xi: require('../assets/images/badges/brown/zeta_delta_xi.png'), }; -export const BADGE_DATA = [ +export const _cornellBadgeImages = { + acacia: require('../assets/images/badges/cornell/acacia.png'), + acapella: require('../assets/images/badges/cornell/acapella.png'), + aeta_phi_beta: require('../assets/images/badges/cornell/aeta_phi_beta.png'), + alpha_chi_omega: require('../assets/images/badges/cornell/alpha_chi_omega.png'), + alpha_delta_phi: require('../assets/images/badges/cornell/alpha_delta_phi.png'), + alpha_epsilon_phi: require('../assets/images/badges/cornell/alpha_epsilon_phi.png'), + alpha_gamma_rho: require('../assets/images/badges/cornell/alpha_gamma_rho.png'), + alpha_kappa_delta_phi: require('../assets/images/badges/cornell/alpha_kappa_delta_phi.png'), + alpha_phi_alpha: require('../assets/images/badges/cornell/alpha_phi_alpha.png'), + alpha_phi: require('../assets/images/badges/cornell/alpha_phi.png'), + alpha_sigma_phi: require('../assets/images/badges/cornell/alpha_sigma_phi.png'), + alpha_xi_delta: require('../assets/images/badges/cornell/alpha_xi_delta.png'), + alpha_zeta: require('../assets/images/badges/cornell/alpha_zeta.png'), + alphs_epsilon_pi: require('../assets/images/badges/cornell/alphs_epsilon_pi.png'), + baseball: require('../assets/images/badges/cornell/baseball.png'), + basketball: require('../assets/images/badges/cornell/basketball.png'), + beta_theta_pi: require('../assets/images/badges/cornell/beta_theta_pi.png'), + chi_phi: require('../assets/images/badges/cornell/chi_phi.png'), + chi_psi: require('../assets/images/badges/cornell/chi_psi.png'), + delta_chi: require('../assets/images/badges/cornell/delta_chi.png'), + delta_delta_delta: require('../assets/images/badges/cornell/delta_delta_delta.png'), + delta_epsilon: require('../assets/images/badges/cornell/delta_epsilon.png'), + delta_gamma: require('../assets/images/badges/cornell/delta_gamma.png'), + delta_kappa_epsilon: require('../assets/images/badges/cornell/delta_kappa_epsilon.png'), + delta_sigma_theta: require('../assets/images/badges/cornell/delta_sigma_theta.png'), + delta_tau_delta: require('../assets/images/badges/cornell/delta_tau_delta.png'), + fencing: require('../assets/images/badges/cornell/fencing.png'), + field_hockey: require('../assets/images/badges/cornell/field_hockey.png'), + football: require('../assets/images/badges/cornell/football.png'), + golf: require('../assets/images/badges/cornell/golf.png'), + gymnastics: require('../assets/images/badges/cornell/gymnastics.png'), + hockey: require('../assets/images/badges/cornell/hockey.png'), + kappa_alpha_theta: require('../assets/images/badges/cornell/kappa_alpha_theta.png'), + kappa_delta_rho: require('../assets/images/badges/cornell/kappa_delta_rho.png'), + kappa_delta: require('../assets/images/badges/cornell/kappa_delta.png'), + kappa_kappa_gamma: require('../assets/images/badges/cornell/kappa_kappa_gamma.png'), + kappa_phi_lambda: require('../assets/images/badges/cornell/kappa_phi_lambda.png'), + kappa_sigma: require('../assets/images/badges/cornell/kappa_sigma.png'), + la_unidad_latina_lambda: require('../assets/images/badges/cornell/la_unidad_latina,_lambda.png'), + lacrosse: require('../assets/images/badges/cornell/lacrosse.png'), + lambda_chi_alpha: require('../assets/images/badges/cornell/lambda_chi_alpha.png'), + lambda_phi_epsilon_international: require('../assets/images/badges/cornell/lambda_phi_epsilon_international.png'), + malik: require('../assets/images/badges/cornell/malik.png'), + phi_beta_phi: require('../assets/images/badges/cornell/phi_beta_phi.png'), + phi_beta_sigma: require('../assets/images/badges/cornell/phi_beta_sigma.png'), + phi_delta_theta: require('../assets/images/badges/cornell/phi_delta_theta.png'), + phi_kappa_tau: require('../assets/images/badges/cornell/phi_kappa_tau.png'), + phi_mu: require('../assets/images/badges/cornell/phi_mu.png'), + phi_sigma_kappa: require('../assets/images/badges/cornell/phi_sigma_kappa.png'), + phi_sigma_sigma: require('../assets/images/badges/cornell/phi_sigma_sigma.png'), + pi_delta_psi: require('../assets/images/badges/cornell/pi_delta_psi.png'), + pi_kappa_alpha: require('../assets/images/badges/cornell/pi_kappa_alpha.png'), + pi_kappa_phi: require('../assets/images/badges/cornell/pi_kappa_phi.png'), + polo: require('../assets/images/badges/cornell/polo.png'), + rowing: require('../assets/images/badges/cornell/rowing.png'), + sailing: require('../assets/images/badges/cornell/sailing.png'), + sigma_alpha_mu: require('../assets/images/badges/cornell/sigma_alpha_mu.png'), + sigma_chi: require('../assets/images/badges/cornell/sigma_chi.png'), + sigma_delta_tau: require('../assets/images/badges/cornell/sigma_delta_tau.png'), + sigma_phi_society: require('../assets/images/badges/cornell/sigma_phi_society.png'), + sigma_pi: require('../assets/images/badges/cornell/sigma_pi.png'), + soccer: require('../assets/images/badges/cornell/soccer.png'), + softball: require('../assets/images/badges/cornell/softball.png'), + squash: require('../assets/images/badges/cornell/squash.png'), + swimming_and_diving: require('../assets/images/badges/cornell/swimming_&_diving.png'), + tennis: require('../assets/images/badges/cornell/tennis.png'), + theta_delta_chi: require('../assets/images/badges/cornell/theta_delta_chi.png'), + track_and_field: require('../assets/images/badges/cornell/track_&_field.png'), + volleyball: require('../assets/images/badges/cornell/volleyball.png'), + wrestling: require('../assets/images/badges/cornell/wrestling.png'), + zeta_beta_tau: require('../assets/images/badges/cornell/zeta_beta_tau.png'), + zeta_psi: require('../assets/images/badges/cornell/zeta_psi.png'), +}; + +const _brownBadges = [ { title: 'Athletics', data: [ { badgeName: 'Brown Football', - badgeImage: _badgeImages.football, + badgeImage: _brownBadgeImages.football, }, { badgeName: 'Brown Track', - badgeImage: _badgeImages.track, + badgeImage: _brownBadgeImages.track, }, { badgeName: 'Brown Soccer', - badgeImage: _badgeImages.soccer, + badgeImage: _brownBadgeImages.soccer, }, { badgeName: 'Brown Volleyball', - badgeImage: _badgeImages.volleyball, + badgeImage: _brownBadgeImages.volleyball, }, { badgeName: 'Brown Lacrosse', - badgeImage: _badgeImages.lacrosse, + badgeImage: _brownBadgeImages.lacrosse, }, { badgeName: 'Brown Basketball', - badgeImage: _badgeImages.basketball, + badgeImage: _brownBadgeImages.basketball, }, { badgeName: 'Brown Field Hockey', - badgeImage: _badgeImages.field_hockey, + badgeImage: _brownBadgeImages.field_hockey, }, { badgeName: 'Brown Gymnastics', - badgeImage: _badgeImages.gymnastics, + badgeImage: _brownBadgeImages.gymnastics, }, { badgeName: 'Brown Tennis', - badgeImage: _badgeImages.tennis, + badgeImage: _brownBadgeImages.tennis, }, { badgeName: 'Brown Hockey', - badgeImage: _badgeImages.hockey, + badgeImage: _brownBadgeImages.hockey, }, { badgeName: 'Brown Softball', - badgeImage: _badgeImages.softball, + badgeImage: _brownBadgeImages.softball, }, { badgeName: 'Brown Baseball', - badgeImage: _badgeImages.baseball, + badgeImage: _brownBadgeImages.baseball, }, ], }, @@ -97,11 +172,11 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Brown Class Board', - badgeImage: _badgeImages.brown_class_board, + badgeImage: _brownBadgeImages.brown_class_board, }, { badgeName: 'UCS', - badgeImage: _badgeImages.ucs, + badgeImage: _brownBadgeImages.ucs, }, ], }, @@ -110,15 +185,15 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Latin @ Brown', - badgeImage: _badgeImages.latin_at_brown, + badgeImage: _brownBadgeImages.latin_at_brown, }, { badgeName: 'Buxton/International', - badgeImage: _badgeImages.buxton_international, + badgeImage: _brownBadgeImages.buxton_international, }, { badgeName: 'BSU', - badgeImage: _badgeImages.bsu, + badgeImage: _brownBadgeImages.bsu, }, ], }, @@ -127,23 +202,23 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Kappa Delta', - badgeImage: _badgeImages.kappa_delta, + badgeImage: _brownBadgeImages.kappa_delta, }, { badgeName: "Brown Women's Collective", - badgeImage: _badgeImages.brown_womens_collective, + badgeImage: _brownBadgeImages.brown_womens_collective, }, { badgeName: 'Alpha Delta Phi', - badgeImage: _badgeImages.alpha_delta_phi, + badgeImage: _brownBadgeImages.alpha_delta_phi, }, { badgeName: 'Alpha Chi Omega', - badgeImage: _badgeImages.alpha_chi_omega, + badgeImage: _brownBadgeImages.alpha_chi_omega, }, { badgeName: 'Delta Gamma', - badgeImage: _badgeImages.delta_gamma, + badgeImage: _brownBadgeImages.delta_gamma, }, ], }, @@ -153,19 +228,19 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Beta Rho Pi', - badgeImage: _badgeImages.beta_rho_pi, + badgeImage: _brownBadgeImages.beta_rho_pi, }, { badgeName: 'Delta Tau', - badgeImage: _badgeImages.delta_tau, + badgeImage: _brownBadgeImages.delta_tau, }, { badgeName: 'Theta Alpha', - badgeImage: _badgeImages.theta_alpha, + badgeImage: _brownBadgeImages.theta_alpha, }, { badgeName: 'Zeta Delta Xi', - badgeImage: _badgeImages.zeta_delta_xi, + badgeImage: _brownBadgeImages.zeta_delta_xi, }, ], }, @@ -174,19 +249,19 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Acapella', - badgeImage: _badgeImages.acapella, + badgeImage: _brownBadgeImages.acapella, }, { badgeName: 'Taps', - badgeImage: _badgeImages.tap, + badgeImage: _brownBadgeImages.tap, }, { badgeName: 'Fashion @ Brown', - badgeImage: _badgeImages.fashion_at_brown, + badgeImage: _brownBadgeImages.fashion_at_brown, }, { badgeName: 'Impulse', - badgeImage: _badgeImages.impulse, + badgeImage: _brownBadgeImages.impulse, }, ], }, @@ -195,20 +270,222 @@ export const BADGE_DATA = [ data: [ { badgeName: 'Brown EP', - badgeImage: _badgeImages.brown_ep, + badgeImage: _brownBadgeImages.brown_ep, }, { badgeName: 'Black in Business', - badgeImage: _badgeImages.black_in_business, + badgeImage: _brownBadgeImages.black_in_business, }, { badgeName: 'Women in Business', - badgeImage: _badgeImages.women_in_business, + badgeImage: _brownBadgeImages.women_in_business, }, { badgeName: 'Brown CS', - badgeImage: _badgeImages.brown_cs, + badgeImage: _brownBadgeImages.brown_cs, }, ], }, ]; + +const _cornellBadges = [ + { + title: 'Athletics', + data: [ + {badgeName: 'Football', badgeImage: _cornellBadgeImages.football}, + { + badgeName: 'Track & Field', + badgeImage: _cornellBadgeImages.track_and_field, + }, + {badgeName: 'Soccer', badgeImage: _cornellBadgeImages.soccer}, + {badgeName: 'Volleyball', badgeImage: _cornellBadgeImages.volleyball}, + {badgeName: 'Lacrosse', badgeImage: _cornellBadgeImages.lacrosse}, + {badgeName: 'Basketball', badgeImage: _cornellBadgeImages.basketball}, + { + badgeName: 'Field hockey', + badgeImage: _cornellBadgeImages.field_hockey, + }, + {badgeName: 'Gymnastics', badgeImage: _cornellBadgeImages.gymnastics}, + {badgeName: 'Tennis', badgeImage: _cornellBadgeImages.tennis}, + {badgeName: 'Hockey', badgeImage: _cornellBadgeImages.hockey}, + {badgeName: 'Softball', badgeImage: _cornellBadgeImages.softball}, + {badgeName: 'Baseball', badgeImage: _cornellBadgeImages.baseball}, + {badgeName: 'Sailing', badgeImage: _cornellBadgeImages.sailing}, + {badgeName: 'Golf', badgeImage: _cornellBadgeImages.golf}, + {badgeName: 'Wrestling', badgeImage: _cornellBadgeImages.wrestling}, + {badgeName: 'Squash', badgeImage: _cornellBadgeImages.squash}, + {badgeName: 'Rowing', badgeImage: _cornellBadgeImages.rowing}, + {badgeName: 'Polo', badgeImage: _cornellBadgeImages.polo}, + { + badgeName: 'Swimming & Diving', + badgeImage: _cornellBadgeImages.swimming_and_diving, + }, + {badgeName: 'Fencing', badgeImage: _cornellBadgeImages.fencing}, + ], + }, + { + title: 'Fraternities', + data: [ + {badgeName: 'Acacia', badgeImage: _cornellBadgeImages.acacia}, + { + badgeName: 'Alpha Delta Phi', + badgeImage: _cornellBadgeImages.alpha_delta_phi, + }, + { + badgeName: 'Alpha Epsilon Pi', + badgeImage: _cornellBadgeImages.alpha_epsilon_phi, + }, + { + badgeName: 'Alpha Gamma Rho', + badgeImage: _cornellBadgeImages.alpha_gamma_rho, + }, + { + badgeName: 'Alpha Sigma Phi', + badgeImage: _cornellBadgeImages.alpha_sigma_phi, + }, + {badgeName: 'Alpha Zeta', badgeImage: _cornellBadgeImages.alpha_zeta}, + { + badgeName: 'Beta Theta Pi', + badgeImage: _cornellBadgeImages.beta_theta_pi, + }, + {badgeName: 'Chi Phi', badgeImage: _cornellBadgeImages.chi_phi}, + {badgeName: 'Chi Psi', badgeImage: _cornellBadgeImages.chi_psi}, + {badgeName: 'Delta Chi', badgeImage: _cornellBadgeImages.delta_chi}, + { + badgeName: 'Delta Kappa Epsilon', + badgeImage: _cornellBadgeImages.delta_kappa_epsilon, + }, + { + badgeName: 'Delta Tau Delta', + badgeImage: _cornellBadgeImages.delta_tau_delta, + }, + // {badgeName: 'Delta Upsilon', badgeImage: _cornellBadgeImages.}, + { + badgeName: 'Kappa Delta Rho', + badgeImage: _cornellBadgeImages.kappa_delta_rho, + }, + {badgeName: 'Kappa Sigma', badgeImage: _cornellBadgeImages.kappa_sigma}, + { + badgeName: 'Lambda Chi Alpha', + badgeImage: _cornellBadgeImages.lambda_chi_alpha, + }, + { + badgeName: 'Phi Delta Theta', + badgeImage: _cornellBadgeImages.phi_delta_theta, + }, + { + badgeName: 'Phi Kappa Tau', + badgeImage: _cornellBadgeImages.phi_kappa_tau, + }, + { + badgeName: 'Phi Sigma Kappa', + badgeImage: _cornellBadgeImages.phi_sigma_kappa, + }, + { + badgeName: 'Pi Kappa Alpha', + badgeImage: _cornellBadgeImages.pi_kappa_alpha, + }, + {badgeName: 'Pi Kappa Phi', badgeImage: _cornellBadgeImages.pi_kappa_phi}, + { + badgeName: 'Sigma Alpha Mu', + badgeImage: _cornellBadgeImages.sigma_alpha_mu, + }, + {badgeName: 'Sigma Chi', badgeImage: _cornellBadgeImages.sigma_chi}, + { + badgeName: 'Sigma Phi Society', + badgeImage: _cornellBadgeImages.sigma_phi_society, + }, + {badgeName: 'Sigma Pi', badgeImage: _cornellBadgeImages.sigma_pi}, + { + badgeName: 'Theta Delta Chi', + badgeImage: _cornellBadgeImages.theta_delta_chi, + }, + { + badgeName: 'Zeta Beta Tau', + badgeImage: _cornellBadgeImages.zeta_beta_tau, + }, + {badgeName: 'Zeta Psi', badgeImage: _cornellBadgeImages.zeta_psi}, + { + badgeName: 'Alpha Phi Alpha', + badgeImage: _cornellBadgeImages.alpha_phi_alpha, + }, + { + badgeName: 'Lambda Phi Epsilon International', + badgeImage: _cornellBadgeImages.lambda_phi_epsilon_international, + }, + { + badgeName: 'La Unidad Latina, Lambda', + badgeImage: _cornellBadgeImages.la_unidad_latina_lambda, + }, + {badgeName: 'MALIK', badgeImage: _cornellBadgeImages.malik}, + { + badgeName: 'Phi Beta Sigma', + badgeImage: _cornellBadgeImages.phi_beta_sigma, + }, + { + badgeName: 'Pi Delta Psi', + badgeImage: _cornellBadgeImages.pi_delta_psi, + }, + ], + }, + { + title: 'Sororities', + data: [ + { + badgeName: 'alpha Kappa Delta Phi', + badgeImage: _cornellBadgeImages.alpha_kappa_delta_phi, + }, + { + badgeName: 'Delta Sigma Theta', + badgeImage: _cornellBadgeImages.delta_sigma_theta, + }, + { + badgeName: 'Kappa Phi Lambda', + badgeImage: _cornellBadgeImages.kappa_phi_lambda, + }, + // {badgeName: 'Zeta Phi Beta', badgeImage: _cornellBadgeImages.ze}, + { + badgeName: 'Alpha Chi Omega', + badgeImage: _cornellBadgeImages.alpha_chi_omega, + }, + { + badgeName: 'Alpha Epsilon Phi', + badgeImage: _cornellBadgeImages.alpha_epsilon_phi, + }, + {badgeName: 'Alpha Phi', badgeImage: _cornellBadgeImages.alpha_phi}, + { + badgeName: 'Alpha Xi Delta', + badgeImage: _cornellBadgeImages.alpha_xi_delta, + }, + { + badgeName: 'Delta Delta Delta', + badgeImage: _cornellBadgeImages.delta_delta_delta, + }, + {badgeName: 'Delta Gamma', badgeImage: _cornellBadgeImages.delta_gamma}, + { + badgeName: 'Kappa Alpha Theta', + badgeImage: _cornellBadgeImages.kappa_alpha_theta, + }, + {badgeName: 'Kappa Delta', badgeImage: _cornellBadgeImages.kappa_delta}, + { + badgeName: 'Kappa Kappa Gamma', + badgeImage: _cornellBadgeImages.kappa_kappa_gamma, + }, + {badgeName: 'Phi Mu', badgeImage: _cornellBadgeImages.phi_mu}, + { + badgeName: 'Phi Sigma Sigma', + badgeImage: _cornellBadgeImages.phi_sigma_sigma, + }, + {badgeName: 'Phi Beta Phi', badgeImage: _cornellBadgeImages.phi_beta_phi}, + { + badgeName: 'Sigma Delta Tau', + badgeImage: _cornellBadgeImages.sigma_delta_tau, + }, + ], + }, +]; + +export const BADGE_DATA = { + 'Brown University': _brownBadges, + 'Cornell University': _cornellBadges, +}; diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index fd250585..300869e9 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -2,12 +2,18 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; import {normalize} from '../../utils'; -const BadgeScreenHeader: React.FC = () => { +interface BadgeScreenHeaderProps { + university: string; +} + +const BadgeScreenHeader: React.FC = ({university}) => { return ( - + - Brown University Badges + {university} Badges diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 335d4333..35e91939 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -114,7 +114,7 @@ const BadgeSelection: React.FC = ({route}) => { - + {/* filter not working, comment out for now */} {/* = ({route}) => { top={Animated.useValue(0)} /> */} diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 8e0801c2..067eadb1 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -50,7 +50,7 @@ const SPBody: React.FC = ({ useEffect(() => { const newBadges: {badge: UniversityBadge; img: any}[] = []; const findBadgeIcons = (badge: UniversityBadge) => { - BADGE_DATA?.forEach((item) => { + BADGE_DATA['Cornell University']?.forEach((item) => { if (item.title === badge.category) { item.data.forEach((object) => { if (object.badgeName === badge.name) { diff --git a/src/utils/search.ts b/src/utils/search.ts index 4293ff25..bdd6c042 100644 --- a/src/utils/search.ts +++ b/src/utils/search.ts @@ -8,7 +8,7 @@ import {ProfilePreviewType, CategoryPreviewType} from '../types'; */ export const getSearchSuggestions = (): string[] => { const suggestions: string[] = []; - for (const category of BADGE_DATA) { + for (const category of BADGE_DATA['Cornell University']) { for (const interest of category.data) { suggestions.push(interest.badgeName); } -- cgit v1.2.3-70-g09d2 From 2222579eea6b2de8b093c9201100335067bd51eb Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 24 Mar 2021 11:03:19 -0700 Subject: Bunch of TODOs for Cornell Changes --- src/assets/images/badges/cornell/zeta_phi_beta.png | Bin 0 -> 19159 bytes src/assets/universities/cornell.png | Bin 0 -> 12353 bytes src/components/profile/ProfileHeader.tsx | 2 +- src/components/profile/UniversityIcon.tsx | 4 +- src/components/search/SearchResultCell.tsx | 2 +- src/components/suggestedPeople/BadgesDropdown.tsx | 4 +- src/constants/badges.ts | 11 +- src/screens/search/SearchScreen.tsx | 2 +- src/screens/search/mock.ts | 118 --------------------- .../SuggestedPeopleUploadPictureScreen.tsx | 2 +- 10 files changed, 17 insertions(+), 128 deletions(-) create mode 100644 src/assets/images/badges/cornell/zeta_phi_beta.png create mode 100644 src/assets/universities/cornell.png delete mode 100644 src/screens/search/mock.ts (limited to 'src') diff --git a/src/assets/images/badges/cornell/zeta_phi_beta.png b/src/assets/images/badges/cornell/zeta_phi_beta.png new file mode 100644 index 00000000..8816cac7 Binary files /dev/null and b/src/assets/images/badges/cornell/zeta_phi_beta.png differ diff --git a/src/assets/universities/cornell.png b/src/assets/universities/cornell.png new file mode 100644 index 00000000..bf15f8b2 Binary files /dev/null and b/src/assets/universities/cornell.png differ diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index e5bd9d93..87eeb507 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -60,7 +60,7 @@ const ProfileHeader: React.FC = ({ diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index aef0de4f..d738e745 100644 --- a/src/components/profile/UniversityIcon.tsx +++ b/src/components/profile/UniversityIcon.tsx @@ -21,8 +21,8 @@ const UniversityIcon: React.FC = ({ var universityIcon; switch (university) { case 'cornell': - //TODO: - universityIcon = require('../../assets/universities/brown.png'); + universityIcon = require('../../assets/universities/cornell.png'); + break; case 'brown': universityIcon = require('../../assets/universities/brown.png'); break; diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index 9a8216e5..3379d789 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -153,7 +153,7 @@ const SearchResultsCell: React.FC = ({ diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 99c03057..3cf9775b 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -81,13 +81,13 @@ const BadgesDropdown: React.FC = ({ }}> {displayBadges ? ( ) : ( diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 16843947..0507ed52 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -110,6 +110,7 @@ export const _cornellBadgeImages = { wrestling: require('../assets/images/badges/cornell/wrestling.png'), zeta_beta_tau: require('../assets/images/badges/cornell/zeta_beta_tau.png'), zeta_psi: require('../assets/images/badges/cornell/zeta_psi.png'), + zeta_phi_beta: require('../assets/images/badges/brown/zeta_phi_beta.png'), }; const _brownBadges = [ @@ -359,7 +360,10 @@ const _cornellBadges = [ badgeName: 'Delta Tau Delta', badgeImage: _cornellBadgeImages.delta_tau_delta, }, - // {badgeName: 'Delta Upsilon', badgeImage: _cornellBadgeImages.}, + { + badgeName: 'Delta Epsilon', + badgeImage: _cornellBadgeImages.delta_epsilon, + }, { badgeName: 'Kappa Delta Rho', badgeImage: _cornellBadgeImages.kappa_delta_rho, @@ -443,7 +447,10 @@ const _cornellBadges = [ badgeName: 'Kappa Phi Lambda', badgeImage: _cornellBadgeImages.kappa_phi_lambda, }, - // {badgeName: 'Zeta Phi Beta', badgeImage: _cornellBadgeImages.ze}, + { + badgeName: 'Zeta Phi Beta', + badgeImage: _cornellBadgeImages.zeta_phi_beta, + }, { badgeName: 'Alpha Chi Omega', badgeImage: _cornellBadgeImages.alpha_chi_omega, diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 65ec3934..28e24299 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -50,7 +50,7 @@ const SearchScreen: React.FC = () => { const top = Animated.useValue(-SCREEN_HEIGHT); const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({ id: -1, - name: `Brown '${year}`, + name: `Brown '${year}`, //TODO: Change category: 'Brown', })); const [keyboardVisible, setKeyboardVisible] = React.useState( diff --git a/src/screens/search/mock.ts b/src/screens/search/mock.ts deleted file mode 100644 index d9909b22..00000000 --- a/src/screens/search/mock.ts +++ /dev/null @@ -1,118 +0,0 @@ -const MockResults = () => { - return { - categories: [ - { - id: 11, - name: "Brown '21", - category: 'Brown', - }, - { - id: 12, - name: "Brown '22", - category: 'Brown', - }, - { - id: 13, - name: "Brown '23", - category: null, - }, - { - id: 14, - name: "Brown '24", - category: null, - }, - ], - users: [ - { - id: 'd5295557-59ce-49fc-aa8a-442874dbffc3', - username: 'foobar', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-d5295557-59ce-49fc-aa8a-442874dbffc3-thumbnail.jpg', - }, - { - id: '31e93eb5-ccc9-4743-b053-eff368e23fa8', - username: 'foobar2', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-31e93eb5-ccc9-4743-b053-eff368e23fa8-thumbnail.jpg', - }, - { - id: 'b1b68df9-97ac-48de-b00d-eab10a6a644a', - username: 'foobar3', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-b1b68df9-97ac-48de-b00d-eab10a6a644a-thumbnail.jpg', - }, - { - id: 'b89c88b3-6b2f-4b6c-85d9-a03ff5396113', - username: 'foobar4', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-b89c88b3-6b2f-4b6c-85d9-a03ff5396113-thumbnail.jpg', - }, - { - id: '73b4496a-0aa8-4115-98da-2070bf326134', - username: 'foobar5', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-73b4496a-0aa8-4115-98da-2070bf326134-thumbnail.jpg', - }, - { - id: '329763b8-931e-4d4d-8a07-003374d38497', - username: 'foobar6', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-329763b8-931e-4d4d-8a07-003374d38497-thumbnail.jpg', - }, - { - id: '9e82fea2-cddc-41e1-be05-6873f58138ca', - username: 'foobar7', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-9e82fea2-cddc-41e1-be05-6873f58138ca-thumbnail.jpg', - }, - { - id: '6e5b8892-4384-45a1-bc0a-8f2c9d614fbc', - username: 'foobar8', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-6e5b8892-4384-45a1-bc0a-8f2c9d614fbc-thumbnail.jpg', - }, - { - id: 'c49b01c6-9151-4654-8fae-834adfa15727', - username: 'foobar9', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-c49b01c6-9151-4654-8fae-834adfa15727-thumbnail.jpg', - }, - { - id: '5b394d5b-62e3-405e-8ecd-7433517ef688', - username: 'foobar10', - first_name: 'Foo', - last_name: 'Bar', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-5b394d5b-62e3-405e-8ecd-7433517ef688-thumbnail.jpg', - }, - { - id: '698e38f0-24ed-404c-9f0c-6a24e43af576', - username: 'fooo', - first_name: 'wefwef', - last_name: 'wefwef', - thumbnail_url: - 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-698e38f0-24ed-404c-9f0c-6a24e43af576-thumbnail.jpg', - }, - ], - }; -}; - -export default MockResults; diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 0a4e5718..16a64573 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -166,7 +166,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC Edit Badges -- cgit v1.2.3-70-g09d2 From 592cb776068b2f1daf90755e04b33cdeba2bb947 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 24 Mar 2021 11:10:08 -0700 Subject: Bunch of Todos + icon updates --- src/assets/universities/cornell-clicked.png | Bin 0 -> 12362 bytes src/assets/universities/cornell-search.png | Bin 0 -> 12171 bytes src/components/profile/ProfileHeader.tsx | 2 +- src/components/search/SearchResultCell.tsx | 2 +- src/components/suggestedPeople/BadgesDropdown.tsx | 4 ++-- .../suggestedPeople/UniversityIconClicked.tsx | 3 +++ src/constants/badges.ts | 2 +- src/constants/constants.ts | 2 +- src/screens/search/SearchScreen.tsx | 2 +- .../SuggestedPeopleUploadPictureScreen.tsx | 2 +- src/services/ExploreService.ts | 2 +- src/types/types.ts | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 src/assets/universities/cornell-clicked.png create mode 100644 src/assets/universities/cornell-search.png (limited to 'src') diff --git a/src/assets/universities/cornell-clicked.png b/src/assets/universities/cornell-clicked.png new file mode 100644 index 00000000..d6450b29 Binary files /dev/null and b/src/assets/universities/cornell-clicked.png differ diff --git a/src/assets/universities/cornell-search.png b/src/assets/universities/cornell-search.png new file mode 100644 index 00000000..ce41e7bc Binary files /dev/null and b/src/assets/universities/cornell-search.png differ diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index 87eeb507..9d9a5cbd 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -60,7 +60,7 @@ const ProfileHeader: React.FC = ({ diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index 3379d789..4484bcd3 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -153,7 +153,7 @@ const SearchResultsCell: React.FC = ({ diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 3cf9775b..3a7eeb0f 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -81,13 +81,13 @@ const BadgesDropdown: React.FC = ({ }}> {displayBadges ? ( ) : ( diff --git a/src/components/suggestedPeople/UniversityIconClicked.tsx b/src/components/suggestedPeople/UniversityIconClicked.tsx index bde4e17f..f23a8c16 100644 --- a/src/components/suggestedPeople/UniversityIconClicked.tsx +++ b/src/components/suggestedPeople/UniversityIconClicked.tsx @@ -20,6 +20,9 @@ const UniversityIconClicked: React.FC = ({ }) => { var universityIcon; switch (university) { + case 'cornell': + universityIcon = require('../../assets/universities/cornell-clicked.png'); + break; case 'brown': universityIcon = require('../../assets/universities/brown-clicked.png'); break; diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 0507ed52..49b96df0 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -110,7 +110,7 @@ export const _cornellBadgeImages = { wrestling: require('../assets/images/badges/cornell/wrestling.png'), zeta_beta_tau: require('../assets/images/badges/cornell/zeta_beta_tau.png'), zeta_psi: require('../assets/images/badges/cornell/zeta_psi.png'), - zeta_phi_beta: require('../assets/images/badges/brown/zeta_phi_beta.png'), + zeta_phi_beta: require('../assets/images/badges/cornell/zeta_phi_beta.png'), }; const _brownBadges = [ diff --git a/src/constants/constants.ts b/src/constants/constants.ts index 6b513f4e..5f91e03d 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -187,7 +187,7 @@ export const EXPLORE_SECTION_TITLES: ExploreSectionType[] = [ 'New to Tagg', 'People You May Know', 'Trending on Tagg', - "Brown '24", + "Brown '24", //TODO: Update for Cornell "Brown '23", "Brown '22", "Brown '21", diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 28e24299..ea660ed9 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -50,7 +50,7 @@ const SearchScreen: React.FC = () => { const top = Animated.useValue(-SCREEN_HEIGHT); const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({ id: -1, - name: `Brown '${year}`, //TODO: Change + name: `Brown '${year}`, //TODO: Update for Cornell category: 'Brown', })); const [keyboardVisible, setKeyboardVisible] = React.useState( diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 16a64573..5275a186 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -166,7 +166,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC Edit Badges diff --git a/src/services/ExploreService.ts b/src/services/ExploreService.ts index 07af91ad..df52b4e3 100644 --- a/src/services/ExploreService.ts +++ b/src/services/ExploreService.ts @@ -56,7 +56,7 @@ export const getAllExploreSections = async () => { 'New to Tagg': data.categories.new_to_tagg, 'People You May Know': data.categories.people_you_may_know, 'Trending on Tagg': data.categories.trending_on_tagg, - "Brown '21": data.categories.brown_21, + "Brown '21": data.categories.brown_21, //TODO: Update for Cornell "Brown '22": data.categories.brown_22, "Brown '23": data.categories.brown_23, "Brown '24": data.categories.brown_24, diff --git a/src/types/types.ts b/src/types/types.ts index dc2817bd..cb6b5209 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -129,7 +129,7 @@ export type ExploreSectionType = | 'People You May Know' | 'New to Tagg' | 'Trending on Tagg' - | "Brown '21" + | "Brown '21" //TODO: Update for Cornell | "Brown '22" | "Brown '23" | "Brown '24"; -- cgit v1.2.3-70-g09d2 From 8ce46790a8d12df6738d8ac17462ba57e2b0e6b9 Mon Sep 17 00:00:00 2001 From: ankit-thanekar007 Date: Wed, 24 Mar 2021 16:09:45 -0700 Subject: Cornell Changes --- src/components/profile/ProfileHeader.tsx | 7 ++-- src/components/profile/UniversityIcon.tsx | 8 ++-- src/components/search/SearchBar.tsx | 8 +++- src/components/search/SearchResultCell.tsx | 19 +++++++--- src/components/suggestedPeople/BadgesDropdown.tsx | 8 ++-- .../suggestedPeople/UniversityIconClicked.tsx | 8 ++-- src/constants/badges.ts | 8 ++-- src/constants/constants.ts | 2 +- src/screens/badge/BadgeScreenHeader.tsx | 9 +++-- src/screens/badge/BadgeSelection.tsx | 23 +++++++----- src/screens/search/SearchScreen.tsx | 8 +++- src/screens/suggestedPeople/SPBody.tsx | 7 ++-- .../SuggestedPeopleUploadPictureScreen.tsx | 10 +++-- src/services/UserProfileService.ts | 2 + src/store/initialStates.ts | 2 +- src/types/types.ts | 13 ++++++- src/utils/common.ts | 43 +++++++++++++++++++++- src/utils/search.ts | 6 +-- 18 files changed, 135 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index 9d9a5cbd..0b93de98 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -4,7 +4,7 @@ import {useSelector} from 'react-redux'; import UniversityIcon from './UniversityIcon'; import {PROFILE_CUTOUT_TOP_Y} from '../../constants'; import {RootState} from '../../store/rootreducer'; -import {ScreenType} from '../../types'; +import {ScreenType, Universities} from '../../types'; import {normalize} from '../../utils'; import Avatar from './Avatar'; import FriendsCount from './FriendsCount'; @@ -24,7 +24,7 @@ const ProfileHeader: React.FC = ({ handleBlockUnblock, }) => { const { - profile: {name = '', university_class = 2021} = {}, + profile: {name = '', university_class = 2021, university = Universities.cornell} = {}, user: {username: userXName = ''}, } = userXId ? useSelector((state: RootState) => state.userX[screenType][userXId]) @@ -60,8 +60,7 @@ const ProfileHeader: React.FC = ({ diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index d738e745..1642b8f0 100644 --- a/src/components/profile/UniversityIcon.tsx +++ b/src/components/profile/UniversityIcon.tsx @@ -2,9 +2,9 @@ import React from 'react'; import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native'; import {Image, Text, View} from 'react-native-animatable'; import {getUniversityClass, normalize} from '../../utils'; - +import {Universities} from '../../types'; export interface UniversityIconProps extends ViewProps { - university: string; + university: Universities; university_class?: number; imageStyle?: StyleProp; } @@ -20,10 +20,10 @@ const UniversityIcon: React.FC = ({ }) => { var universityIcon; switch (university) { - case 'cornell': + case 'Cornell': universityIcon = require('../../assets/universities/cornell.png'); break; - case 'brown': + case 'Brown': universityIcon = require('../../assets/universities/brown.png'); break; default: diff --git a/src/components/search/SearchBar.tsx b/src/components/search/SearchBar.tsx index 62bda77e..5008ff53 100644 --- a/src/components/search/SearchBar.tsx +++ b/src/components/search/SearchBar.tsx @@ -14,6 +14,9 @@ import Animated, {interpolate} from 'react-native-reanimated'; import Icon from 'react-native-vector-icons/Feather'; import {normalize} from 'react-native-elements'; import {SCREEN_HEIGHT, getSearchSuggestions} from '../../utils'; +import {useSelector} from 'react-redux'; +import {RootState} from '../../store/rootReducer'; +import {Universities} from '../../types'; const AnimatedIcon = Animated.createAnimatedComponent(Icon); @@ -37,9 +40,12 @@ const SearchBar: React.FC = ({ e.preventDefault(); Keyboard.dismiss(); }; + const {profile: {university = Universities.cornell} = {}} = useSelector( + (state: RootState) => state.user, + ); const DEFAULT_PLACEHOLDER: string = 'Search'; // the list of suggestions to cycle through. TODO: get this from the backend - const SEARCH_SUGGESTIONS: string[] = getSearchSuggestions(); + const SEARCH_SUGGESTIONS: string[] = getSearchSuggestions(university); /* * index & id of current placeholder, used in selecting next placeholder. -1 * indicates DEFAULT_PLACEHOLDER. TODO: make it appear more random by tracking diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index 4484bcd3..6ebe19a6 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -2,7 +2,7 @@ import {useNavigation} from '@react-navigation/native'; import React, {useEffect, useState} from 'react'; import {Alert, Image, StyleSheet, Text, View} from 'react-native'; import {TouchableOpacity} from 'react-native-gesture-handler'; -import {useDispatch, useStore} from 'react-redux'; +import {useDispatch, useSelector, useStore} from 'react-redux'; import {ERROR_UNABLE_TO_VIEW_PROFILE} from '../../constants/strings'; import {loadImageFromURL} from '../../services'; import {RootState} from '../../store/rootReducer'; @@ -10,11 +10,13 @@ import { CategoryPreviewType, ProfilePreviewType, ScreenType, + Universities, UserType, } from '../../types'; import { addCategoryToRecentlySearched, addUserToRecentlySearched, + getUniversityBadge, normalize, SCREEN_WIDTH, } from '../../utils'; @@ -43,6 +45,11 @@ const SearchResultsCell: React.FC = ({ loggedInUser, }) => { const [avatar, setAvatar] = useState(undefined); + + const {profile: {university = Universities.cornell} = {}} = useSelector( + (state: RootState) => state.user, + ); + useEffect(() => { (async () => { if (thumbnail_url !== undefined) { @@ -143,17 +150,17 @@ const SearchResultsCell: React.FC = ({ return require('../../assets/images/search.png'); }; - const universityIcon = () => { - return require('../../assets/images/bwbadges.png'); - }; - const categoryCell = () => { return ( diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 3a7eeb0f..f8e7bdaa 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -4,11 +4,12 @@ import {Image, StyleSheet} from 'react-native'; import {TouchableOpacity} from 'react-native-gesture-handler'; import LinearGradient from 'react-native-linear-gradient'; import Animated, {Easing} from 'react-native-reanimated'; -import {UniversityBadge} from 'src/types'; +import {Universities, UniversityBadge} from '../../types'; import {UniversityIcon} from '..'; import {normalize, SCREEN_WIDTH} from '../../utils'; import UniversityIconClicked from './UniversityIconClicked'; interface BadgesDropdownProps { + university: Universities; localBadges: { badge: UniversityBadge; img: string; @@ -17,6 +18,7 @@ interface BadgesDropdownProps { } const BadgesDropdown: React.FC = ({ + university, localBadges, badges, }) => { @@ -81,13 +83,13 @@ const BadgesDropdown: React.FC = ({ }}> {displayBadges ? ( ) : ( diff --git a/src/components/suggestedPeople/UniversityIconClicked.tsx b/src/components/suggestedPeople/UniversityIconClicked.tsx index f23a8c16..7a0f3442 100644 --- a/src/components/suggestedPeople/UniversityIconClicked.tsx +++ b/src/components/suggestedPeople/UniversityIconClicked.tsx @@ -2,9 +2,9 @@ import React from 'react'; import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native'; import {Image, Text, View} from 'react-native-animatable'; import {getUniversityClass, normalize} from '../../utils'; - +import {Universities} from '../../types'; export interface UniversityIconClickedProps extends ViewProps { - university: string; + university: Universities; university_class?: number; imageStyle?: StyleProp; } @@ -20,10 +20,10 @@ const UniversityIconClicked: React.FC = ({ }) => { var universityIcon; switch (university) { - case 'cornell': + case 'Cornell': universityIcon = require('../../assets/universities/cornell-clicked.png'); break; - case 'brown': + case 'Brown': universityIcon = require('../../assets/universities/brown-clicked.png'); break; default: diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 49b96df0..b56ac34e 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -1,3 +1,5 @@ +import {BadgeDataType} from '../types'; + export const _brownBadgeImages = { acapella: require('../assets/images/badges/brown/acapella.png'), alpha_chi_omega: require('../assets/images/badges/brown/alpha_chi_omega.png'), @@ -492,7 +494,7 @@ const _cornellBadges = [ }, ]; -export const BADGE_DATA = { - 'Brown University': _brownBadges, - 'Cornell University': _cornellBadges, +export const BADGE_DATA: BadgeDataType = { + Brown: _brownBadges, + Cornell: _cornellBadges, }; diff --git a/src/constants/constants.ts b/src/constants/constants.ts index 5f91e03d..c2ba11b2 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -187,7 +187,7 @@ export const EXPLORE_SECTION_TITLES: ExploreSectionType[] = [ 'New to Tagg', 'People You May Know', 'Trending on Tagg', - "Brown '24", //TODO: Update for Cornell + "Brown '24", "Brown '23", "Brown '22", "Brown '21", diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index 300869e9..746e05d9 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -1,19 +1,20 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; -import {normalize} from '../../utils'; +import { Universities } from 'src/types'; +import {getUniversityBadge, normalize} from '../../utils'; interface BadgeScreenHeaderProps { - university: string; + university: Universities; } const BadgeScreenHeader: React.FC = ({university}) => { return ( - {university} Badges + {university} University Badges diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 35e91939..08cad020 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -15,7 +15,7 @@ import {BACKGROUND_GRADIENT_MAP} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {suggestedPeopleBadgesFinished} from '../../store/actions'; -import {BackgroundGradientType} from '../../types'; +import {BackgroundGradientType, Universities} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; @@ -34,9 +34,10 @@ type BadgeSelectionProps = { const BadgeSelection: React.FC = ({route}) => { const {editing} = route.params; - const {userId: loggedInUserId} = useSelector( - (state: RootState) => state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university = Universities.brown}, + } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState([]); const dispatch = useDispatch(); const navigation = useNavigation(); @@ -114,18 +115,20 @@ const BadgeSelection: React.FC = ({route}) => { - + {/* filter not working, comment out for now */} {/* {}} top={Animated.useValue(0)} /> */} - + {university && ( + + )} diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index ea660ed9..7e84b372 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -22,6 +22,7 @@ import { ProfilePreviewType, ScreenType, SearchCategoryType, + Universities, } from '../../types'; import { getRecentlySearchedCategories, @@ -38,6 +39,9 @@ import { const SearchScreen: React.FC = () => { const {recentSearches} = useSelector((state: RootState) => state.taggUsers); + const {profile: {university = Universities.cornell} = {}} = useSelector( + (state: RootState) => state.user, + ); const [query, setQuery] = useState(''); const [results, setResults] = useState | undefined>(undefined); const [recents, setRecents] = useState>( @@ -50,8 +54,8 @@ const SearchScreen: React.FC = () => { const top = Animated.useValue(-SCREEN_HEIGHT); const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({ id: -1, - name: `Brown '${year}`, //TODO: Update for Cornell - category: 'Brown', + name: `${university} '${year}`, + category: university, })); const [keyboardVisible, setKeyboardVisible] = React.useState( 'keyboardVisible', diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 067eadb1..c4195fac 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -27,6 +27,7 @@ interface SPBodyProps { const SPBody: React.FC = ({ item: { user, + university, mutual_friends, social_links, suggested_people_url, @@ -50,7 +51,7 @@ const SPBody: React.FC = ({ useEffect(() => { const newBadges: {badge: UniversityBadge; img: any}[] = []; const findBadgeIcons = (badge: UniversityBadge) => { - BADGE_DATA['Cornell University']?.forEach((item) => { + BADGE_DATA[university]?.forEach((item) => { if (item.title === badge.category) { item.data.forEach((object) => { if (object.badgeName === badge.name) { @@ -120,7 +121,7 @@ const SPBody: React.FC = ({ return ( { - navigation.push('Profile', { + navigation.navigate('Profile', { userXId: loggedInUserId === user.id ? undefined : user.id, screenType, }); @@ -139,7 +140,7 @@ const SPBody: React.FC = ({ {firstItem && 'Suggested People'} {localBadges && ( - + )} diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 5275a186..378e69c5 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -14,6 +14,7 @@ import ImagePicker from 'react-native-image-crop-picker'; import {SafeAreaView} from 'react-native-safe-area-context'; import {useDispatch, useSelector} from 'react-redux'; import {MainStackParams} from 'src/routes'; +import {Universities} from '../../types'; import FrontArrow from '../../assets/icons/front-arrow.svg'; import {TaggSquareButton, UniversityIcon} from '../../components'; import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator'; @@ -49,9 +50,10 @@ const SuggestedPeopleUploadPictureScreen: React.FC state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university = Universities.brown}, + } = useSelector((state: RootState) => state.user); useEffect(() => { const loadData = async () => { @@ -166,7 +168,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC Edit Badges diff --git a/src/services/UserProfileService.ts b/src/services/UserProfileService.ts index dd77db9f..22492124 100644 --- a/src/services/UserProfileService.ts +++ b/src/services/UserProfileService.ts @@ -48,6 +48,7 @@ export const loadProfileInfo = async (token: string, userId: string) => { gender, snapchat, tiktok, + university, university_class, profile_completion_stage, suggested_people_linked, @@ -63,6 +64,7 @@ export const loadProfileInfo = async (token: string, userId: string) => { gender, snapchat, tiktok, + university, university_class, profile_completion_stage, suggested_people_linked, diff --git a/src/store/initialStates.ts b/src/store/initialStates.ts index b43e4a1d..e1b4b127 100644 --- a/src/store/initialStates.ts +++ b/src/store/initialStates.ts @@ -18,7 +18,7 @@ export const NO_PROFILE: ProfileType = { gender: '', birthday: undefined, university_class: 2021, - + university: undefined, //Default to an invalid value and ignore it gracefully while showing tutorials / popups. profile_completion_stage: -1, suggested_people_linked: -1, diff --git a/src/types/types.ts b/src/types/types.ts index cb6b5209..8a4474dc 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -21,11 +21,16 @@ export interface CategoryPreviewType { export type FriendshipStatusType = 'friends' | 'requested' | 'no_record'; +export enum Universities { + brown = 'Brown', + cornell = 'Cornell', +} export interface ProfileType { name: string; biography: string; website: string; gender: string; + university: Universities | undefined; university_class: number; profile_completion_stage: number; suggested_people_linked: number; @@ -129,7 +134,7 @@ export type ExploreSectionType = | 'People You May Know' | 'New to Tagg' | 'Trending on Tagg' - | "Brown '21" //TODO: Update for Cornell + | "Brown '21" | "Brown '22" | "Brown '23" | "Brown '24"; @@ -233,12 +238,13 @@ export type TypeOfNotification = export type UniversityBadge = { id: number; name: string; - university: string; + university: Universities; category: string; }; export type SuggestedPeopleDataType = { user: ProfilePreviewType; + university: Universities; mutual_friends: ProfilePreviewType[]; badges: UniversityBadge[]; social_links: string[]; @@ -262,3 +268,6 @@ export type ContactType = { first_name: string; last_name: string; }; + +export type UniversityBadgeType = 'Search' | 'Crest'; +export type BadgeDataType = Record; diff --git a/src/utils/common.ts b/src/utils/common.ts index 0a76ec08..fdc6b875 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,4 +1,9 @@ -import {ContactType, NotificationType} from './../types/types'; +import { + ContactType, + NotificationType, + Universities, + UniversityBadgeType, +} from './../types/types'; import moment from 'moment'; import {Linking} from 'react-native'; import {BROWSABLE_SOCIAL_URLS, TOGGLE_BUTTON_TYPE} from '../constants'; @@ -132,3 +137,39 @@ export const extractContacts = async () => { }); return retrievedContacts; }; + +export const getUniversityBadge = ( + university: Universities, + type: UniversityBadgeType, +) => { + switch (type) { + case 'Search': + return _searchPageIcon(university); + case 'Crest': + return _crestIcon(university); + default: + return require('../assets/images/bwbadges.png'); + } +}; + +const _searchPageIcon = (university: Universities) => { + switch (university) { + case 'Cornell': + return require('../assets/universities/cornell-search.png'); + case 'Brown': + return require('../assets/images/bwbadges.png'); + default: + return require('../assets/images/bwbadges.png'); + } +}; + +const _crestIcon = (university: Universities) => { + switch (university) { + case 'Cornell': + return require('../assets/universities/cornell.png'); + case 'Brown': + return require('../assets/universities/brown.png'); + default: + return require('../assets/images/bwbadges.png'); + } +}; diff --git a/src/utils/search.ts b/src/utils/search.ts index bdd6c042..aa9a7463 100644 --- a/src/utils/search.ts +++ b/src/utils/search.ts @@ -1,14 +1,14 @@ import AsyncStorage from '@react-native-community/async-storage'; import {BADGE_DATA} from '../constants/badges'; -import {ProfilePreviewType, CategoryPreviewType} from '../types'; +import {ProfilePreviewType, CategoryPreviewType, Universities} from '../types'; /* * Gets all possible search suggestions. */ -export const getSearchSuggestions = (): string[] => { +export const getSearchSuggestions = (university : Universities): string[] => { const suggestions: string[] = []; - for (const category of BADGE_DATA['Cornell University']) { + for (const category of BADGE_DATA[university]) { for (const interest of category.data) { suggestions.push(interest.badgeName); } -- cgit v1.2.3-70-g09d2 From 64785e6527e521ce14e32edcc80adc6253b48657 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Fri, 26 Mar 2021 22:40:00 -0400 Subject: renamed to UniversityType, applied to all --- src/components/profile/ProfileHeader.tsx | 16 ++++++-------- src/components/profile/UniversityIcon.tsx | 25 +++++++--------------- src/components/search/SearchBar.tsx | 21 ++++++++---------- src/components/search/SearchResultCell.tsx | 8 +++---- src/components/suggestedPeople/BadgesDropdown.tsx | 4 ++-- .../suggestedPeople/UniversityIconClicked.tsx | 8 +++---- src/constants/badges.ts | 5 +++-- src/screens/badge/BadgeScreenHeader.tsx | 13 ++++++++--- src/screens/badge/BadgeSelection.tsx | 4 ++-- src/screens/search/SearchScreen.tsx | 9 ++++---- .../suggestedPeople/SuggestedPeopleScreen.tsx | 9 -------- .../SuggestedPeopleUploadPictureScreen.tsx | 4 ++-- src/types/types.ts | 2 +- src/utils/common.ts | 16 +++++++------- src/utils/search.ts | 16 ++++++++++---- 15 files changed, 75 insertions(+), 85 deletions(-) (limited to 'src') diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index 0b93de98..2c623c2b 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -1,14 +1,14 @@ import React, {useState} from 'react'; import {StyleSheet, Text, View} from 'react-native'; import {useSelector} from 'react-redux'; -import UniversityIcon from './UniversityIcon'; import {PROFILE_CUTOUT_TOP_Y} from '../../constants'; import {RootState} from '../../store/rootreducer'; -import {ScreenType, Universities} from '../../types'; +import {ScreenType} from '../../types'; import {normalize} from '../../utils'; import Avatar from './Avatar'; import FriendsCount from './FriendsCount'; import ProfileMoreInfoDrawer from './ProfileMoreInfoDrawer'; +import UniversityIcon from './UniversityIcon'; type ProfileHeaderProps = { userXId: string | undefined; @@ -24,11 +24,11 @@ const ProfileHeader: React.FC = ({ handleBlockUnblock, }) => { const { - profile: {name = '', university_class = 2021, university = Universities.cornell} = {}, + profile: {name = '', university_class = 2021, university}, user: {username: userXName = ''}, - } = userXId - ? useSelector((state: RootState) => state.userX[screenType][userXId]) - : useSelector((state: RootState) => state.user); + } = useSelector((state: RootState) => + userXId ? state.userX[screenType][userXId] : state.user, + ); const [drawerVisible, setDrawerVisible] = useState(false); const [firstName, lastName] = [...name.split(' ')]; return ( @@ -59,9 +59,7 @@ const ProfileHeader: React.FC = ({ )} - + diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index 1642b8f0..4cb1abe6 100644 --- a/src/components/profile/UniversityIcon.tsx +++ b/src/components/profile/UniversityIcon.tsx @@ -1,10 +1,11 @@ import React from 'react'; import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native'; import {Image, Text, View} from 'react-native-animatable'; -import {getUniversityClass, normalize} from '../../utils'; -import {Universities} from '../../types'; +import {getUniversityBadge, getUniversityClass, normalize} from '../../utils'; +import {UniversityType} from '../../types'; + export interface UniversityIconProps extends ViewProps { - university: Universities; + university: UniversityType; university_class?: number; imageStyle?: StyleProp; } @@ -18,22 +19,12 @@ const UniversityIcon: React.FC = ({ university_class, imageStyle, }) => { - var universityIcon; - switch (university) { - case 'Cornell': - universityIcon = require('../../assets/universities/cornell.png'); - break; - case 'Brown': - universityIcon = require('../../assets/universities/brown.png'); - break; - default: - universityIcon = require('../../assets/universities/brown.png'); - break; - } - return ( - + {university_class && ( {getUniversityClass(university_class)} diff --git a/src/components/search/SearchBar.tsx b/src/components/search/SearchBar.tsx index 5008ff53..4824b56f 100644 --- a/src/components/search/SearchBar.tsx +++ b/src/components/search/SearchBar.tsx @@ -1,22 +1,21 @@ -import React, {useState, useEffect} from 'react'; +import React, {useEffect, useState} from 'react'; import { + Keyboard, + NativeSyntheticEvent, StyleSheet, - TextInput, - TouchableOpacity, Text, - View, + TextInput, TextInputProps, - Keyboard, - NativeSyntheticEvent, TextInputSubmitEditingEventData, + TouchableOpacity, + View, } from 'react-native'; +import {normalize} from 'react-native-elements'; import Animated, {interpolate} from 'react-native-reanimated'; import Icon from 'react-native-vector-icons/Feather'; -import {normalize} from 'react-native-elements'; -import {SCREEN_HEIGHT, getSearchSuggestions} from '../../utils'; import {useSelector} from 'react-redux'; import {RootState} from '../../store/rootReducer'; -import {Universities} from '../../types'; +import {getSearchSuggestions, SCREEN_HEIGHT} from '../../utils'; const AnimatedIcon = Animated.createAnimatedComponent(Icon); @@ -40,9 +39,7 @@ const SearchBar: React.FC = ({ e.preventDefault(); Keyboard.dismiss(); }; - const {profile: {university = Universities.cornell} = {}} = useSelector( - (state: RootState) => state.user, - ); + const {university} = useSelector((state: RootState) => state.user.profile); const DEFAULT_PLACEHOLDER: string = 'Search'; // the list of suggestions to cycle through. TODO: get this from the backend const SEARCH_SUGGESTIONS: string[] = getSearchSuggestions(university); diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx index 6ebe19a6..5a6ea110 100644 --- a/src/components/search/SearchResultCell.tsx +++ b/src/components/search/SearchResultCell.tsx @@ -10,7 +10,7 @@ import { CategoryPreviewType, ProfilePreviewType, ScreenType, - Universities, + UniversityType, UserType, } from '../../types'; import { @@ -46,9 +46,7 @@ const SearchResultsCell: React.FC = ({ }) => { const [avatar, setAvatar] = useState(undefined); - const {profile: {university = Universities.cornell} = {}} = useSelector( - (state: RootState) => state.user, - ); + const {university} = useSelector((state: RootState) => state.user.profile); useEffect(() => { (async () => { @@ -157,7 +155,7 @@ const SearchResultsCell: React.FC = ({ ; } @@ -20,10 +20,10 @@ const UniversityIconClicked: React.FC = ({ }) => { var universityIcon; switch (university) { - case 'Cornell': + case UniversityType.Cornell: universityIcon = require('../../assets/universities/cornell-clicked.png'); break; - case 'Brown': + case UniversityType.Brown: universityIcon = require('../../assets/universities/brown-clicked.png'); break; default: diff --git a/src/constants/badges.ts b/src/constants/badges.ts index b56ac34e..5a7b4671 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -495,6 +495,7 @@ const _cornellBadges = [ ]; export const BADGE_DATA: BadgeDataType = { - Brown: _brownBadges, - Cornell: _cornellBadges, + 'Brown University': _brownBadges, + 'Cornell University': _cornellBadges, + '': [], }; diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index 746e05d9..46c0c1c8 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -1,10 +1,10 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; -import { Universities } from 'src/types'; +import {UniversityType} from 'src/types'; import {getUniversityBadge, normalize} from '../../utils'; interface BadgeScreenHeaderProps { - university: Universities; + university: UniversityType; } const BadgeScreenHeader: React.FC = ({university}) => { @@ -12,9 +12,12 @@ const BadgeScreenHeader: React.FC = ({university}) => { - {university} University Badges + + {university} University Badges + @@ -44,6 +47,10 @@ const styles = StyleSheet.create({ lineHeight: normalize(17.9), color: 'white', }, + icon: { + aspectRatio: 675 / 750, + height: 40, + }, }); export default BadgeScreenHeader; diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 08cad020..deaefb52 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -15,7 +15,7 @@ import {BACKGROUND_GRADIENT_MAP} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {suggestedPeopleBadgesFinished} from '../../store/actions'; -import {BackgroundGradientType, Universities} from '../../types'; +import {BackgroundGradientType, UniversityType} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; @@ -36,7 +36,7 @@ const BadgeSelection: React.FC = ({route}) => { const {editing} = route.params; const { user: {userId: loggedInUserId}, - profile: {university = Universities.brown}, + profile: {university}, } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState([]); const dispatch = useDispatch(); diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 7e84b372..683d25f4 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -22,7 +22,6 @@ import { ProfilePreviewType, ScreenType, SearchCategoryType, - Universities, } from '../../types'; import { getRecentlySearchedCategories, @@ -39,9 +38,9 @@ import { const SearchScreen: React.FC = () => { const {recentSearches} = useSelector((state: RootState) => state.taggUsers); - const {profile: {university = Universities.cornell} = {}} = useSelector( - (state: RootState) => state.user, - ); + const { + profile: {university}, + } = useSelector((state: RootState) => state.user); const [query, setQuery] = useState(''); const [results, setResults] = useState | undefined>(undefined); const [recents, setRecents] = useState>( @@ -54,7 +53,7 @@ const SearchScreen: React.FC = () => { const top = Animated.useValue(-SCREEN_HEIGHT); const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({ id: -1, - name: `${university} '${year}`, + name: `${university.split(' ')[0]} '${year}`, category: university, })); const [keyboardVisible, setKeyboardVisible] = React.useState( diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx index 76889657..336e8b35 100644 --- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx +++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx @@ -4,9 +4,6 @@ import {FlatList, RefreshControl, StatusBar, ViewToken} from 'react-native'; import {useDispatch, useSelector, useStore} from 'react-redux'; import {Background, TabsGradient, TaggLoadingIndicator} from '../../components'; import {SP_PAGE_SIZE} from '../../constants'; -import {MainStack} from '../../routes'; -import MainStackScreen from '../../routes/main/MainStackScreen'; -import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen'; import {getSuggestedPeople} from '../../services/SuggestedPeopleService'; import {cancelFriendRequest, resetScreenType} from '../../store/actions'; import {RootState} from '../../store/rootReducer'; @@ -22,15 +19,9 @@ import { getUserAsProfilePreviewType, handleAddFriend, } from '../../utils'; -import {SuggestedPeopleWelcomeScreen} from '../suggestedPeopleOnboarding'; import {userXInStore} from './../../utils/'; import SPBody from './SPBody'; -/** - * Bare bones for suggested people consisting of: - * * Image, title, name, username, add friend button [w/o functionality] - */ - const SuggestedPeopleScreen: React.FC = () => { const navigation = useNavigation(); const state: RootState = useStore().getState(); diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index 378e69c5..e1bcb477 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -14,7 +14,7 @@ import ImagePicker from 'react-native-image-crop-picker'; import {SafeAreaView} from 'react-native-safe-area-context'; import {useDispatch, useSelector} from 'react-redux'; import {MainStackParams} from 'src/routes'; -import {Universities} from '../../types'; +import {UniversityType} from '../../types'; import FrontArrow from '../../assets/icons/front-arrow.svg'; import {TaggSquareButton, UniversityIcon} from '../../components'; import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator'; @@ -52,7 +52,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC state.user); useEffect(() => { diff --git a/src/types/types.ts b/src/types/types.ts index 8ec3ab52..94fc966e 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -273,4 +273,4 @@ export type ContactType = { }; export type UniversityBadgeType = 'Search' | 'Crest'; -export type BadgeDataType = Record; +export type BadgeDataType = Record; diff --git a/src/utils/common.ts b/src/utils/common.ts index fdc6b875..4f31af8e 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,7 +1,7 @@ import { ContactType, NotificationType, - Universities, + UniversityType, UniversityBadgeType, } from './../types/types'; import moment from 'moment'; @@ -139,7 +139,7 @@ export const extractContacts = async () => { }; export const getUniversityBadge = ( - university: Universities, + university: UniversityType, type: UniversityBadgeType, ) => { switch (type) { @@ -152,22 +152,22 @@ export const getUniversityBadge = ( } }; -const _searchPageIcon = (university: Universities) => { +const _searchPageIcon = (university: UniversityType) => { switch (university) { - case 'Cornell': + case UniversityType.Cornell: return require('../assets/universities/cornell-search.png'); - case 'Brown': + case UniversityType.Brown: return require('../assets/images/bwbadges.png'); default: return require('../assets/images/bwbadges.png'); } }; -const _crestIcon = (university: Universities) => { +const _crestIcon = (university: UniversityType) => { switch (university) { - case 'Cornell': + case UniversityType.Cornell: return require('../assets/universities/cornell.png'); - case 'Brown': + case UniversityType.Brown: return require('../assets/universities/brown.png'); default: return require('../assets/images/bwbadges.png'); diff --git a/src/utils/search.ts b/src/utils/search.ts index aa9a7463..26f40b1b 100644 --- a/src/utils/search.ts +++ b/src/utils/search.ts @@ -1,12 +1,16 @@ import AsyncStorage from '@react-native-community/async-storage'; import {BADGE_DATA} from '../constants/badges'; -import {ProfilePreviewType, CategoryPreviewType, Universities} from '../types'; +import { + ProfilePreviewType, + CategoryPreviewType, + UniversityType, +} from '../types'; /* * Gets all possible search suggestions. */ -export const getSearchSuggestions = (university : Universities): string[] => { +export const getSearchSuggestions = (university: UniversityType): string[] => { const suggestions: string[] = []; for (const category of BADGE_DATA[university]) { for (const interest of category.data) { @@ -62,7 +66,9 @@ export const getRecentlySearchedUsers = async (): Promise< > => { try { const usersJSON = await AsyncStorage.getItem(recentlySearchedUsersKey); - if (usersJSON) return JSON.parse(usersJSON); + if (usersJSON) { + return JSON.parse(usersJSON); + } } catch (e) { console.log(e); } @@ -124,7 +130,9 @@ export const getRecentlySearchedCategories = async (): Promise< const categoriesJSON = await AsyncStorage.getItem( '@recently_searched_categories', ); - if (categoriesJSON) return JSON.parse(categoriesJSON); + if (categoriesJSON) { + return JSON.parse(categoriesJSON); + } } catch (e) { console.log(e); } -- cgit v1.2.3-70-g09d2 From 3b8a11073f9a97a9f09e263dcc818c0094031c14 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Sat, 27 Mar 2021 20:29:39 -0400 Subject: Added default string for university --- src/screens/search/SearchScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 683d25f4..4f0cabb4 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -39,7 +39,7 @@ import { const SearchScreen: React.FC = () => { const {recentSearches} = useSelector((state: RootState) => state.taggUsers); const { - profile: {university}, + profile: {university = ''}, } = useSelector((state: RootState) => state.user); const [query, setQuery] = useState(''); const [results, setResults] = useState | undefined>(undefined); -- cgit v1.2.3-70-g09d2 From bf0a2abf8bab333ff0d87bc07002e6f96199ce3b Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Sat, 27 Mar 2021 20:29:46 -0400 Subject: disable auto correct in login --- src/screens/onboarding/Login.tsx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/screens/onboarding/Login.tsx b/src/screens/onboarding/Login.tsx index 97f4fe87..49ca5ff4 100644 --- a/src/screens/onboarding/Login.tsx +++ b/src/screens/onboarding/Login.tsx @@ -263,6 +263,7 @@ const Login: React.FC = ({navigation}: LoginProps) => { valid={form.isValidUser} invalidWarning="Username must be at least 6 characters and can only contain letters, numbers, periods, and underscores." attemptedSubmit={form.attemptedSubmit} + autoCorrect={false} /> = ({navigation}: LoginProps) => { invalidWarning="Password must be at least 8 characters long." attemptedSubmit={form.attemptedSubmit} ref={inputRef} + autoCorrect={false} />