Skip to content

Fixes for 97, 98, 99 #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixes for 97, 98, 99 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7cac4
scroll to top on app submit; clear form on success; updated custom me…
geozaur Jul 27, 2019
63600f9
add scroll util function + refactor code
lrdTnc Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 6 additions & 31 deletions src/app/pages/AddAppPage/components/add-app/add-app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,9 @@



// .add-app {
// padding-top: 80px;
// .header {
// text-align: center;
// h2 {
// padding: 10px;
// margin: 20px 0;
// display: inline-block;
// }


// }
// .form-actions {
// .btn {
// background: $primary;
// color: $white;
// }
// }
// .ng-valid[required] {
// border-left: 5px solid #42A948; /* green */
// }

// .ng-invalid {
// border-left: 5px solid #a94442; /* red */
// }
// .custom-messages {
// h3 {
// padding: 15px;
// }
// }
// }
.add-app {
.custom-messages .alert {
padding-top: 10px;
padding-bottom: 10px;
}
}
35 changes: 30 additions & 5 deletions src/app/pages/AddAppPage/components/add-app/add-app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {CivicFile} from '../../../../shared/models/civic-file.model';
import {UploadService} from '../../../../services/upload.service';
import {Component, OnInit, Input, OnChanges, SimpleChanges} from '@angular/core';
import {Component, OnInit, Input, OnChanges, SimpleChanges, ViewChild, ElementRef} from '@angular/core';

import {AppService} from '../../../../services/app.service';
import {CategoriesService} from '../../../../services/category.service';
Expand All @@ -10,6 +10,7 @@ import {concat, Observable, of, Subject} from "rxjs";
import {catchError, debounceTime, distinctUntilChanged, switchMap, tap} from "rxjs/operators";
import {AppTag} from "../../../../shared/models/app-tag.model";
import {TechnologiesService} from "../../../../services/technology.service";
import {scrollToElementRef} from '../../../../util/scroll.util';



Expand All @@ -26,6 +27,7 @@ export class AddAppComponent implements OnInit, OnChanges {
constructor(private appService: AppService, private tagsService: TagsService, private technologiesService: TechnologiesService, private categoriesService: CategoriesService, private uploadService: UploadService) {

this.submitted = false;
this.successful = false;
this.isAddingNewApp = true;
}

Expand All @@ -41,6 +43,7 @@ export class AddAppComponent implements OnInit, OnChanges {
public selectedTechnologies: string[] = [];
private newTag: string;
private submitted: boolean;
private successful: boolean;
private message;
private error;
private appLogo: CivicFile;
Expand All @@ -53,6 +56,11 @@ export class AddAppComponent implements OnInit, OnChanges {
private needsToUpdateNgoLogo: boolean;
public phoneRegex = '\\+4\\d{10}';

@ViewChild('appLogoInput') appLogoInputRef: ElementRef;
@ViewChild('ngoLogoInput') ngoLogoInputRef: ElementRef;
@ViewChild('addAppContainer', {read: ElementRef})
addAppComponentRef: ElementRef;

ngOnChanges(changes: SimpleChanges) {
if (changes['app']) {
this.submitted = false;
Expand Down Expand Up @@ -177,7 +185,7 @@ export class AddAppComponent implements OnInit, OnChanges {
this.isNgoLogoUploaded = false;
}
this.error = err.toString();
}
}

addApp(form) {
if (this.isAddingNewApp) {
Expand Down Expand Up @@ -237,19 +245,19 @@ export class AddAppComponent implements OnInit, OnChanges {
if (this.message === 'success') {
this.error = null;
this.setDefaultsForLogoWhenEditingApp();

} else {
const errorRegex = /\(ERROR\)\:(.*)/;
this.error = errorRegex.exec(this.message);
}

scrollToElementRef(this.addAppComponentRef);
}
}
});
}
}

private addNewApp(form) {
this.successful = false;
this.submitted = true;

if (this.isAppLogoValid && this.isNgoLogoValid) {
Expand All @@ -273,22 +281,33 @@ export class AddAppComponent implements OnInit, OnChanges {

this.message = response['result'];
if (this.message === 'success') {
this.submitted = false;
this.successful = true;
this.error = null;
this.setDefaultsForLogoRelated();
form.reset();
this.setFormDefaults();
} else {
const errorRegex = /\(ERROR\):(.*)/;
this.error = errorRegex.exec(this.message)[1];
}
scrollToElementRef(this.addAppComponentRef);
}
}

});
} else {
this.error = 'Logo-ul aplicației sau al organizației este invalid, poate sa fie doar .png sau .jpg, maxim 500px x 500px.';
scrollToElementRef(this.addAppComponentRef);
}
}

private setDefaultsForLogoRelated() {
if (this.appLogoInputRef) {
this.appLogoInputRef.nativeElement.value = null;
}
if (this.ngoLogoInputRef) {
this.ngoLogoInputRef.nativeElement.value = null;
}
this.ngoLogo = null;
this.appLogo = null;
this.isAppLogoUploaded = false;
Expand All @@ -306,4 +325,10 @@ export class AddAppComponent implements OnInit, OnChanges {
this.needsToUpdateNgoLogo = false;

}

private setFormDefaults() {
this.setDefaultsForLogoRelated();
this.selectedAppTags = [];
this.selectedTechnologies = [];
}
}
18 changes: 8 additions & 10 deletions src/app/pages/AddAppPage/components/add-app/add-app.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div *ngIf="!isAddingNewApp">
<h1>Edit App</h1>
</div>
<div *ngIf="app" class="add-app">
<div #addAppContainer *ngIf="app" class="add-app">
<div *ngIf="isAddingNewApp" class="page-title">
<h1>Adaugă-ți aplicația in Centru Civic</h1>

Expand All @@ -13,18 +13,16 @@ <h1>Adaugă-ți aplicația in Centru Civic</h1>

<div class="col-xs-12 col-md-offset-1 col-md-10">
<div class="custom-messages col-xs-12">
<div class="sucess" *ngIf="submitted && message =='success' && !error && isAddingNewApp">
<h3>Aplicația ta a fost adaugată cu succes!</h3>
<p>Te vom contacta când aceasta este publicată pe site. Mulțumim!</p>
<div class="alert alert-success" *ngIf="successful && message =='success' && !error && isAddingNewApp">
<b>Aplicația ta a fost adaugată cu succes! Te vom contacta când aceasta este publicată pe site. Mulțumim!</b>
</div>

<div class="sucess" *ngIf="submitted && message =='success' && !error && !isAddingNewApp">
<h3>Aplicația a fost modificată cu succes!</h3>

<div class="alert alert-success" *ngIf="submitted && message =='success' && !error && !isAddingNewApp">
<b>Aplicația a fost modificată cu succes!</b>
</div>

<div class="alert alert-danger" *ngIf="submitted && error">
{{error}}
<b>{{error}}</b>
</div>
</div>
<form #form="ngForm" (ngSubmit)="addApp(form)" novalidate name="addAppForm">
Expand Down Expand Up @@ -116,7 +114,7 @@ <h3>Aplicația a fost modificată cu succes!</h3>

<div class="form-group">
<label>Logo-ul aplicației <span class="req">*</span></label>
<input type="file" class="form-control" accept=".jpg,.png,image/png,image/jpeg,image/jpg" (change)="appLogoChangeEvent($event)"
<input #appLogoInput type="file" class="form-control" accept=".jpg,.png,image/png,image/jpeg,image/jpg" (change)="appLogoChangeEvent($event)"
placeholder="" />
<span class="help-block">Logo-ul aplicației poate să fie doar <code>.png</code> sau <code>.jpg</code>, maxim <code>500px x 500px</code>.</span>
<div *ngIf="!isAddingNewApp" class="card-image">
Expand Down Expand Up @@ -242,7 +240,7 @@ <h3>Aplicația a fost modificată cu succes!</h3>

<div class="form-group">
<label>Logo-ul tău</label>
<input type="file" class="form-control" accept=".jpg,.png,image/png,image/jpeg,image/jpg" (change)="ngoLogoChangeEvent($event)"
<input #ngoLogoInput type="file" class="form-control" accept=".jpg,.png,image/png,image/jpeg,image/jpg" (change)="ngoLogoChangeEvent($event)"
placeholder="" />
<span class="help-block">Logo-ul tău poate să fie doar <code>.png</code> sau <code>.jpg</code>, maxim <code>500px x 500px</code>.</span>
<div *ngIf="!isAddingNewApp" class="media-left media-middle">
Expand Down
7 changes: 2 additions & 5 deletions src/app/pages/ApproveApp/components/approve-app/approve-app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Component, OnInit, ViewChild, ElementRef } from '@angular/core';

import { AppService } from '../../../../services/app.service';
import { AddAppModel } from '../../../AddAppPage/services/add-app.model';
import {scrollToElementRef} from '../../../../util/scroll.util';

@Component({
selector: 'approve-app',
Expand Down Expand Up @@ -60,7 +61,7 @@ export class ApproveAppComponent implements OnInit {
this.selectedApp.ngophone = app.ngodetail.phone;
this.selectedApp.ngotwitter = app.ngodetail.twitter;
this.selectedApp.ngoid = app.ngodetail.id;
this.scrollToEditApp();
scrollToElementRef(this.addAppComponentRef);
}

private getDateAsString(theDateAsString): string{
Expand All @@ -81,10 +82,6 @@ export class ApproveAppComponent implements OnInit {
return str;
}

scrollToEditApp() {
this.addAppComponentRef.nativeElement.scrollIntoView({behavior: "smooth", block:"start"});
}

stopClickPropagation($event: MouseEvent) {
event.stopPropagation();
}
Expand Down
5 changes: 5 additions & 0 deletions src/app/util/scroll.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {ElementRef} from '@angular/core';

export function scrollToElementRef(elem: ElementRef) {
elem.nativeElement.scrollIntoView({behavior: "smooth", block:"start"});
}