migrated back from typescript

6 files changed, 19 insertions, 14 deletions

diff --git a/iridescence/src/App.vue b/iridescence/src/App.vue
index 4094265..fa08cab 100644
--- a/iridescence/src/App.vue
+++ b/iridescence/src/App.vue
@@ -20,6 +20,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "../node_modules/bulma/bulma.sass";
+@use "../node_modules/bulma/bulma.sass";
 @import url("https://fonts.googleapis.com/css2?family=Nova+Mono&display=swap");
 </style>
diff --git a/iridescence/src/components/Navbar.vue b/iridescence/src/components/Navbar.vue
index 8c2f0a6..65d5032 100644
--- a/iridescence/src/components/Navbar.vue
+++ b/iridescence/src/components/Navbar.vue
@@ -61,8 +61,6 @@
 </template>
 
 <script>
-import Category from "~models/category.js";
-
 export default {
   name: "Navbar",
   data() {
diff --git a/iridescence/src/models/category.js b/iridescence/src/models/category.js
index 689c98f..04966f5 100644
--- a/iridescence/src/models/category.js
+++ b/iridescence/src/models/category.js
@@ -1,3 +1,4 @@
+
 export class Category {
   name: string;
   subcategory: Category;
diff --git a/iridescence/src/router/index.js b/iridescence/src/router/index.js
index 28b1079..8c05e28 100644
--- a/iridescence/src/router/index.js
+++ b/iridescence/src/router/index.js
@@ -1,6 +1,8 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
 import Home from "../views/Home.vue";
+import About from "../views/About.vue";
+import Admin from "../views/Admin.vue";
 
 Vue.use(VueRouter);
 
@@ -16,22 +18,19 @@ const routes = [
     // route level code-splitting
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
-    component: () =>
-      import(/* webpackChunkName: "about" */ "../views/About.vue")
+    component: About
   },
   {
     path: "/admin",
     name: "Administration",
-    component: () =>
-      import(/* webpackChunkName: "admin" */ "../views/Admin.vue")
+    component: Admin
   }
 ];
 
 const router = new VueRouter({
   mode: "history",
   base: process.env.BASE_URL,
-  routes: routes,
-  linkExactActiveClass: "is-active"
+  routes
 });
 
 export default router;
diff --git a/iridescence/src/views/About.vue b/iridescence/src/views/About.vue
index 0dce204..3fa2807 100644
--- a/iridescence/src/views/About.vue
+++ b/iridescence/src/views/About.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="about">
     <h1>This is an about page</h1>
   </div>
 </template>
diff --git a/iridescence/src/views/Admin.vue b/iridescence/src/views/Admin.vue
index f51d3c4..a14cc7f 100644
--- a/iridescence/src/views/Admin.vue
+++ b/iridescence/src/views/Admin.vue
@@ -1,7 +1,14 @@
 <template>
-  <!-- The Administrators' page lets artists/admins add or remove inventory
-	  items and update their prices, descriptions, stock, and thumbnails. -->
-  <div>
-    <h1>This is an admin page</h1>
+  <div class="home">
+    <img alt="Vue logo" src="../assets/logo.png" />
   </div>
 </template>
+
+<script>
+// @ is an alias to /src
+
+export default {
+  name: "Admin",
+  components: {}
+};
+</script>