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.

Sign up for GitHub

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

Jump to bottom

[FEAT] add explanation component #76

Merged
merged 13 commits into from
Mar 22, 2022
Merged

[FEAT] add explanation component #76

merged 13 commits into from
Mar 22, 2022

Conversation

surchs
Copy link
Contributor

@surchs surchs commented Mar 21, 2022 •
edited

  • adds components for each of the currently used categories and links them from the annotation page.
  • adds an explanation sub-component to display text explanations during annotation

@surchs
[FEAT] added annotation page
30d02aa 
- each category is added as a separate component
- category components are prefixed with annot
- components are invoked in a for loop over a list of categories
@surchs
[FEAT] added explanation component
621742a 
- each category sub-page gets an explanation text
- an explanation component displays the text
resolves: #56
@surchs surchs requested a review from jarmoza March 21, 2022 03:49
jarmoza
jarmoza reviewed Mar 21, 2022
View reviewed changes
components/annot-age.vue Outdated Show resolved Hide resolved
jarmoza
jarmoza reviewed Mar 21, 2022
View reviewed changes
pages/annotation.vue Outdated Show resolved Hide resolved
jarmoza
jarmoza suggested changes Mar 21, 2022
View reviewed changes
Copy link
Contributor

@jarmoza jarmoza left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we go with the annotation page! This PR is nice and simple, but I've included a few comments addressing some light changes - and some 'might as well do this now' changes - now that we're integrating your work into the codebase.

@surchs surchs mentioned this pull request Mar 22, 2022
Merged
@surchs
Merge branch 'master' into feat-add-explanation
dcea507
@surchs
consistent string use
7251ba0 
- adopted single quote strings for all non-template code
- use pascalCase for Vue component names as recommended
@surchs
force client-side render on annotation page
4be7c3c 
- the v-for rendering of the b-tab sub-pages caused a rendered DOM mismatch between server and client
- the first page from "pages" was rendered twice (e.g. two Age tabs)
- added the <no-ssr> tag to fore client-side only rendering
- this addressed the problem for now
@surchs
rename gender -> sex
fd62fc0
@surchs
reformat age component
9894e80 
- to comply with code style
@surchs
Copy link
Contributor Author

surchs commented Mar 22, 2022

@jarmoza: thanks for the comments! I addressed what you suggested. Let me know if you have other comments.

@jarmoza
Copy link
Contributor

jarmoza commented Mar 22, 2022

With the reversion back to double quotes, this PR is ready to be merged.

@jarmoza jarmoza merged commit 5b0f90f into master Mar 22, 2022
@jarmoza jarmoza mentioned this pull request Mar 22, 2022
Merged
@jarmoza jarmoza deleted the feat-add-explanation branch March 24, 2022 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jarmoza jarmoza jarmoza requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@surchs @jarmoza