From ad6399b1031c240604c7cc17f3799df43bef8be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20H=C3=B8vik?= <andehovi@stud.ntnu.no>
Date: Fri, 26 Apr 2024 14:11:32 +0200
Subject: [PATCH] Fix: Change margin to fix footer
---
src/stores/UserStore.ts | 2 +-
src/views/BasePageView.vue | 8 ++++----
src/views/Settings/SettingsSecurityView.vue | 12 +++++++++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index bbd8383..9d00eac 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -36,7 +36,7 @@ export type UserStoreInfo = {
accessToken?: string;
role?: string;
};
-
+//todo Fix if there is time
export const useUserInfoStore = defineStore('UserInfoStore', {
state: () => ({
email: '',
diff --git a/src/views/BasePageView.vue b/src/views/BasePageView.vue
index 73bb277..8845c8b 100644
--- a/src/views/BasePageView.vue
+++ b/src/views/BasePageView.vue
@@ -8,14 +8,14 @@ import FooterAlternative from "@/components/BaseComponents/FooterAlternative.vue
<template>
<Menu></Menu>
- <div style="display: flex; flex-direction: row;">
+ <!--<div style="display: flex; flex-direction: row;">
<img v-for="item in 7" src="@/assets/coca.webp" style="width: 100%; height: 100px; margin: 5px; border-radius: 1rem;" alt="picture">
- </div>
+ </div>-->
<div>
<RouterView />
</div>
- <div style="display: flex; flex-direction: row;">
+ <!-- <div style="display: flex; flex-direction: row;">
<img v-for="item in 7" src="@/assets/coca.webp" style="width: 100%; height: 100px; margin: 5px; border-radius: 1rem;" alt="picture">
- </div>
+ </div> -->
<FooterAlternative></FooterAlternative>
</template>
\ No newline at end of file
diff --git a/src/views/Settings/SettingsSecurityView.vue b/src/views/Settings/SettingsSecurityView.vue
index 7a63053..62b021c 100644
--- a/src/views/Settings/SettingsSecurityView.vue
+++ b/src/views/Settings/SettingsSecurityView.vue
@@ -6,12 +6,18 @@
<div class="form-group">
<label class="d-block">Change Password</label>
<input type="text" class="form-control" placeholder="Enter your old password">
- <input type="text" class="form-control mt-1" placeholder="New password">
- <input type="text" class="form-control mt-1" placeholder="Confirm new password">
+ <input type="text" class="form-control mt-3" placeholder="New password">
+ <input type="text" class="form-control mt-3 mb-2" placeholder="Confirm new password">
</div>
<button type="button" class="btn btn-primary">Update Password</button>
<button type="reset" class="btn btn-light">Reset Changes</button>
</form>
<hr>
</div>
-</template>
\ No newline at end of file
+</template>
+<script setup lang="ts">
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
--
GitLab