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

Render the git graph on the server #12333

Merged

zeripath merged 14 commits into go-gitea:master from zeripath:gitgraph-server-rendering

Aug 6, 2020

Contributor

zeripath commented Jul 26, 2020 •

edited

Loading

Rendering the git graph on the server means that we can properly track flows and switch from the Canvas implementation to a SVG implementation.

This implementation provides a 16 limited color selection
The uniqued color numbers are also provided
And there is also a monochrome version
In addition is a hover highlight that allows users to highlight commits on the same flow.

Closes #12209

Signed-off-by: Andrew Thornton art27@cantab.net

Screenshots

Color

Monochrome


          Render the git graph on the server

dcddace

Rendering the git graph on the server means that we can properly track
flows and switch from the Canvas implementation to a SVG implementation.

* This implementation provides a 16 limited color selection
* The uniqued color numbers are also provided
* And there is also a monochrome version
* In addition is a hover highlight that allows users to highlight commits on
the same flow.

Signed-off-by: Andrew Thornton <art27@cantab.net>

zeripath added the topic/ui label

zeripath added this to the 1.13.0 milestone

Contributor Author

zeripath commented Jul 26, 2020

@silverwind I used the colors provided in #10217 (comment) but I think they don't quite match up nicely as highlights of each other - should be easily fixable though.

GiteaBot added the lgtm/need 2 label

Member

silverwind commented Jul 26, 2020

Issue is that 16 colors of the same lightness is too much to get proper distinction. Some hand-picked ones may be better where you can also variate the lightness on them.

Member

silverwind commented Jul 26, 2020

Based on those screenshots: The header could use a bit more horizontal padding so it aligns with the content below.

Not sure I like the buttons, maybe try outline variants? Could probably also add some text to them too.

silverwind reviewed

View reviewed changes

templates/repo/graph.tmpl Outdated Show resolved Hide resolved

Member

silverwind commented Jul 27, 2020 •

edited

Loading

Thought again about colors. Current ones are probably fine, but I'd put the green one first.

zeripath added 2 commits

July 27, 2020 16:45


          Fix test

Signed-off-by: Andrew Thornton <art27@cantab.net>


          Merge remote-tracking branch 'origin/master' into gitgraph-server-ren…

c4eb7a4

…dering

silverwind reviewed

View reviewed changes

web_src/js/features/gitgraph.js Outdated Show resolved Hide resolved

silverwind reviewed

View reviewed changes

web_src/js/features/gitgraph.js Outdated Show resolved Hide resolved

silverwind reviewed

View reviewed changes

web_src/js/features/gitgraph.js Outdated Show resolved Hide resolved

zeripath and others added 7 commits

July 27, 2020 18:39


          more color changes

a8b5684

Signed-off-by: Andrew Thornton <art27@cantab.net>


          slightly further differentiate flow-9

df4985e

Signed-off-by: Andrew Thornton <art27@cantab.net>


          as per @silverwind

1a285f2

Signed-off-by: Andrew Thornton <art27@cantab.net>


          fix-up color-5 on the dark theme

5d0ba5c

Signed-off-by: Andrew Thornton <art27@cantab.net>


          fix icon hover in dark theme

b639a61

Signed-off-by: Andrew Thornton <art27@cantab.net>


          Clean-up graph.go a little to make things clearer

ae6e8d0

Signed-off-by: Andrew Thornton <art27@cantab.net>


          Merge branch 'master' into gitgraph-server-rendering

89f5373

Member

silverwind commented Jul 28, 2020

Some suggestions in silverwind@a4a59d9 if you care to pull that in.


          tweaks from @silverwind

892858d

Signed-off-by: Andrew Thornton <art27@cantab.net>

Member

silverwind commented Jul 28, 2020 •

edited

Loading

I think you can delete web_src/less/vendor and the import in web_src/less/index.less and the ignoreFiles in .stylelintrc with this change.


          as per @silverwind

7b2a40b

Signed-off-by: Andrew Thornton <art27@cantab.net>

Member

silverwind commented Jul 29, 2020 •

edited

Loading

One last suggestion: Put all git graph related styles in web_src/less/features/gitgraph.less and then do a @import "./features/gitgraph.less"; in index.less right after the font-awesome import. We have to modularize the less more, this is a good opportunity.


          As per @silverwind

bdfb94e

Signed-off-by: Andrew Thornton <art27@cantab.net>

silverwind approved these changes

View reviewed changes

Member

silverwind left a comment

Nice work

GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels

lunny approved these changes

View reviewed changes

GiteaBot added lgtm/done and removed lgtm/need 1 labels

Member

lunny commented Aug 6, 2020

conflicted.


          Merge branch 'master' into gitgraph-server-rendering

0c7698c

Contributor Author

zeripath commented Aug 6, 2020

make lg-tm work

zeripath merged commit 2c1ae6c into go-gitea:master

zeripath deleted the gitgraph-server-rendering branch

August 6, 2020 08:04

go-gitea locked and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.