IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,208 Commits 5 Branches 2 Tags
Commit Graph

197 Commits

Author SHA1 Message Date
Moriz Wahl
2544edcb29 no more error messages on page load 2020-04-14 21:50:53 +02:00
Moriz Wahl
7562af227e pages are counted correctly 2020-04-14 21:41:45 +02:00
ogerly
8f56ad4a3b feature: hashtag inserted and taken over in search 2020-04-14 18:16:44 +02:00
Moriz Wahl
1adc2b6962 MMerge branch 'master' into 2144-Add_Search_Results_Page 2020-04-08 17:42:35 +02:00
Alina Beck
797efe0a60 use CounterIcon component to show counts 
- also adds a 'soft' variant to CounterIcon to make it more adaptable
 2020-04-07 15:41:47 +02:00
mattwr18
db20af2d39 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-04-02 08:19:43 +02:00
mattwr18
e8492b59f4 feat: add pagination for search page 
- it wasn't really making sense to have one query for all users/posts,
  future hashtags, because we change the first/offset when the user
paginates, which would unneccesarily refetch all other resources.
- the solution was to separate them into their own queries and only
  refetch when the user wants to paginate the resources.
 2020-04-02 00:36:26 +02:00
mattwr18
79c1cc02c1 test: add SearchResults test/rename classes 2020-04-01 19:20:00 +02:00
mattwr18
06985c2dbb chore: fix lint w/ new linting rules 2020-03-26 18:55:10 +01:00
mattwr18
cb0a3f5cdd chore: Fix lint w/ new linting rules 2020-03-26 10:14:51 +01:00
Raphael Beer
c7762e3539
Fix: UserAvatar missing alt-attribute 2020-03-26 05:27:42 +01:00
mattwr18
e1733201e8 chore: Fix lint, follow @alina-beck suggestions 2020-03-25 11:02:28 +01:00
Alina Beck
d9c3412b41 outsource styling to FilterMenuSection component 
@mattwr18 great work and great styling so far! ;)
fyi: I noticed there was a lot of duplicate CSS and the solution I came up with is this new component, using slots
 2020-03-25 11:02:28 +01:00
mattwr18
863656f718 chore: add story for LabeledButton 2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex 
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
 2020-03-25 11:02:00 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Alina Beck
150442db01 use translations in SearchResults component 2020-03-23 17:14:41 +01:00
Alina Beck
a796efb54e use Empty component when no search results are found 2020-03-23 16:56:27 +01:00
Alina Beck
23a8010872 fix styling for post results 2020-03-23 14:29:49 +01:00
Alina Beck
72d979de55 improve user search results styling 2020-03-23 14:21:41 +01:00
Alina Beck
e03260d28d disable tabs when 0 results found 2020-03-23 13:57:56 +01:00
mattwr18
6d531c2cf8 chore: Update activeTab to show first results 
Co-authored-by: Alina Beck <alina.beck@mail.com>
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2020-03-19 16:47:41 +01:00
mattwr18
906f1bc0ca Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-03-19 16:02:54 +01:00
Alina Beck
5cb28d161d display empty state for search results 2020-03-19 15:37:40 +01:00
mattwr18
27c731cc1a Style tabs, add grid for posts 
Co-authored-by: Alina Beck <alina.beck@mail.com>
Co-authored-by: kachulio1 <jngugi88@gmail.com>
 2020-03-19 13:10:05 +01:00
mattwr18
6d83299e75 Extract component, start story, styling (wip) 2020-03-18 19:46:40 +01:00
Alina Beck
7a818a04a7 refactor and design search results page (wip) 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
Co-authored-by: Raphael Beer <raphael.beer@protonmail.com>
 2020-03-18 14:33:01 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043) 
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2020-03-16 15:32:19 +01:00
Alina Beck
6aecbd6c6d Merge branch 'master' into migrate-styleguide-card 2020-02-19 10:25:37 +01:00
Alina Beck
cca9ec8e81 avatar image spans 100% width and height 2020-02-18 16:17:27 +01:00
Alina Beck
2510643361 improve mobile-responsiveness of BaseCard, following @mattwr18 suggestions 2020-02-17 10:56:07 +01:00
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00
Alina Beck
60818c5902 replace CardWithColumns with new and improved BaseCard 2020-02-11 16:57:25 +01:00
Alina Beck
3c8c9d51e1 re-refactor LoginForm, ContributionForm and TeaserImage 2020-02-11 16:34:35 +01:00
Alina Beck
37959d8167 refactor BaseCard to use slots and props 2020-02-11 16:10:45 +01:00
Alina Beck
9c3378807c introduce CardWithColumns component 2020-02-11 11:23:34 +01:00
Alina Beck
1eac8ed14d add variants to BaseCard 2020-02-11 11:17:04 +01:00
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +01:00
Alina Beck
d2148bdd47 Merge branch 'master' into migrate-styleguide-card 2020-02-03 19:23:22 +01:00
Alina Beck
c74eebfcdc use $event instead of event in vue template 2020-01-27 19:25:46 +01:00
Alina Beck
73a1d54915 remove z-index from UserAvatar 2020-01-27 19:17:22 +01:00
Alina Beck
e7bf499d37 use BaseCard in Comment component and refactor 2020-01-22 17:37:32 +03:00
Alina Beck
db422257e4 add BaseCard component 2020-01-22 12:59:46 +03:00
Alina Beck
d20421cb70 clean up UserAvatar a little 2020-01-21 13:26:14 +03:00
mattwr18
7b73c990ec Remove unintended changes to class name/comment 2020-01-20 10:19:39 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions 
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-01-20 10:04:30 +01:00
mattwr18
905f34c827 Support use of initials, add tests, move component 
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
 2020-01-20 10:04:30 +01:00
mattwr18
9e639c23a7 Fix import for newly named/moved component 2020-01-15 18:20:12 +01:00
mattwr18
81cbb7a85c Refactor styling, fix naming convention 
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
 2020-01-15 17:37:54 +01:00
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00