Skip to content

Update Main branch (#299) #301

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
merged 32 commits into from
May 24, 2024
Merged

Update Main branch (#299) #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
69970e2
fix/ add lucide icons to replace emojis so it works across all browsers
dadedeandrade May 17, 2024
e17170f
feat: added shelter category
fagundesjg May 17, 2024
d45956a
setup shadcdn combobox
larissapissurno May 19, 2024
450a44b
remove new item btn
larissapissurno May 19, 2024
568e2f5
add autocomplete with search
larissapissurno May 20, 2024
bd0dbfc
handle add new item
larissapissurno May 20, 2024
2fc2bf9
add clear feat
larissapissurno May 20, 2024
9611486
cleanup
larissapissurno May 20, 2024
7aa1e55
cleanup
larissapissurno May 20, 2024
5424ce2
cleanup
larissapissurno May 20, 2024
5671020
fix imports
larissapissurno May 20, 2024
dbb4c6c
fix: new item keeps on when item selected
larissapissurno May 20, 2024
883ae64
update text
larissapissurno May 20, 2024
58ed488
add text above list
larissapissurno May 20, 2024
ba795f4
add initial filter to show only stored supplies
larissapissurno May 20, 2024
859a46d
Merge branch 'master' into develop
giggio May 20, 2024
005de2f
Merge branch 'main' into develop
giggio May 20, 2024
286c867
Add contributing
giggio May 20, 2024
97fb443
remove unused import
larissapissurno May 21, 2024
02065f5
feat: melhoria na UI de lista de itens para evitar duplicação (#275)
vinny-silveira May 21, 2024
180a914
Resolves #284
rayanerocha07 May 21, 2024
e1a84a1
review
rayanerocha07 May 22, 2024
afbbbf0
removes unusued session context
rayanerocha07 May 22, 2024
703aa9b
finishing
rayanerocha07 May 22, 2024
dc0bb64
removes unusued functions
rayanerocha07 May 22, 2024
2275040
Resolves #284 - Padronizar Termos: Alterar "necessita urgentemente" p…
vinny-silveira May 22, 2024
582343d
fix/ add lucide icons to replace emojis so it works across all browse…
vinny-silveira May 22, 2024
fd5fefe
feat: added more contributors to about me page (#292)
fagundesjg May 23, 2024
d208bf1
feat: added hmac and obfuscate api module (#294)
fagundesjg May 23, 2024
2b13673
Update staging branch (#299)
fagundesjg May 23, 2024
825536c
fix: sorted supply search result by lenght to appear best results fir…
fagundesjg May 24, 2024
784fbc8
Merge branch 'develop' into staging
fagundesjg May 24, 2024
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
3 changes: 2 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VITE_API_URL=http://localhost:4000
VITE_API_URL=http://localhost:4000
VITE_HMAC_SECRET_KEY=
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
run: |
touch .env
echo VITE_API_URL=${{ secrets.VITE_API_URL }} >> .env
echo VITE_HMAC_SECRET_KEY=${{ secrets.VITE_HMAC_SECRET_KEY }} >> .env
cat .env

- run: npm run build
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
run: |
touch .env
echo VITE_API_URL=${{ secrets.DEV_VITE_API_URL }} >> .env
echo VITE_HMAC_SECRET_KEY=${{ secrets.VITE_HMAC_SECRET_KEY }} >> .env
cat .env

- run: npm run build
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
run: |
touch .env
echo VITE_API_URL=${{ secrets.STG_VITE_API_URL }} >> .env
echo VITE_HMAC_SECRET_KEY=${{ secrets.VITE_HMAC_SECRET_KEY }} >> .env
cat .env

- run: npm run build
Expand Down
Loading