Merge pull request #5 from navikt/oppdateringer

oppdaterer frontend-setup + mappenavn
2023-06-28 15:55:22 +02:00 · 2023-06-28 15:55:22 +02:00 · 6c08b11d37
commit 6c08b11d37
parent 6d760937cf ff95d772fa
28 changed files with 234 additions and 4240 deletions
--- a/sprik-backend/build.gradle.kts
+++ b/sprik-backend/build.gradle.kts
--- a/sprik-backend/gradle.properties
+++ b/sprik-backend/gradle.properties
--- a/sprik-backend/gradle/wrapper/gradle-wrapper.jar
+++ b/sprik-backend/gradle/wrapper/gradle-wrapper.jar
--- a/sprik-backend/gradle/wrapper/gradle-wrapper.properties
+++ b/sprik-backend/gradle/wrapper/gradle-wrapper.properties
--- a/sprik-backend/gradlew
+++ b/sprik-backend/gradlew
--- a/sprik-backend/gradlew.bat
+++ b/sprik-backend/gradlew.bat
--- a/sprik-backend/settings.gradle.kts
+++ b/sprik-backend/settings.gradle.kts
--- a/sprik-backend/src/main/kotlin/Main.kt
+++ b/sprik-backend/src/main/kotlin/Main.kt
--- a/sprik-frontend/.eslintrc.json
+++ b/sprik-frontend/.eslintrc.json
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@ -0,0 +1,35 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
--- a/sprik-frontend/README.md
+++ b/sprik-frontend/README.md
@ -14,7 +14,11 @@ pnpm dev

 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file.
+
+[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`.
+
+The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.

 This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

--- a/sprik-frontend/next.config.js
+++ b/sprik-frontend/next.config.js
@ -1,4 +1,6 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {}
+const nextConfig = {
+  reactStrictMode: true,
+}

 module.exports = nextConfig
--- a/sprik-frontend/package.json
+++ b/sprik-frontend/package.json
@ -1,5 +1,5 @@
 {
-  "name": "sprik-frontend",
+  "name": "frontend",
  "version": "0.1.0",
  "private": true,
  "scripts": {
@ -9,9 +9,10 @@
    "lint": "next lint"
  },
  "dependencies": {
-    "@navikt/ds-css": "^4.4.1",
-    "@navikt/ds-react": "^4.4.1",
-    "@types/node": "20.3.1",
+    "@navikt/aksel-icons": "^4.4.2",
+    "@navikt/ds-css": "^4.4.2",
+    "@navikt/ds-react": "^4.4.2",
+    "@types/node": "20.3.2",
    "@types/react": "18.2.14",
    "@types/react-dom": "18.2.6",
    "autoprefixer": "10.4.14",
@ -22,6 +23,6 @@
    "react": "18.2.0",
    "react-dom": "18.2.0",
    "tailwindcss": "3.3.2",
-    "typescript": "5.1.3"
+    "typescript": "5.1.5"
  }
 }
--- a/frontend/pages/_app.tsx
+++ b/frontend/pages/_app.tsx
@ -0,0 +1,6 @@
+import '@/styles/globals.css'
+import type { AppProps } from 'next/app'
+
+export default function App({ Component, pageProps }: AppProps) {
+  return <Component {...pageProps} />
+}
--- a/frontend/pages/_document.tsx
+++ b/frontend/pages/_document.tsx
@ -0,0 +1,13 @@
+import { Html, Head, Main, NextScript } from 'next/document'
+
+export default function Document() {
+  return (
+    <Html lang="en">
+      <Head />
+      <body>
+        <Main />
+        <NextScript />
+      </body>
+    </Html>
+  )
+}
--- a/frontend/pages/api/hello.ts
+++ b/frontend/pages/api/hello.ts
@ -0,0 +1,13 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next'
+
+type Data = {
+  name: string
+}
+
+export default function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<Data>
+) {
+  res.status(200).json({ name: 'John Doe' })
+}
--- a/frontend/pages/index.tsx
+++ b/frontend/pages/index.tsx
@ -0,0 +1,118 @@
+import Image from 'next/image'
+import { Inter } from 'next/font/google'
+
+const inter = Inter({ subsets: ['latin'] })
+
+export default function Home() {
+  return (
+    <main
+      className={`flex min-h-screen flex-col items-center justify-between p-24 ${inter.className}`}
+    >
+      <div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
+        <p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto  lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
+          Get started by editing&nbsp;
+          <code className="font-mono font-bold">pages/index.tsx</code>
+        </p>
+        <div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
+          <a
+            className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
+            href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            By{' '}
+            <Image
+              src="/vercel.svg"
+              alt="Vercel Logo"
+              className="dark:invert"
+              width={100}
+              height={24}
+              priority
+            />
+          </a>
+        </div>
+      </div>
+
+      <div className="relative flex place-items-center before:absolute before:h-[300px] before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700/10 after:dark:from-sky-900 after:dark:via-[#0141ff]/40 before:lg:h-[360px]">
+        <Image
+          className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
+          src="/next.svg"
+          alt="Next.js Logo"
+          width={180}
+          height={37}
+          priority
+        />
+      </div>
+
+      <div className="mb-32 grid text-center lg:mb-0 lg:grid-cols-4 lg:text-left">
+        <a
+          href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <h2 className={`mb-3 text-2xl font-semibold`}>
+            Docs{' '}
+            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
+              -&gt;
+            </span>
+          </h2>
+          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+            Find in-depth information about Next.js features and API.
+          </p>
+        </a>
+
+        <a
+          href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <h2 className={`mb-3 text-2xl font-semibold`}>
+            Learn{' '}
+            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
+              -&gt;
+            </span>
+          </h2>
+          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+            Learn about Next.js in an interactive course with&nbsp;quizzes!
+          </p>
+        </a>
+
+        <a
+          href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <h2 className={`mb-3 text-2xl font-semibold`}>
+            Templates{' '}
+            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
+              -&gt;
+            </span>
+          </h2>
+          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+            Discover and deploy boilerplate example Next.js&nbsp;projects.
+          </p>
+        </a>
+
+        <a
+          href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
+          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <h2 className={`mb-3 text-2xl font-semibold`}>
+            Deploy{' '}
+            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
+              -&gt;
+            </span>
+          </h2>
+          <p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
+            Instantly deploy your Next.js site to a shareable URL with Vercel.
+          </p>
+        </a>
+      </div>
+    </main>
+  )
+}
--- a/sprik-frontend/postcss.config.js
+++ b/sprik-frontend/postcss.config.js
--- a/sprik-frontend/src/app/favicon.ico
+++ b/sprik-frontend/src/app/favicon.ico
--- a/sprik-frontend/public/next.svg
+++ b/sprik-frontend/public/next.svg
--- a/sprik-frontend/public/vercel.svg
+++ b/sprik-frontend/public/vercel.svg
--- a/sprik-frontend/src/app/globals.css
+++ b/sprik-frontend/src/app/globals.css
@ -2,6 +2,12 @@
@tailwind components;
@tailwind utilities;

+:root {
+  --foreground-rgb: 0, 0, 0;
+  --background-start-rgb: 214, 219, 220;
+  --background-end-rgb: 255, 255, 255;
+}
+
@media (prefers-color-scheme: dark) {
  :root {
    --foreground-rgb: 255, 255, 255;
--- a/sprik-frontend/tailwind.config.js
+++ b/sprik-frontend/tailwind.config.js
@ -1,9 +1,9 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
  content: [
-    './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/components/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/app/**/*.{js,ts,jsx,tsx,mdx}',
+    './pages/**/*.{js,ts,jsx,tsx,mdx}',
+    './components/**/*.{js,ts,jsx,tsx,mdx}',
+    './app/**/*.{js,ts,jsx,tsx,mdx}',
  ],
  theme: {
    extend: {
--- a/sprik-frontend/tsconfig.json
+++ b/sprik-frontend/tsconfig.json
@ -14,15 +14,10 @@
    "isolatedModules": true,
    "jsx": "preserve",
    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
    "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./*"]
    }
  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
  "exclude": ["node_modules"]
 }
--- a/sprik-frontend/yarn.lock
+++ b/sprik-frontend/yarn.lock
@ -3,9 +3,9 @@


 "@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.5.tgz#383aeebd5c176c320d6364fb869669559bbdbac9"
-  integrity sha512-plhoNEfSVdHMKXQyAxvH0Zyv3/4NL8r6pwgMQdmHR2vBUXn2t74PN2pBRppqKUa6RMT0yldyvOHG5Dbjwy2mBQ==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==

 "@alloc/quick-lru@^5.2.0":
  version "5.2.0"
@ -135,23 +135,23 @@
    "@jridgewell/resolve-uri" "3.1.0"
    "@jridgewell/sourcemap-codec" "1.4.14"

-"@navikt/aksel-icons@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@navikt/aksel-icons/-/aksel-icons-4.4.1.tgz#d7af119e945dce58316d71d06cff3f4193edd593"
-  integrity sha512-62HZh0MUmDpf/XHIBVzSQyWCWEuv4hmzubQPNumADBdGAe3HXKN+CuT3USVJFX2XtVrsv/akALMBUWi+DvxaVA==
+"@navikt/aksel-icons@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@navikt/aksel-icons/-/aksel-icons-4.4.2.tgz#3547541631b662313ce39f1bb0fe59b52bfd80f9"
+  integrity sha512-i4ubW/IR5yZxHftHrmaftPHBelvpcfzxbuamrKM5tiniGWJzH7Gk8AvT6pXqzqi+l4wXW4pSYitAlMVxEeGDAA==

-"@navikt/ds-css@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@navikt/ds-css/-/ds-css-4.4.1.tgz#d68ea9be4e7cead9175bc27f473dee1f9f2e7354"
-  integrity sha512-mNYwsIhQ5TdoM0fDiH4Y4xOxn/aLdHjLnkIJgRF5dQfgI5YOi54jwT2DWpoHK52qVb81toONCp8sfMULuyyiSQ==
+"@navikt/ds-css@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@navikt/ds-css/-/ds-css-4.4.2.tgz#b2ea08f8991c43733d51bda9e47a3bfe25289899"
+  integrity sha512-rY0AIi8/+Q+IndCH+bCCZxQ4gharu4ReVSo/92qs8Jdk+KMlPLPX+C3ikl7g67twnY2RbXleHJMPRJJzqmhL7w==

-"@navikt/ds-react@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@navikt/ds-react/-/ds-react-4.4.1.tgz#21f65e8601c45454a64f8794f4fe619e665c3941"
-  integrity sha512-FIf5nXx7DgJUvHDUC5Apfnv/CR/9tmIyAeUStkw3X7wW0Yqhz0ESgo+Y9PnXCZMThLCxHrklFF81eKkakMRS6A==
+"@navikt/ds-react@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@navikt/ds-react/-/ds-react-4.4.2.tgz#06ef7cf36247e906d644c594659e6c05ca4fb95d"
+  integrity sha512-yRo9Fm2+SS8DzHteS1YIYk5TrOoNUbIVe83GcpCwYJzvXfVj6Fk36Xdqjps4GpgsYgBsuGlhkygb7qezsL9G+Q==
  dependencies:
    "@floating-ui/react" "0.24.1"
-    "@navikt/aksel-icons" "^4.4.1"
+    "@navikt/aksel-icons" "^4.4.2"
    "@radix-ui/react-tabs" "1.0.0"
    "@radix-ui/react-toggle-group" "1.0.0"
    clsx "^1.2.1"
@ -415,10 +415,10 @@
  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

-"@types/node@20.3.1":
-  version "20.3.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe"
-  integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==
+"@types/node@20.3.2":
+  version "20.3.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.2.tgz#fa6a90f2600e052a03c18b8cb3fd83dd4e599898"
+  integrity sha512-vOBLVQeCQfIcF/2Y7eKFTqrMnizK5lRNQ7ykML/5RuwVXVWxYkgwS7xbt4B6fKCUPgbSL5FSsjHQpaGQP/dQmw==

 "@types/prop-types@*":
  version "15.7.5"
@ -2657,10 +2657,10 @@ typed-array-length@^1.0.4:
    for-each "^0.3.3"
    is-typed-array "^1.1.9"

-typescript@5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"
-  integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==
+typescript@5.1.5:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.5.tgz#a3ae755082488b6046fe64345d293ef26af08671"
+  integrity sha512-FOH+WN/DQjUvN6WgW+c4Ml3yi0PH+a/8q+kNIfRehv1wLhWONedw85iu+vQ39Wp49IzTJEsZ2lyLXpBF7mkF1g==

 unbox-primitive@^1.0.2:
  version "1.0.2"
--- a/sprik-frontend/package-lock.json
+++ b/sprik-frontend/package-lock.json
--- a/sprik-frontend/src/app/layout.tsx
+++ b/sprik-frontend/src/app/layout.tsx
@ -1,21 +0,0 @@
-import './globals.css'
-import { Inter } from 'next/font/google'
-
-const inter = Inter({ subsets: ['latin'] })
-
-export const metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
-}
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode
-}) {
-  return (
-    <html lang="en">
-      <body className={inter.className}>{children}</body>
-    </html>
-  )
-}
--- a/sprik-frontend/src/app/page.tsx
+++ b/sprik-frontend/src/app/page.tsx
@ -1,17 +0,0 @@
-"use client"
-
-import React from 'react'
-
-import "@navikt/ds-css";
-import { Button } from "@navikt/ds-react";
-
-export default function Home() {
-  return (
-    <main className="bg-surface-subtle flex min-h-screen flex-col items-center justify-between p-24">
-        <h1 className="text-4xl font-bold text-center">
-          Sprik
-          <Button variant="primary">Rapporter feil</Button>
-        </h1>
-    </main>
-  )
-}