Merge pull request #275 from ASCENDynamics-NFP/main

MVP release fixes

src/app/app.routes.ts

@@ -33,6 +33,7 @@ export const routes: Routes = [
       import("./modules/account/pages/group-list/group-list.page").then(
         (m) => m.GroupListPage,
       ),
+    canActivate: [AuthGuard],
   },
   {
     path: "signup",

src/app/core/services/auth-store.service.ts

@@ -121,7 +121,7 @@ export class AuthStoreService {
         this.successHandler.handleSuccess(
           "Successfully signed up! Please verify your email.",
         );
-        this.router.navigate([`/${result.user.uid}`]);
+        this.router.navigate([`/registration/${result.user.uid}`]);
       })
       .catch((error) => this.handleError(error))
       .finally(() => loading.dismiss());

src/app/models/account.model.ts

@@ -33,6 +33,7 @@ export interface Address {
   country?: Nullable<string>;
   formatted?: Nullable<string>;
   geopoint?: Nullable<GeoPoint>; // Use Firebase GeoPoint
+  isPrimaryAddress?: Nullable<boolean>;
 }
 
 // PhoneNumber interface with nullable fields

src/app/modules/account/pages/details/components/contact-information/contact-information.component.ts

@@ -99,7 +99,7 @@ export class ContactInformationComponent {
 
   formatEmail(email: Email): string {
     if (!email.email) return "-";
-    return `${email.name || "N/A"}: ${email.email}`;
+    return `${email.name || "-"}: ${email.email}`;
   }
 
   getFirstAddress(): string {
@@ -112,7 +112,8 @@ export class ContactInformationComponent {
 
   formatAddress(address: Address): string {
     if (!address.street) return "-";
-    return `${address.name || ""}\n${address.street}\n${address.city || ""}, ${address.state || ""}, ${address.country || ""} ${address.zipcode || ""}`;
+    const primary = address.isPrimaryAddress ? "(Primary)" : "";
+    return `${address.name || ""} ${primary}\n${address.street}\n${address.city || ""}, ${address.state || ""}, ${address.country || ""} ${address.zipcode || ""}`;
   }
 
   toggleShow(type: "phone" | "email" | "address") {

src/app/modules/account/pages/details/components/hero/hero.component.ts

@@ -58,10 +58,20 @@ export class HeroComponent {
       this.account?.contactInformation?.addresses &&
       this.account?.contactInformation?.addresses?.length > 0
     ) {
-      return `${this.account.contactInformation.addresses[0]?.city} /${this.account.contactInformation.addresses[0]?.country}`;
-    } else {
-      return "";
+      if (
+        this.account.contactInformation.addresses[0]?.city &&
+        this.account.contactInformation.addresses[0]?.country
+      ) {
+        return `${this.account.contactInformation.addresses[0]?.city} / ${this.account.contactInformation.addresses[0]?.country}`;
+      } else {
+        this.account.contactInformation.addresses[0]?.city ||
+          this.account.contactInformation.addresses[0]?.country;
+      }
+      {
+        return `${this.account.contactInformation.addresses[0]?.city}${this.account.contactInformation.addresses[0]?.country}`;
+      }
     }
+    return "";
   }
 
   async openImageUploadModal() {

src/app/modules/account/pages/details/components/mutual-aid-community-info/mutual-aid-community-info.component.html

@@ -44,8 +44,6 @@ <h2>Services Offered</h2>
             <h2>Services Needed</h2>
             <p>{{ mutualAidCommunityEngagement.servicesNeeded.join(", ") }}</p>
           </div>
-        </ion-col>
-        <ion-col size="6">
           <div class="info-block">
             <h2>Community Affiliations</h2>
             <p>
@@ -55,6 +53,8 @@ <h2>Community Affiliations</h2>
               }}
             </p>
           </div>
+        </ion-col>
+        <ion-col size="6">
           <div class="info-block">
             <h2>Willingness to Provide Mentorship</h2>
             <p>

src/app/modules/account/pages/details/components/professional-info/professional-info.component.html

@@ -25,23 +25,37 @@
     <ion-grid>
       <ion-row>
         <ion-col size="6">
+          <div class="info-block">
+            <h2>Employer Name</h2>
+            <p>{{ professionalInfo?.employerName ?? "-" }}</p>
+          </div>
+          <div class="info-block">
+            <h2>Current Title</h2>
+            <p>{{ professionalInfo?.currentJobTitle ?? "-" }}</p>
+          </div>
           <div class="info-block">
             <h2>Occupation</h2>
-            <p>{{ professionalInfo?.occupation }}</p>
+            <p>{{ professionalInfo?.occupation ?? "-" }}</p>
           </div>
           <div class="info-block">
-            <h2>Employer Name</h2>
-            <p>{{ professionalInfo?.employerName }}</p>
+            <h2>Work Experience</h2>
+            <p>{{ professionalInfo?.workExperience ?? "-" }}</p>
           </div>
         </ion-col>
         <ion-col size="6">
           <div class="info-block">
             <h2>Skills and Expertise</h2>
-            <p>{{ professionalInfo?.skillsAndExpertise?.join(", ") }}</p>
+            <p>{{ professionalInfo?.skillsAndExpertise?.join(", ") ?? "-" }}</p>
           </div>
           <div class="info-block">
             <h2>Educational Background</h2>
-            <p>{{ professionalInfo?.educationalBackground }}</p>
+            <p>{{ professionalInfo?.educationalBackground ?? "-" }}</p>
+          </div>
+          <div class="info-block">
+            <h2>LinkedIn Profile</h2>
+            <a [href]="professionalInfo?.linkedInProfile" target="_blank">{{
+              professionalInfo?.linkedInProfile
+            }}</a>
           </div>
         </ion-col>
       </ion-row>

src/app/modules/account/pages/details/components/profile/profile.component.html

@@ -19,7 +19,7 @@
 -->
 <ion-card class="profile-info-card">
   <ion-card-header>
-    <ion-card-title>Profile</ion-card-title>
+    <ion-card-title>{{ getSectionTitle }}</ion-card-title>
   </ion-card-header>
   <ion-card-content>
     <ion-grid>

src/app/modules/account/pages/details/components/profile/profile.component.spec.ts

@@ -55,9 +55,14 @@ describe("ProfileComponent", () => {
   });
 
   it("should return correct section title for non-user type", () => {
-    component.account = {type: "group"};
+    component.account = {
+      type: "group",
+      groupDetails: {
+        groupType: "Nonprofit",
+      },
+    };
     fixture.detectChanges();
-    expect(component.getSectionTitle).toBe("Details");
+    expect(component.getSectionTitle).toBe("Organization (Nonprofit)");
   });
 
   it("should filter web links by category", () => {

src/app/modules/account/pages/details/components/profile/profile.component.ts

@@ -42,7 +42,7 @@ export class ProfileComponent {
     if (this.account.type === "user") {
       return "Profile";
     }
-    return "Details";
+    return "Organization (" + this.account.groupDetails?.groupType + ")";
   }
 
   getWebLinks(category: string): WebLink[] {

src/app/modules/account/pages/details/components/volunteer-preference-info/volunteer-preference-info.component.html

@@ -28,12 +28,12 @@
           <div class="info-block">
             <h2>Areas of Interest</h2>
             <p>
-              {{ volunteerPreferences?.areasOfInterest?.join(", ") || "N/A" }}
+              {{ volunteerPreferences?.areasOfInterest?.join(", ") || "-" }}
             </p>
           </div>
           <div class="info-block">
             <h2>Availability</h2>
-            <p>{{ volunteerPreferences?.availability || "N/A" }}</p>
+            <p>{{ volunteerPreferences?.availability || "-" }}</p>
           </div>
           <div class="info-block">
             <h2>Willingness to Travel</h2>
@@ -45,16 +45,16 @@ <h2>Willingness to Travel</h2>
         <ion-col>
           <div class="info-block">
             <h2>Preferred Volunteer Roles</h2>
-            <p>{{ preferredVolunteerRolesString || "N/A" }}</p>
+            <p>{{ preferredVolunteerRolesString || "-" }}</p>
           </div>
           <div class="info-block">
             <h2>Desired Level of Commitment</h2>
-            <p>{{ volunteerPreferences?.desiredLevelOfCommitment || "N/A" }}</p>
+            <p>{{ volunteerPreferences?.desiredLevelOfCommitment || "-" }}</p>
           </div>
           <div class="info-block">
             <h2>Previous Volunteer Experience</h2>
             <p>
-              {{ volunteerPreferences?.previousVolunteerExperience || "N/A" }}
+              {{ volunteerPreferences?.previousVolunteerExperience || "-" }}
             </p>
           </div>
         </ion-col>

src/app/modules/account/pages/edit/components/basic-info/basic-info.component.html

@@ -170,7 +170,7 @@
                 linkControl.get('url')?.touched
               "
             >
-              Please enter a valid URL
+              Please enter a valid URL including http:// or https://
             </ion-note>
           </ion-col>
           <ion-col size="1">

src/app/modules/account/pages/edit/components/basic-info/basic-info.component.ts

@@ -77,7 +77,7 @@ export class BasicInfoComponent implements OnChanges {
         "",
         [
           Validators.pattern(
-            /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+            /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
           ),
         ],
       ],
@@ -133,7 +133,7 @@ export class BasicInfoComponent implements OnChanges {
             webLink.url,
             [
               Validators.pattern(
-                /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+                /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
               ),
             ],
           ],

src/app/modules/account/pages/edit/components/contact-info/contact-info.component.ts

@@ -120,6 +120,7 @@ export class ContactInfoComponent implements OnChanges {
             state: address?.state ?? null,
             zipcode: address?.zipcode ?? null,
             country: address?.country ?? null,
+            isPrimaryAddress: address?.isPrimaryAddress || false,
           })),
         },
       };
@@ -172,6 +173,7 @@ export class ContactInfoComponent implements OnChanges {
           state: [address?.state],
           zipcode: [address?.zipcode, Validators.pattern("^[0-9]*$")],
           country: [address?.country],
+          isPrimaryAddress: [address?.isPrimaryAddress],
         }),
       );
     });

src/app/modules/account/pages/edit/components/professional-info/professional-info.component.html

@@ -23,27 +23,39 @@
   </ion-item>
   <div slot="content">
     <ion-grid>
-      <!-- Occupation -->
+      <!-- Employer Name -->
       <ion-row>
         <ion-col>
           <ion-input
-            formControlName="occupation"
-            label="Occupation"
+            formControlName="employerName"
+            label="Employer Name"
             label-placement="floating"
             fill="outline"
-            placeholder="Enter your occupation"
+            placeholder="Enter your employer's name"
           ></ion-input>
         </ion-col>
       </ion-row>
-      <!-- Employer Name -->
+      <!-- Current Job Title -->
       <ion-row>
         <ion-col>
           <ion-input
-            formControlName="employerName"
-            label="Employer Name"
+            formControlName="currentJobTitle"
+            label="Current Job Title"
             label-placement="floating"
             fill="outline"
-            placeholder="Enter your employer's name"
+            placeholder="Enter your current job title"
+          ></ion-input>
+        </ion-col>
+      </ion-row>
+      <!-- Occupation -->
+      <ion-row>
+        <ion-col>
+          <ion-input
+            formControlName="occupation"
+            label="Occupation"
+            label-placement="floating"
+            fill="outline"
+            placeholder="Enter your occupation"
           ></ion-input>
         </ion-col>
       </ion-row>
@@ -82,18 +94,6 @@
           </ion-select>
         </ion-col>
       </ion-row>
-      <!-- Current Job Title -->
-      <ion-row>
-        <ion-col>
-          <ion-input
-            formControlName="currentJobTitle"
-            label="Current Job Title"
-            label-placement="floating"
-            fill="outline"
-            placeholder="Enter your current job title"
-          ></ion-input>
-        </ion-col>
-      </ion-row>
       <!-- LinkedIn Profile -->
       <ion-row>
         <ion-col>

src/app/modules/account/pages/registration/components/group-registration/group-registration.component.html

@@ -202,7 +202,7 @@
                     linkControl.get('url')?.touched
                   "
                 >
-                  Please enter a valid URL
+                  Please enter a valid URL including http:// or https://
                 </ion-note>
               </ion-col>
               <ion-col size="1">

src/app/modules/account/pages/registration/components/group-registration/group-registration.component.ts

@@ -217,7 +217,7 @@ export class GroupRegistrationComponent implements OnChanges {
             webLink.url,
             [
               Validators.pattern(
-                /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+                /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
               ),
             ],
           ],
@@ -348,7 +348,7 @@ export class GroupRegistrationComponent implements OnChanges {
         "",
         [
           Validators.pattern(
-            /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+            /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
           ),
         ],
       ],

src/app/modules/account/pages/registration/components/user-registration/user-registration.component.html

@@ -175,7 +175,7 @@
                     linkControl.get('url')?.touched
                   "
                 >
-                  Please enter a valid URL
+                  Please enter a valid URL including http:// or https://
                 </ion-note>
               </ion-col>
               <ion-col size="1">

src/app/modules/account/pages/registration/components/user-registration/user-registration.component.ts

@@ -205,7 +205,7 @@ export class UserRegistrationComponent implements OnChanges {
             webLink.url,
             [
               Validators.pattern(
-                /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+                /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
               ),
             ],
           ],
@@ -336,7 +336,7 @@ export class UserRegistrationComponent implements OnChanges {
         "",
         [
           Validators.pattern(
-            /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
+            /^(https?:\/\/)([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}([\/?].*)?$/,
           ),
         ],
       ],

src/app/shared/components/menu/menu.component.html

@@ -59,6 +59,7 @@
             </ion-item>
           </ng-container>
           <ion-item
+            *ngIf="isAuthenticated$ | async"
             style="cursor: pointer"
             lines="none"
             detail="false"