-
Notifications
You must be signed in to change notification settings - Fork 0
feat: redesign UI — migrate from PicoCSS to Bootstrap 5 #46
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
Draft
mroderick
wants to merge
3
commits into
main
Choose a base branch
from
feature/codebar-design-clean
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/fallow-rs/fallow/main/schema.json", | ||
| "entry": ["test/features/*.test.js", "test/unit/*.test.js"], | ||
| "ignorePatterns": ["static/**"], | ||
| "ignoreUnresolvedImports": ["/**/static/**"], | ||
| "ignoreDependencies": ["pino"], | ||
| "ignoreExports": [{ "file": "static/auth-client.js", "exports": ["*"] }] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,72 @@ | ||
| import { html } from "hono/html"; | ||
| import { formatISO } from "date-fns"; | ||
|
|
||
| // Admin users list component | ||
| export const UsersList = ({ users, total }) => html` | ||
| <div class="form-section"> | ||
| <h3>Users (${total} total)</h3> | ||
| <div class="card"> | ||
| <div class="card-header card-header-cb"> | ||
| <h3 class="h5 mb-0">Users (${total} total)</h3> | ||
| </div> | ||
| ${users && users.length > 0 | ||
| ? html` | ||
| <table> | ||
| <thead> | ||
| <tr> | ||
| <th>Name</th> | ||
| <th>Email</th> | ||
| <th>Verified</th> | ||
| <th>Role</th> | ||
| <th>Created</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| ${users.map( | ||
| (user) => html` | ||
| <tr> | ||
| <td>${user.name}</td> | ||
| <td>${user.email}</td> | ||
| <td>${user.emailVerified ? "✅" : "❌"}</td> | ||
| <td> | ||
| <form method="post" action="/admin/user/role"> | ||
| <input type="hidden" name="userId" value="${user.id}" /> | ||
| <select name="role" onchange="this.form.submit()"> | ||
| <option | ||
| value="user" | ||
| ${user.role === "user" ? "selected" : ""} | ||
| <div class="table-responsive"> | ||
| <table class="table table-hover mb-0"> | ||
| <thead class="table-light"> | ||
| <tr> | ||
| <th>Name</th> | ||
| <th>Email</th> | ||
| <th>Verified</th> | ||
| <th>Role</th> | ||
| <th>Date</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| ${users.map( | ||
| (user) => html` | ||
| <tr> | ||
| <td>${user.name}</td> | ||
| <td>${user.email}</td> | ||
| <td>${user.emailVerified ? "✅" : "❌"}</td> | ||
| <td> | ||
| <form method="post" action="/admin/user/role"> | ||
| <input | ||
| type="hidden" | ||
| name="userId" | ||
| value="${user.id}" | ||
| /> | ||
| <select | ||
| name="role" | ||
| class="form-select form-select-sm" | ||
| onchange="this.form.submit()" | ||
| > | ||
| User | ||
| </option> | ||
| <option | ||
| value="admin" | ||
| ${user.role === "admin" ? "selected" : ""} | ||
| > | ||
| Admin | ||
| </option> | ||
| </select> | ||
| </form> | ||
| </td> | ||
| <td> | ||
| ${formatISO(new Date(user.createdAt), { | ||
| representation: "date", | ||
| })} | ||
| </td> | ||
| </tr> | ||
| `, | ||
| )} | ||
| </tbody> | ||
| </table> | ||
| <option | ||
| value="user" | ||
| ${user.role === "user" ? "selected" : ""} | ||
| > | ||
| User | ||
| </option> | ||
| <option | ||
| value="admin" | ||
| ${user.role === "admin" ? "selected" : ""} | ||
| > | ||
| Admin | ||
| </option> | ||
| </select> | ||
| </form> | ||
| </td> | ||
| <td class="text-nowrap"> | ||
| ${formatISO(new Date(user.createdAt), { | ||
| representation: "date", | ||
| })} | ||
| </td> | ||
| </tr> | ||
| `, | ||
| )} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ` | ||
| : html` <p>No users found.</p> `} | ||
| : html`<div class="card-body"> | ||
| <p class="mb-0 text-muted">No users found.</p> | ||
| </div>`} | ||
| </div> | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,20 @@ | ||
| import { html } from "hono/html"; | ||
|
|
||
| // Form section wrapper | ||
| export const FormSection = ({ children }) => html` <div>${children}</div> `; | ||
|
|
||
| // Message display component | ||
| export const Message = ({ error, success }) => html` | ||
| export const Message = ({ error, success, info } = {}) => html` | ||
| ${error | ||
| ? html`<div class="pico-background-red-50"> | ||
| ? html`<div class="alert alert-cb-error mb-3"> | ||
| ${decodeURIComponent(error)} | ||
| </div>` | ||
| : ""} | ||
| ${success | ||
| ? html`<div class="pico-background-green-50"> | ||
| ? html`<div class="alert alert-cb-success mb-3"> | ||
| ${decodeURIComponent(success)} | ||
| </div>` | ||
| : ""} | ||
| ${info | ||
| ? html`<div class="alert alert-cb-info mb-3"> | ||
| ${decodeURIComponent(info)} | ||
| </div>` | ||
| : ""} | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,63 @@ | ||
| import { html } from "hono/html"; | ||
|
|
||
| // Base layout component | ||
| export const Layout = ({ title, children }) => html` | ||
| export const Layout = ({ title, children, hideNav }) => html` | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <html data-bs-theme="auto"> | ||
| <head> | ||
| <title>${title}</title> | ||
| <title>codebar Auth — ${title}</title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="color-scheme" content="light dark" /> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com" /> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> | ||
| <link | ||
| href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;700&display=swap" | ||
| rel="stylesheet" | ||
| href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css" | ||
| /> | ||
| <link | ||
| rel="stylesheet" | ||
| href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.colors.min.css" | ||
| /> | ||
| <link rel="stylesheet" href="/static/bootstrap.min.css" /> | ||
| <link rel="stylesheet" href="/static/codebar.css" /> | ||
| </head> | ||
| <body> | ||
| <header></header> | ||
| <main class="container">${children}</main> | ||
| <footer></footer> | ||
| ${!hideNav | ||
| ? html` | ||
| <nav | ||
| class="navbar navbar-expand-lg navbar-light bg-white fixed-top py-3" | ||
| > | ||
| <div class="container"> | ||
| <a | ||
| class="navbar-brand border-0 d-flex align-items-center gap-2" | ||
| href="/" | ||
| > | ||
| <img | ||
| src="/static/codebar-logo.png" | ||
| alt="codebar logo" | ||
| width="200" | ||
| height="54" | ||
| /> | ||
| <span | ||
| class="fw-semibold text-muted" | ||
| style="font-size: 0.85rem;" | ||
| >auth</span | ||
| > | ||
| </a> | ||
| </div> | ||
| </nav> | ||
| ` | ||
| : ""} | ||
| <main class="container py-4">${children}</main> | ||
| <script type="module" src="/static/auth-client.js?v=2"></script> | ||
| <script src="/static/bootstrap.bundle.min.js"></script> | ||
| </body> | ||
| </html> | ||
| `; | ||
|
|
||
| // Navigation component | ||
| export const Navigation = ({ back, extra }) => html` | ||
| <a href="${back.href}">← ${back.text}</a> | ||
| ${extra ? html` | <a href="${extra.href}">${extra.text}</a>` : ""} | ||
| <a href="${back.href}" class="btn btn-outline-secondary btn-sm" | ||
| >← ${back.text}</a | ||
| > | ||
| ${extra | ||
| ? html`<a href="${extra.href}" class="btn btn-outline-secondary btn-sm ms-1" | ||
| >${extra.text}</a | ||
| >` | ||
| : ""} | ||
| `; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,19 @@ | ||
| import { html } from "hono/html"; | ||
|
|
||
| export const GitHubButton = ({ callbackURL } = {}) => html` | ||
| <h2>Using GitHub</h2> | ||
| <form method="post" action="/login/github"> | ||
| <input type="hidden" name="callbackURL" value="${callbackURL || ""}" /> | ||
| <button type="submit">Sign In with GitHub</button> | ||
| <button type="submit" class="btn btn-cb-primary w-100"> | ||
| Sign in with GitHub | ||
| </button> | ||
| </form> | ||
| `; | ||
|
|
||
| export const MagicLinkButton = ({ callbackURL } = {}) => html` | ||
| <h2>Using magic link</h2> | ||
| <form method="get" action="/login/magic-link"> | ||
| <input type="hidden" name="callbackURL" value="${callbackURL || ""}" /> | ||
| <button type="submit">Send Magic Link</button> | ||
| <button type="submit" class="btn btn-cb-primary w-100"> | ||
| Send magic link | ||
| </button> | ||
| </form> | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,24 @@ | ||
| import { html } from "hono/html"; | ||
| import { format } from "date-fns"; | ||
|
|
||
| // User info display | ||
| export const UserInfo = ({ user }) => html` | ||
| <h2>User Information</h2> | ||
| <p><strong>Name:</strong> ${user.name}</p> | ||
| <p><strong>Email:</strong> ${user.email}</p> | ||
| <p><strong>ID:</strong> ${user.id}</p> | ||
| <p><strong>Email Verified:</strong> ${user.emailVerified ? "Yes" : "No"}</p> | ||
| <p> | ||
| <strong>Created:</strong> ${format( | ||
| new Date(user.createdAt), | ||
| "yyyy-MM-dd HH:mm:ss", | ||
| )} | ||
| </p> | ||
| <div class="card"> | ||
| <div class="card-header card-header-cb"> | ||
| <h2 class="h5 mb-0">User Information</h2> | ||
| </div> | ||
| <div class="card-body"> | ||
| <dl class="row mb-0"> | ||
| <dt class="col-sm-3">Name</dt> | ||
| <dd class="col-sm-9">${user.name}</dd> | ||
| <dt class="col-sm-3">Email</dt> | ||
| <dd class="col-sm-9">${user.email}</dd> | ||
| <dt class="col-sm-3">Email verified</dt> | ||
| <dd class="col-sm-9">${user.emailVerified ? "Yes" : "No"}</dd> | ||
| <dt class="col-sm-3">Member since</dt> | ||
| <dd class="col-sm-9"> | ||
| ${format(new Date(user.createdAt), "dd MMM yyyy")} | ||
| </dd> | ||
| </dl> | ||
| </div> | ||
| </div> | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not gdpr compatible
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! I will fix that!