diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-27 20:30:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 20:30:36 -0400 |
| commit | 67fb6f5cae06dfbcb359dd6468cb66ad85fa230d (patch) | |
| tree | eaf092811d5be72e89e4dec9942dc59a1f8a0211 /src | |
| parent | bef5728b24a71d1bf327a72e425346020a997037 (diff) | |
| parent | bf0a2abf8bab333ff0d87bc07002e6f96199ce3b (diff) | |
Merge pull request #330 from ankit-thanekar007/tma-722-cornell-fe
[TMA 722] : Cornell FrontEnd changes
Diffstat (limited to 'src')
129 files changed, 515 insertions, 273 deletions
diff --git a/src/assets/images/badges/acapella.png b/src/assets/images/badges/brown/acapella.png Binary files differindex c0adb885..c0adb885 100644 --- a/src/assets/images/badges/acapella.png +++ b/src/assets/images/badges/brown/acapella.png diff --git a/src/assets/images/badges/alpha_chi_omega.png b/src/assets/images/badges/brown/alpha_chi_omega.png Binary files differindex f6db85af..f6db85af 100644 --- a/src/assets/images/badges/alpha_chi_omega.png +++ b/src/assets/images/badges/brown/alpha_chi_omega.png diff --git a/src/assets/images/badges/alpha_delta_phi.png b/src/assets/images/badges/brown/alpha_delta_phi.png Binary files differindex 51186468..51186468 100644 --- a/src/assets/images/badges/alpha_delta_phi.png +++ b/src/assets/images/badges/brown/alpha_delta_phi.png diff --git a/src/assets/images/badges/baseball.png b/src/assets/images/badges/brown/baseball.png Binary files differindex 2a049c16..2a049c16 100644 --- a/src/assets/images/badges/baseball.png +++ b/src/assets/images/badges/brown/baseball.png diff --git a/src/assets/images/badges/basketball.png b/src/assets/images/badges/brown/basketball.png Binary files differindex 43d08803..43d08803 100644 --- a/src/assets/images/badges/basketball.png +++ b/src/assets/images/badges/brown/basketball.png diff --git a/src/assets/images/badges/beta_rho_pi.png b/src/assets/images/badges/brown/beta_rho_pi.png Binary files differindex 490acebb..490acebb 100644 --- a/src/assets/images/badges/beta_rho_pi.png +++ b/src/assets/images/badges/brown/beta_rho_pi.png diff --git a/src/assets/images/badges/black_in_business.png b/src/assets/images/badges/brown/black_in_business.png Binary files differindex 995ae652..995ae652 100644 --- a/src/assets/images/badges/black_in_business.png +++ b/src/assets/images/badges/brown/black_in_business.png diff --git a/src/assets/images/badges/brown_badge.png b/src/assets/images/badges/brown/brown_badge.png Binary files differindex bcffb6e3..bcffb6e3 100644 --- a/src/assets/images/badges/brown_badge.png +++ b/src/assets/images/badges/brown/brown_badge.png diff --git a/src/assets/images/badges/brown_band.png b/src/assets/images/badges/brown/brown_band.png Binary files differindex bb21bcde..bb21bcde 100644 --- a/src/assets/images/badges/brown_band.png +++ b/src/assets/images/badges/brown/brown_band.png diff --git a/src/assets/images/badges/brown_class_board.png b/src/assets/images/badges/brown/brown_class_board.png Binary files differindex a04e0a63..a04e0a63 100644 --- a/src/assets/images/badges/brown_class_board.png +++ b/src/assets/images/badges/brown/brown_class_board.png diff --git a/src/assets/images/badges/brown_cs.png b/src/assets/images/badges/brown/brown_cs.png Binary files differindex 18c7165a..18c7165a 100644 --- a/src/assets/images/badges/brown_cs.png +++ b/src/assets/images/badges/brown/brown_cs.png diff --git a/src/assets/images/badges/brown_democrats.png b/src/assets/images/badges/brown/brown_democrats.png Binary files differindex ba828a2a..ba828a2a 100644 --- a/src/assets/images/badges/brown_democrats.png +++ b/src/assets/images/badges/brown/brown_democrats.png diff --git a/src/assets/images/badges/brown_ep.png b/src/assets/images/badges/brown/brown_ep.png Binary files differindex c4f381b2..c4f381b2 100644 --- a/src/assets/images/badges/brown_ep.png +++ b/src/assets/images/badges/brown/brown_ep.png diff --git a/src/assets/images/badges/brown_womens_collective.png b/src/assets/images/badges/brown/brown_womens_collective.png Binary files differindex 242188ab..242188ab 100644 --- a/src/assets/images/badges/brown_womens_collective.png +++ b/src/assets/images/badges/brown/brown_womens_collective.png diff --git a/src/assets/images/badges/bsu.png b/src/assets/images/badges/brown/bsu.png Binary files differindex 13838f32..13838f32 100644 --- a/src/assets/images/badges/bsu.png +++ b/src/assets/images/badges/brown/bsu.png diff --git a/src/assets/images/badges/buxton_international.png b/src/assets/images/badges/brown/buxton_international.png Binary files differindex 2b1d33a3..2b1d33a3 100644 --- a/src/assets/images/badges/buxton_international.png +++ b/src/assets/images/badges/brown/buxton_international.png diff --git a/src/assets/images/badges/delta_gamma.png b/src/assets/images/badges/brown/delta_gamma.png Binary files differindex 4f1aa675..4f1aa675 100644 --- a/src/assets/images/badges/delta_gamma.png +++ b/src/assets/images/badges/brown/delta_gamma.png diff --git a/src/assets/images/badges/delta_tau.png b/src/assets/images/badges/brown/delta_tau.png Binary files differindex 80d2a373..80d2a373 100644 --- a/src/assets/images/badges/delta_tau.png +++ b/src/assets/images/badges/brown/delta_tau.png diff --git a/src/assets/images/badges/fashion_at_brown.png b/src/assets/images/badges/brown/fashion_at_brown.png Binary files differindex a60b65fc..a60b65fc 100644 --- a/src/assets/images/badges/fashion_at_brown.png +++ b/src/assets/images/badges/brown/fashion_at_brown.png diff --git a/src/assets/images/badges/field_hockey.png b/src/assets/images/badges/brown/field_hockey.png Binary files differindex 7f08587e..7f08587e 100644 --- a/src/assets/images/badges/field_hockey.png +++ b/src/assets/images/badges/brown/field_hockey.png diff --git a/src/assets/images/badges/football.png b/src/assets/images/badges/brown/football.png Binary files differindex 1a5c0f4f..1a5c0f4f 100644 --- a/src/assets/images/badges/football.png +++ b/src/assets/images/badges/brown/football.png diff --git a/src/assets/images/badges/gymnastics.png b/src/assets/images/badges/brown/gymnastics.png Binary files differindex 64735dd2..64735dd2 100644 --- a/src/assets/images/badges/gymnastics.png +++ b/src/assets/images/badges/brown/gymnastics.png diff --git a/src/assets/images/badges/hockey.png b/src/assets/images/badges/brown/hockey.png Binary files differindex 2cfd547e..2cfd547e 100644 --- a/src/assets/images/badges/hockey.png +++ b/src/assets/images/badges/brown/hockey.png diff --git a/src/assets/images/badges/impulse.png b/src/assets/images/badges/brown/impulse.png Binary files differindex 68a73028..68a73028 100644 --- a/src/assets/images/badges/impulse.png +++ b/src/assets/images/badges/brown/impulse.png diff --git a/src/assets/images/badges/kappa_delta.png b/src/assets/images/badges/brown/kappa_delta.png Binary files differindex 7a3fdb25..7a3fdb25 100644 --- a/src/assets/images/badges/kappa_delta.png +++ b/src/assets/images/badges/brown/kappa_delta.png diff --git a/src/assets/images/badges/lacrosse.png b/src/assets/images/badges/brown/lacrosse.png Binary files differindex 67ac8f5e..67ac8f5e 100644 --- a/src/assets/images/badges/lacrosse.png +++ b/src/assets/images/badges/brown/lacrosse.png diff --git a/src/assets/images/badges/latin_at_brown.png b/src/assets/images/badges/brown/latin_at_brown.png Binary files differindex 515599f9..515599f9 100644 --- a/src/assets/images/badges/latin_at_brown.png +++ b/src/assets/images/badges/brown/latin_at_brown.png diff --git a/src/assets/images/badges/soccer.png b/src/assets/images/badges/brown/soccer.png Binary files differindex f2202510..f2202510 100644 --- a/src/assets/images/badges/soccer.png +++ b/src/assets/images/badges/brown/soccer.png diff --git a/src/assets/images/badges/softball.png b/src/assets/images/badges/brown/softball.png Binary files differindex 2a049c16..2a049c16 100644 --- a/src/assets/images/badges/softball.png +++ b/src/assets/images/badges/brown/softball.png diff --git a/src/assets/images/badges/tap.png b/src/assets/images/badges/brown/tap.png Binary files differindex e6db8470..e6db8470 100644 --- a/src/assets/images/badges/tap.png +++ b/src/assets/images/badges/brown/tap.png diff --git a/src/assets/images/badges/tennis.png b/src/assets/images/badges/brown/tennis.png Binary files differindex 358cb8c7..358cb8c7 100644 --- a/src/assets/images/badges/tennis.png +++ b/src/assets/images/badges/brown/tennis.png diff --git a/src/assets/images/badges/theta_alpha.png b/src/assets/images/badges/brown/theta_alpha.png Binary files differindex 323b538e..323b538e 100644 --- a/src/assets/images/badges/theta_alpha.png +++ b/src/assets/images/badges/brown/theta_alpha.png diff --git a/src/assets/images/badges/track.png b/src/assets/images/badges/brown/track.png Binary files differindex 5bcff810..5bcff810 100644 --- a/src/assets/images/badges/track.png +++ b/src/assets/images/badges/brown/track.png diff --git a/src/assets/images/badges/ucs.png b/src/assets/images/badges/brown/ucs.png Binary files differindex 1009dc9b..1009dc9b 100644 --- a/src/assets/images/badges/ucs.png +++ b/src/assets/images/badges/brown/ucs.png diff --git a/src/assets/images/badges/volleyball.png b/src/assets/images/badges/brown/volleyball.png Binary files differindex 915b467c..915b467c 100644 --- a/src/assets/images/badges/volleyball.png +++ b/src/assets/images/badges/brown/volleyball.png diff --git a/src/assets/images/badges/women_in_business.png b/src/assets/images/badges/brown/women_in_business.png Binary files differindex 1a504676..1a504676 100644 --- a/src/assets/images/badges/women_in_business.png +++ b/src/assets/images/badges/brown/women_in_business.png diff --git a/src/assets/images/badges/zeta_delta_xi.png b/src/assets/images/badges/brown/zeta_delta_xi.png Binary files differindex 7880d2b7..7880d2b7 100644 --- a/src/assets/images/badges/zeta_delta_xi.png +++ b/src/assets/images/badges/brown/zeta_delta_xi.png diff --git a/src/assets/images/badges/cornell/acacia.png b/src/assets/images/badges/cornell/acacia.png Binary files differnew file mode 100644 index 00000000..2dc2b383 --- /dev/null +++ b/src/assets/images/badges/cornell/acacia.png diff --git a/src/assets/images/badges/cornell/acapella.png b/src/assets/images/badges/cornell/acapella.png Binary files differnew file mode 100644 index 00000000..2b56c9ad --- /dev/null +++ b/src/assets/images/badges/cornell/acapella.png diff --git a/src/assets/images/badges/cornell/aeta_phi_beta.png b/src/assets/images/badges/cornell/aeta_phi_beta.png Binary files differnew file mode 100644 index 00000000..8816cac7 --- /dev/null +++ b/src/assets/images/badges/cornell/aeta_phi_beta.png diff --git a/src/assets/images/badges/cornell/alpha_chi_omega.png b/src/assets/images/badges/cornell/alpha_chi_omega.png Binary files differnew file mode 100644 index 00000000..304639ee --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_chi_omega.png diff --git a/src/assets/images/badges/cornell/alpha_delta_phi.png b/src/assets/images/badges/cornell/alpha_delta_phi.png Binary files differnew file mode 100644 index 00000000..89311e10 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_delta_phi.png diff --git a/src/assets/images/badges/cornell/alpha_epsilon_phi.png b/src/assets/images/badges/cornell/alpha_epsilon_phi.png Binary files differnew file mode 100644 index 00000000..e35d1b24 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_epsilon_phi.png diff --git a/src/assets/images/badges/cornell/alpha_gamma_rho.png b/src/assets/images/badges/cornell/alpha_gamma_rho.png Binary files differnew file mode 100644 index 00000000..1b1f88ae --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_gamma_rho.png diff --git a/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png b/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png Binary files differnew file mode 100644 index 00000000..cfc5b51c --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_kappa_delta_phi.png diff --git a/src/assets/images/badges/cornell/alpha_phi.png b/src/assets/images/badges/cornell/alpha_phi.png Binary files differnew file mode 100644 index 00000000..dcf5d391 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_phi.png diff --git a/src/assets/images/badges/cornell/alpha_phi_alpha.png b/src/assets/images/badges/cornell/alpha_phi_alpha.png Binary files differnew file mode 100644 index 00000000..4dde66b3 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_phi_alpha.png diff --git a/src/assets/images/badges/cornell/alpha_sigma_phi.png b/src/assets/images/badges/cornell/alpha_sigma_phi.png Binary files differnew file mode 100644 index 00000000..a63a6850 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_sigma_phi.png diff --git a/src/assets/images/badges/cornell/alpha_xi_delta.png b/src/assets/images/badges/cornell/alpha_xi_delta.png Binary files differnew file mode 100644 index 00000000..47f8108c --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_xi_delta.png diff --git a/src/assets/images/badges/cornell/alpha_zeta.png b/src/assets/images/badges/cornell/alpha_zeta.png Binary files differnew file mode 100644 index 00000000..1942f775 --- /dev/null +++ b/src/assets/images/badges/cornell/alpha_zeta.png diff --git a/src/assets/images/badges/cornell/alphs_epsilon_pi.png b/src/assets/images/badges/cornell/alphs_epsilon_pi.png Binary files differnew file mode 100644 index 00000000..0480edc2 --- /dev/null +++ b/src/assets/images/badges/cornell/alphs_epsilon_pi.png diff --git a/src/assets/images/badges/cornell/baseball.png b/src/assets/images/badges/cornell/baseball.png Binary files differnew file mode 100644 index 00000000..5643f9b8 --- /dev/null +++ b/src/assets/images/badges/cornell/baseball.png diff --git a/src/assets/images/badges/cornell/basketball.png b/src/assets/images/badges/cornell/basketball.png Binary files differnew file mode 100644 index 00000000..d2a8f04a --- /dev/null +++ b/src/assets/images/badges/cornell/basketball.png diff --git a/src/assets/images/badges/cornell/beta_theta_pi.png b/src/assets/images/badges/cornell/beta_theta_pi.png Binary files differnew file mode 100644 index 00000000..ae09a5b6 --- /dev/null +++ b/src/assets/images/badges/cornell/beta_theta_pi.png diff --git a/src/assets/images/badges/cornell/chi_phi.png b/src/assets/images/badges/cornell/chi_phi.png Binary files differnew file mode 100644 index 00000000..199213c9 --- /dev/null +++ b/src/assets/images/badges/cornell/chi_phi.png diff --git a/src/assets/images/badges/cornell/chi_psi.png b/src/assets/images/badges/cornell/chi_psi.png Binary files differnew file mode 100644 index 00000000..e9ad6540 --- /dev/null +++ b/src/assets/images/badges/cornell/chi_psi.png diff --git a/src/assets/images/badges/cornell/delta_chi.png b/src/assets/images/badges/cornell/delta_chi.png Binary files differnew file mode 100644 index 00000000..116c1ae7 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_chi.png diff --git a/src/assets/images/badges/cornell/delta_delta_delta.png b/src/assets/images/badges/cornell/delta_delta_delta.png Binary files differnew file mode 100644 index 00000000..93d92ce3 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_delta_delta.png diff --git a/src/assets/images/badges/cornell/delta_epsilon.png b/src/assets/images/badges/cornell/delta_epsilon.png Binary files differnew file mode 100644 index 00000000..2f7ef7ca --- /dev/null +++ b/src/assets/images/badges/cornell/delta_epsilon.png diff --git a/src/assets/images/badges/cornell/delta_gamma.png b/src/assets/images/badges/cornell/delta_gamma.png Binary files differnew file mode 100644 index 00000000..218ac7a6 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_gamma.png diff --git a/src/assets/images/badges/cornell/delta_kappa_epsilon.png b/src/assets/images/badges/cornell/delta_kappa_epsilon.png Binary files differnew file mode 100644 index 00000000..12bd6e37 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_kappa_epsilon.png diff --git a/src/assets/images/badges/cornell/delta_sigma_theta.png b/src/assets/images/badges/cornell/delta_sigma_theta.png Binary files differnew file mode 100644 index 00000000..d70d4220 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_sigma_theta.png diff --git a/src/assets/images/badges/cornell/delta_tau_delta.png b/src/assets/images/badges/cornell/delta_tau_delta.png Binary files differnew file mode 100644 index 00000000..02011fc1 --- /dev/null +++ b/src/assets/images/badges/cornell/delta_tau_delta.png diff --git a/src/assets/images/badges/cornell/fencing.png b/src/assets/images/badges/cornell/fencing.png Binary files differnew file mode 100644 index 00000000..c2649533 --- /dev/null +++ b/src/assets/images/badges/cornell/fencing.png diff --git a/src/assets/images/badges/cornell/field_hockey.png b/src/assets/images/badges/cornell/field_hockey.png Binary files differnew file mode 100644 index 00000000..5405e392 --- /dev/null +++ b/src/assets/images/badges/cornell/field_hockey.png diff --git a/src/assets/images/badges/cornell/football.png b/src/assets/images/badges/cornell/football.png Binary files differnew file mode 100644 index 00000000..bcc44778 --- /dev/null +++ b/src/assets/images/badges/cornell/football.png diff --git a/src/assets/images/badges/cornell/golf.png b/src/assets/images/badges/cornell/golf.png Binary files differnew file mode 100644 index 00000000..92f8f394 --- /dev/null +++ b/src/assets/images/badges/cornell/golf.png diff --git a/src/assets/images/badges/cornell/gymnastics.png b/src/assets/images/badges/cornell/gymnastics.png Binary files differnew file mode 100644 index 00000000..2f6c4fae --- /dev/null +++ b/src/assets/images/badges/cornell/gymnastics.png diff --git a/src/assets/images/badges/cornell/hockey.png b/src/assets/images/badges/cornell/hockey.png Binary files differnew file mode 100644 index 00000000..0d1f1294 --- /dev/null +++ b/src/assets/images/badges/cornell/hockey.png diff --git a/src/assets/images/badges/cornell/kappa_alpha_theta.png b/src/assets/images/badges/cornell/kappa_alpha_theta.png Binary files differnew file mode 100644 index 00000000..dadc7f86 --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_alpha_theta.png diff --git a/src/assets/images/badges/cornell/kappa_delta.png b/src/assets/images/badges/cornell/kappa_delta.png Binary files differnew file mode 100644 index 00000000..1f9b4e06 --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_delta.png diff --git a/src/assets/images/badges/cornell/kappa_delta_rho.png b/src/assets/images/badges/cornell/kappa_delta_rho.png Binary files differnew file mode 100644 index 00000000..c32c7c70 --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_delta_rho.png diff --git a/src/assets/images/badges/cornell/kappa_kappa_gamma.png b/src/assets/images/badges/cornell/kappa_kappa_gamma.png Binary files differnew file mode 100644 index 00000000..7583ebfd --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_kappa_gamma.png diff --git a/src/assets/images/badges/cornell/kappa_phi_lambda.png b/src/assets/images/badges/cornell/kappa_phi_lambda.png Binary files differnew file mode 100644 index 00000000..f3dd4a49 --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_phi_lambda.png diff --git a/src/assets/images/badges/cornell/kappa_sigma.png b/src/assets/images/badges/cornell/kappa_sigma.png Binary files differnew file mode 100644 index 00000000..7df2efa5 --- /dev/null +++ b/src/assets/images/badges/cornell/kappa_sigma.png diff --git a/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png b/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png Binary files differnew file mode 100644 index 00000000..f8017b9f --- /dev/null +++ b/src/assets/images/badges/cornell/la_unidad_latina,_lambda.png diff --git a/src/assets/images/badges/cornell/lacrosse.png b/src/assets/images/badges/cornell/lacrosse.png Binary files differnew file mode 100644 index 00000000..100ae33b --- /dev/null +++ b/src/assets/images/badges/cornell/lacrosse.png diff --git a/src/assets/images/badges/cornell/lambda_chi_alpha.png b/src/assets/images/badges/cornell/lambda_chi_alpha.png Binary files differnew file mode 100644 index 00000000..9360a226 --- /dev/null +++ b/src/assets/images/badges/cornell/lambda_chi_alpha.png diff --git a/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png b/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png Binary files differnew file mode 100644 index 00000000..f2721927 --- /dev/null +++ b/src/assets/images/badges/cornell/lambda_phi_epsilon_international.png diff --git a/src/assets/images/badges/cornell/malik.png b/src/assets/images/badges/cornell/malik.png Binary files differnew file mode 100644 index 00000000..ac221d24 --- /dev/null +++ b/src/assets/images/badges/cornell/malik.png diff --git a/src/assets/images/badges/cornell/phi_beta_phi.png b/src/assets/images/badges/cornell/phi_beta_phi.png Binary files differnew file mode 100644 index 00000000..8d46dd2e --- /dev/null +++ b/src/assets/images/badges/cornell/phi_beta_phi.png diff --git a/src/assets/images/badges/cornell/phi_beta_sigma.png b/src/assets/images/badges/cornell/phi_beta_sigma.png Binary files differnew file mode 100644 index 00000000..49e636dc --- /dev/null +++ b/src/assets/images/badges/cornell/phi_beta_sigma.png diff --git a/src/assets/images/badges/cornell/phi_delta_theta.png b/src/assets/images/badges/cornell/phi_delta_theta.png Binary files differnew file mode 100644 index 00000000..55ff15dc --- /dev/null +++ b/src/assets/images/badges/cornell/phi_delta_theta.png diff --git a/src/assets/images/badges/cornell/phi_kappa_tau.png b/src/assets/images/badges/cornell/phi_kappa_tau.png Binary files differnew file mode 100644 index 00000000..b1c01ab1 --- /dev/null +++ b/src/assets/images/badges/cornell/phi_kappa_tau.png diff --git a/src/assets/images/badges/cornell/phi_mu.png b/src/assets/images/badges/cornell/phi_mu.png Binary files differnew file mode 100644 index 00000000..0049a584 --- /dev/null +++ b/src/assets/images/badges/cornell/phi_mu.png diff --git a/src/assets/images/badges/cornell/phi_sigma_kappa.png b/src/assets/images/badges/cornell/phi_sigma_kappa.png Binary files differnew file mode 100644 index 00000000..9249db92 --- /dev/null +++ b/src/assets/images/badges/cornell/phi_sigma_kappa.png diff --git a/src/assets/images/badges/cornell/phi_sigma_sigma.png b/src/assets/images/badges/cornell/phi_sigma_sigma.png Binary files differnew file mode 100644 index 00000000..889dc14f --- /dev/null +++ b/src/assets/images/badges/cornell/phi_sigma_sigma.png diff --git a/src/assets/images/badges/cornell/pi_delta_psi.png b/src/assets/images/badges/cornell/pi_delta_psi.png Binary files differnew file mode 100644 index 00000000..164c4483 --- /dev/null +++ b/src/assets/images/badges/cornell/pi_delta_psi.png diff --git a/src/assets/images/badges/cornell/pi_kappa_alpha.png b/src/assets/images/badges/cornell/pi_kappa_alpha.png Binary files differnew file mode 100644 index 00000000..08a3153e --- /dev/null +++ b/src/assets/images/badges/cornell/pi_kappa_alpha.png diff --git a/src/assets/images/badges/cornell/pi_kappa_phi.png b/src/assets/images/badges/cornell/pi_kappa_phi.png Binary files differnew file mode 100644 index 00000000..0a1dee58 --- /dev/null +++ b/src/assets/images/badges/cornell/pi_kappa_phi.png diff --git a/src/assets/images/badges/cornell/polo.png b/src/assets/images/badges/cornell/polo.png Binary files differnew file mode 100644 index 00000000..05758440 --- /dev/null +++ b/src/assets/images/badges/cornell/polo.png diff --git a/src/assets/images/badges/cornell/rowing.png b/src/assets/images/badges/cornell/rowing.png Binary files differnew file mode 100644 index 00000000..28e4436f --- /dev/null +++ b/src/assets/images/badges/cornell/rowing.png diff --git a/src/assets/images/badges/cornell/sailing.png b/src/assets/images/badges/cornell/sailing.png Binary files differnew file mode 100644 index 00000000..ea8d3a11 --- /dev/null +++ b/src/assets/images/badges/cornell/sailing.png diff --git a/src/assets/images/badges/cornell/sigma_alpha_mu.png b/src/assets/images/badges/cornell/sigma_alpha_mu.png Binary files differnew file mode 100644 index 00000000..d05a8fed --- /dev/null +++ b/src/assets/images/badges/cornell/sigma_alpha_mu.png diff --git a/src/assets/images/badges/cornell/sigma_chi.png b/src/assets/images/badges/cornell/sigma_chi.png Binary files differnew file mode 100644 index 00000000..0ca28bb3 --- /dev/null +++ b/src/assets/images/badges/cornell/sigma_chi.png diff --git a/src/assets/images/badges/cornell/sigma_delta_tau.png b/src/assets/images/badges/cornell/sigma_delta_tau.png Binary files differnew file mode 100644 index 00000000..f0863d8d --- /dev/null +++ b/src/assets/images/badges/cornell/sigma_delta_tau.png diff --git a/src/assets/images/badges/cornell/sigma_phi_society.png b/src/assets/images/badges/cornell/sigma_phi_society.png Binary files differnew file mode 100644 index 00000000..478922c8 --- /dev/null +++ b/src/assets/images/badges/cornell/sigma_phi_society.png diff --git a/src/assets/images/badges/cornell/sigma_pi.png b/src/assets/images/badges/cornell/sigma_pi.png Binary files differnew file mode 100644 index 00000000..c5cb5ce3 --- /dev/null +++ b/src/assets/images/badges/cornell/sigma_pi.png diff --git a/src/assets/images/badges/cornell/soccer.png b/src/assets/images/badges/cornell/soccer.png Binary files differnew file mode 100644 index 00000000..e17d76de --- /dev/null +++ b/src/assets/images/badges/cornell/soccer.png diff --git a/src/assets/images/badges/cornell/softball.png b/src/assets/images/badges/cornell/softball.png Binary files differnew file mode 100644 index 00000000..fda13c9a --- /dev/null +++ b/src/assets/images/badges/cornell/softball.png diff --git a/src/assets/images/badges/cornell/squash.png b/src/assets/images/badges/cornell/squash.png Binary files differnew file mode 100644 index 00000000..5d6c3f0e --- /dev/null +++ b/src/assets/images/badges/cornell/squash.png diff --git a/src/assets/images/badges/cornell/swimming_&_diving.png b/src/assets/images/badges/cornell/swimming_&_diving.png Binary files differnew file mode 100644 index 00000000..aed8f37e --- /dev/null +++ b/src/assets/images/badges/cornell/swimming_&_diving.png diff --git a/src/assets/images/badges/cornell/tennis.png b/src/assets/images/badges/cornell/tennis.png Binary files differnew file mode 100644 index 00000000..24ea81e4 --- /dev/null +++ b/src/assets/images/badges/cornell/tennis.png diff --git a/src/assets/images/badges/cornell/theta_delta_chi.png b/src/assets/images/badges/cornell/theta_delta_chi.png Binary files differnew file mode 100644 index 00000000..7a2bf4e8 --- /dev/null +++ b/src/assets/images/badges/cornell/theta_delta_chi.png diff --git a/src/assets/images/badges/cornell/track_&_field.png b/src/assets/images/badges/cornell/track_&_field.png Binary files differnew file mode 100644 index 00000000..05644dc4 --- /dev/null +++ b/src/assets/images/badges/cornell/track_&_field.png diff --git a/src/assets/images/badges/cornell/volleyball.png b/src/assets/images/badges/cornell/volleyball.png Binary files differnew file mode 100644 index 00000000..9ea08622 --- /dev/null +++ b/src/assets/images/badges/cornell/volleyball.png diff --git a/src/assets/images/badges/cornell/wrestling.png b/src/assets/images/badges/cornell/wrestling.png Binary files differnew file mode 100644 index 00000000..28892124 --- /dev/null +++ b/src/assets/images/badges/cornell/wrestling.png diff --git a/src/assets/images/badges/cornell/zeta_beta_tau.png b/src/assets/images/badges/cornell/zeta_beta_tau.png Binary files differnew file mode 100644 index 00000000..4572bf01 --- /dev/null +++ b/src/assets/images/badges/cornell/zeta_beta_tau.png diff --git a/src/assets/images/badges/cornell/zeta_phi_beta.png b/src/assets/images/badges/cornell/zeta_phi_beta.png Binary files differnew file mode 100644 index 00000000..8816cac7 --- /dev/null +++ b/src/assets/images/badges/cornell/zeta_phi_beta.png diff --git a/src/assets/images/badges/cornell/zeta_psi.png b/src/assets/images/badges/cornell/zeta_psi.png Binary files differnew file mode 100644 index 00000000..ad245931 --- /dev/null +++ b/src/assets/images/badges/cornell/zeta_psi.png diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index e5bd9d93..2c623c2b 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -1,7 +1,6 @@ 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} from '../../types'; @@ -9,6 +8,7 @@ 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<ProfileHeaderProps> = ({ handleBlockUnblock, }) => { const { - profile: {name = '', university_class = 2021} = {}, + 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,10 +59,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({ )} <View style={styles.friendsAndUniversity}> <FriendsCount screenType={screenType} userXId={userXId} /> - <UniversityIcon - university="brown" - university_class={university_class} - /> + <UniversityIcon {...{university, university_class}} /> </View> </View> </View> diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index 48cfe3dc..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 {getUniversityBadge, getUniversityClass, normalize} from '../../utils'; +import {UniversityType} from '../../types'; export interface UniversityIconProps extends ViewProps { - university: string; + university: UniversityType; university_class?: number; imageStyle?: StyleProp<ImageStyle>; } @@ -18,19 +19,12 @@ const UniversityIcon: React.FC<UniversityIconProps> = ({ university_class, imageStyle, }) => { - var universityIcon; - switch (university) { - case 'brown': - universityIcon = require('../../assets/universities/brown.png'); - break; - default: - universityIcon = require('../../assets/universities/brown.png'); - break; - } - return ( <View style={[styles.container, style]}> - <Image source={universityIcon} style={[styles.icon, imageStyle]} /> + <Image + source={getUniversityBadge(university, 'Crest')} + style={[styles.icon, imageStyle]} + /> {university_class && ( <Text style={styles.univClass}> {getUniversityClass(university_class)} diff --git a/src/components/search/SearchBar.tsx b/src/components/search/SearchBar.tsx index 62bda77e..4824b56f 100644 --- a/src/components/search/SearchBar.tsx +++ b/src/components/search/SearchBar.tsx @@ -1,19 +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 {getSearchSuggestions, SCREEN_HEIGHT} from '../../utils'; const AnimatedIcon = Animated.createAnimatedComponent(Icon); @@ -37,9 +39,10 @@ const SearchBar: React.FC<SearchBarProps> = ({ e.preventDefault(); Keyboard.dismiss(); }; + 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(); + 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 9a8216e5..5a6ea110 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, + UniversityType, UserType, } from '../../types'; import { addCategoryToRecentlySearched, addUserToRecentlySearched, + getUniversityBadge, normalize, SCREEN_WIDTH, } from '../../utils'; @@ -43,6 +45,9 @@ const SearchResultsCell: React.FC<SearchResults> = ({ loggedInUser, }) => { const [avatar, setAvatar] = useState<string | undefined>(undefined); + + const {university} = useSelector((state: RootState) => state.user.profile); + useEffect(() => { (async () => { if (thumbnail_url !== undefined) { @@ -143,17 +148,17 @@ const SearchResultsCell: React.FC<SearchResults> = ({ return require('../../assets/images/search.png'); }; - const universityIcon = () => { - return require('../../assets/images/bwbadges.png'); - }; - const categoryCell = () => { return ( <TouchableOpacity style={styles.cellContainer} onPress={onPressCategory}> <View style={[styles.imageContainer, styles.categoryBackground]}> <Image resizeMode="contain" - source={category === 'Brown' ? universityIcon() : searchIcon()} + source={ + category in UniversityType + ? getUniversityBadge(university, 'Search') + : searchIcon() + } style={styles.categoryImage} /> </View> diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 99c03057..bc4e7a54 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 {UniversityType, UniversityBadge} from '../../types'; import {UniversityIcon} from '..'; import {normalize, SCREEN_WIDTH} from '../../utils'; import UniversityIconClicked from './UniversityIconClicked'; interface BadgesDropdownProps { + university: UniversityType; localBadges: { badge: UniversityBadge; img: string; @@ -17,6 +18,7 @@ interface BadgesDropdownProps { } const BadgesDropdown: React.FC<BadgesDropdownProps> = ({ + university, localBadges, badges, }) => { @@ -81,13 +83,13 @@ const BadgesDropdown: React.FC<BadgesDropdownProps> = ({ }}> {displayBadges ? ( <UniversityIconClicked - university="brown" + university={university} style={styles.universityIconContainer} imageStyle={{width: normalize(31), height: normalize(38)}} /> ) : ( <UniversityIcon - university="brown" + university={university} style={styles.universityIconContainer} imageStyle={{width: normalize(31), height: normalize(38)}} /> diff --git a/src/components/suggestedPeople/UniversityIconClicked.tsx b/src/components/suggestedPeople/UniversityIconClicked.tsx index bde4e17f..41e27c8e 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 {UniversityType} from '../../types'; export interface UniversityIconClickedProps extends ViewProps { - university: string; + university: UniversityType; university_class?: number; imageStyle?: StyleProp<ImageStyle>; } @@ -20,7 +20,10 @@ const UniversityIconClicked: React.FC<UniversityIconClickedProps> = ({ }) => { var universityIcon; switch (university) { - case 'brown': + case UniversityType.Cornell: + universityIcon = require('../../assets/universities/cornell-clicked.png'); + break; + 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 6dc7ccf2..5a7b4671 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -1,93 +1,171 @@ -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'), +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'), + 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 _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'), + zeta_phi_beta: require('../assets/images/badges/cornell/zeta_phi_beta.png'), }; -export const BADGE_DATA = [ +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 +175,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 +188,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 +205,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 +231,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 +252,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 +273,229 @@ 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 Epsilon', + badgeImage: _cornellBadgeImages.delta_epsilon, + }, + { + 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.zeta_phi_beta, + }, + { + 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: BadgeDataType = { + 'Brown University': _brownBadges, + 'Cornell University': _cornellBadges, + '': [], +}; diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index fd250585..46c0c1c8 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -1,13 +1,23 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; -import {normalize} from '../../utils'; +import {UniversityType} from 'src/types'; +import {getUniversityBadge, normalize} from '../../utils'; -const BadgeScreenHeader: React.FC = () => { +interface BadgeScreenHeaderProps { + university: UniversityType; +} + +const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => { return ( <View style={styles.container}> - <Image source={require('../../assets/images/badges/brown_badge.png')} /> + <Image + source={getUniversityBadge(university, 'Crest')} + style={styles.icon} + /> <View style={styles.universityTextContainer}> - <Text style={styles.universityText}>Brown University Badges</Text> + <Text style={styles.universityText}> + {university} University Badges + </Text> </View> <View style={styles.searchTextContainer}> <Text style={styles.searchText}> @@ -37,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 335d4333..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} from '../../types'; +import {BackgroundGradientType, UniversityType} 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<BadgeSelectionProps> = ({route}) => { const {editing} = route.params; - const {userId: loggedInUserId} = useSelector( - (state: RootState) => state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university}, + } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState<string[]>([]); const dispatch = useDispatch(); const navigation = useNavigation(); @@ -114,18 +115,20 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => { <StatusBar barStyle={'light-content'} /> <SafeAreaView> <View style={styles.listContainer}> - <BadgeScreenHeader /> + <BadgeScreenHeader {...{university}} /> {/* filter not working, comment out for now */} {/* <SearchBar style={styles.searchBarStyle} onCancel={() => {}} top={Animated.useValue(0)} /> */} - <BadgeList - data={BADGE_DATA} - selectedBadges={selectedBadges} - selectKey={selectKey} - /> + {university && ( + <BadgeList + data={BADGE_DATA[university]} + selectedBadges={selectedBadges} + selectKey={selectKey} + /> + )} </View> </SafeAreaView> </LinearGradient> 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<LoginProps> = ({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} /> <TaggInput @@ -280,6 +281,7 @@ const Login: React.FC<LoginProps> = ({navigation}: LoginProps) => { invalidWarning="Password must be at least 8 characters long." attemptedSubmit={form.attemptedSubmit} ref={inputRef} + autoCorrect={false} /> <ForgotPassword /> <TaggSquareButton diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx index 65ec3934..4f0cabb4 100644 --- a/src/screens/search/SearchScreen.tsx +++ b/src/screens/search/SearchScreen.tsx @@ -38,6 +38,9 @@ import { const SearchScreen: React.FC = () => { const {recentSearches} = useSelector((state: RootState) => state.taggUsers); + const { + profile: {university = ''}, + } = useSelector((state: RootState) => state.user); const [query, setQuery] = useState<string>(''); const [results, setResults] = useState<Array<any> | undefined>(undefined); const [recents, setRecents] = useState<Array<ProfilePreviewType>>( @@ -50,8 +53,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}`, - category: 'Brown', + name: `${university.split(' ')[0]} '${year}`, + category: university, })); const [keyboardVisible, setKeyboardVisible] = React.useState( 'keyboardVisible', 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/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx index 8e0801c2..c4195fac 100644 --- a/src/screens/suggestedPeople/SPBody.tsx +++ b/src/screens/suggestedPeople/SPBody.tsx @@ -27,6 +27,7 @@ interface SPBodyProps { const SPBody: React.FC<SPBodyProps> = ({ item: { user, + university, mutual_friends, social_links, suggested_people_url, @@ -50,7 +51,7 @@ const SPBody: React.FC<SPBodyProps> = ({ useEffect(() => { const newBadges: {badge: UniversityBadge; img: any}[] = []; const findBadgeIcons = (badge: UniversityBadge) => { - BADGE_DATA?.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<SPBodyProps> = ({ return ( <TouchableOpacity onPress={() => { - navigation.push('Profile', { + navigation.navigate('Profile', { userXId: loggedInUserId === user.id ? undefined : user.id, screenType, }); @@ -139,7 +140,7 @@ const SPBody: React.FC<SPBodyProps> = ({ <View style={styles.topContainer}> <Text style={styles.title}>{firstItem && 'Suggested People'}</Text> {localBadges && ( - <BadgesDropdown localBadges={localBadges} badges={badges} /> + <BadgesDropdown {...{university, localBadges, badges}} /> )} </View> <View style={styles.body}> 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 0a4e5718..e1bcb477 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 {UniversityType} 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<SuggestedPeopleUploadPictureS const [loading, setLoading] = useState(false); const dispatch = useDispatch(); const navigation = useNavigation(); - const {userId: loggedInUserId} = useSelector( - (state: RootState) => state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university = UniversityType.brown}, + } = useSelector((state: RootState) => state.user); useEffect(() => { const loadData = async () => { @@ -166,7 +168,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS <View style={styles.editBadgesMainContainer}> <View style={styles.editBadgesSubContainer}> <UniversityIcon - university="brown" + university={university} imageStyle={{width: normalize(16), height: normalize(20)}} /> <Text style={styles.editBadgesText}>Edit Badges</Text> diff --git a/src/store/initialStates.ts b/src/store/initialStates.ts index 47ab8f39..02331eb6 100644 --- a/src/store/initialStates.ts +++ b/src/store/initialStates.ts @@ -17,7 +17,7 @@ export const NO_PROFILE: ProfileInfoType = { 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 48b52366..94fc966e 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -241,12 +241,13 @@ export type TypeOfNotification = export type UniversityBadge = { id: number; name: string; - university: string; + university: UniversityType; category: string; }; export type SuggestedPeopleDataType = { user: ProfilePreviewType; + university: UniversityType; mutual_friends: ProfilePreviewType[]; badges: UniversityBadge[]; social_links: string[]; @@ -270,3 +271,6 @@ export type ContactType = { first_name: string; last_name: string; }; + +export type UniversityBadgeType = 'Search' | 'Crest'; +export type BadgeDataType = Record<UniversityType, any[]>; diff --git a/src/utils/common.ts b/src/utils/common.ts index 0a76ec08..4f31af8e 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -1,4 +1,9 @@ -import {ContactType, NotificationType} from './../types/types'; +import { + ContactType, + NotificationType, + UniversityType, + 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: UniversityType, + type: UniversityBadgeType, +) => { + switch (type) { + case 'Search': + return _searchPageIcon(university); + case 'Crest': + return _crestIcon(university); + default: + return require('../assets/images/bwbadges.png'); + } +}; + +const _searchPageIcon = (university: UniversityType) => { + switch (university) { + case UniversityType.Cornell: + return require('../assets/universities/cornell-search.png'); + case UniversityType.Brown: + return require('../assets/images/bwbadges.png'); + default: + return require('../assets/images/bwbadges.png'); + } +}; + +const _crestIcon = (university: UniversityType) => { + switch (university) { + case UniversityType.Cornell: + return require('../assets/universities/cornell.png'); + 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 4293ff25..26f40b1b 100644 --- a/src/utils/search.ts +++ b/src/utils/search.ts @@ -1,14 +1,18 @@ import AsyncStorage from '@react-native-community/async-storage'; import {BADGE_DATA} from '../constants/badges'; -import {ProfilePreviewType, CategoryPreviewType} from '../types'; +import { + ProfilePreviewType, + CategoryPreviewType, + UniversityType, +} from '../types'; /* * Gets all possible search suggestions. */ -export const getSearchSuggestions = (): string[] => { +export const getSearchSuggestions = (university: UniversityType): string[] => { const suggestions: string[] = []; - for (const category of BADGE_DATA) { + for (const category of BADGE_DATA[university]) { for (const interest of category.data) { suggestions.push(interest.badgeName); } @@ -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); } |
