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

[BEEEP] [PM-10117] Migrate index.html #10286

Merged
merged 14 commits into from
Aug 26, 2024
Merged

[BEEEP] [PM-10117] Migrate index.html #10286

merged 14 commits into from
Aug 26, 2024

Conversation

Hinton
Copy link
Member

@Hinton Hinton commented Jul 26, 2024

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-10117

📔 Objective

Migrate the index.html to use tailwind instead of bootstrap styling.

  • Extracted some more global styles to override the bootstrap styles for layout frontend. We should revisit this when we remove bootstrap.
  • Removed Angular specific logo for anon pages. Now uses the same css class as loading page to prevent duplicated assets.

📸 Screenshots

Screen.Recording.2024-07-26.at.14.00.16.mov

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@Hinton Hinton changed the title [BEEEP] [PM-10117] Migrate the 404 page [BEEEP] [PM-10117] Migrate index.html Jul 26, 2024
Copy link

codecov bot commented Jul 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 32.78%. Comparing base (6e04fba) to head (53eb52d).
Report is 95 commits behind head on main.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #10286   +/-   ##
=======================================
  Coverage   32.78%   32.78%           
=======================================
  Files        2665     2665           
  Lines       81354    81354           
  Branches    15320    15320           
=======================================
  Hits        26668    26668           
  Misses      52647    52647           
  Partials     2039     2039           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

github-actions bot commented Jul 26, 2024

Logo
Checkmarx One – Scan Summary & Details4ca14c78-2b14-4188-ac7a-40c1883197e3

New Issues

Severity Issue Source File / Package Checkmarx Insight
MEDIUM Angular_Improper_Type_Pipe_Usage /apps/web/src/app/billing/organizations/adjust-subscription.component.html: 10 Attack Vector
MEDIUM Angular_Improper_Type_Pipe_Usage /apps/web/src/app/billing/organizations/adjust-subscription.component.html: 49 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 924 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 878 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 796 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 535 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 596 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 746 Attack Vector
MEDIUM Client_Privacy_Violation /apps/browser/src/background/main.background.ts: 746 Attack Vector

Base automatically changed from ps/migrate-404 to main July 30, 2024 10:25
An error occurred while trying to automatically change base from ps/migrate-404 to main July 30, 2024 10:25
…ndex

# Conflicts:
#	apps/web/src/scss/tailwind.css
@Hinton Hinton marked this pull request as ready for review July 30, 2024 10:36
@Hinton Hinton requested a review from a team as a code owner July 30, 2024 10:36
@Hinton Hinton requested review from jlf0dev, a team and vleague2 July 30, 2024 10:36
…ndex

# Conflicts:
#	libs/auth/src/angular/anon-layout/anon-layout.component.html
#	libs/auth/src/angular/anon-layout/anon-layout.component.ts
#	libs/auth/src/angular/icons/index.ts
@willmartian willmartian self-assigned this Aug 2, 2024
@jlf0dev jlf0dev requested review from rr-bw and removed request for jlf0dev August 9, 2024 14:59
@@ -16,9 +16,9 @@
</head>

<body class="tw-min-h-screen !tw-min-w-0 tw-text-center tw-bg-background-alt tw-flex tw-flex-col">
<main class="tw-max-w-3xl tw-mx-auto tw-mb-8 tw-px-2">
<img src="images/logo.svg" width="200px" class="tw-py-16" alt="Bitwarden" />
<img class="new-logo-themed tw-m-8" alt="Bitwarden" />
Copy link
Contributor

Choose a reason for hiding this comment

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

❓ I think all content is supposed to be in a landmark so I think it should be in main?

Copy link
Member Author

Choose a reason for hiding this comment

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

We could do that, but I would need to move. the classes to a div to maintain the design.

@@ -5,7 +5,7 @@
<meta name="viewport" content="width=1010" />
<meta name="theme-color" content="#175DDC" />

<title page-title>Bitwarden Web Vault</title>
<title page-title>Bitwarden Web vault</title>
Copy link
Contributor

Choose a reason for hiding this comment

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

❓ Why leave Web as title case?

Copy link
Member Author

Choose a reason for hiding this comment

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

To keep it consistent to other places. The Angular apps uses lowercase.

/**
* Logo, used both in loading and on "frontend" pages.
*/
img.new-logo-themed {
Copy link
Contributor

Choose a reason for hiding this comment

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

❓ Do we need the word "new" in this class name? (Only because eventually it won't be new, but we probably won't go update this class)

Copy link
Member Author

Choose a reason for hiding this comment

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

Because logo-themed is already taken. 😢

Copy link
Contributor

@rr-bw rr-bw left a comment

Choose a reason for hiding this comment

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

This looks great on web, but will break the logo on Desktop and I believe Browser when the email verification FF is turned on. Here is a screenshot on the /signup page on Desktop, which you get to by clicking "Create account" on the login page.

Screenshot 2024-08-12 at 11 51 47 AM

@@ -2,7 +2,7 @@
class="tw-flex tw-min-h-screen tw-w-full tw-mx-auto tw-flex-col tw-gap-7 tw-bg-background-alt tw-px-8 tw-pb-4 tw-text-main"
[ngClass]="{ 'tw-pt-0': decreaseTopPadding, 'tw-pt-8': !decreaseTopPadding }"
>
<bit-icon *ngIf="!hideLogo" [icon]="logo" class="tw-max-w-36"></bit-icon>
<bit-icon *ngIf="!hideLogo" [icon]="logo" class="tw-w-[128px] [&>*]:tw-align-top"></bit-icon>
Copy link
Member Author

Choose a reason for hiding this comment

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

This was needed to ensure consistency between the loading page and angular.

@Hinton Hinton requested a review from vleague2 August 13, 2024 16:55
@Hinton Hinton requested a review from rr-bw August 13, 2024 16:55
@Hinton
Copy link
Member Author

Hinton commented Aug 13, 2024

@rr-bw I rolledback the changes to annon-layout.

Copy link
Contributor

@vleague2 vleague2 left a comment

Choose a reason for hiding this comment

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

Reminder to approve UI tests!

@Hinton Hinton merged commit 9152c32 into main Aug 26, 2024
66 checks passed
@Hinton Hinton deleted the ps/migrate-index branch August 26, 2024 16:15
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.

4 participants