Skip to content
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

Grants frontend complete #36

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open

Grants frontend complete #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c5f6436
added icons + color changes
varortz Apr 10, 2023
827a35b
spacing issues for grant card title
varortz Apr 13, 2023
6cd3beb
grantCard title spacing fixed
varortz Apr 13, 2023
3bd6916
grant newsfeed complete
varortz Apr 15, 2023
7cf8970
grantInfo frontend WIP
varortz Apr 15, 2023
00dba7b
frontend complete
varortz Apr 15, 2023
4051ae7
grants fronted prettier/eslint changes
varortz Apr 15, 2023
5656212
width issues solved w percentages
varortz Apr 16, 2023
33d1f16
added maxWidth
varortz Apr 17, 2023
9614fe7
grant frontend implementation redo
varortz Apr 23, 2023
a3498e8
added margin for info on GrantCard
varortz Apr 23, 2023
1544fa6
update to GrantCard title size
varortz Apr 23, 2023
bad7c48
added icons + color changes
varortz Apr 10, 2023
60c600a
spacing issues for grant card title
varortz Apr 13, 2023
30bdf01
grantCard title spacing fixed
varortz Apr 13, 2023
b6526b8
grant newsfeed complete
varortz Apr 15, 2023
e0b8cb4
grantInfo frontend WIP
varortz Apr 15, 2023
6bf2be3
frontend complete
varortz Apr 15, 2023
5e1a69d
grants fronted prettier/eslint changes
varortz Apr 15, 2023
fcd09c2
width issues solved w percentages
varortz Apr 16, 2023
c0baf7d
added maxWidth
varortz Apr 17, 2023
33f89c4
grant frontend implementation redo
varortz Apr 23, 2023
f0d5611
added margin for info on GrantCard
varortz Apr 23, 2023
d22f82b
update to GrantCard title size
varortz Apr 23, 2023
82b8c97
Merge branch 'alvaro/new-grants-frontend' of https://github.com/calbl…
varortz Apr 24, 2023
37e638c
added Linking + Back Arrow support
varortz Apr 29, 2023
a5ea405
Merge branch 'alvaro/new-grants-frontend' of https://github.com/calbl…
varortz Apr 29, 2023
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
0 assets/grantPlaceholderImg.png → assets/grantPlaceholder.png
View file
Open in desktop
File renamed without changes
38 changes: 37 additions & 1 deletion assets/icons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ export type IconType =
| 'audio_forward'
| 'audio_back'
| 'dropdown'
| 'expand';
| 'expand'
| 'coins'
| 'calendar'
| 'back_arrow';

const IconSvgs: Record<IconType, React.ReactElement> = {
inactive_grants_icon: (
Expand Down Expand Up @@ -182,6 +185,39 @@ const IconSvgs: Record<IconType, React.ReactElement> = {
`}
/>
),
coins: (
<SvgXml
xml={`
<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.80534 11.9097C9.62429 11.9097 11.9095 9.62448 11.9095 6.80552C11.9095 3.98657 9.62429 1.70135 6.80534 1.70135C3.98639 1.70135 1.70117 3.98657 1.70117 6.80552C1.70117 9.62448 3.98639 11.9097 6.80534 11.9097Z" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M15.3898 8.82159C16.1939 9.1214 16.9095 9.61915 17.4703 10.2688C18.0312 10.9184 18.4191 11.699 18.5984 12.5383C18.7776 13.3777 18.7423 14.2486 18.4957 15.0707C18.2491 15.8927 17.7992 16.6393 17.1876 17.2414C16.5761 17.8436 15.8225 18.2817 14.9967 18.5155C14.1709 18.7492 13.2995 18.7709 12.4631 18.5786C11.6267 18.3863 10.8523 17.9862 10.2114 17.4153C9.57062 16.8444 9.0841 16.1211 8.79688 15.3124" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M5.95508 5.10413H6.80577V8.5069" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M14.2156 11.8076L14.8111 12.4116L12.4121 14.8106" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
`}
/>
),
calendar: (
<SvgXml
xml={`
<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.1638 3.40283H4.25412C3.31447 3.40283 2.55273 4.16457 2.55273 5.10422V17.0139C2.55273 17.9536 3.31447 18.7153 4.25412 18.7153H16.1638C17.1035 18.7153 17.8652 17.9536 17.8652 17.0139V5.10422C17.8652 4.16457 17.1035 3.40283 16.1638 3.40283Z" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M13.6113 1.70142V5.10419" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M6.80469 1.70142V5.10419" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M2.55273 8.50696H17.8652" stroke="black" stroke-width="1.70139" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
`}
/>
),
back_arrow: (
<SvgXml
xml={`
<svg width="38" height="38" viewBox="0 0 38 38" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.75 28.5L14.25 19L23.75 9.5" stroke="#CC502F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
`}
/>
),
};
type Props = {
className?: string;
Expand Down
129 changes: 43 additions & 86 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"i18next": "^22.4.10",
"react": "18.1.0",
"react-i18next": "^12.1.5",
"react-native": "0.70.5",
"react-native": "0.70.8",
"react-native-dotenv": "^3.4.7",
"react-native-gesture-handler": "~2.8.0",
"react-native-reanimated": "~2.12.0",
Expand Down
Loading