Skip to content

pushed ui fix #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Manan-Sharma-5 merged 3 commits into from
Jan 15, 2025
Merged

pushed ui fix #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86703d4
pushed ui fix
Manan-Sharma-5 Jan 14, 2025
8bd7a68
Merge branch 'dev' into feature/bug-fixes
Manan-Sharma-5 Jan 14, 2025
8d140ed
pushed icons
Manan-Sharma-5 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions components/collaboration-card/card-components/CollaborationDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ import Colors from "@/constants/Colors";
import {
faCoins,
faDollar,
faDollarSign,
faEllipsisH,
faFilm,
faHouseLaptop,
faMap,
faPanorama,
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-native-fontawesome";
import { useTheme } from "@react-navigation/native";
Expand Down Expand Up @@ -95,9 +99,9 @@ const CollaborationDetails: FC<CollaborationDetailsProps> = ({
chipText={
promotionType === PromotionType.PAID_COLLAB ? "Paid" : "Unpaid"
}
chipIcon={faDollar}
chipIcon={faDollarSign}
/>
<ChipCard chipText={location.type} chipIcon={faMap} />
<ChipCard chipText={location.type} chipIcon={faHouseLaptop} />
{platform &&
platform.map((content, index) => (
<ChipCard
Expand All @@ -116,7 +120,17 @@ const CollaborationDetails: FC<CollaborationDetailsProps> = ({
))}
{contentType &&
contentType.map((content, index) => (
<ChipCard key={index} chipText={content} chipIcon={faCoins} />
<ChipCard
key={index}
chipText={content}
chipIcon={
content === "Posts"
? faPanorama
: content === "Reels"
? faFilm
: faCoins
}
/>
))}
</View>
</View>
Expand Down
20 changes: 17 additions & 3 deletions components/collaboration/collaboration-details/OverviewTabContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import {
faCheckCircle,
faCoins,
faDollar,
faDollarSign,
faFilm,
faHouseLaptop,
faMap,
faPanorama,
faStar,
faStarHalfStroke,
} from "@fortawesome/free-solid-svg-icons";
Expand Down Expand Up @@ -322,11 +326,11 @@ const OverviewTabContent = (props: CollaborationDetailsContentProps) => {
? "Paid"
: "Unpaid"
}
chipIcon={faDollar}
chipIcon={faDollarSign}
/>
<ChipCard
chipText={props.collaboration.location.type}
chipIcon={faMap}
chipIcon={faHouseLaptop}
/>
{props.collaboration.platform &&
props.collaboration.platform.map((content, index) => (
Expand All @@ -346,7 +350,17 @@ const OverviewTabContent = (props: CollaborationDetailsContentProps) => {
))}
{props.collaboration.contentFormat &&
props.collaboration.contentFormat.map((content, index) => (
<ChipCard key={index} chipText={content} chipIcon={faCoins} />
<ChipCard
key={index}
chipText={content}
chipIcon={
content === "Posts"
? faPanorama
: content === "Reels"
? faFilm
: faCoins
}
/>
))}
</View>

Expand Down
59 changes: 28 additions & 31 deletions components/proposals/Applications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ const Applications = () => {
contentContainerStyle={{
gap: 16,
paddingBottom: 64,
alignItems: xl ? "center" : "stretch",
}}
refreshControl={
<RefreshControl
Expand Down Expand Up @@ -267,39 +266,37 @@ const Applications = () => {
key={selectedCollabId}
/>
)}
{
filteredProposals.length !== 0 && (
<View
style={{
position: "absolute",
bottom: 0,
right: 0,
left: 0,
paddingTop: 16,
paddingHorizontal: 16,
{filteredProposals.length !== 0 && (
<View
style={{
position: "absolute",
bottom: 0,
right: 0,
left: 0,
paddingTop: 16,
paddingHorizontal: 16,
}}
>
<Button
onPress={() => {
router.push({
pathname: "/(modal)/create-collaboration",
});
}}
>
<Button
onPress={() => {
router.push({
pathname: "/(modal)/create-collaboration",
});
<FontAwesomeIcon
icon={faPlus}
color="white"
size={14}
style={{
marginRight: 8,
marginTop: -2,
}}
>
<FontAwesomeIcon
icon={faPlus}
color="white"
size={14}
style={{
marginRight: 8,
marginTop: -2,
}}
/>
Create Collaboration
</Button>
</View>
)
}
/>
Create Collaboration
</Button>
</View>
)}
</View>
);
};
Expand Down
8 changes: 6 additions & 2 deletions constants/Menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { faGears, faUser } from "@fortawesome/free-solid-svg-icons";
import {
faGears,
faUser,
faUsersBetweenLines,
} from "@fortawesome/free-solid-svg-icons";

export const MENU_ITEMS = [
{
id: "1",
icon: faUser,
icon: faUsersBetweenLines,
title: "Members",
href: "/preferences",
},
Expand Down