resolving merge conflicts

src/app/components/carousel/carousel.component.css

@@ -0,0 +1,34 @@
+.team-carousel-caption{
+    display: none;
+}
+
+.team-carousel .teamImg:hover{
+    background-color: black;
+    border-radius: 12px !important;
+}
+
+.team-carousel .teamImg:hover img{
+    opacity: 0.5;
+    cursor: pointer;
+}
+
+.team-carousel .teamImg:hover .team-carousel-caption{
+    display: block;
+}
+
+.team-carousel .teamImg:hover .team-carousel-caption>p{
+    color: white;
+    font-weight: bold;
+    font-size: large;
+}
+
+@media screen and (max-width:1024px){
+    .team-carousel img{
+        height: 80%;
+    }
+
+    .team-carousel .teamImg:hover .team-carousel-caption{
+        padding-bottom: 20px !important;
+        text-align: center;
+    }
+}

src/app/components/carousel/carousel.component.html

@@ -0,0 +1,19 @@
+<div class="section team-carousel" id="carousel">
+    <div class="container">
+        <div class="col-md-auto">
+            <h2 class="title">Our Team</h2>
+        </div>
+        <div class="page-carousel col-md-7 ml-auto mr-auto">
+            <ngb-carousel>
+                <ng-template ngbSlide #teamImg *ngFor="let teamPic of teamCarousel">
+                    <div class="teamImg"> 
+                        <img src="./assets/img/{{teamPic.image}}" alt="Team gatherings">
+                        <div class="carousel-caption team-carousel-caption">
+                            <p>{{teamPic.description}}</p>
+                        </div>
+                    </div>
+                </ng-template>
+            </ngb-carousel>
+        </div>
+    </div>
+</div>

src/app/components/carousel/carousel.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CarouselComponent } from './carousel.component';
+
+describe('CarouselComponent', () => {
+  let component: CarouselComponent;
+  let fixture: ComponentFixture<CarouselComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CarouselComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CarouselComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/carousel/carousel.component.ts

@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+import teamImages from '../../../assets/json/teamCarousel.json';
+
+@Component({
+  selector: 'app-carousel',
+  templateUrl: './carousel.component.html',
+  styleUrls: ['./carousel.component.css']
+})
+export class CarouselComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+  teamCarousel: any = teamImages;
+
+}

src/app/components/components.component.html

@@ -95,7 +95,8 @@ <h3>Notification</h3>
           </div>
           <app-notification></app-notification>
       </div>
-      <app-typography></app-typography>
+      <team-members></team-members>
+      <app-carousel></app-carousel>
       <div class="section javascript-components">
           <div class="container">
               <div class="tim-title">

src/app/components/components.module.ts

@@ -16,6 +16,7 @@ import { NgbdModalComponent } from './modal/modal.component';
 import { NgbdModalContent } from './modal/modal.component';
 import { MemberCardComponent } from './member-card/member-card.component';
 import { OurWorkComponent } from './our-work/our-work.component';
+import { CarouselComponent } from './carousel/carousel.component';
 
 @NgModule({
     imports: [
@@ -36,7 +37,8 @@ import { OurWorkComponent } from './our-work/our-work.component';
         NgbdModalComponent,
         NgbdModalContent,
         MemberCardComponent,
-        OurWorkComponent
+        OurWorkComponent,
+        CarouselComponent
     ],
     entryComponents: [NgbdModalContent],
     exports: [ComponentsComponent]

src/app/components/teamSection/teamSection.component.ts

@@ -1,11 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import teamMembers from '../../../assets/json/team.json';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NgbdModalComponent } from '../modal/modal.component';
 import { MemberCardComponent } from '../member-card/member-card.component';
 
 @Component({
-    selector: 'app-typography',
+    selector: 'team-members',
     templateUrl: './teamSection.component.html',
     styleUrls: ['./teamSection.component.scss']
 })

src/assets/json/teamCarousel.json

@@ -0,0 +1,14 @@
+[
+    {
+        "image": "teamPic1.jpg",
+        "description": "Team Gatherings . . ."
+    },
+    {
+        "image": "teamPic2.jpg",
+        "description": "Our Team presenting Sertum Robot in an exhibition . . ."
+    },
+    {
+        "image": "teamPic3.jpg",
+        "description": "Team working on a website . . ."
+    }
+]