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

feature: improve preformatted text display #1069

Merged

Conversation

sheeeng
Copy link
Contributor

@sheeeng sheeeng commented Sep 23, 2021

  • Improve preformatted text display without overflowing issue.
    • Before: Screenshot 2021-09-23 at 12 25 32
    • After: Screenshot 2021-09-23 at 12 47 05

@codecov
Copy link

codecov bot commented Oct 6, 2021

Codecov Report

Merging #1069 (16f5e26) into master (47f4318) will decrease coverage by 1.83%.
The diff coverage is 44.44%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1069      +/-   ##
==========================================
- Coverage   80.00%   78.16%   -1.84%     
==========================================
  Files           6        6              
  Lines         390      403      +13     
==========================================
+ Hits          312      315       +3     
- Misses         52       58       +6     
- Partials       26       30       +4     
Impacted Files Coverage Δ
pkg/server/server.go 86.17% <44.44%> (-7.46%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 61e6da0...16f5e26. Read the comment docs.

@jhaals
Copy link
Owner

jhaals commented Oct 6, 2021

Great contribution, thank you @sheeeng!

@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 6, 2021

@jhaals, I have tried to fix the cypress test with 2a8eb04. Could you help to restart the tests again to verify that it works?

@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 6, 2021

Fixed prettier checks with c69604a, hopefully.

@jhaals
Copy link
Owner

jhaals commented Oct 6, 2021

seems like it's still failing on prettier, are you rebased on master? Otherwise try rebase, yarn install and yarn format

@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 7, 2021

I will have a look. Sorry about the failures.
Yes, I am already rebased from master branch.
I will try to rebase from master branch again.

@sheeeng sheeeng force-pushed the feature/improve-preformatted-text-display branch from c69604a to fd33abc Compare October 7, 2021 07:35
@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 7, 2021

I have rebased from wrong master branch and ran yarn format in the end.

Fixing in progress.

@sheeeng sheeeng marked this pull request as draft October 7, 2021 07:39
@sheeeng sheeeng force-pushed the feature/improve-preformatted-text-display branch from fd33abc to c3829f0 Compare October 7, 2021 07:41
@sheeeng sheeeng force-pushed the feature/improve-preformatted-text-display branch from c3829f0 to 51dd856 Compare October 7, 2021 07:42
@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 7, 2021

Fixed once again with the correct upstream master branch and ran yarn format in a single commit.

$ git remote add upstream [email protected]:jhaals/yopass.git
$ git remote --verbose show upstream
* remote upstream
  Fetch URL: [email protected]:jhaals/yopass.git
  Push  URL: [email protected]:jhaals/yopass.git
$ git fetch --all --prune && git pull --rebase --prune upstream master

@sheeeng sheeeng marked this pull request as ready for review October 7, 2021 07:45
@sheeeng
Copy link
Contributor Author

sheeeng commented Oct 8, 2021

I have tried to check locally. All matched files use Prettier code style!

@jhaals, could you try to check out this branch and see if the code matches Prettier code style on your side?

As an alternative, do you have any ideas for me to further debug this issue?

website git:(feature/improve-preformatted-text-display) $ yarn run lint
yarn run v1.22.10
$ prettier --ignore-path .gitignore  -c .
Checking formatting...
All matched files use Prettier code style!
✨  Done in 1.09s.website git:(feature/improve-preformatted-text-display) $ yarn format  
yarn run v1.22.10
$ prettier --ignore-path .gitignore -c --write .
Checking formatting...
All matched files use Prettier code style!
✨  Done in 1.05s.website git:(feature/improve-preformatted-text-display) $ 

Signed-off-by: Johan Haals <[email protected]>
@jhaals jhaals merged commit 2cf2508 into jhaals:master Oct 11, 2021
@sheeeng sheeeng deleted the feature/improve-preformatted-text-display branch October 11, 2021 07:42
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