Resolve rebase conflicts

bcgov · Jan 13, 2025 · 38d2236 · 38d2236
1 parent 81e8799
commit 38d2236
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 69 deletions.
diff --git a/frontend/src/components/form/AutoComplete.vue b/frontend/src/components/form/AutoComplete.vue
@@ -39,7 +39,7 @@ const {
 
 // Emits
 const emit = defineEmits(['onChange', 'onComplete', 'onInput']);
-const { errorMessage, value, resetField } = useField<string>(name);
+const { errorMessage, handleBlur, value, resetField } = useField<string>(name);
 
 onMounted(() => {
   resetField({ touched: false });

diff --git a/frontend/src/components/form/RadioList.vue b/frontend/src/components/form/RadioList.vue
@@ -21,7 +21,7 @@ const {
 const emit = defineEmits(['onChange', 'onClick']);
 
 // State
-const { errorMessage, value, resetField } = useField<string>(name);
+const { errorMessage, handleBlur, value, resetField } = useField<string>(name);
 
 // Actions
 watch(value, () => {

diff --git a/frontend/src/components/housing/submission/SubmissionIntakeForm.vue b/frontend/src/components/housing/submission/SubmissionIntakeForm.vue
@@ -748,7 +748,7 @@ watch(
               <template #content>
                 <div class="grid grid-cols-12 gap-4">
                   <RadioList
-                    class="col-12"
+                    class="col-span-12"
                     name="basic.projectApplicantType"
                     :bold="false"
                     :disabled="!editable"
@@ -762,7 +762,7 @@ watch(
 
                   <span
                     v-if="values.basic?.projectApplicantType === ProjectApplicant.BUSINESS"
-                    class="col-12"
+                    class="col-span-12"
                   >
                     <div class="flex items-center">
                       <p class="font-bold">Is it registered in B.C?</p>
@@ -797,7 +797,7 @@ watch(
                     />
                     <InputText
                       v-else-if="values.basic.isDevelopedInBC === BasicResponse.NO"
-                      class="col-span-6 pl-0"
+                      class="col-span-6 mt-4 pl-0"
                       name="basic.registeredName"
                       :placeholder="'Type the business/company/organization name'"
                       :bold="false"

diff --git a/frontend/src/components/permit/PermitCard.vue b/frontend/src/components/permit/PermitCard.vue
@@ -69,7 +69,7 @@ function isCompleted(authStatus: string | undefined): boolean {
   <Card :class="{ completed: isCompleted(cardData.authStatus), selected: notesModalVisible }">
     <template #title>
       <div class="flex">
-        <div class="flex-grow-1">
+        <div class="grow">
           <h3 class="mb-0">{{ permitTypeName }}</h3>
         </div>
         <div class="flex justify-center flex-wrap gap-2 align-items-center">
@@ -107,69 +107,63 @@ function isCompleted(authStatus: string | undefined): boolean {
           :auth-status="permit.authStatus"
         />
       </div>
-      <div class="grid nested-grid pt-3">
+      <div class="grid grid-cols-3 gap-4 my-3">
         <!-- Left column -->
-        <div class="col-12 md:col-6 lg:col-4">
-          <div class="grid">
-            <p class="col-12">
-              <span class="key font-bold">Tracking ID:</span>
-              {{ cardData.trackingId }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Status verified date:</span>
-              {{ cardData.statusLastVerified ? formatDate(cardData.statusLastVerified) : undefined }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Submitted date:</span>
-              {{ cardData.submittedDate ? formatDate(cardData.submittedDate) : undefined }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Permit state:</span>
-              {{ cardData.status }}
-            </p>
-          </div>
+        <div class="grid grid-cols-1 space-y-4">
+          <p>
+            <span class="key font-bold">Tracking ID:</span>
+            {{ cardData.trackingId }}
+          </p>
+          <p>
+            <span class="key font-bold">Status verified date:</span>
+            {{ cardData.statusLastVerified ? formatDate(cardData.statusLastVerified) : undefined }}
+          </p>
+          <p>
+            <span class="key font-bold">Submitted date:</span>
+            {{ cardData.submittedDate ? formatDate(cardData.submittedDate) : undefined }}
+          </p>
+          <p>
+            <span class="key font-bold">Permit state:</span>
+            {{ cardData.status }}
+          </p>
         </div>
         <!-- Middle column -->
-        <div class="col-12 md:col-6 lg:col-4">
-          <div class="grid">
-            <p class="col-12">
-              <span class="key font-bold">Last updated:</span>
-              {{ cardData.updatedAt ? ` ${formatDateTime(cardData.updatedAt)}` : undefined }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Updated by:</span>
-              {{ cardUpdatedBy }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Adjudication date:</span>
-              {{ cardData.adjudicationDate ? formatDate(cardData.adjudicationDate) : undefined }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Issued Permit ID:</span>
-              {{ cardData.issuedPermitId }}
-            </p>
-          </div>
+        <div class="grid grid-cols-1 space-y-4">
+          <p>
+            <span class="key font-bold">Last updated:</span>
+            {{ cardData.updatedAt ? ` ${formatDateTime(cardData.updatedAt)}` : undefined }}
+          </p>
+          <p>
+            <span class="key font-bold">Updated by:</span>
+            {{ cardUpdatedBy }}
+          </p>
+          <p>
+            <span class="key font-bold">Adjudication date:</span>
+            {{ cardData.adjudicationDate ? formatDate(cardData.adjudicationDate) : undefined }}
+          </p>
+          <p>
+            <span class="key font-bold">Issued Permit ID:</span>
+            {{ cardData.issuedPermitId }}
+          </p>
         </div>
         <!-- Right column -->
-        <div class="col-12 md:col-6 lg:col-4">
-          <div class="grid">
-            <p class="col-12">
-              <span class="key font-bold">Agency:</span>
-              {{ permitType?.agency }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Business domain:</span>
-              {{ permitType?.businessDomain }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Source system:</span>
-              {{ permitType?.sourceSystem }}
-            </p>
-            <p class="col-12">
-              <span class="key font-bold">Needed:</span>
-              {{ cardData.needed }}
-            </p>
-          </div>
+        <div class="grid grid-cols-1 space-y-4">
+          <p>
+            <span class="key font-bold">Agency:</span>
+            {{ permitType?.agency }}
+          </p>
+          <p>
+            <span class="key font-bold">Business domain:</span>
+            {{ permitType?.businessDomain }}
+          </p>
+          <p>
+            <span class="key font-bold">Source system:</span>
+            {{ permitType?.sourceSystem }}
+          </p>
+          <p>
+            <span class="key font-bold">Needed:</span>
+            {{ cardData.needed }}
+          </p>
         </div>
       </div>
       <div
@@ -207,11 +201,6 @@ function isCompleted(authStatus: string | undefined): boolean {
 </template>
 
 <style scoped lang="scss">
-p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
 .key {
   color: #38598a;
 }