From 3ca5d04fbbe733adb8c36c240f0c4c8695210493 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 9 Mar 2021 14:45:30 -0500 Subject: new badges and assets --- src/assets/images/badges/acapella.png | Bin 0 -> 16688 bytes src/assets/images/badges/alpha_chi_omega.png | Bin 1039 -> 11237 bytes src/assets/images/badges/alpha_delta_phi.png | Bin 0 -> 10962 bytes src/assets/images/badges/alpha_phi_alpha.png | Bin 1107 -> 0 bytes src/assets/images/badges/baseball.png | Bin 1305 -> 18096 bytes src/assets/images/badges/basketball.png | Bin 1484 -> 20516 bytes src/assets/images/badges/beta_omega_chi.png | Bin 1187 -> 0 bytes src/assets/images/badges/beta_rho_pi.png | Bin 0 -> 8682 bytes src/assets/images/badges/black_in_business.png | Bin 0 -> 7632 bytes src/assets/images/badges/brown_band.png | Bin 0 -> 8388 bytes src/assets/images/badges/brown_class_board.png | Bin 0 -> 7095 bytes src/assets/images/badges/brown_cs.png | Bin 0 -> 11517 bytes src/assets/images/badges/brown_democrats.png | Bin 0 -> 7661 bytes .../images/badges/brown_entrepreneurship.png | Bin 0 -> 15555 bytes .../images/badges/brown_womens_collective.png | Bin 0 -> 16495 bytes src/assets/images/badges/bsu.png | Bin 0 -> 9209 bytes src/assets/images/badges/buxton_international.png | Bin 0 -> 16050 bytes src/assets/images/badges/delta_gamma.png | Bin 643 -> 7840 bytes src/assets/images/badges/delta_phi.png | Bin 857 -> 0 bytes src/assets/images/badges/delta_tau.png | Bin 0 -> 7971 bytes src/assets/images/badges/fashion_at_brown.png | Bin 0 -> 10204 bytes src/assets/images/badges/field_hockey.png | Bin 970 -> 16665 bytes src/assets/images/badges/football.png | Bin 5374 -> 19113 bytes src/assets/images/badges/gymnastics.png | Bin 1643 -> 25165 bytes src/assets/images/badges/hockey.png | Bin 1077 -> 16274 bytes src/assets/images/badges/impulse_and_mezcla.png | Bin 0 -> 20809 bytes src/assets/images/badges/kappa_alpha_psi.png | Bin 1018 -> 0 bytes src/assets/images/badges/kappa_delta.png | Bin 758 -> 9561 bytes src/assets/images/badges/lacrosse.png | Bin 0 -> 17631 bytes src/assets/images/badges/latin_at_brown.png | Bin 0 -> 28842 bytes src/assets/images/badges/lax.png | Bin 1091 -> 0 bytes src/assets/images/badges/old/alpha_chi_omega.png | Bin 0 -> 1039 bytes src/assets/images/badges/old/alpha_phi_alpha.png | Bin 0 -> 1107 bytes src/assets/images/badges/old/baseball.png | Bin 0 -> 1305 bytes src/assets/images/badges/old/basketball.png | Bin 0 -> 1484 bytes src/assets/images/badges/old/beta_omega_chi.png | Bin 0 -> 1187 bytes src/assets/images/badges/old/brown_badge.png | Bin 0 -> 843 bytes src/assets/images/badges/old/delta_gamma.png | Bin 0 -> 643 bytes src/assets/images/badges/old/delta_phi.png | Bin 0 -> 857 bytes src/assets/images/badges/old/field_hockey.png | Bin 0 -> 970 bytes src/assets/images/badges/old/football.png | Bin 0 -> 5374 bytes src/assets/images/badges/old/gymnastics.png | Bin 0 -> 1643 bytes src/assets/images/badges/old/hockey.png | Bin 0 -> 1077 bytes src/assets/images/badges/old/kappa_alpha_psi.png | Bin 0 -> 1018 bytes src/assets/images/badges/old/kappa_delta.png | Bin 0 -> 758 bytes src/assets/images/badges/old/lax.png | Bin 0 -> 1091 bytes src/assets/images/badges/old/sigma.png | Bin 0 -> 685 bytes src/assets/images/badges/old/theta_alpha.png | Bin 0 -> 852 bytes src/assets/images/badges/old/track.png | Bin 0 -> 1162 bytes src/assets/images/badges/old/volleyball.png | Bin 0 -> 1674 bytes src/assets/images/badges/sigma.png | Bin 685 -> 0 bytes src/assets/images/badges/soccer.png | Bin 0 -> 15982 bytes src/assets/images/badges/softball.png | Bin 0 -> 18096 bytes src/assets/images/badges/tap.png | Bin 0 -> 11489 bytes src/assets/images/badges/tennis.png | Bin 0 -> 17695 bytes src/assets/images/badges/theta_alpha.png | Bin 852 -> 12104 bytes src/assets/images/badges/track.png | Bin 1162 -> 17837 bytes src/assets/images/badges/ucs.png | Bin 0 -> 10132 bytes src/assets/images/badges/volleyball.png | Bin 1674 -> 28161 bytes src/assets/images/badges/women_in_business.png | Bin 0 -> 14868 bytes src/assets/images/badges/zeta_delta_xi.png | Bin 0 -> 8952 bytes src/constants/badges.ts | 206 +++++++++++++++++++++ src/screens/badge/BadgeItem.tsx | 2 +- src/screens/badge/BadgeSelection.tsx | 121 +----------- 64 files changed, 209 insertions(+), 120 deletions(-) create mode 100644 src/assets/images/badges/acapella.png create mode 100644 src/assets/images/badges/alpha_delta_phi.png delete mode 100644 src/assets/images/badges/alpha_phi_alpha.png delete mode 100644 src/assets/images/badges/beta_omega_chi.png create mode 100644 src/assets/images/badges/beta_rho_pi.png create mode 100644 src/assets/images/badges/black_in_business.png create mode 100644 src/assets/images/badges/brown_band.png create mode 100644 src/assets/images/badges/brown_class_board.png create mode 100644 src/assets/images/badges/brown_cs.png create mode 100644 src/assets/images/badges/brown_democrats.png create mode 100644 src/assets/images/badges/brown_entrepreneurship.png create mode 100644 src/assets/images/badges/brown_womens_collective.png create mode 100644 src/assets/images/badges/bsu.png create mode 100644 src/assets/images/badges/buxton_international.png delete mode 100644 src/assets/images/badges/delta_phi.png create mode 100644 src/assets/images/badges/delta_tau.png create mode 100644 src/assets/images/badges/fashion_at_brown.png create mode 100644 src/assets/images/badges/impulse_and_mezcla.png delete mode 100644 src/assets/images/badges/kappa_alpha_psi.png create mode 100644 src/assets/images/badges/lacrosse.png create mode 100644 src/assets/images/badges/latin_at_brown.png delete mode 100644 src/assets/images/badges/lax.png create mode 100644 src/assets/images/badges/old/alpha_chi_omega.png create mode 100644 src/assets/images/badges/old/alpha_phi_alpha.png create mode 100644 src/assets/images/badges/old/baseball.png create mode 100644 src/assets/images/badges/old/basketball.png create mode 100644 src/assets/images/badges/old/beta_omega_chi.png create mode 100644 src/assets/images/badges/old/brown_badge.png create mode 100644 src/assets/images/badges/old/delta_gamma.png create mode 100644 src/assets/images/badges/old/delta_phi.png create mode 100644 src/assets/images/badges/old/field_hockey.png create mode 100644 src/assets/images/badges/old/football.png create mode 100644 src/assets/images/badges/old/gymnastics.png create mode 100644 src/assets/images/badges/old/hockey.png create mode 100644 src/assets/images/badges/old/kappa_alpha_psi.png create mode 100644 src/assets/images/badges/old/kappa_delta.png create mode 100644 src/assets/images/badges/old/lax.png create mode 100644 src/assets/images/badges/old/sigma.png create mode 100644 src/assets/images/badges/old/theta_alpha.png create mode 100644 src/assets/images/badges/old/track.png create mode 100644 src/assets/images/badges/old/volleyball.png delete mode 100644 src/assets/images/badges/sigma.png create mode 100644 src/assets/images/badges/soccer.png create mode 100644 src/assets/images/badges/softball.png create mode 100644 src/assets/images/badges/tap.png create mode 100644 src/assets/images/badges/tennis.png create mode 100644 src/assets/images/badges/ucs.png create mode 100644 src/assets/images/badges/women_in_business.png create mode 100644 src/assets/images/badges/zeta_delta_xi.png create mode 100644 src/constants/badges.ts (limited to 'src') diff --git a/src/assets/images/badges/acapella.png b/src/assets/images/badges/acapella.png new file mode 100644 index 00000000..c0adb885 Binary files /dev/null and b/src/assets/images/badges/acapella.png differ diff --git a/src/assets/images/badges/alpha_chi_omega.png b/src/assets/images/badges/alpha_chi_omega.png index 473894cc..f6db85af 100644 Binary files a/src/assets/images/badges/alpha_chi_omega.png and b/src/assets/images/badges/alpha_chi_omega.png differ diff --git a/src/assets/images/badges/alpha_delta_phi.png b/src/assets/images/badges/alpha_delta_phi.png new file mode 100644 index 00000000..51186468 Binary files /dev/null and b/src/assets/images/badges/alpha_delta_phi.png differ diff --git a/src/assets/images/badges/alpha_phi_alpha.png b/src/assets/images/badges/alpha_phi_alpha.png deleted file mode 100644 index 275e0eb3..00000000 Binary files a/src/assets/images/badges/alpha_phi_alpha.png and /dev/null differ diff --git a/src/assets/images/badges/baseball.png b/src/assets/images/badges/baseball.png index 7b470dbe..2a049c16 100644 Binary files a/src/assets/images/badges/baseball.png and b/src/assets/images/badges/baseball.png differ diff --git a/src/assets/images/badges/basketball.png b/src/assets/images/badges/basketball.png index 45d1139b..43d08803 100644 Binary files a/src/assets/images/badges/basketball.png and b/src/assets/images/badges/basketball.png differ diff --git a/src/assets/images/badges/beta_omega_chi.png b/src/assets/images/badges/beta_omega_chi.png deleted file mode 100644 index f2a85996..00000000 Binary files a/src/assets/images/badges/beta_omega_chi.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 new file mode 100644 index 00000000..490acebb Binary files /dev/null and b/src/assets/images/badges/beta_rho_pi.png differ diff --git a/src/assets/images/badges/black_in_business.png b/src/assets/images/badges/black_in_business.png new file mode 100644 index 00000000..995ae652 Binary files /dev/null and b/src/assets/images/badges/black_in_business.png differ diff --git a/src/assets/images/badges/brown_band.png b/src/assets/images/badges/brown_band.png new file mode 100644 index 00000000..bb21bcde Binary files /dev/null and b/src/assets/images/badges/brown_band.png differ diff --git a/src/assets/images/badges/brown_class_board.png b/src/assets/images/badges/brown_class_board.png new file mode 100644 index 00000000..a04e0a63 Binary files /dev/null and b/src/assets/images/badges/brown_class_board.png differ diff --git a/src/assets/images/badges/brown_cs.png b/src/assets/images/badges/brown_cs.png new file mode 100644 index 00000000..18c7165a Binary files /dev/null and b/src/assets/images/badges/brown_cs.png differ diff --git a/src/assets/images/badges/brown_democrats.png b/src/assets/images/badges/brown_democrats.png new file mode 100644 index 00000000..ba828a2a Binary files /dev/null and b/src/assets/images/badges/brown_democrats.png differ diff --git a/src/assets/images/badges/brown_entrepreneurship.png b/src/assets/images/badges/brown_entrepreneurship.png new file mode 100644 index 00000000..c4f381b2 Binary files /dev/null and b/src/assets/images/badges/brown_entrepreneurship.png differ diff --git a/src/assets/images/badges/brown_womens_collective.png b/src/assets/images/badges/brown_womens_collective.png new file mode 100644 index 00000000..242188ab Binary files /dev/null and b/src/assets/images/badges/brown_womens_collective.png differ diff --git a/src/assets/images/badges/bsu.png b/src/assets/images/badges/bsu.png new file mode 100644 index 00000000..13838f32 Binary files /dev/null and b/src/assets/images/badges/bsu.png differ diff --git a/src/assets/images/badges/buxton_international.png b/src/assets/images/badges/buxton_international.png new file mode 100644 index 00000000..2b1d33a3 Binary files /dev/null and b/src/assets/images/badges/buxton_international.png differ diff --git a/src/assets/images/badges/delta_gamma.png b/src/assets/images/badges/delta_gamma.png index 84182eca..4f1aa675 100644 Binary files a/src/assets/images/badges/delta_gamma.png and b/src/assets/images/badges/delta_gamma.png differ diff --git a/src/assets/images/badges/delta_phi.png b/src/assets/images/badges/delta_phi.png deleted file mode 100644 index 074317d1..00000000 Binary files a/src/assets/images/badges/delta_phi.png and /dev/null differ diff --git a/src/assets/images/badges/delta_tau.png b/src/assets/images/badges/delta_tau.png new file mode 100644 index 00000000..80d2a373 Binary files /dev/null and b/src/assets/images/badges/delta_tau.png differ diff --git a/src/assets/images/badges/fashion_at_brown.png b/src/assets/images/badges/fashion_at_brown.png new file mode 100644 index 00000000..a60b65fc Binary files /dev/null and b/src/assets/images/badges/fashion_at_brown.png differ diff --git a/src/assets/images/badges/field_hockey.png b/src/assets/images/badges/field_hockey.png index 766f0f60..7f08587e 100644 Binary files a/src/assets/images/badges/field_hockey.png and b/src/assets/images/badges/field_hockey.png differ diff --git a/src/assets/images/badges/football.png b/src/assets/images/badges/football.png index 2e8214b7..1a5c0f4f 100644 Binary files a/src/assets/images/badges/football.png and b/src/assets/images/badges/football.png differ diff --git a/src/assets/images/badges/gymnastics.png b/src/assets/images/badges/gymnastics.png index 5d500f26..64735dd2 100644 Binary files a/src/assets/images/badges/gymnastics.png and b/src/assets/images/badges/gymnastics.png differ diff --git a/src/assets/images/badges/hockey.png b/src/assets/images/badges/hockey.png index 7e269665..2cfd547e 100644 Binary files a/src/assets/images/badges/hockey.png and b/src/assets/images/badges/hockey.png differ diff --git a/src/assets/images/badges/impulse_and_mezcla.png b/src/assets/images/badges/impulse_and_mezcla.png new file mode 100644 index 00000000..68a73028 Binary files /dev/null and b/src/assets/images/badges/impulse_and_mezcla.png differ diff --git a/src/assets/images/badges/kappa_alpha_psi.png b/src/assets/images/badges/kappa_alpha_psi.png deleted file mode 100644 index 1b7d7aff..00000000 Binary files a/src/assets/images/badges/kappa_alpha_psi.png and /dev/null differ diff --git a/src/assets/images/badges/kappa_delta.png b/src/assets/images/badges/kappa_delta.png index 642ddb5b..7a3fdb25 100644 Binary files a/src/assets/images/badges/kappa_delta.png and b/src/assets/images/badges/kappa_delta.png differ diff --git a/src/assets/images/badges/lacrosse.png b/src/assets/images/badges/lacrosse.png new file mode 100644 index 00000000..67ac8f5e Binary files /dev/null and b/src/assets/images/badges/lacrosse.png differ diff --git a/src/assets/images/badges/latin_at_brown.png b/src/assets/images/badges/latin_at_brown.png new file mode 100644 index 00000000..515599f9 Binary files /dev/null and b/src/assets/images/badges/latin_at_brown.png differ diff --git a/src/assets/images/badges/lax.png b/src/assets/images/badges/lax.png deleted file mode 100644 index 3810589b..00000000 Binary files a/src/assets/images/badges/lax.png and /dev/null differ diff --git a/src/assets/images/badges/old/alpha_chi_omega.png b/src/assets/images/badges/old/alpha_chi_omega.png new file mode 100644 index 00000000..473894cc Binary files /dev/null and b/src/assets/images/badges/old/alpha_chi_omega.png differ diff --git a/src/assets/images/badges/old/alpha_phi_alpha.png b/src/assets/images/badges/old/alpha_phi_alpha.png new file mode 100644 index 00000000..275e0eb3 Binary files /dev/null and b/src/assets/images/badges/old/alpha_phi_alpha.png differ diff --git a/src/assets/images/badges/old/baseball.png b/src/assets/images/badges/old/baseball.png new file mode 100644 index 00000000..7b470dbe Binary files /dev/null and b/src/assets/images/badges/old/baseball.png differ diff --git a/src/assets/images/badges/old/basketball.png b/src/assets/images/badges/old/basketball.png new file mode 100644 index 00000000..45d1139b Binary files /dev/null and b/src/assets/images/badges/old/basketball.png differ diff --git a/src/assets/images/badges/old/beta_omega_chi.png b/src/assets/images/badges/old/beta_omega_chi.png new file mode 100644 index 00000000..f2a85996 Binary files /dev/null and b/src/assets/images/badges/old/beta_omega_chi.png differ diff --git a/src/assets/images/badges/old/brown_badge.png b/src/assets/images/badges/old/brown_badge.png new file mode 100644 index 00000000..bcffb6e3 Binary files /dev/null and b/src/assets/images/badges/old/brown_badge.png differ diff --git a/src/assets/images/badges/old/delta_gamma.png b/src/assets/images/badges/old/delta_gamma.png new file mode 100644 index 00000000..84182eca Binary files /dev/null and b/src/assets/images/badges/old/delta_gamma.png differ diff --git a/src/assets/images/badges/old/delta_phi.png b/src/assets/images/badges/old/delta_phi.png new file mode 100644 index 00000000..074317d1 Binary files /dev/null and b/src/assets/images/badges/old/delta_phi.png differ diff --git a/src/assets/images/badges/old/field_hockey.png b/src/assets/images/badges/old/field_hockey.png new file mode 100644 index 00000000..766f0f60 Binary files /dev/null and b/src/assets/images/badges/old/field_hockey.png differ diff --git a/src/assets/images/badges/old/football.png b/src/assets/images/badges/old/football.png new file mode 100644 index 00000000..2e8214b7 Binary files /dev/null and b/src/assets/images/badges/old/football.png differ diff --git a/src/assets/images/badges/old/gymnastics.png b/src/assets/images/badges/old/gymnastics.png new file mode 100644 index 00000000..5d500f26 Binary files /dev/null and b/src/assets/images/badges/old/gymnastics.png differ diff --git a/src/assets/images/badges/old/hockey.png b/src/assets/images/badges/old/hockey.png new file mode 100644 index 00000000..7e269665 Binary files /dev/null and b/src/assets/images/badges/old/hockey.png differ diff --git a/src/assets/images/badges/old/kappa_alpha_psi.png b/src/assets/images/badges/old/kappa_alpha_psi.png new file mode 100644 index 00000000..1b7d7aff Binary files /dev/null and b/src/assets/images/badges/old/kappa_alpha_psi.png differ diff --git a/src/assets/images/badges/old/kappa_delta.png b/src/assets/images/badges/old/kappa_delta.png new file mode 100644 index 00000000..642ddb5b Binary files /dev/null and b/src/assets/images/badges/old/kappa_delta.png differ diff --git a/src/assets/images/badges/old/lax.png b/src/assets/images/badges/old/lax.png new file mode 100644 index 00000000..3810589b Binary files /dev/null and b/src/assets/images/badges/old/lax.png differ diff --git a/src/assets/images/badges/old/sigma.png b/src/assets/images/badges/old/sigma.png new file mode 100644 index 00000000..7e6c9d22 Binary files /dev/null and b/src/assets/images/badges/old/sigma.png differ diff --git a/src/assets/images/badges/old/theta_alpha.png b/src/assets/images/badges/old/theta_alpha.png new file mode 100644 index 00000000..607720f5 Binary files /dev/null and b/src/assets/images/badges/old/theta_alpha.png differ diff --git a/src/assets/images/badges/old/track.png b/src/assets/images/badges/old/track.png new file mode 100644 index 00000000..a531f641 Binary files /dev/null and b/src/assets/images/badges/old/track.png differ diff --git a/src/assets/images/badges/old/volleyball.png b/src/assets/images/badges/old/volleyball.png new file mode 100644 index 00000000..a9bb9c88 Binary files /dev/null and b/src/assets/images/badges/old/volleyball.png differ diff --git a/src/assets/images/badges/sigma.png b/src/assets/images/badges/sigma.png deleted file mode 100644 index 7e6c9d22..00000000 Binary files a/src/assets/images/badges/sigma.png and /dev/null differ diff --git a/src/assets/images/badges/soccer.png b/src/assets/images/badges/soccer.png new file mode 100644 index 00000000..f2202510 Binary files /dev/null and b/src/assets/images/badges/soccer.png differ diff --git a/src/assets/images/badges/softball.png b/src/assets/images/badges/softball.png new file mode 100644 index 00000000..2a049c16 Binary files /dev/null and b/src/assets/images/badges/softball.png differ diff --git a/src/assets/images/badges/tap.png b/src/assets/images/badges/tap.png new file mode 100644 index 00000000..e6db8470 Binary files /dev/null and b/src/assets/images/badges/tap.png differ diff --git a/src/assets/images/badges/tennis.png b/src/assets/images/badges/tennis.png new file mode 100644 index 00000000..358cb8c7 Binary files /dev/null and b/src/assets/images/badges/tennis.png differ diff --git a/src/assets/images/badges/theta_alpha.png b/src/assets/images/badges/theta_alpha.png index 607720f5..323b538e 100644 Binary files a/src/assets/images/badges/theta_alpha.png and b/src/assets/images/badges/theta_alpha.png differ diff --git a/src/assets/images/badges/track.png b/src/assets/images/badges/track.png index a531f641..5bcff810 100644 Binary files a/src/assets/images/badges/track.png and b/src/assets/images/badges/track.png differ diff --git a/src/assets/images/badges/ucs.png b/src/assets/images/badges/ucs.png new file mode 100644 index 00000000..1009dc9b Binary files /dev/null and b/src/assets/images/badges/ucs.png differ diff --git a/src/assets/images/badges/volleyball.png b/src/assets/images/badges/volleyball.png index a9bb9c88..915b467c 100644 Binary files a/src/assets/images/badges/volleyball.png and b/src/assets/images/badges/volleyball.png differ diff --git a/src/assets/images/badges/women_in_business.png b/src/assets/images/badges/women_in_business.png new file mode 100644 index 00000000..1a504676 Binary files /dev/null and b/src/assets/images/badges/women_in_business.png differ diff --git a/src/assets/images/badges/zeta_delta_xi.png b/src/assets/images/badges/zeta_delta_xi.png new file mode 100644 index 00000000..7880d2b7 Binary files /dev/null and b/src/assets/images/badges/zeta_delta_xi.png differ diff --git a/src/constants/badges.ts b/src/constants/badges.ts new file mode 100644 index 00000000..946340d2 --- /dev/null +++ b/src/constants/badges.ts @@ -0,0 +1,206 @@ +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_entrepreneurship: require('../assets/images/badges/brown_entrepreneurship.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_and_mezcla: require('../assets/images/badges/impulse_and_mezcla.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 BADGE_DATA = [ + { + title: 'Athletics', + data: [ + { + badgeName: 'Brown Football', + badgeImage: _badgeImages.football, + }, + { + badgeName: 'Brown Track', + badgeImage: _badgeImages.track, + }, + { + badgeName: 'Brown Soccer', + badgeImage: _badgeImages.soccer, + }, + { + badgeName: 'Brown Volleyball', + badgeImage: _badgeImages.volleyball, + }, + { + badgeName: 'Brown Lacross', + badgeImage: _badgeImages.lacrosse, + }, + { + badgeName: 'Brown Basketball', + badgeImage: _badgeImages.basketball, + }, + { + badgeName: 'Brown Field Hockey', + badgeImage: _badgeImages.field_hockey, + }, + { + badgeName: 'Brown Gymnastics', + badgeImage: _badgeImages.gymnastics, + }, + { + badgeName: 'Brown Tennis', + badgeImage: _badgeImages.tennis, + }, + { + badgeName: 'Brown Hockey', + badgeImage: _badgeImages.hockey, + }, + { + badgeName: 'Brown Softball', + badgeImage: _badgeImages.softball, + }, + { + badgeName: 'Brown Baseball', + badgeImage: _badgeImages.baseball, + }, + ], + }, + + { + title: 'Student Leadership', + data: [ + { + badgeName: 'Brown Class Board', + badgeImage: _badgeImages.brown_class_board, + }, + { + badgeName: 'UCS', + badgeImage: _badgeImages.ucs, + }, + ], + }, + { + title: 'Culture / Ethnic Groups', + data: [ + { + badgeName: 'Latin @ Brown', + badgeImage: _badgeImages.latin_at_brown, + }, + { + badgeName: 'Buxton/international', + badgeImage: _badgeImages.buxton_international, + }, + { + badgeName: 'BSU', + badgeImage: _badgeImages.bsu, + }, + ], + }, + { + title: 'Sorority', + data: [ + { + badgeName: 'Kappa Delta', + badgeImage: _badgeImages.kappa_delta, + }, + { + badgeName: "Brown Women's Collective", + badgeImage: _badgeImages.brown_womens_collective, + }, + { + badgeName: 'Alpha Delta Phi', + badgeImage: _badgeImages.alpha_delta_phi, + }, + { + badgeName: 'Alpha Chi Omega', + badgeImage: _badgeImages.alpha_chi_omega, + }, + { + badgeName: 'Delta Gamma', + badgeImage: _badgeImages.delta_gamma, + }, + ], + }, + + { + title: 'Fraternity', + data: [ + { + badgeName: 'Beta Rho Pi', + badgeImage: _badgeImages.beta_rho_pi, + }, + { + badgeName: 'Delta Tau', + badgeImage: _badgeImages.delta_tau, + }, + { + badgeName: 'Theta Alpha', + badgeImage: _badgeImages.theta_alpha, + }, + { + badgeName: 'Zeta Delta Xi', + badgeImage: _badgeImages.zeta_delta_xi, + }, + ], + }, + { + title: 'Arts', + data: [ + { + badgeName: 'Acapella', + badgeImage: _badgeImages.acapella, + }, + { + badgeName: 'Taps', + badgeImage: _badgeImages.tap, + }, + { + badgeName: 'Fashion @ Brown', + badgeImage: _badgeImages.fashion_at_brown, + }, + { + badgeName: 'Brown Democrats', + badgeImage: _badgeImages.brown_democrats, + }, + { + badgeName: 'Impulse + Mezcla', + badgeImage: _badgeImages.impulse_and_mezcla, + }, + ], + }, + { + title: 'Network', + data: [ + { + badgeName: 'Brown Entrepreneurship', + badgeImage: _badgeImages.brown_entrepreneurship, + }, + ], + }, +]; diff --git a/src/screens/badge/BadgeItem.tsx b/src/screens/badge/BadgeItem.tsx index d7c0b74a..b7fc351a 100644 --- a/src/screens/badge/BadgeItem.tsx +++ b/src/screens/badge/BadgeItem.tsx @@ -44,7 +44,7 @@ const BadgeItem: React.FC = ({ const styles = StyleSheet.create({ item: { width: SCREEN_WIDTH / 3 - 20, - height: SCREEN_WIDTH / 3 - 20, + height: 140, marginLeft: 15, marginBottom: 12, borderRadius: 8, diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 4946bd96..a3f302d1 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -7,6 +7,7 @@ import {TouchableOpacity} from 'react-native-gesture-handler'; import LinearGradient from 'react-native-linear-gradient'; import {useDispatch} from 'react-redux'; import {ADD_USER_BADGES, BACKGROUND_GRADIENT_MAP} from '../../constants'; +import {BADGE_DATA} from '../../constants/badges'; import { ERROR_BADGES_EXCEED_LIMIT, ERROR_UPLOAD_BADGES, @@ -21,124 +22,6 @@ import BadgeScreenHeader from './BadgeScreenHeader'; * Home Screen for displaying Tagg Badge Selections **/ -export const BadgeImages = { - football: require('../../assets/images/badges/football.png'), - track: require('../../assets/images/badges/track.png'), - volleyball: require('../../assets/images/badges/volleyball.png'), - lax: require('../../assets/images/badges/brown_badge.png'), - fieldHockey: require('../../assets/images/badges/field_hockey.png'), - gymnastics: require('../../assets/images/badges/gymnastics.png'), - hockey: require('../../assets/images/badges/hockey.png'), - baseball: require('../../assets/images/badges/baseball.png'), - basketball: require('../../assets/images/badges/basketball.png'), - kappadelta: require('../../assets/images/badges/kappa_delta.png'), - alphachiomega: require('../../assets/images/badges/alpha_chi_omega.png'), - deltagamma: require('../../assets/images/badges/delta_gamma.png'), - sigma: require('../../assets/images/badges/sigma.png'), - thetaalpha: require('../../assets/images/badges/theta_alpha.png'), - deltaphi: require('../../assets/images/badges/delta_phi.png'), - kappaalphapsi: require('../../assets/images/badges/kappa_alpha_psi.png'), - alphaphialpha: require('../../assets/images/badges/alpha_phi_alpha.png'), - betaomegachi: require('../../assets/images/badges/beta_omega_chi.png'), -}; - -export const DATA = [ - { - title: 'Athletics', - data: [ - { - badgeName: 'Brown Football', - badgeImage: BadgeImages.football, - }, - { - badgeName: 'Brown Track', - badgeImage: BadgeImages.track, - }, - { - badgeName: 'Brown Volleyball', - badgeImage: BadgeImages.volleyball, - }, - { - badgeName: 'Brown LAX', - badgeImage: BadgeImages.lax, - }, - { - badgeName: 'Brown Field Hockey', - badgeImage: BadgeImages.fieldHockey, - }, - { - badgeName: 'Brown Gymnastics', - badgeImage: BadgeImages.gymnastics, - }, - { - badgeName: 'Brown Hockey', - badgeImage: BadgeImages.hockey, - }, - { - badgeName: 'Brown Baseball', - badgeImage: BadgeImages.baseball, - }, - { - badgeName: 'Brown Basketball', - badgeImage: BadgeImages.basketball, - }, - ], - }, - - { - title: 'Sorority', - data: [ - { - badgeName: 'Kappa Delta', - badgeImage: BadgeImages.kappadelta, - }, - { - badgeName: 'Alpha Chi Omega', - badgeImage: BadgeImages.alphachiomega, - }, - { - badgeName: 'Delta Gamma', - badgeImage: BadgeImages.deltagamma, - }, - ], - }, - - { - title: 'Fraternity', - data: [ - { - badgeName: 'Sigma', - badgeImage: BadgeImages.sigma, - }, - { - badgeName: 'Theta Alpha', - badgeImage: BadgeImages.thetaalpha, - }, - { - badgeName: 'Delta Phi', - badgeImage: BadgeImages.deltaphi, - }, - ], - }, - { - title: 'Historically Black Fraternities', - data: [ - { - badgeName: 'Kappa Alpha Psi', - badgeImage: BadgeImages.kappadelta, - }, - { - badgeName: 'Alpha Phi Alpha', - badgeImage: BadgeImages.alphaphialpha, - }, - { - badgeName: 'Beta Omega Chi', - badgeImage: BadgeImages.betaomegachi, - }, - ], - }, -]; - type BadgeSelectionParamList = { BadgeList: any[]; }; @@ -226,7 +109,7 @@ const BadgeSelection: React.FC = ({navigation}) => { top={Animated.useValue(0)} /> */} -- cgit v1.2.3-70-g09d2 From 11acc1bcb6224ce0bf299310e2212621f9006123 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 9 Mar 2021 16:09:48 -0500 Subject: missed 3 badges --- src/constants/badges.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/constants/badges.ts b/src/constants/badges.ts index 946340d2..0604464d 100644 --- a/src/constants/badges.ts +++ b/src/constants/badges.ts @@ -201,6 +201,18 @@ export const BADGE_DATA = [ badgeName: 'Brown Entrepreneurship', badgeImage: _badgeImages.brown_entrepreneurship, }, + { + badgeName: 'Black in Business', + badgeImage: _badgeImages.black_in_business, + }, + { + badgeName: 'Women in Business', + badgeImage: _badgeImages.women_in_business, + }, + { + badgeName: 'Brown CS', + badgeImage: _badgeImages.brown_cs, + }, ], }, ]; -- cgit v1.2.3-70-g09d2 From f2ec950ce7f525c9262e8d9612f66ef5397a3c8b Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 9 Mar 2021 17:44:17 -0500 Subject: updated image size --- src/screens/badge/BadgeItem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/screens/badge/BadgeItem.tsx b/src/screens/badge/BadgeItem.tsx index b7fc351a..adf74026 100644 --- a/src/screens/badge/BadgeItem.tsx +++ b/src/screens/badge/BadgeItem.tsx @@ -66,8 +66,8 @@ const styles = StyleSheet.create({ borderRadius: 8, }, imageStyles: { - width: '31%', - height: '31%', + width: 40, + height: 40, marginTop: '11%', }, textContainer: {marginTop: '16%'}, -- cgit v1.2.3-70-g09d2 From 3b65bc4a8e5727cc741fb2e4e22aa36ede34093b Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 9 Mar 2021 17:55:50 -0500 Subject: fixed unable to skip and edit profile error --- src/screens/badge/BadgeSelection.tsx | 2 ++ .../suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index a3f302d1..f1cd000c 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -44,6 +44,8 @@ const BadgeSelection: React.FC = ({navigation}) => { onPress={() => { if (canSubmit) { uploadUserSelection(); + } else { + dispatch(suggestedPeopleBadgesFinished()); } }}> {canSubmit ? 'Done' : 'Skip'} diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx index bb8aaccf..92f862c4 100644 --- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx +++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx @@ -76,7 +76,9 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => { const success = await sendSuggestedPeoplePhoto(image); if (success) { dispatch(uploadedSuggestedPeoplePhoto(image)); - navigation.push('BadgeSelection'); + if (goTo !== 'Profile') { + navigation.push('BadgeSelection'); + } } else { Alert.alert(ERROR_UPLOAD); } -- cgit v1.2.3-70-g09d2