diff --git a/frontend/angular.json b/frontend/angular.json index a8e7fa0..28cbcf6 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -25,7 +25,8 @@ "aot": false, "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + "src/robots.txt" ], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index d0b18c7..fcd30f6 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -5,6 +5,7 @@ import {NotfoundComponent} from './containers/notfound/notfound.component'; import {SearchComponent} from './containers/search/search.component'; import {RegionDetailsComponent} from './containers/region-details/region-details.component'; import {BookmarkListComponent} from './containers/bookmark-list/bookmark-list.component'; +import {TeamComponent} from './containers/team/team.component'; const routes: Routes = [ @@ -12,6 +13,7 @@ const routes: Routes = [ {path: 'search', component: SearchComponent}, {path: 'region/:id', component: RegionDetailsComponent}, {path: 'bookmark', component: BookmarkListComponent}, + {path: 'team', component: TeamComponent}, {path: '', redirectTo: 'home', pathMatch: 'full'}, {path: '**', component: NotfoundComponent} ]; diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 2ce0211..687fc4c 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -7,17 +7,17 @@ diff --git a/frontend/src/app/app.component.scss b/frontend/src/app/app.component.scss index 0b7572f..bf9e864 100644 --- a/frontend/src/app/app.component.scss +++ b/frontend/src/app/app.component.scss @@ -26,12 +26,20 @@ display: flex; flex-direction: column; - >a { + a { margin-bottom: 0.5rem; text-align: start; - >span { - padding-left: 2rem; + mat-icon { + margin-right: 0.75rem; + } + + span { + + } + + &.active { + color: #00ae00; } } } diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 50036cb..f28d8cd 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -32,6 +32,7 @@ import {BookmarkButtonComponent} from './components/bookmark-button/bookmark-but import {BookmarkListComponent} from './containers/bookmark-list/bookmark-list.component'; import {ShareButtonComponent} from './components/share-button/share-button.component'; import {ShareDialogComponent} from './dialogs/share-dialog/share-dialog.component'; +import {TeamComponent} from './containers/team/team.component'; @NgModule({ @@ -49,7 +50,8 @@ import {ShareDialogComponent} from './dialogs/share-dialog/share-dialog.componen BookmarkButtonComponent, BookmarkListComponent, ShareButtonComponent, - ShareDialogComponent + ShareDialogComponent, + TeamComponent ], imports: [ BrowserModule, diff --git a/frontend/src/app/containers/region-details/region-details.component.scss b/frontend/src/app/containers/region-details/region-details.component.scss index 40f20f3..7d56b93 100644 --- a/frontend/src/app/containers/region-details/region-details.component.scss +++ b/frontend/src/app/containers/region-details/region-details.component.scss @@ -9,6 +9,7 @@ object-fit: cover; height: 10rem; margin-bottom: 1.5rem; + align-self: center; } .region-details-header { diff --git a/frontend/src/app/containers/team/team.component.html b/frontend/src/app/containers/team/team.component.html new file mode 100644 index 0000000..ed5db75 --- /dev/null +++ b/frontend/src/app/containers/team/team.component.html @@ -0,0 +1,21 @@ +

Team

+
+ + +
+ {{member.position}} + {{member.name}} +
+ + + + + + + + + +
Course:{{member.course}}
Semester:{{member.semester}}
+
+
diff --git a/frontend/src/app/containers/team/team.component.scss b/frontend/src/app/containers/team/team.component.scss new file mode 100644 index 0000000..8d9fa7a --- /dev/null +++ b/frontend/src/app/containers/team/team.component.scss @@ -0,0 +1,49 @@ +:host { + display: flex; + flex-direction: column; +} + +.team-member-container { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-around; + + .member { + + margin: 1rem 0; + + .image { + width: 15rem; + margin-bottom: 1rem; + } + + .name-pos-container { + display: flex; + flex-direction: column; + margin-bottom: 1rem; + + .name { + font-weight: bold; + font-size: 1.2rem; + } + + .position { + text-transform: uppercase; + font-size: 0.75rem; + } + + } + + .table { + .property { + margin-right: 0.5rem; + } + + font-size: 0.75rem; + } + + } + + +} diff --git a/frontend/src/app/containers/team/team.component.spec.ts b/frontend/src/app/containers/team/team.component.spec.ts new file mode 100644 index 0000000..1f57304 --- /dev/null +++ b/frontend/src/app/containers/team/team.component.spec.ts @@ -0,0 +1,25 @@ +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; + +import {TeamComponent} from './team.component'; + +describe('TeamComponent', () => { + let component: TeamComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TeamComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TeamComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/containers/team/team.component.ts b/frontend/src/app/containers/team/team.component.ts new file mode 100644 index 0000000..97dc316 --- /dev/null +++ b/frontend/src/app/containers/team/team.component.ts @@ -0,0 +1,69 @@ +import {Component, OnInit} from '@angular/core'; + +export interface TeamMember { + name: string; + position: string; + course: string; + semester: number; + imageUrl?: string; +} + +@Component({ + selector: 'app-team', + templateUrl: './team.component.html', + styleUrls: ['./team.component.scss'] +}) +export class TeamComponent implements OnInit { + + readonly team: TeamMember[] = [ + { + name: 'Patrick Gebhardt', + position: 'Frontend Developer', + course: 'Software Engineering (SEB)', + semester: 6 + }, + { + name: 'Lucas Hinderberger', + position: 'Operations', + course: 'Software Engineering (SEB)', + semester: 6 + }, + { + name: 'Timo John', + position: 'Backend Developer', + course: 'Software Engineering (SEB)', + semester: 6 + }, + { + name: 'Timo Volkmann', + position: 'Backend Developer', + course: 'Software Engineering (SEB)', + semester: 6 + }, + { + name: 'Yannick von Hofen', + position: 'Management', + course: 'Transport und Logistik (MTL)', + semester: 3 + }, + { + name: 'Thomas Schapper', + position: 'Management', + course: 'Transport und Logistik (MTL)', + semester: 3 + }, + { + name: 'Nicolas Karon', + position: 'Management', + course: 'Transport und Logistik (MTL)', + semester: 3 + } + ]; + + constructor() { + } + + ngOnInit() { + } + +} diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index ce897d3..1da9305 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -5,14 +5,14 @@ "sun_hours": "Sunny hours", "precipitation": "Precipitation", "humidity": "Humidity", - "alcohol_costs": "Alcohol costs", - "food_costs": "Food costs", - "water_costs": "Water costs", + "alcohol_costs": "Alcohol", + "food_costs": "Food ", + "water_costs": "Water", "cheap_alcohol": "Cheap alcohol", "local_transportation_costs": "Public transport", - "average_per_day_costs": "Average total costs", - "entertainment_costs": "Entertainment costs", - "accommodation_costs": "Accommodation costs", + "average_per_day_costs": "Total costs", + "entertainment_costs": "Entertainment", + "accommodation_costs": "Accommodation", "cheap_food": "Cheap food", "cheap_water": "Cheap water", "cheap_transportations": "Cheap public transport", diff --git a/frontend/src/assets/placeholder.jpg b/frontend/src/assets/placeholder.jpg new file mode 100644 index 0000000..ebb07fd Binary files /dev/null and b/frontend/src/assets/placeholder.jpg differ diff --git a/frontend/src/robots.txt b/frontend/src/robots.txt new file mode 100644 index 0000000..a4751e2 --- /dev/null +++ b/frontend/src/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: *