diff --git a/frontend/index.html b/frontend/index.html index 63465482..b42512ae 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,8 @@ - + + Damp diff --git a/frontend/public/apple-touch-icon.png b/frontend/public/apple-touch-icon.png new file mode 100644 index 00000000..d55e786d Binary files /dev/null and b/frontend/public/apple-touch-icon.png differ diff --git a/frontend/public/favicon-32.png b/frontend/public/favicon-32.png new file mode 100644 index 00000000..c65bab0e Binary files /dev/null and b/frontend/public/favicon-32.png differ diff --git a/frontend/public/favicon.svg b/frontend/public/favicon.svg deleted file mode 100644 index 34534755..00000000 --- a/frontend/public/favicon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/frontend/public/icons.svg b/frontend/public/icons.svg deleted file mode 100644 index e9522193..00000000 --- a/frontend/public/icons.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/src/apollo.ts b/frontend/src/apollo.ts index a4532adb..dba00364 100644 --- a/frontend/src/apollo.ts +++ b/frontend/src/apollo.ts @@ -2,10 +2,11 @@ import { ApolloClient, HttpLink, InMemoryCache } from '@apollo/client'; /** * Felles GraphQL-klient for hele appen. Svar caches i minnet, så samme søk - * to ganger gir bare én forespørsel. URL-en kan overstyres med VITE_GRAPHQL_URL ved deploy. + * to ganger gir bare én forespørsel. URL-en er lik for dev og deploy. + * Se vite.config.ts. */ export const client = new ApolloClient({ - link: new HttpLink({ uri: import.meta.env.VITE_GRAPHQL_URL ?? 'http://localhost:3001' }), + link: new HttpLink({ uri: `${import.meta.env.BASE_URL}graphql` }), cache: new InMemoryCache(), }); diff --git a/frontend/src/assets/drawings/turbin.webp b/frontend/src/assets/drawings/turbin.webp new file mode 100644 index 00000000..b4035599 Binary files /dev/null and b/frontend/src/assets/drawings/turbin.webp differ diff --git a/frontend/src/assets/hero.png b/frontend/src/assets/hero.png deleted file mode 100644 index 02251f4b..00000000 Binary files a/frontend/src/assets/hero.png and /dev/null differ diff --git a/frontend/src/assets/logo/damp-logo-horizontal-on-dark.svg b/frontend/src/assets/logo/damp-logo-horizontal-on-dark.svg deleted file mode 100644 index e341514d..00000000 --- a/frontend/src/assets/logo/damp-logo-horizontal-on-dark.svg +++ /dev/null @@ -1 +0,0 @@ -Damp diff --git a/frontend/src/assets/logo/damp-logo-horizontal-on-light.svg b/frontend/src/assets/logo/damp-logo-horizontal-on-light.svg deleted file mode 100644 index d23dcef8..00000000 --- a/frontend/src/assets/logo/damp-logo-horizontal-on-light.svg +++ /dev/null @@ -1 +0,0 @@ -Damp diff --git a/frontend/src/assets/logo/damp-logo-stacked-on-dark.svg b/frontend/src/assets/logo/damp-logo-stacked-on-dark.svg deleted file mode 100644 index 980071ea..00000000 --- a/frontend/src/assets/logo/damp-logo-stacked-on-dark.svg +++ /dev/null @@ -1 +0,0 @@ -Damp diff --git a/frontend/src/assets/logo/damp-logo-stacked-on-light.svg b/frontend/src/assets/logo/damp-logo-stacked-on-light.svg deleted file mode 100644 index 6ceb29b3..00000000 --- a/frontend/src/assets/logo/damp-logo-stacked-on-light.svg +++ /dev/null @@ -1 +0,0 @@ -Damp diff --git a/frontend/src/assets/logo/damp-mark-on-dark.svg b/frontend/src/assets/logo/damp-mark-on-dark.svg deleted file mode 100644 index e2a0f87e..00000000 --- a/frontend/src/assets/logo/damp-mark-on-dark.svg +++ /dev/null @@ -1 +0,0 @@ -Damp logo mark diff --git a/frontend/src/assets/logo/damp-mark-on-light.svg b/frontend/src/assets/logo/damp-mark-on-light.svg deleted file mode 100644 index a81e0c36..00000000 --- a/frontend/src/assets/logo/damp-mark-on-light.svg +++ /dev/null @@ -1 +0,0 @@ -Damp logo mark diff --git a/frontend/src/assets/react.svg b/frontend/src/assets/react.svg deleted file mode 100644 index 6c87de9b..00000000 --- a/frontend/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/assets/vite.svg b/frontend/src/assets/vite.svg deleted file mode 100644 index 5101b674..00000000 --- a/frontend/src/assets/vite.svg +++ /dev/null @@ -1 +0,0 @@ -Vite diff --git a/frontend/src/components/Logo/Logo.css b/frontend/src/components/Logo/Logo.css index 008f1125..11e182fa 100644 --- a/frontend/src/components/Logo/Logo.css +++ b/frontend/src/components/Logo/Logo.css @@ -1,6 +1,9 @@ -/* Smale skjermer: første element i toppfeltet (Header) */ +/* Smale skjermer: i toppfeltet, med navnet ved siden av tegningen */ .logo { + display: flex; flex-shrink: 0; + align-items: center; + gap: 10px; } .logo img { @@ -9,18 +12,24 @@ width: auto; } -/* Viser riktig logo for valgt tema. display: none skjuler den andre også for skjermlesere */ -.logo .logo__img--dark { - display: none; +/* Navnet i samme stil som overskriftene (.label i index.css): monospace, sperrede versaler */ +.logo__name { + font-family: var(--mono); + font-size: 14px; + font-weight: 500; + letter-spacing: 0.3em; + /* letter-spacing legger også luft etter siste bokstav, dette tar den bort så teksten står midt */ + margin-right: -0.3em; + text-transform: uppercase; + color: var(--text-h); } -:root[data-theme='dark'] .logo .logo__img--light { - display: none; -} -:root[data-theme='dark'] .logo .logo__img--dark { - display: block; + +/* Tegningen er svart på gjennomsiktig bakgrunn. I mørkt tema snus den til lys */ +:root[data-theme='dark'] .logo__img { + filter: invert(1); } -/* Brede skjermer: fast og midt i sidepanelet til venstre. Må stå sist i filen */ +/* Brede skjermer: fast og midt i sidepanelet til venstre, navnet under. Må stå sist i filen */ @media (min-width: 1320px) { .logo { position: fixed; @@ -29,6 +38,8 @@ /* Midten av sidepanelet. 1126px er bredden på #root i index.css */ left: calc((100vw - 1126px) / 4); transform: translateX(-50%); + flex-direction: column; + gap: 12px; } .logo img { diff --git a/frontend/src/components/Logo/Logo.tsx b/frontend/src/components/Logo/Logo.tsx index baa3d283..df41c8f9 100644 --- a/frontend/src/components/Logo/Logo.tsx +++ b/frontend/src/components/Logo/Logo.tsx @@ -1,13 +1,13 @@ -import logoOnDark from '../../assets/logo/damp-logo-stacked-on-dark.svg'; -import logoOnLight from '../../assets/logo/damp-logo-stacked-on-light.svg'; +import turbine from '../../assets/drawings/turbin.webp'; import './Logo.css'; -/** Damp-logoen (symbol med navnet under). CSS viser riktig versjon for valgt tema. */ +/** Damp-logoen: turbintegningen med navnet under. */ export function Logo() { return (
- Damp - Damp + {/* Tegningen er pynt (alt=""), navnet under er det skjermlesere leser */} + + Damp
); } diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 30aa20c3..94079e3f 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -6,4 +6,12 @@ import { defineConfig } from 'vite'; export default defineConfig({ base: '/project2/', plugins: [react(), babel({ presets: [reactCompilerPreset()] })], + server: { + proxy: { + '/project2/graphql': { + target: 'http://localhost:3001', + rewrite: () => '/', + }, + }, + }, });