From d583a6d3da2a5fabb85f266d73f844c24053b4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B8rn=20Antonsen?= <torbjant@ntnu.no>
Date: Sun, 7 Apr 2024 15:14:49 +0200
Subject: [PATCH] fixed pom.xml dependencies preventing bean creation and fixed
app.vue to refresh token
---
FullstackProsjekt/pom.xml | 16 +++-------------
FullstackProsjekt/src/frontend/src/App.vue | 2 +-
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/FullstackProsjekt/pom.xml b/FullstackProsjekt/pom.xml
index 9dec027..2b8e968 100644
--- a/FullstackProsjekt/pom.xml
+++ b/FullstackProsjekt/pom.xml
@@ -59,31 +59,21 @@
<artifactId>jjwt-jackson</artifactId>
<version>0.11.5</version>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
- <version>2.5.0</version>
- </dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
- <mainClass>edu.ntnu.idatt2105.FullstackProsjektApplication</mainClass>
- </configuration>
+ <mainClass>edu.ntnu.idatt2105.FullstackProsjektApplication</mainClass>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/FullstackProsjekt/src/frontend/src/App.vue b/FullstackProsjekt/src/frontend/src/App.vue
index afd2b13..7289276 100644
--- a/FullstackProsjekt/src/frontend/src/App.vue
+++ b/FullstackProsjekt/src/frontend/src/App.vue
@@ -9,7 +9,6 @@ export default {
components: { RouterLink, RouterView, Sidebar },
setup() {
let intervalId = null;
- return {sidebarWidth}
// Start interval for token refresh
const startInterval = () => {
@@ -46,6 +45,7 @@ export default {
} catch (error) {
console.error("Error refreshing token: ", error);
}
+ return {sidebarWidth}
};
// Lifecycle hooks
--
GitLab