Merge remote-tracking branch 'origin/develop' into BETTERZON-109

# Conflicts: # Frontend/src/app/app.component.html # Frontend/src/app/app.module.ts # Frontend/src/app/components/top-bar/top-bar.component.css # Frontend/src/app/components/top-bar/top-bar.component.html # Frontend/src/app/pages/landingpage/landingpage.component.html # Frontend/src/styles.css
wip: component created and added to the app.module.ts
2026-05-26 04:28:05 +00:00 · 2021-05-20 10:35:41 +02:00 · 2021-05-17 11:11:17 +02:00 · 2021-05-16 23:49:57 +02:00 · 2021-05-16 22:42:59 +02:00 · 2021-05-15 21:42:52 +02:00
17 changed files with 307 additions and 15 deletions
@@ -9,6 +9,5 @@
    <exclude-output />
    <content url="file://$MODULE_DIR$" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Python 3.9 (venv) interpreter library" level="application" />
  </component>
 </module>
@@ -1,7 +1,13 @@
-<app-top-bar></app-top-bar>
-<div class="page-content">
-    <router-outlet></router-outlet>
+<div class="container">
+    <div class="header">
+        <app-top-bar></app-top-bar>
+    </div>
+    <div class="page-content">
+        <router-outlet></router-outlet>
+    </div>
+    <div class="footer">
+        <app-bottom-bar></app-bottom-bar>
+    </div>
 </div>
-<app-bottom-bar></app-bottom-bar>


@@ -29,6 +29,8 @@ import {MatIconModule} from '@angular/material/icon';
 import {MatSidenavModule} from '@angular/material/sidenav';
 import {MatListModule} from "@angular/material/list";
 import {BottomBarComponent} from './components/bottom-bar/bottom-bar.component';
+import { HotDealsWidgetComponent } from './components/hot-deals-widget/hot-deals-widget.component';
+import { SliderForProductsComponent } from './components/slider-for-products/slider-for-products.component';


 // For cookie popup
@@ -85,7 +87,9 @@ const cookieConfig: NgcCookieConsentConfig = {
        ImprintComponent,
        PrivacyComponent,
        TopBarComponent,
-        BottomBarComponent
+        BottomBarComponent,
+        HotDealsWidgetComponent,
+        SliderForProductsComponent
    ],
    imports: [
        BrowserModule,
@@ -0,0 +1,70 @@
+.hot-deal-widget-wrapper{
+    width: 1640px;
+    height: 820px;
+    background-color: #f8f9fa;
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    align-items: center;
+}
+
+.product-description {
+    /*background-color: #3480E3;*/
+    height: 100%;
+    display: grid;
+    grid-template-columns: 15% 16px 15% 16px 15% 16px 15% 16px 15% 16px 15% 8px;
+    grid-template-rows: repeat(5, 1fr);
+}
+
+.product-image {
+
+}
+
+#hot-deals{
+    /*background-color: #E53167;*/
+    justify-self: center;
+    align-self: center;
+    grid-column: 3/10;
+    grid-row: 1/2;
+}
+
+#product-name {
+    justify-self: center;
+    align-self: center;
+    grid-column: 3/10;
+    grid-row: 2/3;
+    /*background-color: #E53167;*/
+}
+
+#product-name > p {
+    font-size: 65px;
+}
+
+#sales {
+    justify-self: center;
+    align-self: center;
+    grid-column: 3/10;
+    grid-row: 3/4;
+    /*background-color: #E53167;*/
+}
+
+#futher-informations {
+    justify-self: center;
+    align-self: center;
+    grid-column: 3/10;
+    grid-row: 4/5;
+    /*background-color: #E53167;*/
+}
+
+#points {
+    justify-self: center;
+    align-self: start;
+    grid-column: 3/10;
+    grid-row: 5/6;
+    /*background-color: #E53167;*/
+}
+
+.product-image {
+    display: grid;
+    justify-content: center;
+}
+
@@ -0,0 +1,23 @@
+<div class="hot-deal-widget-wrapper">
+    <div class="product-description">
+        <div id="hot-deals">
+            <h1>HOT DEALS</h1>
+        </div>
+        <div id="product-name">
+            <h1>Neues Apple iPhone 12 Pro <br> (512 GB) - Graphit</h1>
+        </div>
+        <div id="sales">
+            SPARE BIS ZU 7%!
+        </div>
+        <div id="futher-informations">
+            Weitere Informationen
+        </div>
+        <div id="points">
+            points
+        </div>
+    </div>
+    <div class="product-image">
+        <img src="assets/images/iphone-12-pro-silver-hero.png" height="771">
+    </div>
+</div>
+
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HotDealsWidgetComponent } from './hot-deals-widget.component';
+
+describe('HotDealsWidgetComponent', () => {
+  let component: HotDealsWidgetComponent;
+  let fixture: ComponentFixture<HotDealsWidgetComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ HotDealsWidgetComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HotDealsWidgetComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-hot-deals-widget',
+  templateUrl: './hot-deals-widget.component.html',
+  styleUrls: ['./hot-deals-widget.component.css']
+})
+export class HotDealsWidgetComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
@@ -0,0 +1 @@
+<p>slider-for-products works!</p>
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SliderForProductsComponent } from './slider-for-products.component';
+
+describe('SliderForProductsComponent', () => {
+  let component: SliderForProductsComponent;
+  let fixture: ComponentFixture<SliderForProductsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SliderForProductsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SliderForProductsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-slider-for-products',
+  templateUrl: './slider-for-products.component.html',
+  styleUrls: ['./slider-for-products.component.css']
+})
+export class SliderForProductsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
@@ -1 +1,54 @@
+.top-bar-wrapper {
+    display: grid;
+    grid-template-columns: 200px 360px 820px 20px 250px;
+    grid-template-rows: 40px;
+    grid-column-gap: 0px;
+    grid-row-gap: 0px;
+    align-items: center;
+}

+.top-logo {
+    grid-area: 1/1;
+}
+
+#better {
+    font-size: 28px;
+    font-weight: bold;
+    color: #3480E3;
+}
+
+#zon {
+    font-size: 28px;
+    font-weight: bold;
+    color: #E53167;
+}
+
+.search-button {
+    /*background-color: #E53167;*/
+}
+
+.sign-up {
+    /*background-color: #E53167;*/
+    margin-left: 50px;
+    margin-right: 25px;
+}
+
+.login {
+    margin-right: 25px;
+}
+
+#signin {
+    border-radius: 25px;
+    background-color: #E53167;
+}
+
+._links > a {
+    /*background-color: #E53167;*/
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
+._signing_links > a {
+    /*background-color: #E53167;*/
+    margin-left: 50px;
+}
@@ -1,4 +1,26 @@
- <a>
-     <img src="assets/images/Betterzon.svg" [routerLink]="''" alt="Betterzon Logo" width="50px">
- </a>
- <a class="button fancy-button"><i class="material-icons">shopping_cart</i>Checkout</a>
+<div class="top-bar-wrapper">
+    <div class="<top-logo>">
+        <a><span id="better">BETTER</span><span id="zon">ZON</span></a>
+    </div>
+    <div class="links">
+        <nav class="_links">
+            <a>KONTAKTIERE UNS</a>
+            <a>KUNDEN</a>
+            <a>FAQ</a>
+        </nav>
+    </div>
+    <div class="footer_space">
+
+    </div>
+    <div class="search-button">
+        <a>
+            <img src="assets/images/search_black_24dp.svg" alt="Sarch button">
+        </a>
+    </div>
+    <div class="links">
+        <nav class="_signing_links">
+            <a>SIGN UP</a>
+            <a><span id="signin">SIGN IN</span></a>
+        </nav>
+    </div>
+</div>
@@ -1,4 +1,6 @@
-<div id="mainComponents">
+<app-hot-deals-widget></app-hot-deals-widget>
+
+<!--<div id="mainComponents">
    <div id="searchContainer">
        <input type="text" [(ngModel)]="searchInput" placeholder="Search" (keyup.enter)="startedSearch()">
    </div>
@@ -14,3 +16,4 @@
        </div>
    </div>
 </div>
+-->
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>
@@ -104,18 +104,48 @@ label {
    padding-right: 4px;
 }

+/* Main Container */
+
+.container {
+    position: fixed;
+    left: 50%;
+    margin-left: -820px;
+    width: 1640px;
+    height: auto;
+    display: grid;
+    grid-template-rows: 70px auto 210px;
+}
+
+.header {
+    grid-row: 1/2;
+}
+
+.page-content {
+    grid-row: 2/3;
+}
+
+.footer {
+    grid-row: 3/4;
+}
+
+/* End of Main Container */
+
 /* Top Bar */

 app-top-bar {
-    width: 100%;
-    height: 68px;
-    background-color: #f2f2f2;
+    width: 1640px;
+    height: 70px;
+    background-color: #ffffff;
    padding: 16px;
+    position: fixed;
+    left: 50%;
+    top:0;
+    margin-left: -820px;
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    align-items: center;
-    box-shadow: 0 3px 5px -1px rgba(0,0,0,.2),0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12)
+    /*box-shadow: 0 3px 5px -1px rgba(0,0,0,.2),0 6px 10px 0 rgba(0,0,0,.14),0 1px 18px 0 rgba(0,0,0,.12)*/
 }

 app-top-bar h1 {
Author	SHA1	Message	Date
Paddy	5712c5c69e	Merge remote-tracking branch 'origin/develop' into BETTERZON-109 # Conflicts: # Frontend/src/app/app.component.html # Frontend/src/app/app.module.ts # Frontend/src/app/components/top-bar/top-bar.component.css # Frontend/src/app/components/top-bar/top-bar.component.html # Frontend/src/app/pages/landingpage/landingpage.component.html # Frontend/src/styles.css	2021-05-20 10:35:41 +02:00
illumizoldyck	0ff4a2e3c2	wip: component created and added to the app.module.ts	2021-05-17 11:11:17 +02:00
illumizoldyck	c936ec97c0	wip: all components were wrapped now. Grid structure has been applied to the main wrapper-class "container".	2021-05-16 23:49:57 +02:00
illumizoldyck	94c3f537bc	wip: new component created and added to the app.module.ts. Added a minimal grid layout.	2021-05-16 22:42:59 +02:00
illumizoldyck	e8bb639ebd	wip: component rewritten, simple grid applied.	2021-05-15 21:42:52 +02:00
illumizoldyck	ceef01899d	Merge remote-tracking branch 'origin/BETTERZON-78' into BETTERZON-78	2021-05-13 19:25:16 +02:00
illumizoldyck	464414cbe2	BETTERZON 78: logo and follow us edited, links added.	2021-05-13 19:24:53 +02:00
Patrick	0f19bd77cd	Merge branch 'develop' into BETTERZON-78	2021-05-11 21:59:02 +02:00
illumizoldyck	a3d9b826f0	BETTERZON-78 - grid added, structured as in Adobe XD mockup	2021-05-11 11:54:02 +02:00
Patrick	536acc06ee	Merge branch 'develop' into BETTERZON-78	2021-05-08 20:01:12 +02:00
Patrick	ac237a6ba1	Apply suggestions from code review Switching from single to double quotes	2021-05-08 20:00:30 +02:00
Patrick	058230e9a9	Merge branch 'develop' into BETTERZON-78	2021-05-06 22:47:22 +02:00
Paddy	f71f53c869	Adding cookieconsent as dependency again since it was removed by a merge	2021-05-05 19:59:02 +02:00
Paddy	6982a139af	Adding cookieconsent as dependency again since it was removed by a merge	2021-05-05 18:48:53 +02:00
illumizoldyck	b0158198d4	Merge branch 'BETTERZON-78' of https://github.com/Mueller-Patrick/Betterzon into BETTERZON-78	2021-05-05 18:42:52 +02:00
illumizoldyck	7e5ef71924	BETTERZON-78 adding bottom bar and top bar	2021-05-05 18:40:22 +02:00
Paddy	b17b92fcc3	Merge remote-tracking branch 'origin/develop' into BETTERZON-78 # Conflicts: # Frontend/angular.json # Frontend/package-lock.json # Frontend/src/app/app.module.ts # Frontend/src/styles.css	2021-05-05 18:39:04 +02:00
illumizoldyck	0c50162fdf	WIP: creating footer using grid.	2021-05-04 22:17:15 +02:00
illumizoldyck	825f744af9	BETTERZON-74 simple top-bar has been created.	2021-04-28 17:53:56 +02:00
Paddy	e0f1724d95	Merge remote-tracking branch 'origin/develop' into BETTERZON-52 # Conflicts: # Frontend/angular.json # Frontend/package-lock.json # Frontend/package.json # Frontend/src/app/app.module.ts # Frontend/src/index.html	2021-04-08 10:52:52 +02:00
illumizoldyck	93b17bc65f	BETTERZON-31, BETTERZON-50 info popover and footer had been changed.	2021-04-08 10:42:45 +02:00
Paddy	64074b48e8	Merge remote-tracking branch 'origin/develop' into BETTERZON-31 # Conflicts: # Frontend/src/app/app.module.ts	2021-04-06 20:19:40 +02:00
Paddy	ee50296dc9	BETTERZON-31: Fixing dependencies	2021-04-06 20:18:17 +02:00
illumizoldyck	57c3f521d1	BETTERZON-31, dependencies.	2021-04-06 20:14:10 +02:00
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>`