Merge pull request #463 from uw-it-aca/fix/solstice-vue

Fixes solstice-vue import. Removes plugin in favor of ind imports.
uw-it-aca · Aug 9, 2024 · b44f410 · b44f410
2 parents f23cf64 + 546732e
commit b44f410
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/course_grader_vue/layouts/default.vue b/course_grader_vue/layouts/default.vue
@@ -18,7 +18,7 @@
       </ul>
     </template>
     <template #profile>
-      <axdd-profile
+      <SProfile
         v-if="userOverride != null"
         :user-netid="userName"
         :user-override="userOverride"
@@ -30,10 +30,10 @@
         >
           Clear override
         </button>
-      </axdd-profile>
-      <axdd-profile v-else :user-netid="userName">
+      </SProfile>
+      <SProfile v-else :user-netid="userName">
         <a :href="signOutUrl" class="text-white">Sign out</a>
-      </axdd-profile>
+      </SProfile>
     </template>
     <template #aside>
       <div class="border border-danger">aside slot area</div>
@@ -70,10 +70,11 @@
 import { useContextStore } from "@/stores/context";
 import { clearOverride } from "@/utils/data";
 import { BAlert, BLink } from "bootstrap-vue-next";
+import { STopbar, SProfile } from "solstice-vue";
 
 export default {
   name: "GradepageApp",
-  components: { BAlert, BLink },
+  components: { BAlert, BLink, STopbar, SProfile },
   props: {
     pageTitle: {
       type: String,

diff --git a/course_grader_vue/main.js b/course_grader_vue/main.js
@@ -4,8 +4,8 @@ import { createPinia } from "pinia";
 import VueGtag from "vue-gtag-next";
 import { Vue3Mq, MqResponsive } from "vue3-mq";
 
-// import solstice-vue
-import SolsticeVue from "solstice-vue";
+// solstice-vue
+// import SolsticeVue from "solstice-vue";
 
 import App from "@/app.vue";
 import router from "@/router";
@@ -18,6 +18,10 @@ import "bootstrap-icons/font/bootstrap-icons.css";
 import "solstice-vue/dist/style.css";
 import "solstice-vue/dist/solstice.scss";
 
+// bootstrap-vue-next
+// import "bootstrap/dist/css/bootstrap.css";
+import "bootstrap-vue-next/dist/bootstrap-vue-next.css";
+
 const app = createApp(App);
 app.config.productionTip = false;
 app.config.globalProperties.window = window
@@ -54,7 +58,7 @@ app.use(pinia);
 app.use(createBootstrap());
 
 // solstice-vue
-app.use(SolsticeVue);
+// app.use(SolsticeVue);
 
 // vue-router
 app.use(router);