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

fix user avator && url #4218

Merged
merged 7 commits into from
Nov 1, 2023
Merged

fix user avator && url #4218

merged 7 commits into from
Nov 1, 2023

Conversation

zjy365
Copy link
Contributor

@zjy365 zjy365 commented Oct 31, 2023

🤖 Generated by Copilot at 8c5468d

Summary

🛠️🚀📚

This pull request introduces several changes to the sealos docs website and the license service. It fixes some bugs and typos in the pricing plan page and the license token generation. It also enhances the user interface and functionality of the account, payment, and tutorial components. It simplifies and optimizes the rendering of the avatar image and the z-index of the header. It adds a time parameter to customize token expiration time and a minH property to ensure a minimum height for the service package content. It removes unnecessary redirections to the pricing page for signed-in users.

We're fixing the bugs and the glitches in the code
We're adding the features and the options for the mode
We're redirecting the users and the tokens to the right place
We're generating the scripts and the licenses with grace

Walkthrough

  • Simplify the conditional rendering of the avatar image and add opacity for better visibility in account/index.tsx and Account/index.tsx (link, link, link, link)
  • Fix the z-index issue of the header overlapping the content in product/index.tsx (link)
  • Change the text from "one year" to "one month" and from "one year" to "one day" to match the unit of the cost calculation for the container quota in plan/index.tsx (link, link)
  • Import the generateLicenseToken function from the backend service to be used in the payment API in payment/create.ts (link)
  • Modify the useMemo hook to return both the file name and the bash parameters based on the oss file name, and use them in the wget, tar, and curl commands in Tutorial.tsx (link, link, link, link)
  • Change the initial state of the isAgree variable from true to false, to require the user to explicitly agree to the terms and conditions before proceeding to payment in Recharge.tsx (link)
  • Change the initial value of the remainingSeconds variable from 2 to 1, to reduce the delay before showing the payment modal in Product.tsx (link)
  • Reduce the duration of the toast message that shows the payment result checking from 9000 to 3500, to avoid blocking the user interface for too long in Product.tsx (link)
  • Simplify the useEffect hook that handles the jump link based on the query parameters to use the routeParams store instead of the router query in Product.tsx (link)
  • Comment out the minW and flexWrap properties of the Flex component, to allow the content to adapt to different screen sizes and avoid horizontal scrolling in Product.tsx (link)
  • Add the minH property to the Box component to ensure a minimum height for the service package content in ServicePackage.tsx (link)
  • Modify the SigninPage component to use the routeParams store to handle the external and clusterType parameters passed from the pricing page, and check if the user is already signed in and redirect them to the pricing page if so in signin.tsx (link)
  • Comment out the useEffect hook that redirects the user to the pricing page if they are already signed in, as it is not needed for the docs website in signin/index.tsx and Signin/index.tsx (link, link)
  • Modify the generateLicenseToken function to accept a time parameter that specifies the expiration time of the token in seconds, and use it instead of the hard-coded value of 3 days in license.ts (link, link)

Signed-off-by: jingyang <3161362058@qq.com>
Signed-off-by: jingyang <3161362058@qq.com>
Signed-off-by: jingyang <3161362058@qq.com>
Signed-off-by: jingyang <3161362058@qq.com>
@sealos-ci-robot
Copy link
Member

sealos-ci-robot commented Oct 31, 2023

🤖 Generated by lychee action

Summary

Status Count
🔍 Total 970
✅ Successful 377
⏳ Timeouts 0
🔀 Redirected 0
👻 Excluded 592
❓ Unknown 0
🚫 Errors 0

Full action output

Full Github Actions output

Copy link

sweep-ai bot commented Oct 31, 2023

Apply Sweep Rules to your PR?

  • Apply: Leftover TODOs in the code should be handled.
  • Apply: All new business logic should have corresponding unit tests in the tests/ directory.
  • Apply: Any clearly inefficient or repeated code should be optimized or refactored.

@sealos-ci-robot
Copy link
Member

sealos-ci-robot commented Oct 31, 2023

📘 Preview documentation website

👀 Visit Preview

Copy link

codecov bot commented Oct 31, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

📢 Thoughts on this report? Let us know!.

@lingdie lingdie merged commit b2fb15a into labring:main Nov 1, 2023
19 of 20 checks passed
lingdie added a commit to lingdie/sealos that referenced this pull request Nov 3, 2023
* add license app to cloud. (labring#4196)

Signed-off-by: yy <lingdie.yy@outlook.com>

* feature(main): skip sealos.run rule (labring#4198)

* Update README (labring#4197)

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>

* add cronjob app to cloud. (labring#4201)

Signed-off-by: yy <lingdie.yy@outlook.com>

* fix run init job. (labring#4202)

Signed-off-by: yy <lingdie.yy@outlook.com>

* feat service license (labring#4195)

* feat: license service

Signed-off-by: jingyang <3161362058@qq.com>

* done

* tempalte

Signed-off-by: jingyang <3161362058@qq.com>

* done

Signed-off-by: jingyang <3161362058@qq.com>

* done

Signed-off-by: jingyang <3161362058@qq.com>

* docker build

Signed-off-by: jingyang <3161362058@qq.com>

* done

Signed-off-by: jingyang <3161362058@qq.com>

* license yaml

Signed-off-by: jingyang <3161362058@qq.com>

* image

* fix type bg

* env

* add oss

Signed-off-by: jingyang <3161362058@qq.com>

* done

Signed-off-by: jingyang <3161362058@qq.com>

cluster done

Signed-off-by: jingyang <3161362058@qq.com>

done

Signed-off-by: jingyang <3161362058@qq.com>

cluster done

Signed-off-by: jingyang <3161362058@qq.com>

done cluster

Signed-off-by: jingyang <3161362058@qq.com>

done

Signed-off-by: jingyang <3161362058@qq.com>

* fix build

Signed-off-by: jingyang <3161362058@qq.com>

* fix oss && only zh

Signed-off-by: jingyang <3161362058@qq.com>

* feat checkout wechat

Signed-off-by: jingyang <3161362058@qq.com>

* fix ci

Signed-off-by: jingyang <3161362058@qq.com>

---------

Signed-off-by: jingyang <3161362058@qq.com>

* Docs: update "What is Sealos?" (labring#4200)

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>

* refactor(main): unmount override container (labring#4161)

Signed-off-by: cuisongliu <cuisongliu@qq.com>

* feat: Create a demo plugin Monitor (labring#4184)

* feat: lens demo of web version

* chore: add & remove some packages

* fix: connect to desktop bug and change icon

* init: plugin Monitor init

* style: restore frontend/pnpm-workspace.yaml & pnpm-lock.yaml and create new ones in plugins/monitor

* restore: frontend/Makefile

* restore: frontend/pnpm-workspace.yaml

* restore

* feat:frontend license app (labring#4203)

* feat:frontend license app

Signed-off-by: jingyang <3161362058@qq.com>

* fix

Signed-off-by: jingyang <3161362058@qq.com>

* fix

* fix detail

Signed-off-by: jingyang <3161362058@qq.com>

---------

Signed-off-by: jingyang <3161362058@qq.com>

* Docs: update introduction (labring#4207)

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>

* fix license db uri (labring#4211)

Signed-off-by: yy <lingdie.yy@outlook.com>

* update price (labring#4212)

* docs: Automated Changelog Update for v4.3.7 (labring#4210)

* 🤖 add release changelog using robot.

Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io>

* Update CHANGELOG.md

---------

Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io>
Co-authored-by: cuisongliu <cuisongliu@qq.com>

* 🤖 add release changelog using rebot. (labring#4213)

* add alt names. (labring#4214)

Signed-off-by: yy <lingdie.yy@outlook.com>

* Update the workflow to automatically update the website image after the image is built (labring#4209)

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>

* fix(costcenter): fix unit & invoice amount (labring#4194)

* feat:docs add private cloud page (labring#4215)

* fix scripts (labring#4217)

* Fix database provider i18n. (labring#4216)

Signed-off-by: zzjin <tczzjin@gmail.com>

* fix user avator && url (labring#4218)

* fix user avator && url

Signed-off-by: jingyang <3161362058@qq.com>

* modify purchase page

Signed-off-by: jingyang <3161362058@qq.com>

* fix height

Signed-off-by: jingyang <3161362058@qq.com>

* fix docs

Signed-off-by: jingyang <3161362058@qq.com>

* fix params

* copy code

* license time

---------

Signed-off-by: jingyang <3161362058@qq.com>

* fix oss file name && docs footer (labring#4220)

* feat(frontend/desktop):support modify team limit (labring#4221)

* add acme resolver monitoring (labring#4223)

* feat:docs language-differentiated domain names (labring#4226)

* feat:standard cluster purchase process (labring#4225)

* feat:standard cluster purchase process

Signed-off-by: jingyang <3161362058@qq.com>

* fix cronjob

Signed-off-by: jingyang <3161362058@qq.com>

---------

Signed-off-by: jingyang <3161362058@qq.com>

* add cloud release ci.

Signed-off-by: yy <lingdie.yy@outlook.com>

---------

Signed-off-by: yy <lingdie.yy@outlook.com>
Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>
Signed-off-by: jingyang <3161362058@qq.com>
Signed-off-by: cuisongliu <cuisongliu@qq.com>
Signed-off-by: sealos-release-robot <sealos-release-robot@sealos.io>
Signed-off-by: zzjin <tczzjin@gmail.com>
Co-authored-by: cuisongliu <cuisongliu@qq.com>
Co-authored-by: Carson Yang <yangchuansheng33@gmail.com>
Co-authored-by: zhujingyang <72259332+zjy365@users.noreply.github.com>
Co-authored-by: Wishrem <97738578+Wishrem@users.noreply.github.com>
Co-authored-by: Jiahui <4543bxy@gmail.com>
Co-authored-by: sealos-release-robot <sealos-release-robot@sealos.io>
Co-authored-by: xudaotutou <13435638964@163.com>
Co-authored-by: zzjin <zzjin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants