Merge branch 'master' into angular-upgrade

Author: arnavbhate

src/app/interfaces.ts

@@ -34,8 +34,10 @@ export interface IEvent {
     str_id: string;
     name: string;
     description: string;
+    email_subject: string;
     longdescription: string;
     email_verified: boolean,
+    email_rejected: boolean,
     image_url: string;
     website_url: string;
     start_time: Date;

src/app/page/add-event/add-event.component.html

@@ -201,8 +201,8 @@
         <mat-form-field class="full-width-details">
           <textarea
             matInput
-            placeholder="Description"
-            [(ngModel)]="event.description"
+            placeholder="Email Subject"
+            [(ngModel)]="event.email_subject"
             rows="8"
           >
           </textarea>
@@ -213,8 +213,9 @@
         <mat-form-field class="full-width-details">
           <textarea
             matInput
-            placeholder="Email Content"
+            placeholder="Email Content / InstiApp Description"
             [(ngModel)]="event.longdescription"
+            (ngModelChange)="event.description = $event"
             rows="8"
           ></textarea>
         </mat-form-field>
@@ -355,7 +356,7 @@
   </div>
 
   <div right class="md-preview">
-    <div class="rl-header head">Description Preview</div>
+    <div class="rl-header head">Email Preview</div>
     <div class="subh">
       Styling with
       <a
@@ -365,6 +366,7 @@
       >
       is supported
     </div>
-    <markdown class="markdown" [data]="event.description"></markdown>
+    <markdown class="markdown" [data]="event.email_subject"></markdown>
+    <markdown class="markdown" [data]="event.longdescription"></markdown>
   </div>
 </app-desktop-split>

src/app/page/add-event/add-event.component.ts

@@ -342,7 +342,7 @@ export class AddEventComponent implements OnInit {
     }
     this.dataService.UploadImage(files[0]).subscribe(
       (result) => {
-        this.event.image_url = result.picture;
+        this.event.image_url = result;
         this.networkBusy = false;
         this.snackBar.open("Image Uploaded", "Dismiss", {
           duration: 2000,

src/app/page/event-details/event-details.component.css

@@ -51,6 +51,17 @@
     word-wrap: break-word;
 }
 
+.approved-button {
+    background-color: white !important; /* Ensure the background remains white */
+    color: green !important; /* Green text */
+    border: 2px solid green !important; /* Green border */
+}
+.rejected-button {
+    background-color: white !important; /* Ensure the background remains white */
+    color: red !important; /* Green text */
+    border: 2px solid red !important; /* Green border */
+}
+
 .event-body {
     max-width: 500px;
     margin: 0 auto;
@@ -94,7 +105,7 @@
     color: black;
 }
 
-.verify-email-popup {
+/* .verify-email-popup {
     position: fixed;
     top: 50%;
     left: 60%;
@@ -104,7 +115,48 @@
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
     z-index: 100000;
     transition: background-color 0.3s;
-}
+} */
+.verify-email-popup {
+    position: fixed;
+    top: 55%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: white;
+    border: 1px solid #ccc;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+    width: 40%;
+    max-width: 40%;
+    max-height: 70%; /* Prevent overflow */
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+    z-index: 1000;
+  }
+
+  .close-button {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    width: 40px; /* Ensure the button is a perfect circle */
+    height: 40px;
+    border-radius: 50%; /* Make it circular */
+    display: flex;
+    align-items: center; /* Center the icon vertically */
+    justify-content: center; /* Center the icon horizontally */
+    background-color: white; /* Optional: Add a background color */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); /* Optional: Add a shadow for better visibility */
+  }
+
+  .scrollable-content {
+    overflow-y: auto;
+    max-height: 60%; /* Adjust height to allow scrolling */
+    margin-bottom: 20px;
+  }
+  .popup-actions {
+    display: flex;
+    justify-content: space-between;
+  }
 
 .verify-email-popup button {
     margin-top: 10px;

src/app/page/event-details/event-details.component.html

@@ -12,9 +12,9 @@
 
   <div right class="right">
     <div class="section">
-      <div class="rl-header sm">{{ event.name }}</div>
+      <div class="rl-header sm">{{ event.email_subject }}</div>
       <div class="markdown">
-        <div [innerHTML]="dataService.processMDHTML(event.description | markdown)"></div>
+        <div [innerHTML]="dataService.processMDHTML(event.longdescription | markdown)"></div>
       </div>
       <ng-container *ngTemplateOutlet="achievements"></ng-container>
     </div>
@@ -79,17 +79,32 @@
     <div class="event-body">
       <ng-container *ngIf="desktopMode || dataService.isMobile()">
         <div class="description markdown">
-          <div [innerHTML]="dataService.processMDHTML(event.description | markdown)"></div>
+          <div [innerHTML]="dataService.processMDHTML(event.email_subject | markdown)"></div>
           <!-- <div [innerHTML]="dataService.processMDHTML(event.long_description | markdown)"></div> -->
         </div>
         <ng-container *ngIf="dataService.canViewMaxContent()">
           <div class="longdescription markdown">
             <div [innerHTML]="dataService.processMDHTML(event.longdescription | markdown)"></div>
           </div>
           <ng-container *ngIf="dataService.canViewMaxContent()">
-            <button mat-raised-button color="primary" (click)="openVerifyEmailPopup()">
-              Verify Email
-            </button>
+            <ng-container *ngIf="event.email_rejected; else emailStatus">
+              <button mat-raised-button class="rejected-button" disabled>
+                Event Rejected
+              </button>
+            </ng-container>
+            <ng-template #emailStatus>
+              <ng-container *ngIf="event.email_verified; else verifyEmailButton">
+                <button mat-raised-button class="approved-button" disabled>
+                  Event Approved
+                </button>
+              </ng-container>
+              <ng-template #verifyEmailButton>
+                <button mat-raised-button color="primary" (click)="openVerifyEmailPopup()">
+                  Verify Email
+                </button>
+              </ng-template>
+            </ng-template>
+            
           </ng-container>
         </ng-container>
         <ng-container *ngIf="!desktopMode">
@@ -120,10 +135,16 @@
 
 <ng-container *ngIf="showVerifyEmailPopup">
   <div class="verify-email-popup">
-    <div class="description markdown">
+    <button mat-icon-button class="close-button" (click)="showVerifyEmailPopup = false">
+      <mat-icon>close</mat-icon>
+    </button>
+    <div class="description markdown scrollable-content">
+      <div [innerHTML]="dataService.processMDHTML(event.email_subject | markdown)"></div>
       <div [innerHTML]="dataService.processMDHTML(event.longdescription | markdown)"></div>
     </div>
-    <button mat-button (click)="approveEmail()">Approve</button>
-    <button mat-button (click)="rejectEmail()">Reject</button>
+    <div class="popup-actions">
+      <button mat-button color="primary" (click)="approveEmail()">Approve</button>
+      <button mat-button color="warn" (click)="rejectEmail()">Reject</button>
+    </div>
   </div>
 </ng-container>

src/app/page/event-details/event-details.component.ts

@@ -23,7 +23,7 @@ export class EventDetailsComponent implements OnChanges, OnInit {
   public error: number;
   @Input() public desktopMode = false;
   public showVerifyEmailPopup = false;
-
+  public emailRejected = false;
   constructor(
     private activatedRoute: ActivatedRoute,
     public dataService: DataService,
@@ -127,6 +127,7 @@ export class EventDetailsComponent implements OnChanges, OnInit {
     this.dataService.approveEmail(this.eventId).subscribe(
       () => {
         console.log('Email approved successfully!');
+        this.event.email_verified = true;
       },
       (error) => {
         console.error('Error approving email:', error);
@@ -139,6 +140,7 @@ export class EventDetailsComponent implements OnChanges, OnInit {
     this.dataService.rejectEmail(this.eventId).subscribe(
       () => {
         console.log('Email rejected successfully!');
+        this.event.email_rejected = true;
       },
       (error) => {
         console.error('Error rejecting email:', error);