Add project images

CHANGELOG.md

@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 ### Added
+- Added project images. - [#464](https://github.com/DigitalExcellence/dex-frontend/issues/464)
 
 ### Changed
 
@@ -31,8 +32,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Implemented categories - [#475](https://github.com/DigitalExcellence/dex-frontend/issues/475)
 - Added filter parameters to the url, so a user can share their search settings - [#493](https://github.com/DigitalExcellence/dex-frontend/issues/493)
 - Added search bar inside navbar with autocomplete suggested results. - [#403](https://github.com/DigitalExcellence/dex-frontend/issues/403)
-- Refactored the home page. [#380](https://github.com/DigitalExcellence/dex-frontend/issues/380)
-- Added project recommendations on the home page. [#497](https://github.com/DigitalExcellence/dex-frontend/issues/497)
+- Refactored the home page. - [#380](https://github.com/DigitalExcellence/dex-frontend/issues/380)
+- Added project recommendations on the home page. - [#497](https://github.com/DigitalExcellence/dex-frontend/issues/497)
 
 ### Changed
 

src/app/components/file-uploader/file-uploader.component.html

@@ -28,17 +28,17 @@
     </label>
   </div>
 </div>
-<p class="form-footnote">The recommended dimensions for an icon are atleast 512x512</p>
+<p class="form-footnote">The recommended dimensions for an icon are atleast {{recommendedWidth}}x{{recommendedHeight}}</p>
 <div *ngIf="showPreview" class="files-list">
-    <div class="single-file" *ngFor="let file of files; let i = index">
-        <div class="file-info">
-            <button type="button" class="btn btn-icon btn-danger" aria-label="error" (click)="deleteFile(i)"><span
-                    aria-hidden="true">&times;</span>
-            </button>
-            <img alt="image-preview" class="file-icon" [src]=file?.preview>
-            <h4 class="file-name">
-                {{ file?.name }}
-            </h4>
+  <div class="single-file" *ngFor="let file of files; let i = index">
+    <div class="file-info">
+      <button type="button" class="btn btn-icon btn-danger" aria-label="error" (click)="deleteFile(i)"><span
+          aria-hidden="true">&times;</span>
+      </button>
+      <img alt="image-preview" class="file-icon" [src]=file?.preview>
+      <h4 class="file-name">
+        {{ file?.name }}
+      </h4>
             <h4 class="file-size">
                 {{ file?.readableSize }}
             </h4>

src/app/components/file-uploader/file-uploader.component.ts

@@ -42,23 +42,22 @@ export class FileUploaderComponent {
   @Input() acceptMultiple: boolean;
   @Input() acceptedTypes: Array<String>;
   @Input() showPreview: Boolean;
-
+  @Input() recommendedHeight = 512;
+  @Input() recommendedWidth = 512;
+  public files: Array<UploadFile> = new Array<UploadFile>();
   /**
    * The maximum size of a file in bytes
    */
   private maxFileSize = 2097152;
-
   /**
    * The maximum size of a file in a readable format
    */
   private maxFileSizeReadable: string = this.formatBytes(this.maxFileSize, 0);
 
   constructor(
-    private uploadService: FileUploaderService,
-    private alertService: AlertService,
-    private fileRetrieverService: FileRetrieverService) { }
-
-  public files: Array<UploadFile> = new Array<UploadFile>();
+      private uploadService: FileUploaderService,
+      private alertService: AlertService,
+      private fileRetrieverService: FileRetrieverService) { }
 
   /**
    * handle onFileDrop event
@@ -85,6 +84,65 @@ export class FileUploaderComponent {
     this.fileInput.nativeElement.value = '';
   }
 
+  /**
+   * Send the selected files to the API and return the id's
+   * @return Observable<Array<UploadFile>>
+   */
+  public uploadFiles(): Observable<Array<UploadFile>> {
+    // Check if any files were uploaded
+    if (this.fileInput.nativeElement.value !== '') {
+      // Map all the files to an observable
+      const fileUploads = this.files.map(file => {
+            if (file.path) {
+              return of(file);
+            } else {
+              return this.uploadService.uploadFile(file)
+                  .pipe(
+                      map(event => {
+                        switch (event.type) {
+                          case HttpEventType.UploadProgress:
+                            // divide the (uploaded bytes * 100) by the total bytes to calculate the progress in percentage
+                            this.files.find(value => value.name === file.name).progress = Math.round(event.loaded * 100 / event.total);
+                            break;
+                          case HttpEventType.Response:
+                            return event.body;
+                          default:
+                            return;
+                        }
+                      })
+                  );
+            }
+          }
+      );
+      // forkJoin the observables so they can be uploaded at the same time
+      return forkJoin(fileUploads);
+    }
+    // If no files were updated return original list
+
+    // If there are any files left in the list
+    if (this.files.length) {
+      // Return the original list
+      return of(this.files);
+    } else {
+      // If there are no files in the list return undefined
+      return of(undefined);
+    }
+  }
+
+  /**
+   * Populates the fileList
+   * @param uploadedFiles files that have been uploaded
+   */
+  public setFiles(uploadedFiles: Array<UploadFile>): void {
+    uploadedFiles.forEach(uploadedFile => {
+      if (uploadedFile) {
+        this.files.push({
+          ...uploadedFile,
+          preview: this.fileRetrieverService.getIconUrl(uploadedFile)
+        });
+      }
+    });
+  }
 
   /**
    * This will finalize the data from the uploadForm and do some filetype and -size checks.
@@ -158,60 +216,4 @@ export class FileUploaderComponent {
 
     return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
   }
-
-
-  /**
-   * Send the selected files to the API and return the id's
-   * @return Observable<Array<UploadFile>>
-   */
-  public uploadFiles(): Observable<Array<UploadFile>> {
-    // Check if any files were uploaded
-    if (this.fileInput.nativeElement.value !== '') {
-      // Map all the files to an observable
-      const fileUploads = this.files.map(file => this.uploadService.uploadFile(file)
-        .pipe(
-          map(event => {
-            switch (event.type) {
-              case HttpEventType.UploadProgress:
-                // divide the (uploaded bytes * 100) by the total bytes to calculate the progress in percentage
-                this.files.find(value => value.name === file.name).progress = Math.round(event.loaded * 100 / event.total);
-                break;
-              case HttpEventType.Response:
-                return event.body;
-              default:
-                return;
-            }
-          })
-        )
-      );
-      // forkJoin the observables so they can be uploaded at the same time
-      return forkJoin(fileUploads);
-    }
-    // If no files were updated return original list
-
-    // If there are any files left in the list
-    if (this.files.length) {
-      // Return the original list
-      return of(this.files);
-    } else {
-      // If there are no files in the list return undefined
-      return of(undefined);
-    }
-  }
-
-
-  /**
-   * Populates the fileList
-   * @param files files that have been uploaded
-   */
-  public setFiles(uploadedFiles: Array<UploadFile>): void {
-    uploadedFiles.forEach(uploadedFile => {
-      if (uploadedFile) {
-        this.files.push({
-          ...uploadedFile,
-          preview: this.fileRetrieverService.getIconUrl(uploadedFile)
-        });
-      }
-    });
-  }
 }

src/app/config/wizard-page-config.ts

@@ -9,6 +9,7 @@ export interface WizardPageConfig {
   8: string;
   9: string;
   10: string;
+  11: string;
 }
 
 export const WizardPageConfig: WizardPageConfig = {
@@ -17,9 +18,10 @@ export const WizardPageConfig: WizardPageConfig = {
   3: 'project-username',
   4: 'project-name',
   5: 'project-description',
-  6: 'project-icon',
-  7: 'project-collaborators',
-  8: 'project-call-to-action',
-  9: 'project-link',
-  10: 'project-categories'
+  6: 'project-images',
+  7: 'project-icon',
+  8: 'project-collaborators',
+  9: 'project-call-to-action',
+  10: 'project-link',
+  11: 'project-categories'
 };

src/app/models/domain/project.ts

@@ -34,6 +34,7 @@ export interface Project {
   collaborators?: Collaborator[];
   callToAction?: CallToAction;
   projectIcon?: UploadFile;
+  images?: UploadFile[];
   likes?: Array<ProjectLike>;
   userHasLikedProject: boolean;
   likeCount: number;

src/app/models/resources/project-add.ts

@@ -27,6 +27,7 @@ export interface ProjectAdd {
   description?: string;
   uri: string;
   callToAction: CallToAction;
-  fileId?: number;
+  iconId?: number;
+  imageIds?: number[];
   categories?: ProjectCategory[];
 }

src/app/models/resources/project-update.ts

@@ -29,5 +29,6 @@ export interface ProjectUpdate {
   url: string;
   callToAction: CallToAction;
   categories: ProjectCategory[];
-  fileId?: number;
+  iconId?: number;
+  imageIds?: number[];
 }

src/app/modules/project/add/add.module.ts

@@ -30,6 +30,7 @@ import { ProjectIconComponent } from './main/wizard/wizardPages/default/project-
 import { ProjectNameComponent } from './main/wizard/wizardPages/default/project-name/project-name.component';
 import { ProjectModule } from 'src/app/modules/project/project.module';
 import { ProjectCallToActionComponent } from './main/wizard/wizardPages/default/project-call-to-action/project-call-to-action.component';
+import { ProjectImagesComponent } from './main/wizard/wizardPages/default/project-images/project-images.component';
 import { ProjectCategoriesComponent } from './main/wizard/wizardPages/default/project-categories/project-categories.component';
 
 @NgModule({
@@ -45,6 +46,7 @@ import { ProjectCategoriesComponent } from './main/wizard/wizardPages/default/pr
     ProjectNameComponent,
     ProjectCallToActionComponent,
     ProjectCategoriesComponent,
+    ProjectImagesComponent,
 
   ],
   imports: [

src/app/modules/project/add/main/wizard/wizard.component.html

@@ -32,6 +32,9 @@
         <ng-container *ngSwitchCase="'project-description'">
           <app-project-description (clickNext)="onNextStep()" [step]="(currentStep | async)"></app-project-description>
         </ng-container>
+        <ng-container *ngSwitchCase="'project-images'">
+          <app-project-images (clickNext)="onNextStep()" [step]="(currentStep | async)"></app-project-images>
+        </ng-container>
         <ng-container *ngSwitchCase="'project-icon'">
           <app-project-icon (clickNext)="onNextStep()" [isOptional]="true" [step]="(currentStep | async)"></app-project-icon>
         </ng-container>

src/app/modules/project/add/main/wizard/wizardPages/default/project-icon/project-icon.component.ts

@@ -58,8 +58,8 @@ export class ProjectIconComponent extends WizardStepBaseComponent implements OnI
     if (this.fileUploader.files.length > 0) {
       this.fileUploader.uploadFiles().subscribe(files => {
         if (files[0]) {
-          this.wizardService.updateProject({...this.project, fileId: files[0].id});
-          this.wizardService.uploadFile = files[0];
+          this.wizardService.updateProject({...this.project, iconId: files[0].id});
+          this.wizardService.projectIcon = files[0];
         }
         super.onClickNext();
       });
@@ -78,10 +78,10 @@ export class ProjectIconComponent extends WizardStepBaseComponent implements OnI
   /**
    * Method that determines which preview to use for the project icon
    */
-  getProjectIcon(): SafeUrl {
+  public getProjectIcon(): SafeUrl {
     if (this.fileUploader?.files[0]) {
       return this.fileUploader.files[0].preview;
     }
-    return this.fileRetrieverService.getIconUrl(this.wizardService.uploadFile);
+    return this.fileRetrieverService.getIconUrl(this.wizardService.projectIcon);
   }
 }

src/app/modules/project/add/main/wizard/wizardPages/default/project-images/project-images.component.html

@@ -0,0 +1,26 @@
+<h2 class="step-header">{{ step.name }}</h2>
+<p class="step-description">{{ step.description }}</p>
+<div class="wrapper">
+  <div class="left">
+    <div class="file-preview">
+      <div *ngFor="let image of getProjectImages(); let i = index" [style.background-image]="'url(' + image + ')'" class="preview">
+        <div (click)="deleteImageClicked(i)" *ngIf="image; else noImage" class="overlay"><em class="fas fa-trash"></em></div>
+        <ng-template #noImage>
+          <div (click)="addImageClick()" class="overlay"><em class="fas fa-plus"></em></div>
+        </ng-template>
+      </div>
+    </div>
+    <div class="buttons">
+      <button (click)="mobileUploadButtonClick()" class="form-continue-btn grey">Upload image</button>
+      <button (click)="onClickNext()" class="form-continue-btn">
+          {{ isOptional && !(fileUploader?.files.length > 0) ? "Skip" : "Next" }}
+        <div class="loading-circle" *ngIf="uploadingFiles">
+          <em class="fas fa-circle-notch fa-pulse"></em>
+        </div>
+      </button>
+    </div>
+  </div>
+  <div class="project-image-picker">
+    <app-file-uploader [acceptMultiple]="acceptMultiple" [acceptedTypes]="acceptedTypes" [showPreview]="false"></app-file-uploader>
+  </div>
+</div>