fix: fixed merge conflict

src/components/Buttons/Button1.vue

@@ -2,7 +2,7 @@
     <button type="button" class="btn btn-primary" id="buttonStyle">{{ buttonText }}</button>
 </template>
 
-<script>
+<script setup lang="ts">
 export default {
     props: ['buttonText']
 }

src/components/Buttons/ShopButton.vue

@@ -2,7 +2,7 @@
     <button type="button" class="btn btn-primary" id="buttonStyle"><img src="@/assets/items/pigcoin.png" style="width: 2rem"> +{{ buttonText }}</button>
 </template>
 
-<script>
+<script setup lang="ts">
 export default {
     props: ['buttonText']
 }

src/views/Authentication/ChangePasswordView.vue

@@ -60,7 +60,7 @@ const submitForm = async () => {
     try {
         const resetPassword = {
             password: newPassword.value,
-            token: token
+            token: token as string,
         };
         const response = await UserService.confirmPasswordReset({ requestBody: resetPassword });
         console.log(response);

src/views/LeaderboardView.vue

@@ -17,7 +17,7 @@
     </div>
     <main>
         <div id="leaderboard">
-            <h1><img src="@/assets/items/pigcoin.png" style="width: 3rem"> Total points</h1>
+            <h1><img src="@/assets/items/pigcoin.png" style="width: 2rem"> Total points</h1>
             <Leaderboard :leaderboard="pointsLeaderboardData" :leaderboardExtra="pointsLeaderboardDataExtra" @navigateToUserProfile="navigateToUserProfile" />
         </div>
         <div id="leaderboard">
@@ -26,8 +26,6 @@
         </div>
         <div id="leaderboard">
             <h1><img src="@/assets/icons/fire.png" style="width: 2rem"> Highest streak</h1>
-            let streakLeaderboardData = ref([] as LeaderboardEntryDTO[]);
-            let streakLeaderboardDataExtra = ref([] as LeaderboardEntryDTO[]);
             <Leaderboard :leaderboard="streakLeaderboardData" :leaderboardExtra="streakLeaderboardDataExtra" @navigateToUserProfile="navigateToUserProfile" />
         </div>
     </main>

src/views/Settings/SettingsNotificationView.vue

@@ -8,12 +8,12 @@
                 <div class="small text-muted mb-3">Receive security alert notifications via email
                 </div>
                 <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="customCheck1" checked="">
+                    <input type="checkbox" class="custom-control-input" id="customCheck1">
                     <label class="custom-control-label" for="customCheck1">Email each time a
                         vulnerability is found</label>
                 </div>
                 <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="customCheck2" checked="">
+                    <input type="checkbox" class="custom-control-input" id="customCheck2">
                     <label class="custom-control-label" for="customCheck2">Email a digest summary of
                         vulnerability</label>
                 </div>
@@ -24,7 +24,7 @@
                     <li class="list-group-item has-icon">
                         Comments
                         <div class="custom-control custom-control-nolabel custom-switch ml-auto">
-                            <input type="checkbox" class="custom-control-input" id="customSwitch1" checked="">
+                            <input type="checkbox" class="custom-control-input" id="customSwitch1">
                             <label class="custom-control-label" for="customSwitch1"></label>
                         </div>
                     </li>
@@ -38,14 +38,14 @@
                     <li class="list-group-item has-icon">
                         Reminders
                         <div class="custom-control custom-control-nolabel custom-switch ml-auto">
-                            <input type="checkbox" class="custom-control-input" id="customSwitch3" checked="">
+                            <input type="checkbox" class="custom-control-input" id="customSwitch3">
                             <label class="custom-control-label" for="customSwitch3"></label>
                         </div>
                     </li>
                     <li class="list-group-item has-icon">
                         Events
                         <div class="custom-control custom-control-nolabel custom-switch ml-auto">
-                            <input type="checkbox" class="custom-control-input" id="customSwitch4" checked="">
+                            <input type="checkbox" class="custom-control-input" id="customSwitch4">
                             <label class="custom-control-label" for="customSwitch4"></label>
                         </div>
                     </li>

src/views/UnauthorizedView.vue

@@ -32,4 +32,5 @@ const home = () => {
     body {
         background-image: url('@/assets/401-error.png');
     }
+
 </style>
\ No newline at end of file