Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions telemetry-worker/src/account-pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ export const ACCOUNT_CSS = `
:root[data-theme="light"]{--paper:#fcfcfc;--panel:#f7f7f7;--ink:#171717;--ink2:#525252;--ink3:#6b6b6b;--rule:#e6e6e6;--rule2:#dcdcdc;--line:#8a8a8a;--accent:#0a7c4a;--accent-x:#0a7c4a;--accent-f:#0a7c4a;--accent-t:#e8f5ee;--warn:#c2410c;--warn-f:#d9480f;--warn-t:#fdeee9;--bar:#6b6b6b;--bar2:#0a7c4a;--bar3:#d9480f;--ink-h:#000000;--green-h:#086a3f;--on-green:#ffffff;--head:rgba(252,252,252,.8);--code:#f3f3f3;--codeink:#171717}
code{font-family:var(--mono);font-size:.9em}
.eb{font:500 12.5px var(--mono);letter-spacing:.04em;text-transform:uppercase;color:var(--accent)}
.auth{max-width:440px;margin:0 auto;padding:44px 0 64px}
.auth{max-width:440px;margin:0 auto;padding:44px 0 64px;overflow-wrap:anywhere}
.auth>.logo{display:inline-flex;margin-bottom:44px}
.auth h1{font:500 clamp(28px,5vw,34px)/1.15 var(--display);letter-spacing:-.04em;margin-top:10px;text-wrap:balance}
.auth h2{font:500 16px var(--sans);letter-spacing:-.015em;margin:0}
/* the sign-in pages (shell option mesh): the column on the left, genclass.dev's self-healing sphere on the right */
body.mesh{isolation:isolate}
body.mesh canvas[data-mesh]{position:fixed;inset:0;width:100%;height:100%;z-index:-1;pointer-events:none}
body.mesh main.wrap{max-width:none;margin:0;padding:0;display:grid;grid-template-columns:minmax(0,40%) 1fr;min-height:100vh;min-height:100dvh}
body.mesh header.top~main.wrap{min-height:calc(100dvh - 64px)}
body.mesh header.top~main.wrap{min-height:calc(100dvh - 65px)}
body.mesh .auth{grid-column:1;align-self:center;justify-self:center;width:min(440px,100%);max-width:none;margin:0;padding:48px 24px 56px}
body.mesh .auth>*{animation:gcin .7s cubic-bezier(.2,.7,.2,1) both}
body.mesh .auth>:nth-child(2){animation-delay:.05s}body.mesh .auth>:nth-child(3){animation-delay:.1s}body.mesh .auth>:nth-child(4){animation-delay:.15s}body.mesh .auth>:nth-child(n+5){animation-delay:.2s}
@keyframes gcin{from{opacity:0;transform:translateY(8px)}}
.mesh-cap{position:fixed;right:16px;bottom:12px;margin:0;font:11px/1.4 var(--mono);color:var(--ink3);pointer-events:none}
.mesh-cap span+span::before{content:" · "}
.mesh-cap span:empty{display:none}
@media (max-width:900px){body.mesh main.wrap{grid-template-columns:1fr}body.mesh .auth{padding:40px 16px 56px}body.mesh canvas[data-mesh]{opacity:.25}.mesh-cap{display:none}}
@media (max-width:900px){body.mesh main.wrap{grid-template-columns:minmax(0,1fr)}body.mesh .auth{padding:40px 16px 56px}body.mesh canvas[data-mesh]{opacity:.25}.mesh-cap{display:none}}
@media (prefers-reduced-motion:reduce){body.mesh .auth>*{animation:none}}
.auth .lead{font-size:16px;line-height:1.55;color:var(--ink2);margin-top:12px}
.auth .ways{margin-top:30px;padding-top:24px;border-top:1px solid var(--rule2);display:grid;gap:10px}
Expand All @@ -71,7 +71,7 @@ body.mesh .auth>:nth-child(2){animation-delay:.05s}body.mesh .auth>:nth-child(3)
.alt a,.alt button.lnk,.lnk.ul{color:var(--ink);text-decoration:underline;text-underline-offset:3px;min-height:32px;display:inline-flex;align-items:center;gap:7px}
.alt svg{width:16px;height:16px;flex:none}
.pwf .row{display:flex;justify-content:space-between;align-items:baseline;gap:12px}
.pwf .row a{font-size:13px;color:var(--ink2)}
.pwf .row a{font-size:13px;color:var(--ink2);padding:4px 0;margin:-4px 0}
.or::before,.or::after{content:"";flex:1;border-top:1px solid var(--rule)}
.auth label,.acct-form label{display:block;font:500 12.5px var(--mono);color:var(--ink3);margin-bottom:7px}
.auth input,.acct-form input{min-height:46px;width:100%;padding:0 12px;border-radius:0;border:1px solid var(--line);background:var(--paper);color:var(--ink);font:16px var(--sans)}
Expand All @@ -98,9 +98,10 @@ dl.req dt{font:500 12.5px var(--mono);color:var(--ink3);padding-top:13px;padding
ul.scope{margin:10px 0 0;padding-left:20px;font-size:14.5px;line-height:1.5;color:var(--ink2)}
details.scope-d{margin-top:16px;font-size:14.5px;color:var(--ink2)}
details.scope-d summary{cursor:pointer;color:var(--ink)}
@media (max-width:600px){details.scope-d summary{padding:11px 0}}
details.scope-d .lead{margin-top:10px}
ul.scope li{margin-top:5px}
.acts{display:flex;gap:10px;margin-top:22px}
.acts{display:flex;flex-wrap:wrap;gap:10px;margin-top:22px}
.acts .btn{flex:1}
.step{margin-top:26px;padding-top:18px;border-top:1px solid var(--rule);display:grid;gap:10px;justify-items:start}
.step p{font-size:14.5px;color:var(--ink2)}
Expand Down Expand Up @@ -708,6 +709,7 @@ export const ORG_CSS = `
.pcard .pk{font:12px var(--mono);color:var(--ink3);margin-top:4px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
.pcard .meta{display:flex;flex-wrap:wrap;gap:8px;align-items:center;font-size:12.5px;color:var(--ink3);margin-top:auto}
.pcard .acts{position:relative;z-index:1;display:flex;flex-wrap:wrap;gap:6px;align-items:center;font-size:12px;color:var(--ink3)}
.pcard .acts>span{min-width:0;overflow-wrap:anywhere}
.pnew{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:8px;min-height:176px;border:1px dashed var(--rule2);border-radius:6px;color:var(--ink3);text-decoration:none;font-size:13px}
.pnew:hover{border-color:var(--rule3);color:var(--ink);background:var(--s75)}
.empty-p{grid-column:1/-1;display:flex;flex-direction:column;align-items:center;gap:12px;padding:56px 16px;border:1px dashed var(--rule2);border-radius:6px;text-align:center}
Expand All @@ -717,15 +719,16 @@ export const ORG_CSS = `
.empty-p.trial h2{font-size:22px;letter-spacing:-.01em}
.empty-p.trial .tp{font-size:14px;color:var(--ink);font-weight:600}
.empty-p.trial ul{list-style:none;padding:0;margin:2px 0 0;display:grid;gap:5px;text-align:left;font-size:13px}
.empty-p.trial li::before{content:"\\2713";color:var(--accent);margin-right:8px}
.empty-p.trial li{display:flex;gap:8px}
.empty-p.trial li::before{content:"\\2713";color:var(--accent);margin-right:0}
.empty-p.trial .pmore{font-size:12.5px;color:var(--ink3);margin-bottom:4px}
.empty-p.trial .pmore ul{margin-top:5px}
.pmore summary{cursor:pointer;list-style:none;color:var(--ink3);text-decoration:underline;text-underline-offset:2px}
.pmore summary{cursor:pointer;list-style:none;color:var(--ink3);text-decoration:underline;text-underline-offset:2px;padding:4px 0;margin:-4px 0}
.pmore summary::-webkit-details-marker{display:none}
.pmore[open] summary{display:none}
.empty-p.trial .btn{padding:11px 22px;font-size:14.5px}
.empty-p.trial .skipit{font-size:11px;margin-top:6px}
.empty-p.trial .skipit a{color:var(--ink3)}
.empty-p.trial .skipit a{color:var(--ink3);display:inline-block;padding:6px 12px;margin:-6px -12px}
.acct-form{display:flex;flex-wrap:wrap;gap:10px;align-items:flex-end;margin-top:16px;max-width:720px}
.acct-form .f{flex:1 1 260px;min-width:0}
.acct-form label{display:block;font-size:13px;color:var(--ink2);margin-bottom:6px}
Expand Down Expand Up @@ -765,7 +768,10 @@ table.dt td form{display:inline}
table.dt.rows td:empty{display:none}
table.dt.rows td[data-l]::before{content:attr(data-l) " ";font-size:12px;color:var(--ink3)}
table.dt.rows td.act{text-align:left;padding-top:8px}
table.dt.rows td.act a:not(.btn){display:inline-flex;align-items:center;min-height:32px}
}
@media (max-width:560px){.ptool .psearch{flex:1 1 100%}.pcard{min-height:0}.pcard h2{white-space:normal;overflow-wrap:anywhere;padding-right:0}.pnew{min-height:56px;flex-direction:row}}
@media (max-width:767px){.pcard .bdg,table.dt td .tag{font-size:12px}}
`;

/** The organization's rail (Studio's: Projects, Billing, and its settings at the foot). */
Expand Down
29 changes: 24 additions & 5 deletions telemetry-worker/src/billing-pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Talk to us, a mailto link, whatever the key. Which plans include something is said from billing/plans.json
// (plansWith), never by name.

import { CLIENT_JS, ORG_CSS, orgRail, pitchList, time } from "./account-pages.js";
import { CLIENT_JS, ORG_CSS, orgRail, PITCH_SHOWN, pitchList, time } from "./account-pages.js";
import type { Env } from "./collector.js";
import type { D1Like, Project, Range } from "./dashboard.js";
import { integrationRows, integrationsKey, KIND_NAMES, KINDS, maskConfig, openConfig, DATADOG_SITES, POSTHOG_HOSTS, type Kind } from "./forward.js";
Expand Down Expand Up @@ -112,6 +112,20 @@ const BILLING_CSS = `
.team td.act{text-align:right;white-space:nowrap}
.team .acct-form{margin-top:14px}
@media (max-width:860px){.plans{grid-template-columns:1fr}}
/* stacked on a phone, a plan shows PITCH_SHOWN lines and folds the rest behind "N more" (the desktop columns show all) */
.pfold{display:none}
@supports selector(:has(a)){@media (max-width:860px){.plan .pfold{display:block;font-size:13px}.plan:has(>.pfold:not([open])) li.folded{display:none}}}
/* the Apps table: rows stack on a phone, as the Team tables do (ORG_CSS table.dt.rows); its tag gets the warn colour from here, not a style attribute the CSP blocks */
#projects td .tag{color:var(--warn);border-color:var(--warn)}
@media (max-width:600px){
#projects table thead{display:none}
#projects table tr{display:block;padding:12px 0;border-bottom:1px solid var(--rule)}
#projects table td{display:block;border:0;padding:3px 20px;white-space:normal;overflow-wrap:anywhere}
#projects table td:first-child{font-weight:500}
#projects table td.act{text-align:left;padding-top:8px}
#projects table td.act a:not(.btn){display:inline-flex;align-items:center;min-height:32px}
}
@media (max-width:767px){.plan .tag{font-size:12px}}
`;

function statusLine(v: BillingView, plan: Plan): string {
Expand Down Expand Up @@ -185,9 +199,14 @@ function planColumn(v: BillingView, p: Plan, current: Plan): string {
else if (byAgreement(p)) act = talk;
else if (v.live && !waiting) act = buy;
const features = p.features
.map((f) => `<li${f.available ? "" : ' class="soon"'}>${esc(f.text)}${f.available || /coming next/i.test(f.text) ? "" : " (coming next)"}</li>`)
.map((f, i) => {
const cls = [f.available ? "" : "soon", i >= PITCH_SHOWN ? "folded" : ""].filter(Boolean).join(" ");
return `<li${cls ? ` class="${cls}"` : ""}>${esc(f.text)}${f.available || /coming next/i.test(f.text) ? "" : " (coming next)"}</li>`;
})
.join("");
return `<div class="plan${cur ? " cur" : pick ? " pick" : ""}"><h3>${esc(p.name)}</h3><p class="price">${esc(priceText(p))}</p><p class="sum">${esc(p.summary)}</p><ul>${features}</ul><div class="act">${act}</div></div>`;
const more = p.features.length - PITCH_SHOWN;
const fold = more > 0 ? `<details class="pmore pfold"><summary>${more} more</summary></details>` : "";
return `<div class="plan${cur ? " cur" : pick ? " pick" : ""}"><h3>${esc(p.name)}</h3><p class="price">${esc(priceText(p))}</p><p class="sum">${esc(p.summary)}</p><ul>${features}</ul>${fold}<div class="act">${act}</div></div>`;
}

/** The account's projects, each with its plan and the way to change it (its own page). */
Expand All @@ -208,7 +227,7 @@ function projectsSection(v: BillingView): string {
return `<section class="blk team" id="projects">
<div class="blk-h"><h2>Apps</h2><span class="aside">What your plan covers</span></div>
<p class="intro">Free covers ${FREE_APPS === 1 ? "one app" : `${FREE_APPS} apps`}${PAID_PLANS[0] ? `; ${esc(PAID_PLANS[0].name)} covers ${PAID_PLANS[0].limits.apps ? `up to ${PAID_PLANS[0].limits.apps} apps` : "every app"}, ${esc(priceText(PAID_PLANS[0]))}` : ""}. More apps come with Enterprise.</p>
<table><thead><tr><th>Project</th><th>Plan</th><th></th></tr></thead><tbody>${rows}</tbody></table>
<div class="tablewrap"><table><thead><tr><th>Project</th><th>Plan</th><th></th></tr></thead><tbody>${rows}</tbody></table></div>
</section>`;
}

Expand Down Expand Up @@ -403,7 +422,7 @@ ${notice}${test}
user: { label, sub: orgName(label) },
...orgRail("billing"),
railLabel: "Organization",
css: DASH_CSS + ORG_CSS + BILLING_CSS + ".planpage .sb-ph{text-align:center}.planpage .sb-ph>div{margin:0 auto}.planpage #plan{background:none;border:0;box-shadow:none;padding:0;display:flex;flex-direction:column;align-items:center;gap:0}.planpage #plan .intro{margin:20px auto 0;text-align:center}.planpage #plan .err:empty{display:none}.planpage .notice{max-width:440px;margin-left:auto;margin-right:auto}.planpage .acct-form{justify-content:center}.plan.big{width:100%;max-width:440px;padding:24px 24px 22px;gap:8px}.plan.big h3{font-size:24px;letter-spacing:-.01em}.plan.big .price{font-size:15px;font-weight:600;margin-top:2px}.plan.big ul{margin-top:6px;gap:6px}.plan.big li{font-size:13.5px}.plan.big .pmore{font-size:12.5px}.plan.big .pmore ul{margin-top:6px}.plan.big .act{padding-top:12px}.plan.big .act .btn{width:100%;justify-content:center;padding:11px 16px;font-size:14.5px}.free{margin-top:12px;font-size:11px;width:100%;max-width:440px;text-align:center}.linkish{background:none;border:0;padding:0;font:inherit;font-size:11px;color:var(--ink3);text-decoration:underline;cursor:pointer}.linkish:disabled{opacity:.6;cursor:default}.trialnote{margin:10px 0 0;font-size:13px;color:var(--ink3);text-align:center;width:100%}dialog.why{margin:auto;max-height:calc(100vh - 32px);overflow:auto;max-width:460px;width:calc(100% - 32px);border:1px solid var(--rule);border-radius:14px;background:var(--paper);color:var(--ink);padding:24px 24px 20px}dialog.why::backdrop{background:rgba(0,0,0,.62)}dialog.why h2{font-size:21px;margin:0 0 4px}dialog.why fieldset{border:0;padding:0;margin:14px 0 6px}dialog.why label{display:flex;gap:10px;align-items:center;padding:7px 0;font-size:15px;cursor:pointer}dialog.why textarea{margin-top:6px}.why-act{display:flex;gap:10px;flex-wrap:wrap;margin-top:14px}",
css: DASH_CSS + ORG_CSS + BILLING_CSS + ".planpage .sb-ph{text-align:center}.planpage .sb-ph>div{margin:0 auto}.planpage #plan{background:none;border:0;box-shadow:none;padding:0;display:flex;flex-direction:column;align-items:center;gap:0}.planpage #plan .intro{margin:20px auto 0;text-align:center}.planpage #plan .err:empty{display:none}.planpage .notice{max-width:440px;margin-left:auto;margin-right:auto}.planpage .acct-form{justify-content:center}.plan.big{width:100%;max-width:440px;padding:24px 24px 22px;gap:8px}.plan.big h3{font-size:24px;letter-spacing:-.01em}.plan.big .price{font-size:15px;font-weight:600;margin-top:2px}.plan.big ul{margin-top:6px;gap:6px}.plan.big li{font-size:13.5px}.plan.big .pmore{font-size:12.5px}.plan.big .pmore ul{margin-top:6px}.plan.big .act{padding-top:12px}.plan.big .act .btn{width:100%;justify-content:center;padding:11px 16px;font-size:14.5px}.free{margin-top:12px;font-size:11px;width:100%;max-width:440px;text-align:center}.linkish{background:none;border:0;padding:0;font:inherit;font-size:11px;color:var(--ink3);text-decoration:underline;cursor:pointer}.linkish:disabled{opacity:.6;cursor:default}.planpage .linkish{display:inline-block;padding:6px 12px;margin:-6px -12px}.trialnote{margin:10px 0 0;font-size:13px;color:var(--ink3);text-align:center;width:100%}dialog.why{margin:auto;max-height:calc(100vh - 32px);overflow:auto;max-width:460px;width:calc(100% - 32px);border:1px solid var(--rule);border-radius:14px;background:var(--paper);color:var(--ink);padding:24px 24px 20px}dialog.why::backdrop{background:rgba(0,0,0,.62)}dialog.why h2{font-size:21px;margin:0 0 4px}dialog.why fieldset{border:0;padding:0;margin:14px 0 6px}dialog.why label{display:flex;gap:10px;align-items:center;padding:7px 0;font-size:15px;cursor:pointer}dialog.why textarea{margin-top:6px}.why-act{display:flex;gap:10px;flex-wrap:wrap;margin-top:14px}",
body,
script: CLIENT_JS + script,
});
Expand Down
3 changes: 2 additions & 1 deletion telemetry-worker/src/github/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ ul.facts b{color:var(--ink);font-weight:500}
@media (max-width:620px){.gh-wf{grid-template-columns:minmax(0,1fr)}}
details.gh-more{max-width:76ch;border-top:1px solid var(--rule);padding-top:14px}
details.gh-more>summary{cursor:pointer;font-size:14px;font-weight:500;color:var(--ink2)}
@media (max-width:620px){details.gh-more>summary{padding:11px 0}}
details.gh-more>summary:hover{color:var(--ink)}
details.gh-more[open]>summary{margin-bottom:6px}
.gh-st{font-size:13px;color:var(--ink2)}
Expand Down Expand Up @@ -412,7 +413,7 @@ export function accountGithubPage(nonce: string, v: GithubAccountView): string {
? `<p class="intro">This server cannot ask GitHub who you are, so repositories cannot be linked here. Reviews work without it.</p>`
: v.connected
? `<p class="intro">Connected as <b>${esc(v.connected.login)}</b>. GitHub's answer about your repositories is used for 30 minutes, then this page asks again.${v.connected.more ? " Only the first 300 repositories are listed." : ""} <a href="/github/connect">Refresh from GitHub</a></p>`
: `<p class="intro">To link a repository, this page asks GitHub which installations of ${esc(v.slug)}[bot] and which repositories you can reach. Your GitHub token is used for that question and not kept.</p><div class="row"><a class="btn" href="/github/connect"><span>Connect GitHub</span></a></div>`;
: `<p class="intro">To link a repository, this page asks GitHub which installations of ${esc(v.slug)}[bot] and which repositories you can reach. Your GitHub token is used for that question and not kept.</p><div class="row mt-s"><a class="btn" href="/github/connect"><span>Connect GitHub</span></a></div>`;
const table = v.repos.length
? `<div class="tablewrap"><table class="dt rows"><thead><tr><th>Repository</th><th>What the app is doing</th><th>GenClass app</th><th></th></tr></thead><tbody>${rows}</tbody></table></div>${
adds
Expand Down
Loading
Loading