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

Annotations redesign #27

Closed
wants to merge 32 commits into from
Closed

Annotations redesign #27

wants to merge 32 commits into from

Conversation

jessp
Copy link
Collaborator

@jessp jessp commented May 24, 2016

@skomputer Was hoping to get your feedback on this in terms of appearance/functionality in addition to elegance of code. I haven't written any unit tests yet as I don't know how substantial the changes I'll have to make will be.

A simple description of this fork would be that it moves the capabilities of GraphEditForm into the annotation list directly, and changes the editing of annotation text/node selection into a triggerable event.

This would close #16, #9, and #11.

My concerns expressed in #16 were echoed by a user I interviewed who expressed his frustration as forgetting if he was in "green or yellow" edit mode, so I was also trying to make changes based on that perspective as well.

An additional change might be to make it so it's always node edit(/"green") mode unless it's in annotation-edit mode, but I haven't gone there yet.

I did run "npm update" as there were a couple changes to medium-react-editor in the past couple weeks to fix bugs in features I didn't end up using (but still...).

There is no rush on this, I just thought it would be a good idea to get your feedback before moving forward with unit tests etc..

jessp added 30 commits April 27, 2016 15:46
@jessp
Changed save to absolute position so doesn't interfere with annotatio…
c04e531 
…ns in mobile layout
@jessp
Restyled classes and added 100% height to container divs so that we c…
d51deb4 
…an set annotations height to 100%
@jessp
Altered CSS so height of svg is no longer contingent on windowsize at…
b3fea00 
… load
@jessp
undid a dumb change I did for testing
9d00fce
@jessp
Moved 'New Annotation' button to form so only list will be scrollable
7af956f
@jessp
Changed to flexbox -- will revert to alternative or use shim dependin…
ce07fef 
…g on desired browser support
@jessp
minor changes
4c1c4f2
@jessp
Still broken, but less so
f43f3b9
@jessp
Drag and drop no longer broken but ugly, other changes in progress.
2b34b79
@jessp
Slowly making changes
d517fdd
@jessp
Drag and drop seems to be working though may rework the codde
b50f05d
@jessp
Figuring out how to move editing functions directly into annotation list
5949c07
@jessp
comparing to master
9d676d5
@jessp
Modied annotation lis to have annotation body and to 'show' properly
ef33a85
@jessp
updated styling
2c836f2
@jessp
Working on functions + removed no longer user toggleEditor function
51119c7
@jessp
figuring out redux
ffac399
@jessp
Working on redux functions
1750b05
@jessp
toggling edit annotations mode seems to work
5bdaae5
@jessp
lied, still was much to to
d92eb40
@jessp
fixed some issues with toggling between annotation mode and edit mode
cb463b5
@jessp
continuing annotations revamp
6931b64
@jessp
added new annotations, reworking margins
7ba3a47
@jessp
margins edited, tests to come
5e25b8f
@jessp
reverted from flexbox layout to keep button positioning the same
33c152f
@jessp
fixed bug where clicking nodes turned off editing styles
f2971db
@jessp
Integrating medium editor, updated medium editor and anchor seems buggy
8e3ae8b
@jessp
seems like anchor editor is broken in master branch as well. removing…
b454a93 
… option until library is fixed
@jessp
changing highlights based on edit mode
d7f37e5
@jessp
colour of node highlight changes based on mode, made tweaks based on …
76d2712 
…if its in editor mode or pres mmode, changed some node status styles
@skomputer
Copy link
Owner

ok great i'll take a look at this tomorrow or the day after.

On Tue, May 24, 2016 at 3:51 PM, Jess Peter [email protected]
wrote:

@skomputer https://github.com/skomputer Was hoping to get your feedback
on this in terms of appearance/functionality in addition to elegance of
code. I haven't written any unit tests yet as I don't know how substantial
the changes I'll have to make will be.

A simple description of this fork would be that it moves the capabilities
of GraphEditForm into the annotation list directly, and changes the editing
of annotation text/node selection into a triggerable event.

This would close #16 #16,
#9 #9, and #11
#11.

My concerns expressed in #16
#16 were echoed by a
user I interviewed who expressed his frustration as forgetting if he was in
"green or yellow" edit mode, so I was also trying to make changes based on
that perspective as well.

An additional change might be to make it so it's always node
edit(/"green") mode unless it's in annotation-edit mode, but I haven't gone
there yet.

I did run "npm update" as there were a couple changes to
medium-react-editor in the past couple weeks to fix bugs in features I
didn't end up using (but still...).

There is no rush on this, I just thought it would be a good idea to get

your feedback before moving forward with unit tests etc..

You can view, comment on, or merge this pull request online at:

#27
Commit Summary

  • Changed save to absolute position so doesn't interfere with
    annotations in mobile layout
  • Restyled classes and added 100% height to container divs so that we
    can set annotations height to 100%
  • Altered CSS so height of svg is no longer contingent on windowsize
    at load
  • undid a dumb change I did for testing
  • Moved 'New Annotation' button to form so only list will be scrollable
  • Changed to flexbox -- will revert to alternative or use shim
    depending on desired browser support
  • minor changes
  • Still broken, but less so
  • Drag and drop no longer broken but ugly, other changes in progress.
  • Slowly making changes
  • Drag and drop seems to be working though may rework the codde
  • Figuring out how to move editing functions directly into annotation
    list
  • comparing to master
  • Modied annotation lis to have annotation body and to 'show' properly
  • updated styling
  • Working on functions + removed no longer user toggleEditor function
  • figuring out redux
  • Working on redux functions
  • toggling edit annotations mode seems to work
  • lied, still was much to to
  • fixed some issues with toggling between annotation mode and edit mode
  • continuing annotations revamp
  • added new annotations, reworking margins
  • margins edited, tests to come
  • reverted from flexbox layout to keep button positioning the same
  • fixed bug where clicking nodes turned off editing styles
  • Integrating medium editor, updated medium editor and anchor seems
    buggy
  • seems like anchor editor is broken in master branch as well.
    removing option until library is fixed
  • changing highlights based on edit mode
  • colour of node highlight changes based on mode, made tweaks based on
    if its in editor mode or pres mmode, changed some node status styles
  • removed GraphAnnotationForm.jsx as capabilities implemented in
    GraphAnnotaionListItem.jsx
  • removed references to GraphAnnotationForm.jsx and styles

File Changes

Patch Links:

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#27

@jessp
Copy link
Collaborator Author

jessp commented Jul 10, 2016

Closing as reworking some of same functionality/restyling in other branches to different ends.

@jessp jessp closed this Jul 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Revamp annotations system so easier to add/edit annotations
2 participants
@jessp @skomputer