ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,605 Commits 117 Branches 1,511 Tags
Commit Graph

72 Commits

Author SHA1 Message Date
ogerly
fde69a3b21 fix: review from wolle, fix lint 2020-08-27 09:49:54 +02:00
ogerly
b2f3b02422 fix: DeleteDate vue and specs 2020-08-19 10:01:59 +02:00
ogerly
6a68bb8f83 fix: location map box USA 2020-08-18 11:50:32 +02:00
ogerly
3d69ebbb1c fix: tests ok, lint ok 2020-08-14 11:39:38 +02:00
ogerly
0b62d76bc1 fix: prework for tests 2020-08-05 13:45:24 +02:00
ogerly
8b7b1056ac fix: style change in modal deleteUserModal 2020-08-04 16:14:05 +02:00
Wolfgang Huß
c517c0fd45 Fix lint 2020-05-28 12:04:26 +02:00
Wolfgang Huß
dcc5b74038 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 17-Admin-Remove-user-profile 2020-05-28 10:52:24 +02:00
roschaefer
574ed578bc Prefer router.replace if you delete sth. 
@ogerly, this is a perfect example where `this.$router.replace` makes a
lot more sense that `this.$router.push`. When you go back in your browser
history, you won't get 404 not found error.
 2020-03-24 22:48:11 +01:00
roschaefer
bfbbe365ed Improve style of deleteUser modal 2020-03-24 22:43:13 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
ogerly
2843635acb delete DeleteUserModal.specs.js 2020-03-06 10:24:28 +01:00
ogerly
7700865692 feat: Style change DeleteUserModal.vue display userdata overview 2020-03-06 09:04:03 +01:00
ogerly
a1114a8a83 feat: additional confirm inserted before really deleting 2020-03-06 08:09:38 +01:00
mattwr18
83491e15c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 13:19:33 +01:00
roschaefer
8c29ad947b Update vue-test-utils and follow updated docs 
https://vue-test-utils.vuejs.org/guides/#writing-asynchronous-tests-using-nexttick-new
 2020-01-11 00:37:22 +01:00
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
ee11f4e366 replace even more ds-buttons with base-buttons (wip) 2019-12-19 11:39:39 +05:30
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
Wolfgang Huß
043b951459 Try avoid modal to show success on error, but not successful 2019-11-23 11:42:46 +01:00
Wolfgang Huß
ec8910d6eb Rename decide mutation to review 2019-11-22 15:12:00 +01:00
Alina Beck
77f4810ddc set up global localVue 
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
 2019-11-20 12:31:40 +03:00
Wolfgang Huß
d4e7e10f8c Use of mutation enable removed, fix fronend tests 
- The mutation definition still has to be removed.
 2019-11-06 14:34:24 +01:00
Wolfgang Huß
a4521b4621 Use of mutation disable removed 
- The mutation definition still has to be removed.
 2019-11-06 09:13:08 +01:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions 
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
 2019-10-15 20:28:25 +02:00
Wolfgang Huß
cae897808b Follow Matts suggestions from his review 2019-10-14 17:38:38 +02:00
Wolfgang Huß
f7cff9cd0b Delete shared file, because it doesn't work with jest tests 2019-10-14 16:18:26 +02:00
Wolfgang Huß
2cf2f2b011 Import report reason categories from a shared array 2019-10-14 15:20:51 +02:00
Wolfgang Huß
b556a601ce Followed Matts suggestion with the push 2019-10-10 09:06:28 +02:00
Wolfgang Huß
4f3f192e12 Remove out commented code 2019-10-09 15:53:35 +02:00
Wolfgang Huß
0062725470 Fix the frontend tests and design issues with and in the report modal 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
Co-Authored-By: alina-beck <4ndroid4va@gmail.com>
 2019-10-09 15:49:11 +02:00
Wolfgang Huß
935252a16e Rename variables, parameters and properties 2019-10-04 15:21:07 +02:00
Wolfgang Huß
b4f47997b3 Centralized and refactored report mutations and queries 2019-10-04 10:40:18 +02:00
Wolfgang Huß
6ad9dc27e9 Write and refactor backend test which are supposed to fail at first 
Implemented the new properties in the GraphQL schema.
 2019-10-02 17:25:36 +02:00
Wolfgang Huß
0517e38873 Implement a form schema that works 
A `ds-form` has not worked for any reason.
 2019-10-02 15:17:53 +02:00
Wolfgang Huß
78b43b05a4 Next step 2019-09-30 13:34:11 +02:00
Wolfgang Huß
7f7bde9ab9 Started to implement report infos 2019-09-26 10:03:09 +02:00
Robert Schäfer
5d57f7b376 No global import - Thank you @JorgenVatle! ❤️ 
In version `v4.2.0` of `vue-sweetalert-icons` the local import is back, see:
https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3#issuecomment-519497796
 2019-08-09 13:21:54 +02:00
Matt Rider
faa4148858 Stub sweetalert-icon in tests which use 2019-08-07 15:20:36 +02:00
Robert Schäfer
27163b8d79 Install vue-sweetalert-icon globally 
Updating the package to `v4.0.0` still gives me this warning:
```
 WARN  Compiled with 1 warnings
 WARN  in ./components/PasswordReset/ChangePassword.vue?vue&type=script&lang=js&
"export 'SweetalertIcon' was not found in 'vue-sweetalert-icons'
```

According to this thread https://github.com/JorgenVatle/vue-sweetalert-icons/issues/3
I copy+pasted the example configuration:
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/nuxt.config.js
https://github.com/JorgenVatle/vue-sweetalert-icons-preview/blob/master/plugins/vue-sweetalert-icons.js

And now the compile warnings are gone. I'm going to ask the maintainer if the
local import is not possible with `v4.0.0` anymore.
 2019-08-06 11:03:12 +02:00
senderfm
6c7ee1ef42 das einmalige melden eines User, Beitrags oder Kommentars 
ist jetzt möglich
 2019-06-25 17:51:14 +02:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback 
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-13 19:23:13 +02:00
Wolfgang Huß
cd0074ec86 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js
#	webapp/pages/profile/_id/_slug.vue
 2019-06-12 18:22:50 +02:00
Wolfgang Huß
8bb33f23a9 Forgot to add some files 2019-06-12 18:04:00 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 18:02:50 +02:00
Wolfgang Huß
8eb089d218 Rename event deletePost to removePostFromList 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 15:58:23 +02:00
Wolfgang Huß
b2e1873ade Refactored to modalData for Delete Comment and Posts 
The error is gone with this.
 2019-06-07 18:04:12 +02:00
Matt Rider
f53d091691 Add error handling component tests 2019-06-06 13:50:10 -03:00
Robert Schäfer
2171add6f3 Disable the location.reloads 
It might create better user experience, but for the small user group I
think the complexity is worse than the feature itself.
 2019-06-06 12:35:49 +02:00
senderfm
f1b85d5256 Fixed clean ReleaseModal and DeleteModal 2019-06-04 16:25:59 +02:00