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.

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

Feature/search 471 #476

Merged
merged 96 commits into from
Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from 94 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
b73669d
Add initial markup
amiskov Jan 18, 2021
ec15d4e
Merge branch 'master' into feature/search-471
amiskov Jan 19, 2021
bee31c9
Add ports to store/retrieve recent searches
amiskov Jan 20, 2021
60ac7e9
Update GraphQl types
amiskov Jan 23, 2021
de375f8
Send query with GraphQl
amiskov Jan 23, 2021
d761546
Remove Debug log
amiskov Jan 23, 2021
0f3d995
Move search to separate module
amiskov Jan 25, 2021
c435d8a
Send recent search item on click
amiskov Jan 25, 2021
31d38ab
Show recent queries instead page body if search is activated
amiskov Jan 25, 2021
914c616
Adjust flag icon
amiskov Jan 25, 2021
7b78bcc
Adjust svg fill colors
amiskov Jan 25, 2021
a8fe191
Add search results with tabs
amiskov Jan 25, 2021
877d227
Improve types
amiskov Jan 27, 2021
9ccf500
Improve types
amiskov Jan 27, 2021
955ea64
Hanlde click for 0-found results
amiskov Jan 27, 2021
7c010b3
Add html/css for actions
amiskov Jan 27, 2021
4fe9e82
Adjust search layout and background
amiskov Jan 27, 2021
ccd7e10
Adjust styles for offers list
amiskov Jan 28, 2021
3bafc5b
Add actions list styles
amiskov Jan 28, 2021
7f64012
Close search
amiskov Jan 28, 2021
4e60528
Add empty results state
amiskov Jan 28, 2021
8ccd1ae
Merge branch 'master' into feature/search-471
amiskov Jan 28, 2021
6ee8a6d
Simplify Aciton functions
amiskov Feb 1, 2021
ab33b58
Simplify view proof function
amiskov Feb 1, 2021
53b09aa
Simplify claim confirmaiton
amiskov Feb 1, 2021
6c93277
Simplify view community status
amiskov Feb 1, 2021
466f091
Rename proofs to proof
amiskov Feb 1, 2021
6ef20a4
WIP: Claim works on community page
amiskov Feb 1, 2021
b6d1f3a
Separate Action module from Community
amiskov Feb 1, 2021
dc726db
Remove obsolete code
amiskov Feb 2, 2021
443236a
Cleanup imports
amiskov Feb 2, 2021
ed39e47
Move claiming helpers to the Action module
amiskov Feb 3, 2021
cb94ce2
WIP: Exclude objective from action type
amiskov Feb 3, 2021
b22f366
Move viewAciton to the Comunity page module
amiskov Feb 3, 2021
24a3f58
Add page for claim with photo
amiskov Feb 3, 2021
632f7e8
WIP: make claim with photo page work
amiskov Feb 3, 2021
d171312
WIP: create claimactionport function
amiskov Feb 3, 2021
47353dc
Remove LoggedIn data from Action module
amiskov Feb 3, 2021
71ecaf4
Improve naming
amiskov Feb 4, 2021
bdde187
Make claim with photo work on search results
amiskov Feb 4, 2021
83ff280
Use Aciton type in search
amiskov Feb 4, 2021
4448f6d
Cleanup search module
amiskov Feb 4, 2021
48e6f89
Make search work with global actions
amiskov Feb 4, 2021
07d8de7
Make claim with photo link work on community page
amiskov Feb 4, 2021
2c7b300
Put back the claim description on the claim view page
amiskov Feb 4, 2021
5ab92f5
Make claim with photo page work
amiskov Feb 4, 2021
777539c
Improve claim with photo page
amiskov Feb 4, 2021
b2cff51
Merge branch 'master' into feature/search-471
amiskov Feb 5, 2021
e63191f
Share port between modules with Claim button
amiskov Feb 5, 2021
1c5306a
Simplify GotAcitonMsg handler
amiskov Feb 5, 2021
91084c5
Make request for PIN work
amiskov Feb 6, 2021
1a719bd
Go to Claim with Photo page after claim confirmation
amiskov Feb 6, 2021
3bbba97
Improve code readability
amiskov Feb 8, 2021
e8a50a9
Add claiming for aciton with proof
amiskov Feb 8, 2021
dceb9b7
Improve claiming with proof
amiskov Feb 8, 2021
5e2594c
Code fix/cleanup
amiskov Feb 9, 2021
485895d
Improve code organization
amiskov Feb 9, 2021
ad8f8e8
Improve code organization
amiskov Feb 9, 2021
c514b9c
Improve the code organization
amiskov Feb 9, 2021
c230240
Fix GraphQl types
amiskov Feb 9, 2021
bf9aabf
Merge branch 'fix/profile-graphql-types' into feature/search-471
amiskov Feb 9, 2021
9651fd4
Cleanup code
amiskov Feb 9, 2021
2e3453d
Code cleanup
amiskov Feb 9, 2021
bcc00cf
Make the code more explicit
amiskov Feb 9, 2021
a0605fb
Hide closed and completed actions from the search dropdown
amiskov Feb 9, 2021
b967309
Handle cancel claiming action with photo
amiskov Feb 9, 2021
4709bd5
Fix review issues
amiskov Feb 9, 2021
1c43891
Merge branch 'master' into feature/search-471
amiskov Feb 9, 2021
4278ea0
Fix styles
amiskov Feb 10, 2021
ed76680
Make loading animation reusable
amiskov Feb 10, 2021
549666d
Improve Search module state handling
amiskov Feb 10, 2021
e73cd27
Handle photo uploading via LoggedIn
amiskov Feb 10, 2021
fac60e7
Code cleanup
amiskov Feb 10, 2021
5fbda53
Improve code organization
amiskov Feb 10, 2021
e742541
Simplify UR
amiskov Feb 10, 2021
c97c9d6
Handle more msgs from Action module
amiskov Feb 10, 2021
ee27d6a
Finish moving action update to Action module
amiskov Feb 10, 2021
1baf64f
Get rid of ClaimWithPhoto module
amiskov Feb 10, 2021
9469eeb
Fix review issues
amiskov Feb 10, 2021
eec7472
Code cleanup
amiskov Feb 11, 2021
2262282
Improve code readability
amiskov Feb 11, 2021
520d0f5
Add translations for the search widget
amiskov Feb 11, 2021
186f154
Fix route for the claim card
amiskov Feb 11, 2021
5316362
Code cleanup
amiskov Feb 11, 2021
55b888c
Fix fetching recent searches from the localStorage
amiskov Feb 11, 2021
e30e2b8
Code cleanup
amiskov Feb 11, 2021
0149d49
Remove redundant todos
amiskov Feb 11, 2021
8023132
Improve page body viewer
amiskov Feb 11, 2021
5c7d11d
Add missing translation
amiskov Feb 12, 2021
d937a87
Remove todo
amiskov Feb 12, 2021
608e29b
Add community symbol in Action via Objective field
amiskov Feb 12, 2021
1fc7173
Use RemoteData pattern for the Search
amiskov Feb 12, 2021
9462e4e
Move the view for search results to the Search module
amiskov Feb 12, 2021
53b8460
Improve state handling for the search and claim with proof
amiskov Feb 12, 2021
30450ca
Move the function to a proper place
amiskov Feb 12, 2021
c6ed2be
Fix icons color
amiskov Feb 15, 2021
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
1 change: 1 addition & 0 deletions elm.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"elm-community/maybe-extra": "5.2.0",
"jfmengels/elm-review": "2.3.2",
"justinmimbs/date": "3.2.1",
"krisajenkins/remotedata": "6.0.1",
"pdamoc/elm-hashids": "1.0.4",
"robinheghan/murmur3": "1.0.0",
"rtfeldman/elm-iso8601-date-strings": "1.1.3",
Expand Down
15 changes: 14 additions & 1 deletion public/translations/amh-ETH.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,20 @@
"view_all": "ሁሉንም ይመልከቱ",
"more": "ተጨማሪ",
"logout": "መዉጫ",
"search": "ይፈልጉ ከማህበረሰብ , ከጓደኞች ...",
"search": {
"placeholder": "እርምጃዎችን እና ቅናሾችን ያግኙ",
"recentlyHeader": "በቅርቡ ተፈልጓል",
"notFoundLabel": "ፈልገዋል",
"notFoundResults": "ምንም ውጤት አልተገኘም",
"overviewHeader": "ያገኘነው እነሆ",
"overviewShow": "አሳይ",
"overviewFound": "አግኝተናል",
"offer": "አቅርብ",
"offers": "አቅርቦቶች",
"action": "ተግባር",
"actions": "እርምጃዎች",
"gain": "ታገኛለህ"
},
"explore": "ያስሱ",
"communities": "ማህበረሰብ",
"welcome_message": "ሄሎ {{user_name}}",
Expand Down
15 changes: 14 additions & 1 deletion public/translations/cat-CAT.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,20 @@
"view_all": "Veure-ho tot",
"more": "Més",
"logout": "Sortir",
"search": "Busqueu comunitats i amics",
"search": {
"placeholder": "Cerqueu accions i ofertes",
"recentlyHeader": "Cercat recentment",
"notFoundLabel": "Heu cercat",
"notFoundResults": "No s'han trobat resultats",
"overviewHeader": "Això és el que hem trobat",
"overviewShow": "Espectacle",
"overviewFound": "Trobem",
"offer": "oferta",
"offers": "ofertes",
"action": "acció",
"actions": "ações",
"gain": "Guanyeu"
},
"explore": "Explorar",
"communities": "Comunitats",
"welcome_message": "Hola {{user_name}}",
Expand Down
15 changes: 14 additions & 1 deletion public/translations/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,20 @@
"view_all": "View All",
"more": "More",
"logout": "Logout",
"search": "Search communities, friends ...",
"search": {
"placeholder": "Find actions and offers",
"recentlyHeader": "Recently searched",
"notFoundLabel": "You searched for",
"notFoundResults": "No results were found",
"overviewHeader": "Here is what we found",
"overviewShow": "Show",
"overviewFound": "We found",
"offer": "offer",
"offers": "offers",
"action": "action",
"actions": "actions",
"gain": "You gain"
},
"explore": "Explore",
"communities": "Communities",
"welcome_message": "Hello {{user_name}}",
Expand Down
15 changes: 14 additions & 1 deletion public/translations/es-ES.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,20 @@
"view_all": "Ver todo",
"more": "Mas",
"logout": "Salir",
"search": "Busca comunidades y amigos",
"search": {
"placeholder": "Encuentra acciones y ofertas",
"recentlyHeader": "Buscado recientemente",
"notFoundLabel": "Usted buscó",
"notFoundResults": "No se encontraron resultados",
"overviewHeader": "Esto es lo que encontramos",
"overviewShow": "mostrar",
"overviewFound": "Nosotros encontramos",
"offer": "oferta",
"offers": "ofertas",
"action": "acción",
"actions": "acciónes",
"gain": "Tu ganas"
},
"explore": "Explorar",
"communities": "Comunidades",
"welcome_message": "Hola {{user_name}}",
Expand Down
15 changes: 14 additions & 1 deletion public/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,20 @@
"view_all": "Ver Tudo",
"more": "Mais",
"logout": "Sair",
"search": "Procurar comunidades, amigos ...",
"search": {
"placeholder": "Encontre ações e ofertas",
"recentlyHeader": "Pesquisado recentemente",
"notFoundLabel": "Você pesquisou por",
"notFoundResults": "Nenhum resultado foi encontrado",
"overviewHeader": "Aqui está o que nós encontramos",
"overviewShow": "Mostrar",
"overviewFound": "Nós achamos",
"offer": "oferta",
"offers": "ofertas",
"action": "ação",
"actions": "ações",
"gain": "Você ganha"
},
"explore": "Explorar",
"communities": "Comunidades",
"welcome_message": "Olá, {{user_name}} ",
Expand Down
Loading