Skip to content

Commit

Permalink
Merge pull request #122 from julianpoy/chore/#120-limit-liability
Browse files Browse the repository at this point in the history
Chore/#120 Account agreement terms
  • Loading branch information
julianpoy authored Jan 29, 2019
2 parents 2c3006a + fc99650 commit 6986096
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Frontend/src/pages/info-components/about/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ion-content padding>
<p>Hello! I'm Julian Poyourow. I made Recipe Sage as an open source alternative to many of the online recipe programs.</p>

<ion-list>
<button ion-item (click)="goTo('AboutDetailsPage')">
<ion-icon name="person" item-start></ion-icon>
Expand All @@ -27,7 +27,11 @@
<ion-icon name="archive" item-start></ion-icon>
Release Notes
</button>
<button ion-item (click)="goTo('LegalPage')">
<ion-icon name="list-box" item-start></ion-icon>
Legal, agreements and disclaimers
</button>
</ion-list>

<p>Feel free to email me at <a href="mailto:[email protected]?subject=RecipeSage Support">[email protected]</a>.</p>
</ion-content>
30 changes: 30 additions & 0 deletions Frontend/src/pages/info-components/legal/legal.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<ion-header>

<ion-navbar color="navBar">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>

<ion-title>Legal, agreements and disclaimers</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>
<p>
Here you'll find a summary of the legal agreements and disclaimers.
<br />
Get ready for legal jargon:
</p>

<p>
Software is provided on an "AS IS" basis, without warranty of any kind, including without limitation the warranties of
merchantability, fitness for a particular purpose and non-infringement. The entire risk as to the quality and
performance of the Software is borne by you. Should the Software prove defective, you and not the vendor assume the entire
cost of any service and repair. <br />
In no event shall the creators, contributors, or providers be liable for any direct, indirect, incidental, special,
exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use,
data, or profits; or business
</p>
</ion-content>
13 changes: 13 additions & 0 deletions Frontend/src/pages/info-components/legal/legal.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { LegalPage } from './legal';

@NgModule({
declarations: [
LegalPage,
],
imports: [
IonicPageModule.forChild(LegalPage),
],
})
export class LegalPageModule {}
3 changes: 3 additions & 0 deletions Frontend/src/pages/info-components/legal/legal.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
page-legal {

}
18 changes: 18 additions & 0 deletions Frontend/src/pages/info-components/legal/legal.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';

@IonicPage({
priority: 'low'
})
@Component({
selector: 'page-legal',
templateUrl: 'legal.html',
})
export class LegalPage {

constructor(public navCtrl: NavController, public navParams: NavParams) {
}

ionViewDidLoad() {}

}
4 changes: 4 additions & 0 deletions Frontend/src/pages/login/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ <h2>Welcome!</h2>
</div>
</div>

<div>
<p *ngIf="!showLogin">By clicking Create Account, you agree to our <a href="" (click)="showLegal($event)">Terms</a></p>
</div>

<div padding>
<button ion-button block (click)="auth()">{{ showLogin ? "Log In" : "Create Account" }}</button>
</div>
Expand Down
5 changes: 5 additions & 0 deletions Frontend/src/pages/login/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,9 @@ export class LoginPage {
}
});
}

showLegal(e) {
e.preventDefault();
this.navCtrl.push('LegalPage');
}
}

0 comments on commit 6986096

Please sign in to comment.