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

Privacy policy & Terms & Conditions #298

Merged
merged 18 commits into from
Mar 9, 2023
Merged

Privacy policy & Terms & Conditions #298

merged 18 commits into from
Mar 9, 2023

Conversation

davidwilby
Copy link
Contributor

@davidwilby davidwilby commented Feb 22, 2023

Resolves #266

  • Adds a privacy policy template page
  • Adds a T&C template page
  • Adds a boolean field to the user model to keep track of agreement, however this gets set to True by the user registration rpc method so all registered users are presumed to have agreed according to the notice on the registration page. For now this is a back-compatability feature allowing us to see which previous users weren't made aware of the privacy policy and Ts&Cs so we can notify them if needed. We may need to add some option allowing them to update their preference.
  • Permits rendering of html files as privacy policy or terms and conditions, so far if a privacy-policy.html or terms-and-conditions.html is present in the root dir, it is rendered in the corresponding page. Feedback appreciated.
  • move privacy policy and t&c links to a footer instead of the navbar?
  • get current instance URL from request object
  • Advise under 18s not to register.
  • Add environment variables to generate-docker-env.sh (also to the helm charts add teamware privacy policy variables charts#3)
  • Docs for bind-mounting whole replacement privacy policy and T&C documents.
  • Documentation

To do:

  • Docs for bind mounting wit k8s - @ianroberts do you know how this would work? Can we use volumes?

@github-actions
Copy link

Jest Coverage

File % Stmts % Branch % Funcs % Lines Uncovered Line #s
All files 78.2 76.63 71.66 78.2
File % Stmts % Branch % Funcs % Lines Uncovered Line #s
All files 78.2 76.63 71.66 78.2
_src/components 77.14 77.35 85.71 77.14
_ AnnotationRenderer.vue 76.23 77.35 84 76.23 126,141-142,196,219,240,247-261,269,275-285,319
_ MarkdownEditor.vue 100 100 100 100
_ MarkdownRenderer.vue 100 100 100 100
_src/components/annotation 78.57 86.66 76.47 78.57
_ CheckboxInput.vue 85.71 100 100 85.71 19
_ HtmlDisplay.vue 80 100 100 80 26-30
_ InputErrorDisplay.vue 100 0 100 100 19-25
_ RadioInput.vue 71.42 100 66.66 71.42 19,26
_ SelectorInput.vue 71.42 100 66.66 71.42 20,27
_ TextInput.vue 75 100 66.66 75 26
_ TextareaInput.vue 66.66 100 50 66.66 20
_src/enum 100 100 100 100
_ DocumentTypes.js 100 100 100 100
_src/jrpc 90.32 83.33 75 90.32
_ index.js 90.32 83.33 75 90.32 29,38-39
_src/utils 70.58 69.69 27.27 70.58
_ annotations.js 100 100 100 100
_ dict.js 100 100 100 100
_ index.js 55.88 54.54 11.11 55.88 9-14,28-93
_tests/unit 100 100 100 100
_ globalVue.js 100 100 100 100

@davidwilby davidwilby marked this pull request as ready for review March 2, 2023 15:56
@davidwilby davidwilby requested a review from twinkarma March 2, 2023 15:57
@davidwilby davidwilby requested a review from ianroberts March 2, 2023 16:37
@davidwilby davidwilby changed the title WIP: Privacy policy & Terms & Conditions Privacy policy & Terms & Conditions Mar 2, 2023
@ianroberts
Copy link
Member

  • Docs for bind mounting wit k8s - @ianroberts do you know how this would work? Can we use volumes?

The lightest touch option would be to allow for arbitrary extra volumes and volumeMounts to be specified for the backend deployment via the values file, and just document what you'd need to do for those to allow a separate privacy policy & terms. But it might be nice to add a simpler option, like have something in the values file for privacyPolicy.customPolicyCM that should name a ConfigMap that has a privacy-policy.html key, and then have the template set up the right volume mounts to make that work. I'll mull it over and add something to GateNLP/charts#3

backend/rpc.py Show resolved Hide resolved
teamware/settings/base.py Outdated Show resolved Hide resolved
frontend/src/views/PrivacyPolicy.vue Outdated Show resolved Hide resolved
frontend/src/views/PrivacyPolicy.vue Outdated Show resolved Hide resolved
frontend/src/views/PrivacyPolicy.vue Show resolved Hide resolved
frontend/src/views/PrivacyPolicy.vue Show resolved Hide resolved
frontend/src/views/TermsAndConditions.vue Show resolved Hide resolved
docs/docs/developerguide/README.md Outdated Show resolved Hide resolved
docs/docs/developerguide/README.md Outdated Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
generate-docker-env.sh Outdated Show resolved Hide resolved
@davidwilby davidwilby merged commit a78c05f into dev Mar 9, 2023
@davidwilby davidwilby deleted the privacy-policy branch March 9, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants