118 Commits

Author SHA1 Message Date
mattwr18
52bdfa7c48
Merge pull request #2073 from Human-Connection/Laod_saved_Laguage_and_select
1931 - after successful login the saved language of the user is set
2019-11-11 11:43:12 +01:00
mattwr18
2ea0364242 Implement refresh posts, fix duplicate posts bug
- on logo click
- scrollToTop
- remove duplicate records

Co-authored-by: kachulio1 <jngugi88@gmail.com>
2019-11-05 14:57:54 +01:00
Alexander Friedland
9a246dea8d
remove getter locale
remove getter locale
2019-11-01 13:14:46 +01:00
Joseph Ngugi
044155a298 add allowShouts mutation 2019-10-31 21:22:44 +03:00
roschaefer
5715d3e9d5 Add vuex store tests for language filter 2019-10-31 17:32:18 +01:00
ogerly
bbfc5294ea auth.test.js test locale white User/locale 2019-10-29 14:41:06 +01:00
ogerly
7d2801a636 after successful login the saved language of the user is set 2019-10-29 11:05:49 +01:00
Moriz Wahl
aeae72f691 first implementation 2019-10-28 13:49:32 +01:00
roschaefer
16d07bd3ba refactor: lint, frontend tests, vuex store
This fixes the lint errors and failing frontend tests. Also, when the
user chooses another orderBy, the menu gets translated.

The refactoring moves code and complexity into the vuex store where it
can be tested separately.
2019-10-18 21:58:53 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
ogerly
e8f771b59a first mega PR crazy update, all work 2019-09-25 18:39:01 +02:00
ogerly
044e2bfed9 Allow embedded code in posts permanent in database 2019-09-23 20:08:45 +02:00
Robert Schäfer
6cebb61d0f
Merge pull request #1490 from Human-Connection/1488-filter-posts-by-emotion
Filter posts by emotions
2019-09-10 15:53:05 +02:00
roschaefer
a8222c5290 Remove obsolete code
I believe this is obsolete code. Could someone double-check?

@mattwr18 I tried to see any difference to `master` and I couldn't. Did
I miss sth.?

For context: During my work on https://github.com/Human-Connection/Human-Connection/pull/1517
the webapp was complaining about missing mutations when I changed the
dropdown.
2019-09-10 03:35:10 +02:00
aonomike
9a6a3a6bea Test clicks on the emotions buttons
- Add tests for clicks on the emotion button
- Refactor name of TOGGLE_EMOTIONS
2019-09-09 15:42:10 +03:00
mattwr18
30ea892aa1 Allow filter by multiple emotions, test getters
- Co-authored-by: vardyb <brent.vardy@challengelogic.net>
- Co-aurhored-by: mike aono <aonomike@gmail.com>
2019-09-07 12:37:03 +02:00
mattwr18
07c58fc03e Add emotions buttons, get it filtering 2019-09-07 12:37:03 +02:00
Robert Schäfer
8d2ea9c4c0
Merge pull request #1474 from Human-Connection/cursor-fixes
Cursor fixes
2019-09-04 23:20:57 +02:00
Alina Beck
b50f18b340 steal better solution from @roschaefer commit f0cde51 2019-09-04 19:20:15 +01:00
ogerly
c64ff67a55 Fixed constant for terms and conditions created in folder for constant 2019-09-04 07:03:56 +02:00
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
roschaefer
c585b23d7a Fix notification queries in webapp 2019-08-30 16:00:32 +02:00
Alexander Friedland
a8e1583481
_err remove 2019-08-30 14:15:38 +02:00
ogerly
27e7bf6279 Cypress tests ok ,terms and conditions after hard work ready to merge 2019-08-30 09:51:00 +02:00
Matt Rider
cf60397477 Fix failing cypress test, add steps
- Added step to expose the search feature was completely broken after my latest commit.
- when a user blocks another user, the search functionality just stopped working.
- reverted changes to @roschaefer hacky fix of the search functionality
2019-08-30 07:47:57 +02:00
Matt Rider
6de602fd58 Revert @roschaefer's hacky fix to Search.feature
- now that we are checking to see if there are any badIds, it was breaking the search functionality
2019-08-26 21:37:36 +02:00
ogerly
c00f281e6c Translations and style adapted 2019-08-23 11:02:24 +02:00
roschaefer
036e2605b7 Implement accept terms and conditions flow 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
mattwr18
6e0f77fc5a
Merge pull request #1338 from Human-Connection/1335-filter_bubble_indicator
Implement visual feedback if filter is active
2019-08-23 08:38:42 +02:00
roschaefer
62c8d34079 Fix expiration dates of JWT and cookie
This won't fix the bug that can happen in `nuxtServerInit`. However,
according to the docs, we accepted JWT which was valid for 1000 days and
our cookie was valid for 3 days - completely weird.

See:
https://github.com/auth0/node-jsonwebtoken
https://github.com/nuxt-community/apollo-module
2019-08-22 22:29:50 +02:00
roschaefer
a7ebbcf154 Implement visual feedback if filter is active 2019-08-21 23:52:10 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I
Start writing tests
2019-08-16 16:56:14 +02:00
Matt Rider
fdc0d808f6 Fix search query 2019-08-16 14:18:18 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
2019-08-16 13:28:55 +02:00
roschaefer
6fb926e735 Fix Search.feature in a hacky way
Ok, we have no control what parameters are passed to the cypher query
generated by `neo4j-graphql-js`. So I'm re-using the `filter` param.
If the `$filter` param is `{}` then we can use COALESCE to turn that
into empty array. Ugh.
2019-08-13 16:46:52 +02:00
Robert Schäfer
196cced8cf Implement+test postsFilter
I think it's much cleaner to have just the filter object in the store
and to implement convenience methods to safely update the filter object.
2019-08-10 03:02:02 +02:00
Robert Schäfer
a8cfe96f60 Don't chane the filterPostsMenu with state
@mattwr18 state is the root of all evil
2019-08-09 17:11:55 +02:00
Matt Rider
0cee0ecccb Fix bug, maintain filters across page changes
- filter was a bit off for categories, clear the filter if there are no categories
- a user should maintain their filter until they clear it
2019-08-08 08:32:43 +02:00
Matt Rider
e08e150742 Fix bug with lost filter when sorting
- add filtered state to vuex, so as to maintain filter
- filter is reset when visiting other pages, so reset the active buttons in the filter posts dropdown
- maybe we want to maintain the filters between page transitions and only clear when the user requests to?
2019-08-06 10:29:16 +02:00
Matt Rider
32796bfa0d Fix failing build 2019-08-05 19:08:53 +02:00
Matt Rider
1cd3ba907b Set vuex state to reset active button
- when a user clicks on the logo or changes pages, the filter is reset, but the active button didn't update
- still a bug with the active categoryIds since it's not so easy to set the state of an array in vuex
- dry out code for toggleFilters
- fix bug where user clicks on filter by users followed, then filters for categories of those users, then clicks to remove category filter
2019-08-05 14:39:45 +02:00
Matt Rider
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +02:00
Wolfgang Huß
75758ab2e7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 09:29:22 +02:00
Matt Rider
c7dc2f6a5c Hide CommentForm when an edit is in progress
- Follow @Tirokk PR review
2019-07-15 19:09:33 -03:00
Matt Rider
2dca04523d Remove key request in badge queries
- clean up from `PR` which uses id, not key
2019-07-15 15:04:19 -03:00
Matt Rider
79930dcdc4 Refetch posts when a user clicks on the HC logo 2019-07-10 18:44:07 -03:00
Matt Rider
c7959dadb7 Refactor code
- Remove vuex as we don't need with vue-apollo and watch
- Use chunk[i] instead of firstGroup, etc...
- Extract Category query to its own file
- Mobile responsive categories dropdown
2019-07-09 13:00:08 -03:00
Matt Rider
3b6db5f631 Set up posts in store, get working from FilterPosts
- also, set it up to be mobile responsive
2019-07-05 12:47:44 -03:00