Resolved merge conflict

Author: shivkumar5

codecamp-front/src/app/components/ide/ide.component.css

@@ -0,0 +1,11 @@
+
+.file-upload{
+    padding: 10px;
+    background: red; 
+    display: table;
+    color: #fff;
+}
+
+input[type="file"] {
+   display: none;
+}

codecamp-front/src/app/components/ide/ide.component.html

@@ -0,0 +1,22 @@
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <p>Online IDE</p>
+            <textarea name="" id="" cols="100" rows="28" ></textarea>  
+            <div class="row">
+            <div class="col-md-8">
+                <label class="file-upload">Upload File
+                    <input type="file" class="form-control-file">
+                </label>
+            </div>
+            <div class="col-md-4">
+                <div class="form-check mr-auto">
+                    <input type="checkbox" class="form-check-input" id="exampleCheck1">
+                    <label class="form-check-label" for="exampleCheck1">Check me out</label>
+                    <button class="btn btn-dark">Compile</button>
+                </div>
+            </div>
+            </div>
+        </div>
+    </div>
+</div>

codecamp-front/src/app/components/ide/ide.component.spec.ts

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

codecamp-front/src/app/components/ide/ide.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-ide',
+  templateUrl: './ide.component.html',
+  styleUrls: ['./ide.component.css']
+})
+export class IdeComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

codecamp-front/src/app/components/ranklist/ranklist.component.css

@@ -0,0 +1,3 @@
+<p>
+  ranklist works!
+</p>

codecamp-front/src/app/components/ranklist/ranklist.component.html

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

codecamp-front/src/app/components/ranklist/ranklist.component.spec.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-ranklist',
+  templateUrl: './ranklist.component.html',
+  styleUrls: ['./ranklist.component.css']
+})
+export class RanklistComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

codecamp-front/src/app/components/ranklist/ranklist.component.ts

@@ -0,0 +1,3 @@
+<p>
+  solution works!
+</p>