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
6,842 Commits 5 Branches 2 Tags
Commit Graph

565 Commits

Author SHA1 Message Date
mattwr18
36722962e0
Merge pull request #1975 from Human-Connection/1974-notifications-page 
Add notifications page with All Notifications
 2019-11-11 14:29:40 +01:00
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
f2e2c78582 Add tests for notifications index page 2019-11-11 08:52:51 +01:00
mattwr18
ddb9fcdcb7 Make dropdown filter reusable 2019-11-11 08:52:04 +01:00
mattwr18
7564908456 Refactor to follow @alina-beck suggestions 
- Update CSS
- Use design tokens where possible
- Update spec description
- Avoid scoped scss as it's more expensive
- did not change the next and back button as they weren't really visible
without the primary class
- Fix German translation
 2019-11-11 08:52:04 +01:00
mattwr18
542647f418 Add NotificationsDropdownFilter story, refactor 
- rename incorrectly named varaibles
- use filterOptions to remove unneccessary computed routes

Co-authored-by: @alina-beck
 2019-11-11 08:52:04 +01:00
mattwr18
cb2cc37556 Extract components following @alina-beck suggestion 
- see https://github.com/Human-Connection/Human-Connection/pull/2075/files
 2019-11-11 08:50:35 +01:00
mattwr18
7007b1c444 Paginate notifications, reusable component w/ test 2019-11-11 08:50:35 +01:00
mattwr18
084388a21e Follow new file structure 
- avoid nested directories
 2019-11-11 08:50:35 +01:00
mattwr18
d83a424513 Add styling 
- to link in NotificationMenu
- make table more mobile responsive
- remove unneccessary props

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
58b1f7948c Follow @alina-beck and @Tirokk suggestions 
- following PR reviews
 2019-11-11 08:50:35 +01:00
mattwr18
cf8124fb2d Clean up/add german translations 2019-11-11 08:50:35 +01:00
mattwr18
b79770469f Update notifications page 
- display more notifications by simplifying the table
- get sorting working
 2019-11-11 08:50:35 +01:00
mattwr18
7cdc12f4b9 Add notifications page with Notifications in table 
- At the moment, the notifications are displayed in a table, and have
the same functionality as the NotificationMenu where you can click on
the title of the Post and visit the Post

- Unsure about the styling, it would kind of be nice to have a more
condensed list to see more notifications per page, but still be able to
click on a row and visit the Post
 2019-11-11 08:50:35 +01:00
Alexander Friedland
826924ad7e
change 
this.$i18n.set(this.user.locale || 'en')
 2019-11-07 11:42:58 +01:00
Alexander Friedland
f023fa40c9
Merge pull request #2126 from Human-Connection/1994-load-latest-posts-on-logo-click 
Implement refresh posts, fix duplicate posts bug
 2019-11-07 09:53:03 +01:00
roschaefer
20b47b873e refactor: add new email, display server response 2019-11-05 15:23:31 +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
roschaefer
0cf59743ab refactor: replace 'isemail' with 'validator' 
..and use `normalizeEmail` everywhere in the webapp.
 2019-11-05 00:24:12 +01:00
roschaefer
fea0b60c2d Fix lint errors 2019-11-04 20:55:08 +01:00
Alexander Friedland
056f2d32a1
change 
this.$i18n.set(this.user.locale)
 2019-11-01 13:23:06 +01:00
ogerly
7d2801a636 after successful login the saved language of the user is set 2019-10-29 11:05:49 +01:00
Robert Schäfer
d3b3d9231e
Merge pull request #2027 from Human-Connection/new-terms-conditions-version-0.0.3 
🍰 New terms and conditions version 0.0.3
 2019-10-24 13:52:29 +02:00
Wolfgang Huß
d2fd33b102 Fix tests 2019-10-24 12:54:51 +02:00
mattwr18
a923cb2e62 Remove duplicate pinned post record 
- Maintain consistent orderBy for fetchMore
 2019-10-24 09:58:22 +02:00
mattwr18
cf5405cf62
Merge pull request #2016 from Human-Connection/1995-shouts-hidden-to-other-users 
Hide shout count on user profile unless my profile
 2019-10-24 08:41:32 +02:00
ogerly
ff8680ff86 new terms and conditions fixed 2019-10-23 18:58:03 +02:00
mattwr18
8f365a60ce Hide shout count on user profile unless my profile 
- we were asked to hide the shouts from other users by Dennis Hack, he
believes people will be more likely to shout a post if it is anonymous.
This only works from our UI to our backend... further steps would need
to be taken to truly make it anonymous. Also, we were asked to implement
it in such a way as to give the user the choice to show their shouts to
others.

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-10-23 14:07:41 +02:00
mattwr18
44e54372c4 Fix block user workflow 
- need to update all the smart queries naming
 2019-10-23 10:51:41 +02:00
mattwr18
fda6f683d4 Update fetchMore functionality on profile page 
- clean up from pinned Posts PR
 2019-10-23 09:41:31 +02:00
roschaefer
6612e4b7ce fix: remove unnecessary pinned orderBy on profile 2019-10-22 20:01:17 +02:00
roschaefer
2a9e182649 fix: performance issue with ordering 
@mattwr18 @aonomike
You must never `ORDER BY` a property with a `@cypher` directive. Reason:
The order by performance will be terribly poor.

See my issue:
https://github.com/neo4j-graphql/neo4j-graphql-js/issues/239
And my PR:
https://github.com/neo4j-graphql/neo4j-graphql-js/pull/247
 2019-10-22 20:00:12 +02:00
mattwr18
fee7f9ff12
Merge pull request #1872 from Human-Connection/1733-fix 
🍰 Fix - maintaining sorting after navigation
 2019-10-22 12:47:18 +02:00
mattwr18
98e3bb40d5
Merge pull request #1906 from Human-Connection/add_storybook_stories_for_our_university_students 
Add storybook stories for our university students
 2019-10-22 11:58:17 +02:00
mattwr18
333b38d1b2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1733-fix 2019-10-22 11:07:29 +02:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02: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
mattwr18
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00
Nimit Bhargava
7330987a69 fix - maintaining sorting after navigation 2019-10-18 16:03:14 +02:00
mattwr18
411bbabcd5 Add profilePagePostsQuery to deal with bug 
- we do not want to add pinnedPosts to every user's profile page
 2019-10-18 00:42:44 +02:00
roschaefer
25f2fc358d fix: console warnings during frontend tests 2019-10-18 00:21:43 +02:00
mattwr18
b45fd51d15 Pin post on user profile as well 2019-10-18 00:13:01 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up 
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
 2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure 
- clean up
 2019-10-17 22:44:44 +02:00
mattwr18
973912fb87 Add tests for unpinPost, refactor 
- following @roschaefer's PR review suggestions
- simplify UpdatePost by using pinPost/unpinPost
- did not remove filtering because attempting to have two queries caused
problems as well to do with duplicate records, etc... and it's working
now
 2019-10-17 21:51:41 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning 
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
 2019-10-17 17:56:16 +02:00
roschaefer
8dff7496c0 refactor: create LoginForm component 
I moved most code in pages/login.vue to a separate LoginForm component.
The intention is to have a separate vue storybook for the LoginForm
component.
 2019-10-16 12:16:38 +02:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment 
Highlight and expand linked comment
 2019-10-16 12:13:16 +02:00