From 9a20d9490448c1e5c90efc265cc7f36040b3226b Mon Sep 17 00:00:00 2001
From: amalieem <amalie.erdal.mansaker@nav.no>
Date: Tue, 27 Jun 2023 13:50:21 +0200
Subject: [PATCH 1/2] Endret mappestruktur frontend og backend

---
 backend/sprik-backend/.idea/.gitignore        |   8 -------
 backend/sprik-backend/.idea/compiler.xml      |   6 ------
 backend/sprik-backend/.idea/gradle.xml        |  16 --------------
 .../inspectionProfiles/Project_Default.xml    |   6 ------
 .../sprik-backend/.idea/jarRepositories.xml   |  20 ------------------
 backend/sprik-backend/.idea/kotlinc.xml       |   6 ------
 backend/sprik-backend/.idea/misc.xml          |  10 ---------
 backend/sprik-backend/.idea/vcs.xml           |   6 ------
 .../build.gradle.kts                          |   0
 .../gradle.properties                         |   0
 .../gradle/wrapper/gradle-wrapper.jar         | Bin
 .../gradle/wrapper/gradle-wrapper.properties  |   0
 .../sprik-backend => sprik-backend}/gradlew   |   0
 .../gradlew.bat                               |   0
 .../settings.gradle.kts                       |   0
 .../src/main/kotlin/Main.kt                   |   0
 .../.eslintrc.json                            |   0
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../next.config.js                            |   0
 .../package-lock.json                         |   0
 .../package.json                              |   0
 .../postcss.config.js                         |   0
 .../public/next.svg                           |   0
 .../public/vercel.svg                         |   0
 .../src/app/favicon.ico                       | Bin
 .../src/app/globals.css                       |   0
 .../src/app/layout.tsx                        |   0
 .../src/app/page.tsx                          |   0
 .../tailwind.config.js                        |   0
 .../tsconfig.json                             |   0
 31 files changed, 78 deletions(-)
 delete mode 100644 backend/sprik-backend/.idea/.gitignore
 delete mode 100644 backend/sprik-backend/.idea/compiler.xml
 delete mode 100644 backend/sprik-backend/.idea/gradle.xml
 delete mode 100644 backend/sprik-backend/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 backend/sprik-backend/.idea/jarRepositories.xml
 delete mode 100644 backend/sprik-backend/.idea/kotlinc.xml
 delete mode 100644 backend/sprik-backend/.idea/misc.xml
 delete mode 100644 backend/sprik-backend/.idea/vcs.xml
 rename {backend/sprik-backend => sprik-backend}/build.gradle.kts (100%)
 rename {backend/sprik-backend => sprik-backend}/gradle.properties (100%)
 rename {backend/sprik-backend => sprik-backend}/gradle/wrapper/gradle-wrapper.jar (100%)
 rename {backend/sprik-backend => sprik-backend}/gradle/wrapper/gradle-wrapper.properties (100%)
 rename {backend/sprik-backend => sprik-backend}/gradlew (100%)
 rename {backend/sprik-backend => sprik-backend}/gradlew.bat (100%)
 rename {backend/sprik-backend => sprik-backend}/settings.gradle.kts (100%)
 rename {backend/sprik-backend => sprik-backend}/src/main/kotlin/Main.kt (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/.eslintrc.json (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/.gitignore (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/README.md (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/next.config.js (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/package-lock.json (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/package.json (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/postcss.config.js (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/public/next.svg (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/public/vercel.svg (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/src/app/favicon.ico (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/src/app/globals.css (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/src/app/layout.tsx (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/src/app/page.tsx (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/tailwind.config.js (100%)
 rename {frontend/sprik-frontend => sprik-frontend}/tsconfig.json (100%)

diff --git a/backend/sprik-backend/.idea/.gitignore b/backend/sprik-backend/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/backend/sprik-backend/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/backend/sprik-backend/.idea/compiler.xml b/backend/sprik-backend/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/backend/sprik-backend/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/gradle.xml b/backend/sprik-backend/.idea/gradle.xml
deleted file mode 100644
index ce1c62c..0000000
--- a/backend/sprik-backend/.idea/gradle.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/inspectionProfiles/Project_Default.xml b/backend/sprik-backend/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index df543e3..0000000
--- a/backend/sprik-backend/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ReplaceUntilWithRangeUntil" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/jarRepositories.xml b/backend/sprik-backend/.idea/jarRepositories.xml
deleted file mode 100644
index fdc392f..0000000
--- a/backend/sprik-backend/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/kotlinc.xml b/backend/sprik-backend/.idea/kotlinc.xml
deleted file mode 100644
index 217e5c5..0000000
--- a/backend/sprik-backend/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/misc.xml b/backend/sprik-backend/.idea/misc.xml
deleted file mode 100644
index cf03873..0000000
--- a/backend/sprik-backend/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/.idea/vcs.xml b/backend/sprik-backend/.idea/vcs.xml
deleted file mode 100644
index b2bdec2..0000000
--- a/backend/sprik-backend/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/backend/sprik-backend/build.gradle.kts b/sprik-backend/build.gradle.kts
similarity index 100%
rename from backend/sprik-backend/build.gradle.kts
rename to sprik-backend/build.gradle.kts
diff --git a/backend/sprik-backend/gradle.properties b/sprik-backend/gradle.properties
similarity index 100%
rename from backend/sprik-backend/gradle.properties
rename to sprik-backend/gradle.properties
diff --git a/backend/sprik-backend/gradle/wrapper/gradle-wrapper.jar b/sprik-backend/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from backend/sprik-backend/gradle/wrapper/gradle-wrapper.jar
rename to sprik-backend/gradle/wrapper/gradle-wrapper.jar
diff --git a/backend/sprik-backend/gradle/wrapper/gradle-wrapper.properties b/sprik-backend/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from backend/sprik-backend/gradle/wrapper/gradle-wrapper.properties
rename to sprik-backend/gradle/wrapper/gradle-wrapper.properties
diff --git a/backend/sprik-backend/gradlew b/sprik-backend/gradlew
similarity index 100%
rename from backend/sprik-backend/gradlew
rename to sprik-backend/gradlew
diff --git a/backend/sprik-backend/gradlew.bat b/sprik-backend/gradlew.bat
similarity index 100%
rename from backend/sprik-backend/gradlew.bat
rename to sprik-backend/gradlew.bat
diff --git a/backend/sprik-backend/settings.gradle.kts b/sprik-backend/settings.gradle.kts
similarity index 100%
rename from backend/sprik-backend/settings.gradle.kts
rename to sprik-backend/settings.gradle.kts
diff --git a/backend/sprik-backend/src/main/kotlin/Main.kt b/sprik-backend/src/main/kotlin/Main.kt
similarity index 100%
rename from backend/sprik-backend/src/main/kotlin/Main.kt
rename to sprik-backend/src/main/kotlin/Main.kt
diff --git a/frontend/sprik-frontend/.eslintrc.json b/sprik-frontend/.eslintrc.json
similarity index 100%
rename from frontend/sprik-frontend/.eslintrc.json
rename to sprik-frontend/.eslintrc.json
diff --git a/frontend/sprik-frontend/.gitignore b/sprik-frontend/.gitignore
similarity index 100%
rename from frontend/sprik-frontend/.gitignore
rename to sprik-frontend/.gitignore
diff --git a/frontend/sprik-frontend/README.md b/sprik-frontend/README.md
similarity index 100%
rename from frontend/sprik-frontend/README.md
rename to sprik-frontend/README.md
diff --git a/frontend/sprik-frontend/next.config.js b/sprik-frontend/next.config.js
similarity index 100%
rename from frontend/sprik-frontend/next.config.js
rename to sprik-frontend/next.config.js
diff --git a/frontend/sprik-frontend/package-lock.json b/sprik-frontend/package-lock.json
similarity index 100%
rename from frontend/sprik-frontend/package-lock.json
rename to sprik-frontend/package-lock.json
diff --git a/frontend/sprik-frontend/package.json b/sprik-frontend/package.json
similarity index 100%
rename from frontend/sprik-frontend/package.json
rename to sprik-frontend/package.json
diff --git a/frontend/sprik-frontend/postcss.config.js b/sprik-frontend/postcss.config.js
similarity index 100%
rename from frontend/sprik-frontend/postcss.config.js
rename to sprik-frontend/postcss.config.js
diff --git a/frontend/sprik-frontend/public/next.svg b/sprik-frontend/public/next.svg
similarity index 100%
rename from frontend/sprik-frontend/public/next.svg
rename to sprik-frontend/public/next.svg
diff --git a/frontend/sprik-frontend/public/vercel.svg b/sprik-frontend/public/vercel.svg
similarity index 100%
rename from frontend/sprik-frontend/public/vercel.svg
rename to sprik-frontend/public/vercel.svg
diff --git a/frontend/sprik-frontend/src/app/favicon.ico b/sprik-frontend/src/app/favicon.ico
similarity index 100%
rename from frontend/sprik-frontend/src/app/favicon.ico
rename to sprik-frontend/src/app/favicon.ico
diff --git a/frontend/sprik-frontend/src/app/globals.css b/sprik-frontend/src/app/globals.css
similarity index 100%
rename from frontend/sprik-frontend/src/app/globals.css
rename to sprik-frontend/src/app/globals.css
diff --git a/frontend/sprik-frontend/src/app/layout.tsx b/sprik-frontend/src/app/layout.tsx
similarity index 100%
rename from frontend/sprik-frontend/src/app/layout.tsx
rename to sprik-frontend/src/app/layout.tsx
diff --git a/frontend/sprik-frontend/src/app/page.tsx b/sprik-frontend/src/app/page.tsx
similarity index 100%
rename from frontend/sprik-frontend/src/app/page.tsx
rename to sprik-frontend/src/app/page.tsx
diff --git a/frontend/sprik-frontend/tailwind.config.js b/sprik-frontend/tailwind.config.js
similarity index 100%
rename from frontend/sprik-frontend/tailwind.config.js
rename to sprik-frontend/tailwind.config.js
diff --git a/frontend/sprik-frontend/tsconfig.json b/sprik-frontend/tsconfig.json
similarity index 100%
rename from frontend/sprik-frontend/tsconfig.json
rename to sprik-frontend/tsconfig.json

From c2869749861762a330a901e9f5cf0c38c36fe857 Mon Sep 17 00:00:00 2001
From: amalieem <amalie.erdal.mansaker@nav.no>
Date: Tue, 27 Jun 2023 13:55:49 +0200
Subject: [PATCH 2/2] Slettet internal gitignore

---
 .gitignore                |  2 +-
 sprik-frontend/.gitignore | 35 -----------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 sprik-frontend/.gitignore

diff --git a/.gitignore b/.gitignore
index f49a102..eb2fed6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ bin/
 
 ### Node ###
 # dependencies
-/node_modules
+node_modules/
 /.pnp
 .pnp.js
 
diff --git a/sprik-frontend/.gitignore b/sprik-frontend/.gitignore
deleted file mode 100644
index 8f322f0..0000000
--- a/sprik-frontend/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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