Skip to content
Closed
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
1 change: 1 addition & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"error",
{ "allowSeparatedGroups": true, "ignoreDeclarationSort": true }
],
"oxc/no-rest-spread-properties": "off",
"import/consistent-type-specifier-style": "off",
"import/exports-last": "off",
"import/group-exports": "off",
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ const fillOptions = (opt: YogaServerOptions): Required<YogaServerOptions> => ({
opt?.origins ??
new Set([
"https://drfed.org",
"http://localhost:5173",
"http://0.0.0.0:5173",
"http://localhost:3000",
"http://0.0.0.0:3000",
]),
});

Expand Down
1 change: 0 additions & 1 deletion packages/web/.env.example

This file was deleted.

3 changes: 2 additions & 1 deletion packages/web/.oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"typescript/strict-void-return": "off",
"typescript/no-non-null-assertion": "off",
"unicorn/filename-case": "off",
"unicorn/prefer-query-selector": "off"
"unicorn/prefer-query-selector": "off",
"promise/avoid-new": "off"
}
}
4 changes: 0 additions & 4 deletions packages/web/env.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
interface ImportMetaEnv {
readonly VITE_DRFED_URL: string;
}

interface ImportMeta {
readonly env: ImportMetaEnv;
}
9 changes: 5 additions & 4 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,16 @@
},
"dependencies": {
"@solidjs/meta": "^0.29.4",
"@solidjs/router": "^0.15.0",
"@solidjs/start": "2.0.0-alpha.2",
"@solidjs/vite-plugin-nitro-2": "^0.1.0",
"@solidjs/router": "^1.0.0",
"@solidjs/start": "2.0.0-rc.10",
"nitro": "3.0.260610-beta",
"relay-runtime": "^21.0.1",
"solid-js": "^1.9.5",
"solid-relay": "1.0.0-beta.27",
"vite": "^7.0.0"
"vite": "^8.2.0"
},
"devDependencies": {
"@faker-js/faker": "^10.5.0",
"@types/relay-runtime": "^20.1.1",
"eslint-plugin-solid": "^0.14.5",
"relay-compiler": "^21.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ const fetchFn: FetchFunction = async (params, variables) => {
if (accessToken !== undefined) {
headers.Authorization = `Bearer ${accessToken}`;
}
const response = await fetch(import.meta.env.VITE_DRFED_URL, {

const url = new URL(
"/graphql",
event?.request.url ?? globalThis.location.href,
);

const response = await fetch(url, {
method: "POST",
headers,
body: JSON.stringify({
Expand Down
59 changes: 46 additions & 13 deletions packages/web/src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ input {
border-color: var(--accent-soft);
}

.app-header a:focus-visible,
.button:focus-visible {
.app-header a:focus-visible {
outline: 3px solid var(--accent-soft);
outline-offset: 0.2rem;
}
Expand All @@ -134,11 +133,11 @@ input {
padding: clamp(2rem, 5vw, 4rem) var(--gutter);
}

.app-content > main:not(.auth-page) {
.app-content > main:not(.form-page) {
width: 100%;
}

.app-content > main:not(.auth-page) :is(h1, h2, p) {
.app-content > main:not(.form-page) :is(h1, h2, p) {
margin-top: 0;
}

Expand All @@ -158,7 +157,7 @@ input {
line-height: var(--leading-body);
}

.auth-page {
.form-page {
align-items: center;
display: flex;
justify-content: center;
Expand All @@ -172,7 +171,7 @@ input {
box-shadow: var(--shadow-sm);
}

.auth-panel {
.form-panel {
max-width: 28rem;
padding: clamp(1.5rem, 4vw, 2rem);
width: 100%;
Expand All @@ -194,16 +193,35 @@ input {
margin: 0;
}

.auth-panel form {
.form-panel form {
display: grid;
gap: 1rem;
}

.field {
display: grid;
gap: 0.5rem;
}

.field-heading {
align-items: baseline;
display: flex;
font-size: 0.9rem;
font-weight: 650;
gap: 0.75rem;
justify-content: space-between;
}

.field-status {
color: var(--ink-faint);
font-family: var(--font-mono);
font-size: 0.68rem;
font-weight: 500;
letter-spacing: 0.04em;
text-transform: uppercase;
}

.field-status.required {
color: var(--accent-strong);
}

.field input {
Expand All @@ -228,6 +246,20 @@ input {
outline: none;
}

.field input:read-only {
border-style: dashed;
color: var(--ink-soft);
cursor: default;
font-family: var(--font-mono);
}

.field-hint {
color: var(--ink-faint);
font-size: 0.78rem;
line-height: 1.45;
margin: 0;
}

.button {
align-items: center;
border: 0;
Expand All @@ -240,6 +272,11 @@ input {
padding: 0.75rem 1.1rem;
}

.button:focus-visible {
outline: 3px solid var(--accent-soft);
outline-offset: 0.2rem;
}

.button.primary {
background: var(--accent);
color: var(--on-accent);
Expand Down Expand Up @@ -270,10 +307,6 @@ input {
border-left: 3px solid var(--danger);
}

.notice.success {
border-left: 3px solid var(--accent);
}

@media (max-width: 600px) {
.app-header-inner {
padding: 0 1rem;
Expand Down Expand Up @@ -301,7 +334,7 @@ input {
padding: 1.5rem 1rem 3rem;
}

.auth-page {
.form-page {
align-items: flex-start;
min-height: auto;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import "./drfed.css";
import "./app.css";
import { RelayEnvironmentProvider } from "solid-relay";

import { createRelayEnvironment } from "./RelayEnviroment";
import { createRelayEnvironment } from "./RelayEnvironment";

export default function App() {
const environment = createRelayEnvironment();
Expand Down
108 changes: 0 additions & 108 deletions packages/web/src/routes/confirm/[slug].tsx

This file was deleted.

Loading