Skip to content
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.

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

#72 implement tooltips #79

Merged
merged 2 commits into from
Jun 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions src/app/service/meme.service.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { AlertMessage } from './../shared/alert-message/alert-message.component';
import { Injectable } from '@angular/core';
import { Meme } from '../shared/model/meme';
import { AngularFireStorage } from '@angular/fire/storage';
Expand All @@ -12,7 +13,7 @@ export class MemeService {

private storageRef = this.afStore.storage;

constructor(private userService: UserService, private afStore: AngularFireStorage, private afDatabase: AngularFireDatabase) { }
constructor(private userService: UserService, private afStore: AngularFireStorage, private afDatabase: AngularFireDatabase, private alertMessage: AlertMessage) { }

// Left as example - delete on refactoring
public async getMemes(): Promise<Meme[]> {
Expand Down Expand Up @@ -97,8 +98,8 @@ export class MemeService {
const uid = this.userService.getAuthenticatedUser().uid;

this.afDatabase.list(`uploadedMemes/${uid}`).push(newIds)
.then(_ => console.log('UploadedMemes push successful'))
.catch(err => console.log(err, 'UploadedMemes push failed'));
.then(_ => this.alertMessage.presentAlert('Meme upload successful'))
.catch(err => this.alertMessage.presentAlert('Meme upload failed'));
}

public getUserLikedMemeReferences() {
Expand Down
12 changes: 7 additions & 5 deletions src/app/service/user.service.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { AlertMessage } from './../shared/alert-message/alert-message.component';
import { Injectable } from '@angular/core';
import { Observable, BehaviorSubject } from 'rxjs';

Expand All @@ -22,7 +23,8 @@ export class UserService {
private router: Router,
private afAuth: AngularFireAuth,
private afDatabase: AngularFireDatabase,
private afStore: AngularFireStorage) { }
private afStore: AngularFireStorage,
private alertMessage: AlertMessage) { }


public register(email: string, password: string): Promise<any> {
Expand Down Expand Up @@ -53,7 +55,7 @@ export class UserService {
await this.afAuth.signOut();
this.authStatus.next(null);
this.authenticatedUser = null;
console.log("Logout successful");
this.alertMessage.presentAlert("Logout successful");
this.router.navigateByUrl("/authentication");
}

Expand All @@ -62,8 +64,8 @@ export class UserService {
}

public updateProfile(updatedProfile: UserProfile) {
this.afDatabase.object(`users/${this.authenticatedUser.uid}`).update(updatedProfile).then(_ => console.log('Profile update successful'))
.catch(err => console.log(err, 'Profile update failed'));
this.afDatabase.object(`users/${this.authenticatedUser.uid}`).update(updatedProfile).then(_ => this.alertMessage.presentAlert("Update successful"))
.catch(err => this.alertMessage.presentAlert("Update failed"));
}

public uploadProfilePictureAndUpdateDatabaseEntry(file: File, activeProfile: UserProfile) {
Expand All @@ -73,7 +75,7 @@ export class UserService {
.subscribe(
uploadSnapshot => {
if (this.checkIfUploadFinished(uploadSnapshot)) {
console.log("Profile picture upload successful");
this.alertMessage.presentAlert("Picture upload successful");

this.afStore.ref(pathReference).getDownloadURL().subscribe(
downloadUrl => {
Expand Down
9 changes: 9 additions & 0 deletions src/app/shared/alert-message/alert-message.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>alert-message</ion-title>
</ion-toolbar>
</ion-header>

<ion-content>

</ion-content>
3 changes: 3 additions & 0 deletions src/app/shared/alert-message/alert-message.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.custom-alert {
background: #000;
}
24 changes: 24 additions & 0 deletions src/app/shared/alert-message/alert-message.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';

import { AlertMessage } from './alert-message.component';

describe('AlertMessage', () => {
let component: AlertMessage;
let fixture: ComponentFixture<AlertMessage>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AlertMessage ],
imports: [IonicModule.forRoot()]
}).compileComponents();

fixture = TestBed.createComponent(AlertMessage);
component = fixture.componentInstance;
fixture.detectChanges();
}));

it('should create', () => {
expect(component).toBeTruthy();
});
});
28 changes: 28 additions & 0 deletions src/app/shared/alert-message/alert-message.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Component, OnInit, Injectable } from '@angular/core';
import { AlertController } from '@ionic/angular';

@Component({
selector: 'app-alert-message',
templateUrl: './alert-message.component.html',
styleUrls: ['./alert-message.component.scss'],
})

@Injectable({
providedIn: 'root'
})

export class AlertMessage {

constructor(public alertController: AlertController) { }

async presentAlert(message: string){
const alert = await this.alertController.create({
cssClass: 'custom-alert', // global css
message: message
});

await alert.present();
let result = await alert.onDidDismiss();
console.log(result);
}
}
17 changes: 17 additions & 0 deletions src/app/shared/alert-message/alert-message.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';

import { IonicModule } from '@ionic/angular';

import { AlertMessage } from './alert-message.component';

@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule
],
declarations: [AlertMessage]
})
export class AlertMessageModule {}
4 changes: 4 additions & 0 deletions src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@
.bold-center{
text-align: center;
font-weight: bold;
}

.custom-alert .alert-wrapper {
background: #fff;
}