Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2024-11-22 06:13:57 +00:00
Code Issues Projects Releases Wiki Activity

wip: german -> english

Browse Source
This commit is contained in:
Jegor 2021-06-17 22:52:09 +02:00
parent a6a5b58e25
commit a792c43e24
10 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Frontend/src/app/components/about-us/about-us.component.html
View File

@ -10,8 +10,8 @@
</div> </div>
<!-- About Section Content--> <!-- About Section Content-->
<div class="row"> <div class="row">
<div class="col-lg-4 ms-auto"><p class="lead">text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries</p></div> <div class="col-lg-4 ms-auto"><p class="lead">You follow the same passion as we do and you want to find alternatives to the de-facto monopolist Amazon?</p></div>
<div class="col-lg-4 me-auto"><p class="lead">text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries</p></div> <div class="col-lg-4 me-auto"><p class="lead">In this case, welcome aboard! We’re happy that you share our passion and hope that we can help you achieving this goal with the website</p></div>
</div> </div>
</div> </div>
</section> </section>

8
Frontend/src/app/components/auth/registration/registration.component.html
View File

@ -6,7 +6,7 @@
<div class="col-md-8 col-xs-12 col-sm-12 login_form "> <div class="col-md-8 col-xs-12 col-sm-12 login_form ">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<h2>Konto erstellen</h2> <h2>Registration</h2>
</div> </div>
<div class="row"> <div class="row">
<form [formGroup]="form" class="form-group" (ngSubmit)="onSubmit()"> <form [formGroup]="form" class="form-group" (ngSubmit)="onSubmit()">
@ -22,17 +22,17 @@
</div> </div>
<div class="row"> <div class="row">
<!-- <span class="fa fa-lock"></span> --> <!-- <span class="fa fa-lock"></span> -->
<input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Kennwort"> <input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Password">
</div> </div>
<!-- <!--
<div class="row"> <div class="row">
<input type="password" name="password" id="password_repeated" class="form__input" placeholder="Kennwort bestätigen"> <input type="password" name="password" id="password_repeated" class="form__input" placeholder="Kennwort bestätigen">
</div> --> </div> -->
<div class="row"> <div class="row">
<input type="submit" value="Erstellen" class="btn_signin"> <input type="submit" value="Sign up" class="btn_signin">
</div> </div>
<div class="row"> <div class="row">
<a href="/signin">Sich anmelden</a> <p>Have an account?<a href="/signin">Log In</a></p>
</div> </div>
</form> </form>
</div> </div>

6
Frontend/src/app/components/auth/signin/signin.component.html
View File

@ -6,7 +6,7 @@
<div class="col-md-8 col-xs-12 col-sm-12 login_form "> <div class="col-md-8 col-xs-12 col-sm-12 login_form ">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<h2>Anmelden</h2> <h2>Sign In</h2>
</div> </div>
<div class="row"> <div class="row">
<form [formGroup]="loginForm" class="form-group" (ngSubmit)="onSubmit()"> <form [formGroup]="loginForm" class="form-group" (ngSubmit)="onSubmit()">
@ -18,12 +18,12 @@
<input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Password"> <input type="password" formControlName="password" name="password" id="password" class="form__input" placeholder="Password">
</div> </div>
<div class="row"> <div class="row">
<input type="submit" value="Anmelden" class="btn_signin"> <input type="submit" value="Log in" class="btn_signin">
</div> </div>
</form> </form>
</div> </div>
<div class="row"> <div class="row">
<a href="/registration">Konto erstellen</a> <p>No account yet?<a href="/registration">sign up</a></p>
</div> </div>
</div> </div>
</div> </div>

14
Frontend/src/app/components/bottom-bar/bottom-bar.component.html
View File

@ -5,24 +5,22 @@
<div class="col-lg-4 mb-5 mb-lg-0"> <div class="col-lg-4 mb-5 mb-lg-0">
<h4 class="text-uppercase mb-4">Location</h4> <h4 class="text-uppercase mb-4">Location</h4>
<p class="lead mb-0"> <p class="lead mb-0">
70376 Stuttgart 76133 Karlsruhe
<br /> <br />
</p> </p>
</div> </div>
<!-- Footer Social Icons--> <!-- Footer Social Icons-->
<div class="col-lg-4 mb-5 mb-lg-0"> <div class="col-lg-4 mb-5 mb-lg-0">
<h4 class="text-uppercase mb-4">FOLGE UNS</h4> <h4 class="text-uppercase mb-4">FOLLOW UNS</h4>
<a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-github"></i></a> <a class="btn btn-outline-light btn-social mx-1" href="https://github.com/Mueller-Patrick/Betterzon"><i class="fab fa-fw fa-github"></i></a>
<a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-twitter"></i></a> <a class="btn btn-outline-light btn-social mx-1" href="https://blog.betterzon.xyz/"><i class="fab fa-fw fa-dribbble"></i></a>
<a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-linkedin-in"></i></a>
<a class="btn btn-outline-light btn-social mx-1" href="#!"><i class="fab fa-fw fa-dribbble"></i></a>
</div> </div>
<!-- Footer About Text--> <!-- Footer About Text-->
<div class="col-lg-4"> <div class="col-lg-4">
<h4 class="text-uppercase mb-4">SOME INFO</h4> <h4 class="text-uppercase mb-4">CONTACT US</h4>
<p class="lead mb-0"> <p class="lead mb-0">
text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries betterzon-contact@mueller-patrick.tech
</p> </p>
</div> </div>
</div> </div>

2
Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html
View File

@ -1,7 +1,7 @@
<section class="page-section portfolio" id="top-gesuchte"> <section class="page-section portfolio" id="top-gesuchte">
<div class="container"> <div class="container">
<!-- Portfolio Section Heading--> <!-- Portfolio Section Heading-->
<h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">TOP-ANGEBOTE</h2> <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">TOP-SEARCHES</h2>
<!-- Icon Divider--> <!-- Icon Divider-->
<div class="divider-custom"> <div class="divider-custom">
<div class="divider-custom-line"></div> <div class="divider-custom-line"></div>

2
Frontend/src/app/components/kunden/kunden.component.html
View File

@ -1,7 +1,7 @@
<section class="page-section portfolio" id="unsere-kunden"> <section class="page-section portfolio" id="unsere-kunden">
<div class="container"> <div class="container">
<!-- Portfolio Section Heading--> <!-- Portfolio Section Heading-->
<h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">SIE VERTRAUEN UNS</h2> <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">THEY TRUST US</h2>
<!-- Icon Divider--> <!-- Icon Divider-->
<div class="divider-custom"> <div class="divider-custom">
<div class="divider-custom-line"></div> <div class="divider-custom-line"></div>

23
Frontend/src/app/components/product-list/product-list.component.ts
View File

@ -61,24 +61,25 @@ export class ProductListComponent implements OnInit {
} }
getPrices(): void { getPrices(): void {
const productIds: number[] = [];
this.products.forEach( this.products.forEach(
product => productIds.push(product.product_id) product => {
) this.apiService.getLowestPrices(product.product_id).subscribe(
this.apiService.getProductsByIds(productIds).subscribe( prices => {
prices => { this.pricesMap[product.product_id] = prices[prices.length - 1];
prices.forEach(price => { }
this.pricesMap[price.product_id] = price; );
})
} }
) );
} }
getSearchedProducts(): void { getSearchedProducts(): void {
this.apiService.getProductsByQuery(this.searchQuery).subscribe(products => this.products = products); this.apiService.getProductsByQuery(this.searchQuery).subscribe(products => {
this.products = products;
this.getPrices();
});
} }
clickedProduct(product: Product): void { clickedProduct(product: Product): void {
this.router.navigate([('/product/' + product.product_id)]); this.router.navigate([('/product/' + product.product_id)]);
} }

14
Frontend/src/app/components/profile/profile.component.html
View File

@ -24,7 +24,7 @@
</strong> </strong>
</td> </td>
<td class="text-primary"> <td class="text-primary">
bootnipets {{currentUser.username}}
</td> </td>
</tr> </tr>
@ -48,7 +48,7 @@
</strong> </strong>
</td> </td>
<td class="text-primary"> <td class="text-primary">
noreply@email.com {{currentUser.email}}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -59,7 +59,7 @@
</strong> </strong>
</td> </td>
<td class="text-primary"> <td class="text-primary">
20 jul 20014 {{currentUser.registration_date}}
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -76,10 +76,10 @@
<div class="col-auto"> <div class="col-auto">
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
<th>Produkt</th> <th>Product</th>
<th>Preis</th> <th>Price</th>
<th>Ändern</th> <th>Change</th>
<th>Löschen</th> <th>Delete</th>
</tr> </tr>
<tr *ngFor="let alarm of alarms"> <tr *ngFor="let alarm of alarms">
<td> <td>

14
Frontend/src/app/components/top-bar/top-bar.component.html
View File

@ -10,13 +10,13 @@
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto"> <ul class="navbar-nav ms-auto">
<li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#top-gesuchte">Top-Gesuchte</a></li> <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#top-gesuchte">top-searches</a></li>
<li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#about">über uns</a></li> <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#about">about</a></li>
<li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#unsere-kunden">Unsere Kunden</a></li> <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#unsere-kunden">our clients</a></li>
<li class="nav-item mx-0 mx-lg-1" *ngIf="!isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/signin">Anmelden</a></li> <li class="nav-item mx-0 mx-lg-1" *ngIf="!isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/signin">sign in</a></li>
<li class="nav-item mx-0 mx-lg-1" *ngIf="!isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/registration">Konto Erstellen</a></li> <li class="nav-item mx-0 mx-lg-1" *ngIf="!isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/registration">sign up</a></li>
<li class="nav-item mx-0 mx-lg-1" *ngIf="isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="" (click)="logout()">Log Out</a></li> <li class="nav-item mx-0 mx-lg-1" *ngIf="isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="" (click)="logout()">log out</a></li>
<li class="nav-item mx-0 mx-lg-1" *ngIf="isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/profile">Profile</a></li> <li class="nav-item mx-0 mx-lg-1" *ngIf="isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/profile">profile</a></li>
</ul> </ul>
</div> </div>
</div> </div>

4
Frontend/src/styles.css
View File

@ -447,8 +447,8 @@ progress {
} }
.lead { .lead {
font-size: 1.25rem; font-size: 1.30rem;
font-weight: 300; font-weight: 400;
} }
.display-1 { .display-1 {