Skip to content

UI restyle#315

Merged
tmcgilchrist merged 10 commits intoocurrent:masterfrom
MisterDA:ui-restyle
May 18, 2022
Merged

UI restyle#315
tmcgilchrist merged 10 commits intoocurrent:masterfrom
MisterDA:ui-restyle

Conversation

@MisterDA
Copy link
Copy Markdown
Contributor

@MisterDA MisterDA commented Mar 4, 2022

Serve js and css from static files.

@MisterDA MisterDA requested a review from tmcgilchrist March 7, 2022 10:35
@MisterDA MisterDA changed the base branch from ui-restyle to master March 15, 2022 08:33
@MisterDA
Copy link
Copy Markdown
Contributor Author

MisterDA commented Mar 15, 2022 •
edited
Loading

Supersedes and close #258.

@samoht
Copy link
Copy Markdown
Contributor

samoht commented Apr 1, 2022

Could you rebase this to master?

tmcgilchrist
tmcgilchrist reviewed Apr 4, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@tmcgilchrist tmcgilchrist left a comment

Choose a reason for hiding this comment

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

Can you rebase and try a deploy of it to ocaml-ci.

@MisterDA MisterDA force-pushed the ui-restyle branch 2 times, most recently from 823be68 to 0b255a5 Compare April 5, 2022 16:15
@MisterDA MisterDA force-pushed the ui-restyle branch 6 times, most recently from 2db5c1d to 9795abb Compare April 14, 2022 15:58
@MisterDA MisterDA requested a review from tmcgilchrist April 21, 2022 10:56
@MisterDA MisterDA force-pushed the ui-restyle branch 2 times, most recently from 9795abb to ac6c55e Compare May 4, 2022 07:48
@MisterDA
Copy link
Copy Markdown
Contributor Author

MisterDA commented May 4, 2022

I think this is ready, please let me know what you think.
The PR builds on the UI restyle by Ewan Mellor, fixes a few content-type bugs, serves files "statically" (which means they need to be installed on the host filesystem).
From the base ui-restyle PR, it removes the hovering animations and doesn't use the Roboto webfont, but rather the preferred system font.

Do you think static files should be served with something like ocaml-crunch instead? I think it's better either way not to embed them in the source, we get syntax highlighting and linting.

@MisterDA MisterDA mentioned this pull request May 6, 2022
Merged
1 task
@MisterDA MisterDA force-pushed the ui-restyle branch 2 times, most recently from cd439cd to 0056ec8 Compare May 10, 2022 09:53
ewanmellor and others added 4 commits May 11, 2022 10:05
@ewanmellor @MisterDA
Move the code that writes the digraph stanza to a helper function.
c6f1ce1 
This adds Dot.digraph.

Signed-off-by: Ewan Mellor <ewan@tarides.com>
@ewanmellor @MisterDA
Implement serving of static images.
1310125 
This adds a static module, which serves the file from a specified
docroot.  Hook this in to the routes under /images/*.

Signed-off-by: Ewan Mellor <ewan@tarides.com>
@ewanmellor @MisterDA
Add a new look-and-feel for the web UI.
7ecc368 
This adds Roboto / Roboto Mono as web fonts, and adds highlight colors
for table heading and the nav menu based on the OCaml logo.  It adds the
logo itself to the nav bar and the favicon.

For the Graphviz diagrams, set the node color (i.e. the box outline color)
to match the fill. This makes the boxes less heavy on the page, because
they no longer have the black border.  Set the default font for the
graph, node, and edge options to use Roboto.  This changes the unit
test expected output to include the options.

Lots of padding and spacing adjustments too.

Signed-off-by: Ewan Mellor <ewan@tarides.com>
@tmcgilchrist @MisterDA
Add label docs.
5e0c701
@MisterDA
Copy link
Copy Markdown
Contributor Author

MisterDA commented May 11, 2022

This PR supersedes and closes #339.

@MisterDA MisterDA force-pushed the ui-restyle branch 2 times, most recently from 32902c2 to 97511dc Compare May 12, 2022 12:16
@talex5
Copy link
Copy Markdown
Contributor

talex5 commented May 13, 2022

Do you think static files should be served with something like ocaml-crunch instead? I think it's better either way not to embed them in the source, we get syntax highlighting and linting.

ocaml-crunch sounds good - it would avoid changing the API / adding another command-line option. Current_web.routes could still take an optional argument to override this (taking a function from resource name to contents, like you get from ocaml-crunch) so that applications using OCurrent can still override things.

@tmcgilchrist
Copy link
Copy Markdown
Member

tmcgilchrist commented May 16, 2022

Note that this needs updating in ocurrent/ocaml-multicore-ci#22 so it can switch to mainline ocurrent.

@MisterDA MisterDA force-pushed the ui-restyle branch 2 times, most recently from 34f6c4e to fed1849 Compare May 17, 2022 11:22
tmcgilchrist
tmcgilchrist reviewed May 17, 2022
View reviewed changes
@MisterDA
Copy link
Copy Markdown
Contributor Author

MisterDA commented May 17, 2022

Applied your suggestion, thanks.

@tmcgilchrist tmcgilchrist merged commit 7c5f34d into ocurrent:master May 18, 2022
@tmcgilchrist tmcgilchrist mentioned this pull request May 18, 2022
Closed
@MisterDA MisterDA deleted the ui-restyle branch May 23, 2022 09:47
@MisterDA MisterDA mentioned this pull request May 24, 2022
Closed
tmcgilchrist added a commit to tmcgilchrist/opam-repository that referenced this pull request Jun 2, 2022
@tmcgilchrist
[new release] current_web, current_slack, current_rpc, current_gitlab…
c938bd6 
…, current_github, current_git, current_examples, current_docker and current (0.6.1)

CHANGES:

Web UI:

- UI restyle, embed files using ocaml-crunch. (@ewanmellor, @MisterDA, ocurrent/ocurrent#315)

- Automatically refresh some pipeline pages. (@MisterDA, ocurrent/ocurrent#227)

- Allow to import and export using CSV the log rules. (@MisterDA, ocurrent/ocurrent#327)

- Log matcher takes the pattern with the highest score (@kit-ty-kate, ocurrent/ocurrent#335)

API:

- GitHub: Add pp_short for commit and fix url link for GH commits. (@tmcgilchrist, ocurrent/ocurrent#347)

- GitHub: Fetch commit messages for commits on GitHub (@punchagan, ocurrent/ocurrent#337)

- GitHub: Add Current_github.Api.cmdliner_opt. (@dra27, ocurrent/ocurrent#338)

- GitHub: Add extra PR information to Ref.t (@tmcgilchrist @TheLortex, ocurrent/ocurrent#336)

Plugins:

- GitLab: support GitLab clone fork and fetch MR branch. (@MisterDA, ocurrent/ocurrent#346)

- Git: Fix handling of git repositories with submodules. (@talex5, ocurrent/ocurrent#345)

- GitLab: Fix ref filtering bug for GitLab (@tmcgilchrist, ocurrent/ocurrent#332)

Other:

- Add missing dependencies on Unix (@dra27, ocurrent/ocurrent#331)
@tmcgilchrist tmcgilchrist mentioned this pull request Jun 2, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tmcgilchrist tmcgilchrist tmcgilchrist approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@MisterDA @samoht @talex5 @tmcgilchrist @ewanmellor