aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/assets/images/badges/cornell/zeta_phi_beta.pngbin0 -> 19159 bytes
-rw-r--r--src/assets/universities/cornell.pngbin0 -> 12353 bytes
-rw-r--r--src/components/profile/ProfileHeader.tsx2
-rw-r--r--src/components/profile/UniversityIcon.tsx4
-rw-r--r--src/components/search/SearchResultCell.tsx2
-rw-r--r--src/components/suggestedPeople/BadgesDropdown.tsx4
-rw-r--r--src/constants/badges.ts11
-rw-r--r--src/screens/search/SearchScreen.tsx2
-rw-r--r--src/screens/search/mock.ts118
-rw-r--r--src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx2
10 files changed, 17 insertions, 128 deletions
diff --git a/src/assets/images/badges/cornell/zeta_phi_beta.png b/src/assets/images/badges/cornell/zeta_phi_beta.png
new file mode 100644
index 00000000..8816cac7
--- /dev/null
+++ b/src/assets/images/badges/cornell/zeta_phi_beta.png
Binary files differ
diff --git a/src/assets/universities/cornell.png b/src/assets/universities/cornell.png
new file mode 100644
index 00000000..bf15f8b2
--- /dev/null
+++ b/src/assets/universities/cornell.png
Binary files differ
diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index e5bd9d93..87eeb507 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -60,7 +60,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
<View style={styles.friendsAndUniversity}>
<FriendsCount screenType={screenType} userXId={userXId} />
<UniversityIcon
- university="brown"
+ university="brown" //TODO: Change
university_class={university_class}
/>
</View>
diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx
index aef0de4f..d738e745 100644
--- a/src/components/profile/UniversityIcon.tsx
+++ b/src/components/profile/UniversityIcon.tsx
@@ -21,8 +21,8 @@ const UniversityIcon: React.FC<UniversityIconProps> = ({
var universityIcon;
switch (university) {
case 'cornell':
- //TODO:
- universityIcon = require('../../assets/universities/brown.png');
+ universityIcon = require('../../assets/universities/cornell.png');
+ break;
case 'brown':
universityIcon = require('../../assets/universities/brown.png');
break;
diff --git a/src/components/search/SearchResultCell.tsx b/src/components/search/SearchResultCell.tsx
index 9a8216e5..3379d789 100644
--- a/src/components/search/SearchResultCell.tsx
+++ b/src/components/search/SearchResultCell.tsx
@@ -153,7 +153,7 @@ const SearchResultsCell: React.FC<SearchResults> = ({
<View style={[styles.imageContainer, styles.categoryBackground]}>
<Image
resizeMode="contain"
- source={category === 'Brown' ? universityIcon() : searchIcon()}
+ source={category === 'Brown' ? universityIcon() : searchIcon()} //TODO: Change
style={styles.categoryImage}
/>
</View>
diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx
index 99c03057..3cf9775b 100644
--- a/src/components/suggestedPeople/BadgesDropdown.tsx
+++ b/src/components/suggestedPeople/BadgesDropdown.tsx
@@ -81,13 +81,13 @@ const BadgesDropdown: React.FC<BadgesDropdownProps> = ({
}}>
{displayBadges ? (
<UniversityIconClicked
- university="brown"
+ university="brown" //TODO: Change
style={styles.universityIconContainer}
imageStyle={{width: normalize(31), height: normalize(38)}}
/>
) : (
<UniversityIcon
- university="brown"
+ university="brown" //TODO: Change
style={styles.universityIconContainer}
imageStyle={{width: normalize(31), height: normalize(38)}}
/>
diff --git a/src/constants/badges.ts b/src/constants/badges.ts
index 16843947..0507ed52 100644
--- a/src/constants/badges.ts
+++ b/src/constants/badges.ts
@@ -110,6 +110,7 @@ export const _cornellBadgeImages = {
wrestling: require('../assets/images/badges/cornell/wrestling.png'),
zeta_beta_tau: require('../assets/images/badges/cornell/zeta_beta_tau.png'),
zeta_psi: require('../assets/images/badges/cornell/zeta_psi.png'),
+ zeta_phi_beta: require('../assets/images/badges/brown/zeta_phi_beta.png'),
};
const _brownBadges = [
@@ -359,7 +360,10 @@ const _cornellBadges = [
badgeName: 'Delta Tau Delta',
badgeImage: _cornellBadgeImages.delta_tau_delta,
},
- // {badgeName: 'Delta Upsilon', badgeImage: _cornellBadgeImages.},
+ {
+ badgeName: 'Delta Epsilon',
+ badgeImage: _cornellBadgeImages.delta_epsilon,
+ },
{
badgeName: 'Kappa Delta Rho',
badgeImage: _cornellBadgeImages.kappa_delta_rho,
@@ -443,7 +447,10 @@ const _cornellBadges = [
badgeName: 'Kappa Phi Lambda',
badgeImage: _cornellBadgeImages.kappa_phi_lambda,
},
- // {badgeName: 'Zeta Phi Beta', badgeImage: _cornellBadgeImages.ze},
+ {
+ badgeName: 'Zeta Phi Beta',
+ badgeImage: _cornellBadgeImages.zeta_phi_beta,
+ },
{
badgeName: 'Alpha Chi Omega',
badgeImage: _cornellBadgeImages.alpha_chi_omega,
diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index 65ec3934..28e24299 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -50,7 +50,7 @@ const SearchScreen: React.FC = () => {
const top = Animated.useValue(-SCREEN_HEIGHT);
const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({
id: -1,
- name: `Brown '${year}`,
+ name: `Brown '${year}`, //TODO: Change
category: 'Brown',
}));
const [keyboardVisible, setKeyboardVisible] = React.useState(
diff --git a/src/screens/search/mock.ts b/src/screens/search/mock.ts
deleted file mode 100644
index d9909b22..00000000
--- a/src/screens/search/mock.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-const MockResults = () => {
- return {
- categories: [
- {
- id: 11,
- name: "Brown '21",
- category: 'Brown',
- },
- {
- id: 12,
- name: "Brown '22",
- category: 'Brown',
- },
- {
- id: 13,
- name: "Brown '23",
- category: null,
- },
- {
- id: 14,
- name: "Brown '24",
- category: null,
- },
- ],
- users: [
- {
- id: 'd5295557-59ce-49fc-aa8a-442874dbffc3',
- username: 'foobar',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-d5295557-59ce-49fc-aa8a-442874dbffc3-thumbnail.jpg',
- },
- {
- id: '31e93eb5-ccc9-4743-b053-eff368e23fa8',
- username: 'foobar2',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-31e93eb5-ccc9-4743-b053-eff368e23fa8-thumbnail.jpg',
- },
- {
- id: 'b1b68df9-97ac-48de-b00d-eab10a6a644a',
- username: 'foobar3',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-b1b68df9-97ac-48de-b00d-eab10a6a644a-thumbnail.jpg',
- },
- {
- id: 'b89c88b3-6b2f-4b6c-85d9-a03ff5396113',
- username: 'foobar4',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-b89c88b3-6b2f-4b6c-85d9-a03ff5396113-thumbnail.jpg',
- },
- {
- id: '73b4496a-0aa8-4115-98da-2070bf326134',
- username: 'foobar5',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-73b4496a-0aa8-4115-98da-2070bf326134-thumbnail.jpg',
- },
- {
- id: '329763b8-931e-4d4d-8a07-003374d38497',
- username: 'foobar6',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-329763b8-931e-4d4d-8a07-003374d38497-thumbnail.jpg',
- },
- {
- id: '9e82fea2-cddc-41e1-be05-6873f58138ca',
- username: 'foobar7',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-9e82fea2-cddc-41e1-be05-6873f58138ca-thumbnail.jpg',
- },
- {
- id: '6e5b8892-4384-45a1-bc0a-8f2c9d614fbc',
- username: 'foobar8',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-6e5b8892-4384-45a1-bc0a-8f2c9d614fbc-thumbnail.jpg',
- },
- {
- id: 'c49b01c6-9151-4654-8fae-834adfa15727',
- username: 'foobar9',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-c49b01c6-9151-4654-8fae-834adfa15727-thumbnail.jpg',
- },
- {
- id: '5b394d5b-62e3-405e-8ecd-7433517ef688',
- username: 'foobar10',
- first_name: 'Foo',
- last_name: 'Bar',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-5b394d5b-62e3-405e-8ecd-7433517ef688-thumbnail.jpg',
- },
- {
- id: '698e38f0-24ed-404c-9f0c-6a24e43af576',
- username: 'fooo',
- first_name: 'wefwef',
- last_name: 'wefwef',
- thumbnail_url:
- 'https://tagg-dev.s3.us-east-2.amazonaws.com/thumbnails/smallProfilePicture/spp-698e38f0-24ed-404c-9f0c-6a24e43af576-thumbnail.jpg',
- },
- ],
- };
-};
-
-export default MockResults;
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 0a4e5718..16a64573 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -166,7 +166,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
<View style={styles.editBadgesMainContainer}>
<View style={styles.editBadgesSubContainer}>
<UniversityIcon
- university="brown"
+ university="brown" //TODO: Change
imageStyle={{width: normalize(16), height: normalize(20)}}
/>
<Text style={styles.editBadgesText}>Edit Badges</Text>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 17:16:17 +0000