From fe04181a524c44381696885cc635cde3f70fab32 Mon Sep 17 00:00:00 2001
From: Wilson Wong <wilwong89@gmail.com>
Date: Thu, 25 Jan 2024 09:41:51 -0800
Subject: [PATCH] feat: update navbar link, fix tests, centered homepage text

---
 app/src/db/prisma/schema.prisma               | 84 +++++++++----------
 frontend/src/components/layout/Navbar.vue     |  2 +-
 frontend/src/views/HomeView.vue               |  6 +-
 .../unit/components/layout/Navbar.spec.ts     |  2 +-
 4 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/app/src/db/prisma/schema.prisma b/app/src/db/prisma/schema.prisma
index badbca6e..276976eb 100644
--- a/app/src/db/prisma/schema.prisma
+++ b/app/src/db/prisma/schema.prisma
@@ -44,48 +44,6 @@ model identity_provider {
   user      user[]
 }
 
-model permit {
-  permitId         String      @id @db.Uuid
-  permitTypeId     Int
-  submissionId     String      @db.Uuid
-  issuedPermitId   String?
-  trackingId       String?
-  authStatus       String?
-  needed           String?
-  status           String?
-  submittedDate    DateTime?   @db.Timestamptz(6)
-  adjudicationDate DateTime?   @db.Timestamptz(6)
-  createdBy        String?     @default("00000000-0000-0000-0000-000000000000")
-  createdAt        DateTime?   @default(now()) @db.Timestamptz(6)
-  updatedBy        String?
-  updatedAt        DateTime?   @db.Timestamptz(6)
-  permit_type      permit_type @relation(fields: [permitTypeId], references: [permitTypeId], onDelete: Cascade, map: "permit_permittypeid_foreign")
-  submission       submission  @relation(fields: [submissionId], references: [submissionId], onDelete: Cascade, map: "permit_submissionid_foreign")
-
-  @@unique([permitId, permitTypeId, submissionId], map: "permit_permitid_permittypeid_submissionid_unique")
-}
-
-model permit_type {
-  permitTypeId        Int       @id @default(autoincrement())
-  agency              String
-  division            String?
-  branch              String?
-  businessDomain      String
-  type                String
-  family              String?
-  name                String
-  nameSubtype         String?
-  acronym             String?
-  trackedInATS        Boolean?
-  sourceSystem        String?
-  sourceSystemAcronym String
-  createdBy           String?   @default("00000000-0000-0000-0000-000000000000")
-  createdAt           DateTime? @default(now()) @db.Timestamptz(6)
-  updatedBy           String?
-  updatedAt           DateTime? @db.Timestamptz(6)
-  permit              permit[]
-}
-
 model submission {
   submissionId                    String     @id @db.Uuid
   assignedToUserId                String?    @db.Uuid
@@ -150,3 +108,45 @@ model user {
   @@index([identityId], map: "user_identityid_index")
   @@index([username], map: "user_username_index")
 }
+
+model permit {
+  permitId         String      @id @db.Uuid
+  permitTypeId     Int
+  submissionId     String      @db.Uuid
+  issuedPermitId   String?
+  trackingId       String?
+  authStatus       String?
+  needed           String?
+  status           String?
+  submittedDate    DateTime?   @db.Timestamptz(6)
+  adjudicationDate DateTime?   @db.Timestamptz(6)
+  createdBy        String?     @default("00000000-0000-0000-0000-000000000000")
+  createdAt        DateTime?   @default(now()) @db.Timestamptz(6)
+  updatedBy        String?
+  updatedAt        DateTime?   @db.Timestamptz(6)
+  permit_type      permit_type @relation(fields: [permitTypeId], references: [permitTypeId], onDelete: Cascade, map: "permit_permittypeid_foreign")
+  submission       submission  @relation(fields: [submissionId], references: [submissionId], onDelete: Cascade, map: "permit_submissionid_foreign")
+
+  @@unique([permitId, permitTypeId, submissionId], map: "permit_permitid_permittypeid_submissionid_unique")
+}
+
+model permit_type {
+  permitTypeId        Int       @id @default(autoincrement())
+  agency              String
+  division            String?
+  branch              String?
+  businessDomain      String
+  type                String
+  family              String?
+  name                String
+  nameSubtype         String?
+  acronym             String?
+  trackedInATS        Boolean?
+  sourceSystem        String?
+  sourceSystemAcronym String
+  createdBy           String?   @default("00000000-0000-0000-0000-000000000000")
+  createdAt           DateTime? @default(now()) @db.Timestamptz(6)
+  updatedBy           String?
+  updatedAt           DateTime? @db.Timestamptz(6)
+  permit              permit[]
+}
diff --git a/frontend/src/components/layout/Navbar.vue b/frontend/src/components/layout/Navbar.vue
index a4ef8db1..9934bb9e 100644
--- a/frontend/src/components/layout/Navbar.vue
+++ b/frontend/src/components/layout/Navbar.vue
@@ -17,7 +17,7 @@ const { getIsAuthenticated } = storeToRefs(useAuthStore());
             <router-link :to="{ name: RouteNames.HOME }">Home</router-link>
           </li>
           <li v-if="getIsAuthenticated">
-            <router-link :to="{ name: RouteNames.INITIATIVES }">Submissions</router-link>
+            <router-link :to="{ name: RouteNames.SUBMISSIONS }">Submissions</router-link>
           </li>
         </ol>
       </template>
diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue
index c5e6a316..cc0df55a 100644
--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -26,10 +26,8 @@ const toSubmissions = (): void => {
   </Message>
 
   <div class="text-center">
-    <h1 class="font-bold">Welcome to the PermitConnect Navigator Service!</h1>
-  </div>
-  <div>
-    <h2>Choose an Initiative:</h2>
+    <h1 class="font-bold">Welcome to the PermitConnect Applications</h1>
+    <h2 class="mb-3">Choose an Initiative:</h2>
     <Button
       :disabled="!getIsAuthenticated"
       @click="toSubmissions"
diff --git a/frontend/tests/unit/components/layout/Navbar.spec.ts b/frontend/tests/unit/components/layout/Navbar.spec.ts
index 3b444597..b340eef0 100644
--- a/frontend/tests/unit/components/layout/Navbar.spec.ts
+++ b/frontend/tests/unit/components/layout/Navbar.spec.ts
@@ -56,7 +56,7 @@ describe('Navbar.vue', () => {
       const linkEle = wrapper.findAll('a');
       expect(linkEle).toHaveLength(2);
       expect(linkEle[0].text()).toBe('Home');
-      expect(linkEle[1].text()).toBe('Initiatives');
+      expect(linkEle[1].text()).toBe('Submissions');
     });
 
     it('shows correct navbar when false', async () => {