Skip to content

Commit

Permalink
Merge pull request #5 from Sybit-Education/feature/header
Browse files Browse the repository at this point in the history
feat: Imprint, Dsgvo and header
  • Loading branch information
AlexanderKugler authored Aug 2, 2023
2 parents 9d2cb52 + d248e55 commit dbea3c4
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 25 deletions.
1 change: 1 addition & 0 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
<app-header></app-header>
<router-outlet></router-outlet>
4 changes: 3 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {sygotchiReducer} from "./store/sygotchi.reducer";
import { TeamSComponent } from './team-s/team-s.component';
import { DsgvoPageComponent } from './dsgvo-page/dsgvo-page.component';
import { ImpressumComponent } from './impressum/impressum.component';
import { HeaderComponent } from './header/header.component';

@NgModule({
declarations: [
Expand All @@ -23,7 +24,8 @@ import { ImpressumComponent } from './impressum/impressum.component';
CreationPageComponent,
TeamSComponent,
DsgvoPageComponent,
ImpressumComponent
ImpressumComponent,
HeaderComponent
],
imports: [
BrowserModule,
Expand Down
43 changes: 21 additions & 22 deletions src/app/dsgvo-page/dsgvo-page.component.html

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions src/app/header/header.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<nav class="navbar navbar-expand-ng navbar-light bg-light">
<div class="container-fluid">
<a>
<img alt="Sygotchi-logo" class="logo" src="assets/images/sygotchi-logo.png">
</a>
<ul class="navbar-nav ms-auto flex-row justify-content-between">
<div ngbDropdown class="d-inline-blog" display="dynamic">
<a type="butoon" class="d-flex align-items-center nav-link" id="dropdownConfig" ngbDropdownToggle>
Sonstige
</a>
<div ngbDropdownMenu aria-labelledby="dropdownConfig">
<a ngbDropdownItem routerLink="/impressum">
<i class="fa-solid fa-stamp"></i>
<span>Impressum</span>
</a>
<a ngbDropdownItem routerLink="/dsgvo">
<i class="fa-solid fa-server"></i>
<span>Datenschutz</span>
</a>
<a ngbDropdownItem routerLink="team-site">
<i class="fa-solid fa-users"></i>
<span>Über uns</span>
</a>
</div>
</div>
</ul>
</div>
</nav>
21 changes: 21 additions & 0 deletions src/app/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.nav-item {
margin-right: 15px;

}

span {
margin-left: 10px;
font-size: 1.3rem;
}

a {
font-size: 1.3rem;
}

.logo {
max-width: 150px;

@media only screen and (max-width: 600px) {
max-width: 50px;
}
}
10 changes: 10 additions & 0 deletions src/app/header/header.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss']
})
export class HeaderComponent {

}
4 changes: 2 additions & 2 deletions src/app/impressum/impressum.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ <h4>DUNS Nummer</h4>
<h3></h3>
<h4>EU-Streitschlichtung</h4>
<p>
Die Europäische Kommission stellt eine Plattform zur Online-Streitbeilegung (OS) bereit:
Die Europäische Kommission stellt eine Plattform zur Online-Streitbeilegung (OS) bereit:
<a href="https://ec.europa.eu/consumers/odr/main/index.cfm?event=main.home.chooseLanguage">https://ec.europa.eu/consumers/odr/.</a>
Unsere E-Mail-Adresse finden Sie oben im Impressum.
</p>
<h3></h3>
<h4>Haftungshinweis:</h4>
<p>Trotz sorgfältiger inhaltlicher Kontrolle übernehmen wir keine Haftung für die Inhalte externer Links. Für den Inhalt der verlinkten Seiten sind ausschließlich deren Betreiber verantwortlich.</p>
</div>
</div>

0 comments on commit dbea3c4

Please sign in to comment.