+
+
+
diff --git a/codecamp-front/src/app/components/contact/contact.component.spec.ts b/codecamp-front/src/app/components/contact/contact.component.spec.ts
new file mode 100644
index 0000000..427633e
--- /dev/null
+++ b/codecamp-front/src/app/components/contact/contact.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContactComponent } from './contact.component';
+
+describe('ContactComponent', () => {
+ let component: ContactComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+ Get In Touch !
+ Please fillout the quick form and we will be in touch with lightening speed
+
+
+ +
+ + +
+
+
+
+ Connect With Us:
+For any questions:
+Email us at + hackercamp.kavalier@gmail.com
+Or
+Contact Details:
+Saquib +91-9804887223
+Sanjeev +91-8282935441
+Shiv +91-8820315476
+Amar +91-8820549897
+
@@ -9,9 +10,9 @@
+ + +
+
diff --git a/codecamp-front/src/app/components/ide/ide.component.ts b/codecamp-front/src/app/components/ide/ide.component.ts
index 7e892a9..0a37ae8 100644
--- a/codecamp-front/src/app/components/ide/ide.component.ts
+++ b/codecamp-front/src/app/components/ide/ide.component.ts
@@ -1,7 +1,9 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild,NgModule } from '@angular/core';
import { EventEmitter } from '@angular/core';
-import { Router } from '@angular/router';
+import { Router, ActivatedRoute } from '@angular/router';
import { AceEditorModule } from 'ng2-ace-editor';
+import { FormsModule } from '@angular/forms';
+import { ContestService } from '../../services/contest.service';
declare var jquery: any;
declare var $: any;
@@ -11,28 +13,37 @@ declare var $: any;
styleUrls: ['./ide.component.css']
})
export class IdeComponent implements OnInit {
-/*
+
selectedLanguage = 'c_cpp';
content: string;
+ test;
currentFileUpload;
value;
ace;
- constructor() {
+ output;
+ input;
+ description;
+ language: string;
+ constructor(
+ private contestService: ContestService,
+ private route: ActivatedRoute,
+ private router: Router
+ ) {
this.content =
`#include
-
+
+Present Contest
-
+
'); } onSelectContest(i) { diff --git a/codecamp-front/src/app/components/discuss/discuss.component.html b/codecamp-front/src/app/components/discuss/discuss.component.html index a29f0ad..7a1ea61 100644 --- a/codecamp-front/src/app/components/discuss/discuss.component.html +++ b/codecamp-front/src/app/components/discuss/discuss.component.html @@ -1,3 +1,4 @@ +;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ FooterComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(FooterComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/codecamp-front/src/app/components/footer/footer.component.ts b/codecamp-front/src/app/components/footer/footer.component.ts
new file mode 100644
index 0000000..67f1378
--- /dev/null
+++ b/codecamp-front/src/app/components/footer/footer.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-footer',
+ templateUrl: './footer.component.html',
+ styleUrls: ['./footer.component.css']
+})
+export class FooterComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/codecamp-front/src/app/components/forgot-password/forgot-password.component.css b/codecamp-front/src/app/components/forgot-password/forgot-password.component.css
new file mode 100644
index 0000000..849b889
--- /dev/null
+++ b/codecamp-front/src/app/components/forgot-password/forgot-password.component.css
@@ -0,0 +1,31 @@
+card-body{
+ padding: 3%;
+ }
+ .card {
+ margin: 3% 10%;
+ box-shadow: 0 1px 15px 1px rgba(39,39,39,.1);
+ }
+
+ .form-control{
+ border-radius: 1.5rem;
+ }
+
+ label{
+ padding-top: 6px;
+ }
+
+ .sub{
+ margin-left: 13.7rem;
+ }
+ .form-control:focus{
+ border-color: none;
+ box-shadow: none;
+ }
+
+ .btn-primary {
+ background: #2ca8ff;
+ right: 0;
+ border-color: #2ca8ff;
+ border-radius: 0;
+ }
+
diff --git a/codecamp-front/src/app/components/forgot-password/forgot-password.component.html b/codecamp-front/src/app/components/forgot-password/forgot-password.component.html
new file mode 100644
index 0000000..65bf618
--- /dev/null
+++ b/codecamp-front/src/app/components/forgot-password/forgot-password.component.html
@@ -0,0 +1,38 @@
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ForgotPasswordComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ForgotPasswordComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/codecamp-front/src/app/components/forgot-password/forgot-password.component.ts b/codecamp-front/src/app/components/forgot-password/forgot-password.component.ts
new file mode 100644
index 0000000..06d814a
--- /dev/null
+++ b/codecamp-front/src/app/components/forgot-password/forgot-password.component.ts
@@ -0,0 +1,46 @@
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { FlashMessagesService } from 'angular2-flash-messages';
+import { AuthService } from '../../services/auth.service';
+
+@Component({
+ selector: 'app-forgot-password',
+ templateUrl: './forgot-password.component.html',
+ styleUrls: ['./forgot-password.component.css']
+})
+export class ForgotPasswordComponent implements OnInit {
+ form: FormGroup;
+ constructor(
+ private authService: AuthService,
+ private router: Router,
+ private formBuilder: FormBuilder,
+ private _flashMessagesService: FlashMessagesService
+ ) {
+ this.createForm();
+ }
+
+ ngOnInit() {
+ }
+ createForm() {
+ this.form = this.formBuilder.group({
+ email_id: ['', Validators.required]
+ });
+}
+onForgot() {
+ const user = {
+ email_id: this.form.get('email_id').value, // Email input field
+ };
+ this.authService.forgetPassword(user).subscribe(data => {
+ if (data.success) {
+ this._flashMessagesService.show(data.msg, { cssClass: 'alert-success', timeout: 2000 });
+ this.router.navigate(['/login']);
+ } else {
+ this._flashMessagesService.show(data.msg, { cssClass: 'alert-danger', timeout: 2000 });
+ }
+ });
+
+ //console.log(user);
+
+}
+}
diff --git a/codecamp-front/src/app/components/home/home.component.css b/codecamp-front/src/app/components/home/home.component.css
index ac3df0b..aa9f549 100644
--- a/codecamp-front/src/app/components/home/home.component.css
+++ b/codecamp-front/src/app/components/home/home.component.css
@@ -42,3 +42,15 @@
max-width: 500px;
margin: 10px auto 0;
}
+
+.col-md-9,.col-md-3{
+ padding: 0%;
+}
+
+.alert{
+ border-radius: 0;
+}
+
+.alert-light{
+ padding: 4.1% 10px;
+}
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/home/home.component.html b/codecamp-front/src/app/components/home/home.component.html
index 90cfc7f..9f26823 100644
--- a/codecamp-front/src/app/components/home/home.component.html
+++ b/codecamp-front/src/app/components/home/home.component.html
@@ -5,12 +5,54 @@
-
\ No newline at end of file
+
Contest
@@ -29,7 +30,7 @@ Present Contest
class="nav-link contest" *ngFor="let i of contest" (click)="onSelectContest(i)"> -
+
-
+
diff --git a/codecamp-front/src/app/components/contest/contest.component.ts b/codecamp-front/src/app/components/contest/contest.component.ts
index 82a2820..6ecafe3 100644
--- a/codecamp-front/src/app/components/contest/contest.component.ts
+++ b/codecamp-front/src/app/components/contest/contest.component.ts
@@ -29,6 +29,7 @@ export class ContestComponent implements OnInit {
}
replaceTZ(time) {
+ // console.log(time);
return time && time.replace(/[TZ]|.000/g, '
{{i.name}}
@@ -41,6 +42,6 @@ Present Contest
'); } onSelectContest(i) { diff --git a/codecamp-front/src/app/components/discuss/discuss.component.html b/codecamp-front/src/app/components/discuss/discuss.component.html index a29f0ad..7a1ea61 100644 --- a/codecamp-front/src/app/components/discuss/discuss.component.html +++ b/codecamp-front/src/app/components/discuss/discuss.component.html @@ -1,3 +1,4 @@ +
discuss works!
diff --git a/codecamp-front/src/app/components/edit-profile/edit-profile.component.css b/codecamp-front/src/app/components/edit-profile/edit-profile.component.css index e69de29..3462e22 100644 --- a/codecamp-front/src/app/components/edit-profile/edit-profile.component.css +++ b/codecamp-front/src/app/components/edit-profile/edit-profile.component.css @@ -0,0 +1,43 @@ +.container{ + padding: 3%; + margin: 10%; + background: aliceblue; + box-shadow: 0 1px 15px 1px rgba(39,39,39,.1); +} +.row{ + margin: 2%; +} +option[disabled] { display: none; } + +.form-control{ + border-radius: 1.5rem; +} +input{ + padding: 6px; + box-shadow: 0 1px 15px 1px rgba(39,39,39,.1); + +} +label{ + padding-top: 6px; +} + +.sub{ + margin-left: 13.7rem; +} +.form-control:focus{ + border-color: none; + box-shadow: none; +} + +.btn-primary { + background: #2ca8ff; + border-color: #2ca8ff; + border-radius: 0; +} +input, select, label{ + font-size: 22px; +} +#save{ + padding:10px; + margin-left: 50%; +} diff --git a/codecamp-front/src/app/components/edit-profile/edit-profile.component.html b/codecamp-front/src/app/components/edit-profile/edit-profile.component.html index fbf98d4..daa4e61 100644 --- a/codecamp-front/src/app/components/edit-profile/edit-profile.component.html +++ b/codecamp-front/src/app/components/edit-profile/edit-profile.component.html @@ -1,3 +1,62 @@ -- Edit-profile works -
+
+
+
diff --git a/codecamp-front/src/app/components/edit-profile/edit-profile.component.ts b/codecamp-front/src/app/components/edit-profile/edit-profile.component.ts
index 0c411aa..3310920 100644
--- a/codecamp-front/src/app/components/edit-profile/edit-profile.component.ts
+++ b/codecamp-front/src/app/components/edit-profile/edit-profile.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AuthService } from '../../services/auth.service';
import { Router } from '@angular/router';
+import { FlashMessagesService } from 'angular2-flash-messages';
@Component({
@@ -12,17 +13,61 @@ import { Router } from '@angular/router';
export class EditProfileComponent implements OnInit {
user;
+ form: FormGroup;
+
constructor(
private authService: AuthService,
- private router: Router
+ private formBuilder: FormBuilder,
+ private router: Router,
+ private _flashMessagesService: FlashMessagesService
) {
this.user = authService.getProfile().subscribe(profile => {
this.user = profile.msg;
- //console.log(JSON.stringify(this.user));
+
+ // console.log(profile);
});
- //console.log(this.user);
+ this.createForm();
+ // console.log(this.user);
}
ngOnInit() {
}
+ createForm() {
+ this.form = this.formBuilder.group({
+ name: this.user.name,
+ email_id: this.user.email_id,
+ username: this.user.username,
+ contact_number: this.user.contact_number,
+ dob: this.user.dob,
+ gender: this.user.gender,
+ city: this.user.city,
+ college: this.user.college
+
+ });
+ }
+ replaceTZ(time) {
+ if(time !== undefined ){
+ let t1 = time.replace(/[TZ]|.000/g , ' ');
+ t1 = t1.split(' ');
+ return t1[0];
+ }
+ }
+ onEdit() {
+ const usr = {
+ name: this.form.get('name').value ? this.form.get('name').value : this.user.name,
+ username: this.form.get('username').value ? this.form.get('username').value : this.user.username,
+ email_id: this.form.get('email_id').value ? this.form.get('email_id').value : this.user.email_id,
+ contact_number: this.form.get('contact_number').value ? this.form.get('contact_number').value : this.user.contact_number,
+ college: this.form.get('college').value ? this.form.get('college').value : this.user.college,
+ city: this.form.get('city').value ? this.form.get('city').value : this.user.city,
+ dob: this.form.get('dob').value ? this.form.get('dob').value : this.user.dob,
+ gender: this.form.get('gender').value ? this.form.get('gender').value : this.user.gender,
+ joinedOn: this.user.joinedOn
+ };
+ this.authService.editUser(usr).subscribe(data => {
+ // console.log(data);
+ this._flashMessagesService.show(data.msg, { cssClass: 'alert-success', timeout: 2000});
+ this.router.navigate(['/profile']);
+ });
+ }
}
diff --git a/codecamp-front/src/app/components/footer/footer.component.css b/codecamp-front/src/app/components/footer/footer.component.css
new file mode 100644
index 0000000..1cf01d1
--- /dev/null
+++ b/codecamp-front/src/app/components/footer/footer.component.css
@@ -0,0 +1,27 @@
+.footer {
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ height: 20%!important;
+ background: radial-gradient( #c5ced0 0%, #f4faf5 100%);
+ color: rgb(21, 62, 245);
+ text-align: center;
+}
+.design{
+ padding-right: 5%;
+ float: right;
+}
+img{
+ height: 50px;
+}
+#image{
+ height:60px;
+ width: 140px;
+}
+.col-md-3{
+ padding-top: 20px;
+ text-align: center;
+}
+i{
+ padding-left:5px;
+}
diff --git a/codecamp-front/src/app/components/footer/footer.component.html b/codecamp-front/src/app/components/footer/footer.component.html
new file mode 100644
index 0000000..4bc317e
--- /dev/null
+++ b/codecamp-front/src/app/components/footer/footer.component.html
@@ -0,0 +1,18 @@
+
+
+
diff --git a/codecamp-front/src/app/components/footer/footer.component.spec.ts b/codecamp-front/src/app/components/footer/footer.component.spec.ts
new file mode 100644
index 0000000..2ca6c45
--- /dev/null
+++ b/codecamp-front/src/app/components/footer/footer.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FooterComponent } from './footer.component';
+
+describe('FooterComponent', () => {
+ let component: FooterComponent;
+ let fixture: ComponentFixture
+
+
+
+
+ Contact Us
+
+
+
+
+
+ 
+
+
+
+
+ +
+
+
diff --git a/codecamp-front/src/app/components/forgot-password/forgot-password.component.spec.ts b/codecamp-front/src/app/components/forgot-password/forgot-password.component.spec.ts
new file mode 100644
index 0000000..9c1a932
--- /dev/null
+++ b/codecamp-front/src/app/components/forgot-password/forgot-password.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ForgotPasswordComponent } from './forgot-password.component';
+
+describe('ForgotPasswordComponent', () => {
+ let component: ForgotPasswordComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+ Passworrd Assistance
+ +
+
+ Enter the email address associated with your HackerCamp account.
+ +
- CodeCamp
+
CodeCamp
+ HackerCamp
-
Eat, Code, Sleep and Repeat
+
diff --git a/codecamp-front/src/app/components/home/home.component.ts b/codecamp-front/src/app/components/home/home.component.ts
index 33fd770..59c9470 100644
--- a/codecamp-front/src/app/components/home/home.component.ts
+++ b/codecamp-front/src/app/components/home/home.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
@Component({
selector: 'app-home',
@@ -7,9 +8,13 @@ import { Component, OnInit } from '@angular/core';
})
export class HomeComponent implements OnInit {
- constructor() { }
+ constructor(
+ private router: Router
+ ) { }
ngOnInit() {
}
-
+ onGetStarted(){
+ this.router.navigate(['/practice']);
+ }
}
diff --git a/codecamp-front/src/app/components/ide/ide.component.css b/codecamp-front/src/app/components/ide/ide.component.css
index 8fad2a6..163df3f 100644
--- a/codecamp-front/src/app/components/ide/ide.component.css
+++ b/codecamp-front/src/app/components/ide/ide.component.css
@@ -1,23 +1,56 @@
-.file-upload{
- padding: 10px;
- background: red;
- display: table;
- color: #fff;
-}
+.insingleblock{
+ box-shadow: 0 1px 15px 1px rgba(14, 14, 14, 0.1);
+ border-radius: 4px;
+ background-color: white;
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+ }
-input[type="file"] {
- display: none;
+.ace-editor{
+ font-size: 18px!important;
}
textarea{
overflow-x: hidden;
+ padding: 5px;
+ width:100%;
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
}
.select {
- margin: 2% 1%;
+ margin: 0px;
+ margin-bottom: 4px;
+ padding: 1%;
+ padding-left: 2%;
+ background: gray;
+ color: white;
+}
+.choose{
+ margin: 2%;
+ margin-bottom: 0;
+ padding-bottom: 2%;
}
-
.options{
- margin-left: 2%;
-}
\ No newline at end of file
+ margin-left: 2%;
+}
+#text{
+ width:100%;
+
+}
+
+.sub{
+ margin-bottom: 2%;
+}
+#myOutputArea{
+ border: 1px solid black;
+ background:aliceblue;
+ padding-top: 2%;
+ padding-left: 3%;
+ padding-right: 3%;
+ padding-bottom: 3%;
+ font-size: 18px;
+}
+
+.output{
+ background: blue;
+}
diff --git a/codecamp-front/src/app/components/ide/ide.component.html b/codecamp-front/src/app/components/ide/ide.component.html
index 4c23b3c..2d5c9a3 100644
--- a/codecamp-front/src/app/components/ide/ide.component.html
+++ b/codecamp-front/src/app/components/ide/ide.component.html
@@ -1,9 +1,8 @@
-
+
+
+
+
+
+ New to Coding and want to know where to start from?
+
+
+
+
+
+ Follow us on
+
+
+
+
+HackerCamp - A Platform for Aspiring Programmers
+ ++ HackerCamp was created as a platform to help programmers make it big in the world of algorithms, computer programming and programming contests. + At HackerCamp we work hard to revive the geek in you by hosting a programming contest at the start of the month and another smaller programming challenge in the middle of the month. We also aim to have training sessions and discussions related to algorithms, binary search, technicalities like array size and the likes. Apart from providing a platform for programming competitions, and forum discussions to help those who are new to the world of computer programming. +
+ + + Practice Section - A Place to home your 'Computer Programming Skills' + Try your hand at one of our many practice problems and submit your solution in a language of your choice. Our programming contest judge accepts solutions in over 4 programming languages. Preparing for coding contests were never this much fun!. Use our practice section to better prepare yourself for the multiple programming challenges that take place through-out the month on HackerCamp. + + Compete - Monthly Programming Contests + Here is where you can show off your computer programming skills. ++ + +
+
+
+
+
+
+
+
+ + +
+
+
+
diff --git a/codecamp-front/src/app/components/iwedge/contestiw/contestiw.component.ts b/codecamp-front/src/app/components/iwedge/contestiw/contestiw.component.ts
new file mode 100644
index 0000000..9fc7d6b
--- /dev/null
+++ b/codecamp-front/src/app/components/iwedge/contestiw/contestiw.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { AuthService } from '../../../services/auth.service';
+import { ContestService } from '../../../services/contest.service';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'app-contestiw',
+ templateUrl: './contestiw.component.html',
+ styleUrls: ['./contestiw.component.css']
+})
+export class ContestiwComponent implements OnInit {
+
+ contest;
+ contestname;
+ constructor(
+ public authService: AuthService,
+ private contestService: ContestService,
+ private router: Router
+ ) { }
+
+ ngOnInit() {
+ this.contestService.getContest().subscribe(
+ contest => {
+ this.contest = contest.contests;
+ });
+ }
+ onAddContest() {
+ this.router.navigate(['/contest/add-contest']);
+ }
+ onClickGrab(i){
+ this.contestname = i.name;
+ this.contestService.changeContest(this.contestname);
+ this.router.navigate(['/contest', i.id]);
+ }
+
+}
diff --git a/codecamp-front/src/app/components/iwedge/iwedge.component.css b/codecamp-front/src/app/components/iwedge/iwedge.component.css
new file mode 100644
index 0000000..e91000b
--- /dev/null
+++ b/codecamp-front/src/app/components/iwedge/iwedge.component.css
@@ -0,0 +1,53 @@
+
+.sample-header {
+ position: fixed;
+ top: 0;
+ width: 100%;
+ background-image: url(../../../assets/infinitywars.jpg);
+ background-position: center;
+ background-size: cover;
+ background-repeat: no-repeat;
+ height: 90vh;
+ }
+ .sample-header::before {
+ content: "";
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ opacity: 0.3;
+ }
+ .sample-header-section {
+ position: relative;
+ padding: 15% 0 10%;
+ max-width: 640px;
+ margin-left: auto;
+ margin-right: auto;
+ color: white;
+ }
+ h1 {
+ font-weight: 500;
+ }
+ h2 {
+ font-weight: 400;
+ }
+ .sample-section-wrap {
+ margin-top: 20rem!important;
+ position: relative;
+ background-color: white;
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+ margin: 20rem 12%!important;
+ border-radius: 5px;
+
+}
+ .sample-section {
+ position: relative;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 40px;
+ }
+
+
+
+
+
diff --git a/codecamp-front/src/app/components/iwedge/iwedge.component.html b/codecamp-front/src/app/components/iwedge/iwedge.component.html
new file mode 100644
index 0000000..6f52388
--- /dev/null
+++ b/codecamp-front/src/app/components/iwedge/iwedge.component.html
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i.name}}
+{{i.description}}
+ +
+
+
+
+
+
diff --git a/codecamp-front/src/app/components/iwedge/iwedge.component.ts b/codecamp-front/src/app/components/iwedge/iwedge.component.ts
new file mode 100644
index 0000000..a2baa4b
--- /dev/null
+++ b/codecamp-front/src/app/components/iwedge/iwedge.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+
+
+@Component({
+ selector: 'app-iwedge',
+ templateUrl: './iwedge.component.html',
+ styleUrls: ['./iwedge.component.css']
+})
+export class IwedgeComponent implements OnInit {
+
+ constructor(
+ private router: Router
+ ) { }
+
+ ngOnInit() {
+
+ }
+ onParticipateClick(){
+ this.router.navigate(['/iwedge/contest']);
+ }
+}
diff --git a/codecamp-front/src/app/components/login/login.component.css b/codecamp-front/src/app/components/login/login.component.css
index fab34af..328560b 100644
--- a/codecamp-front/src/app/components/login/login.component.css
+++ b/codecamp-front/src/app/components/login/login.component.css
@@ -15,7 +15,7 @@ label{
}
.sub{
- margin-left: 13.7rem;
+ margin-left: 13.7rem;
}
.form-control:focus{
border-color: none;
@@ -26,4 +26,19 @@ label{
background: #2ca8ff;
border-color: #2ca8ff;
border-radius: 0;
+}
+.fa {
+ float: right;
+ margin-right: 15px;
+ margin-top: -27px;
+ position: relative;
+ z-index: 2;
+ color: black;
+}
+.col-md-3{
+ padding: 1%;
+}
+
+.top{
+ min-height: 800px;
}
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/login/login.component.html b/codecamp-front/src/app/components/login/login.component.html
index a740d04..6fb44ea 100644
--- a/codecamp-front/src/app/components/login/login.component.html
+++ b/codecamp-front/src/app/components/login/login.component.html
@@ -1,42 +1,52 @@
+
+
+
+ Infinity War
++
+
+
+
+
+
+
+
+
+
+ ABOUT
++
Welcome to Infinity War, Online Coding event of EDGE'18 presented by Team Compute@id.
+ A 3-day event which is full of excitement and an arena is set to fight out.
+ Dive into this arena of battle to face off THANOS by forming your own AVENGERS team.
+
+ The more the strength of the team, more time you are going to get to knock THANOS out.
+
+ Compete against others and the one with the more problems solved will emerge as the Ultimate Savior of the Universe.
+
+
BRIEF ABOUT INFINITY WAR
++
As the Avengers and their allies have continued to protect the world from threats that are too large for any hero to handle, a new danger has emerged from the cosmic shadows: Thanos. + A despot of intergalactic infamy, his goal is to collect all six Infinity Stones, artifacts of unimaginable power, and use them to inflict his twisted will on all of reality. + Everything the Avengers have fought for has led up to this moment - the fate of Earth and its existence has never been more uncertain.
++
RULES
++
-
+
- The Portal for Coding will come live on 30th March, 2018 at 19:00 IST. +
- You have got 10 AVENGERS character and 36 HRS to compete for and form a team of AVENGERS with as many characters you can. +
- The Characters are divided into three Grades which will have their own sets of Questions to solve. +
- The Third Grades slots are opened first. It will contain 4 characters Captain America, Ant Man, Spider Man and Black Widow. + Each will contain 3 Problems to solve. +
- The Second Grade slots are opened after 8 HRS of start. It will contain 3 characters Doctor Strange, Black Panther and Star Lord.
+ Each will contain 4 Problems to solve.
+
+ Note: You can still solve any of the grades all slots are opened anytime during first 36 HRS +
+ - + The First and Final Grade slots are started after 16 HRS of start. It will contain 3 Major characters Iron Man, HULK and Thor. + Each will contain 4 Problems to solve. + +
- Category wise rules are given inside contest. +
-
+ FINAL SHOWDOWN
+
+ Scorelist freezes after First 36 HRS of the event and whatever be your score on basis of that, time will be calculated and that will + be the time limit to participate in the final showdown. +
+ - The Final Showdown will start at 19:00 IST on 1st April, 2018. +
- This round will be of 6 Problems to be solved. Each Wrong Subission or a TLE will fetch you a penalty. Be Confident on your algorithm. +
- The Tie breaker will be decided on penalties and Time taken for submission. +
- The One on the top of the Ranklist at the end would emerge as the Ultimate Winner of the Conquest against THANOS. +
+
+
+
+
-
SIGN IN
+
+
+
+ SIGN IN
+
+
+
+
-
+
+
+ + notification works! +
diff --git a/codecamp-front/src/app/components/notification/notification.component.spec.ts b/codecamp-front/src/app/components/notification/notification.component.spec.ts new file mode 100644 index 0000000..69192c5 --- /dev/null +++ b/codecamp-front/src/app/components/notification/notification.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NotificationComponent } from './notification.component'; + +describe('NotificationComponent', () => { + let component: NotificationComponent; + let fixture: ComponentFixture
-
-
-
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/practice/practice.component.ts b/codecamp-front/src/app/components/practice/practice.component.ts
index 562bf15..140845e 100644
--- a/codecamp-front/src/app/components/practice/practice.component.ts
+++ b/codecamp-front/src/app/components/practice/practice.component.ts
@@ -1,4 +1,7 @@
import { Component, OnInit } from '@angular/core';
+import { ContestService } from '../../services/contest.service';
+import { AuthService } from '../../services/auth.service';
+import { Router } from '@angular/router';
@Component({
selector: 'app-practice',
@@ -7,8 +10,21 @@ import { Component, OnInit } from '@angular/core';
})
export class PracticeComponent implements OnInit {
- constructor() { }
+ problems;
+ p;
+ constructor(
+ private contestService: ContestService,
+ private authService: AuthService,
+ private router: Router
+ ) { }
ngOnInit() {
+ this.contestService.getPracticeProblems().subscribe((data) => {
+ this.problems = data.msg;
+ })
}
+
+ onSelectProblem(contest,code){
+ this.router.navigate(['/practice', contest,code]);
+ }
}
diff --git a/codecamp-front/src/app/components/problem/problem.component.css b/codecamp-front/src/app/components/problem/problem.component.css
index 6222c1c..1be0f6e 100644
--- a/codecamp-front/src/app/components/problem/problem.component.css
+++ b/codecamp-front/src/app/components/problem/problem.component.css
@@ -1,6 +1,6 @@
.main {
background: white;
- box-shadow: 0 1px 15px 1px rgba(39,39,39,.1);
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
padding-top: 30px;
}
@@ -16,9 +16,6 @@ h6{
font-weight: bold;
}
-button{
- margin-left: 3.5%;
-}
p{
font-size: 15px;
}
@@ -26,4 +23,26 @@ p{
border: 1px solid #111;
padding: 5%;
background-color: rgb(201, 252, 235);
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+}
+
+
+.side{
+ height: 60vh;
+ overflow-y: scroll;
+ overflow-x: hidden;
}
+
+.head {
+ padding: 2%;
+ font-size: 14px;
+ font-weight: bold;
+ background: #2c3e50;
+ color: #fff;
+ text-align: center;
+}
+
+.score{
+ font-size: 18px;
+ font-weight: bolder;
+}
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/problem/problem.component.html b/codecamp-front/src/app/components/problem/problem.component.html
index c2bcf44..baae179 100644
--- a/codecamp-front/src/app/components/problem/problem.component.html
+++ b/codecamp-front/src/app/components/problem/problem.component.html
@@ -1,57 +1,75 @@
+
-
- Name
-
-
- Code
-
-
+Submission
-
+
-
-
+
+
+
+ Problem
+
+
+ Problem Code
+
+
+ Successful Submission
+
+
+
+
+
+ {{i.name}}
+
+
+ {{i.code}}
+
+
+ {{i.successfullSubmission}}
+
+
-
-
-
-
- A puzzle Game
-
-
- H1
-
-
- 43.43
--
-
diff --git a/codecamp-front/src/app/components/problems/problems.component.ts b/codecamp-front/src/app/components/problems/problems.component.ts
index 2718696..09a76af 100644
--- a/codecamp-front/src/app/components/problems/problems.component.ts
+++ b/codecamp-front/src/app/components/problems/problems.component.ts
@@ -21,20 +21,28 @@ export class ProblemsComponent implements OnInit {
contestname;
time;
- //Called after the constructor, initializing input properties, and the first call to ngOnChanges.
- //Add 'implements OnInit' to the class.
+ // Called after the constructor, initializing input properties, and the first call to ngOnChanges.
+ // Add 'implements OnInit' to the class.
countDownDate;
now;
end;
distance;
- days= 0;
+ days = 0;
hours;
minutes;
seconds;
times;
+ time_hr;
+ time_day;
+ time_min;
+ time_sec;
start;
x;
- ticks= 0;
+ ticks = 0;
+ typeOfNow = 'Contest Will Start In';
+ conditionToShowProblem = false;
+ user;
+ username;
constructor(
private contestService: ContestService,
private router: Router,
@@ -46,23 +54,33 @@ export class ProblemsComponent implements OnInit {
ngOnInit() {
this.contest = this.route.snapshot.params['contest'];
+
this.contestService.getProblems(this.contest).subscribe((contest) => {
this.problems = contest.msg[0].questions;
this.start = new Date(contest.msg[0].startTime);
this.end = new Date(contest.msg[0].endTime);
+ // console.log(this.start);
+ // console.log(this.end);
var timer;
- if (this.start > new Date())
- var compareDate = this.start;
- else
- var compareDate = this.end;
- //compareDate.setDate(this.end.getDate()); //just for this demo today + 7 days
- //console.log(compareDate);
+ if (this.start > new Date()) {
+ var compareDate = this.start;
+ } else if (this.start <= new Date() && this.end >= new Date()) {
+ this.typeOfNow = 'Contest Will End In';
+ var compareDate = this.end;
+ this.conditionToShowProblem = true;
+ } else {
+ this.typeOfNow = 'Contest Ended';
+ this.conditionToShowProblem = true;
+ }
+ // compareDate.setDate(this.end.getDate()); //just for this demo today + 7 days
+ // console.log(compareDate);
/* timer = setInterval(function() {
timeBetweenDates(compareDate);
}, 1000);*/
- setInterval((()=>{
- var dateEntered = compareDate;
+ setInterval((() => {
+ if (compareDate) {
+ var dateEntered = new Date(compareDate);
var now = new Date();
var difference = dateEntered.getTime() - now.getTime();
@@ -70,7 +88,7 @@ export class ProblemsComponent implements OnInit {
// Timer done
clearInterval(timer);
-
+ this.times = '';
} else {
var second = Math.floor(difference / 1000);
@@ -81,7 +99,7 @@ export class ProblemsComponent implements OnInit {
hour %= 24;
minute %= 60;
second %= 60;
- //console.log(day,hour,minute,second);
+ // console.log(day,hour,minute,second);
// this.days = day;
// this.hours = hour;
// this.minutes = minute;
@@ -93,18 +111,27 @@ export class ProblemsComponent implements OnInit {
var temp = String(day) + ' days ' + String(hour) + ' hr ' +String(minute) + ' min ' +String(second) + ' sec';
////this.contestService.time.next(temp);
//this.contestService.time.subscribe(value => this.times = value);*/
- this.times = String(day) + ' days ' + String(hour) + ' hr ' +String(minute) + ' min ' +String(second) + ' sec';
-
+ this.time_day = day ;
+ this.time_hr = hour ;
+ this.time_min = minute ;
+ this.time_sec = second ;
+ this.times = String(day) + ' days ' + String(hour) + ' hr ' + String(minute) + ' min ' + String(second) + ' sec';
+ }
}
- }),1000);
-
+ }), 1000);
});
this.contestService.currentContest.subscribe(contest => this.contestname = contest);
}
- tickerFunc(tick){
+
+ ngOnDestroy() {
+ //Called once, before the instance is destroyed.
+ //Add 'implements OnDestroy' to the class.
+
+ }
+ tickerFunc(tick) {
this.ticks = tick;
}
onAddProblem() {
diff --git a/codecamp-front/src/app/components/profile/profile.component.css b/codecamp-front/src/app/components/profile/profile.component.css
index 271ca9a..86e4342 100644
--- a/codecamp-front/src/app/components/profile/profile.component.css
+++ b/codecamp-front/src/app/components/profile/profile.component.css
@@ -1,14 +1,35 @@
.circle{
margin-top: 40px;
- width: 80%;
+ width: 30%;
border-radius: 120px;
- margin-left: 25%;
+ margin-left: 40%;
+}
+.col-md-6{
+ margin-top: 7%;
+}
+.col-md-2{
+ margin-top:2%;
}
.bold{
text-align: center;
- font-size:35px !important;
+ font-size:30px !important;
}
-.college{
+#college{
text-align: center;
- font-size: 15px;
+ font-size: 20px;
+}
+#user{
+ margin-left: 60%;
+}
+
+.container1{
+ margin-left:10%;
+ margin-right:15%;
+ box-sizing: border-box;
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+ background: #fff;
+ min-height: 800px;
+}
+.list-group-item{
+ border: rgb(165, 162, 162);
}
diff --git a/codecamp-front/src/app/components/profile/profile.component.html b/codecamp-front/src/app/components/profile/profile.component.html
index 19fe18e..126c615 100644
--- a/codecamp-front/src/app/components/profile/profile.component.html
+++ b/codecamp-front/src/app/components/profile/profile.component.html
@@ -1,28 +1,49 @@
-
-
- ![]()
+ ![]()
@@ -59,9 +77,16 @@
+
+
+
diff --git a/codecamp-front/src/app/components/problem/problem.component.ts b/codecamp-front/src/app/components/problem/problem.component.ts
index acfd0be..6ccf0d3 100644
--- a/codecamp-front/src/app/components/problem/problem.component.ts
+++ b/codecamp-front/src/app/components/problem/problem.component.ts
@@ -16,6 +16,8 @@ export class ProblemComponent implements OnInit {
contest;
problem;
base64Image;
+ showComment = false;
+ caretType = 'fa-caret-right';
constructor(
private route: ActivatedRoute,
private router: Router,
@@ -26,13 +28,16 @@ export class ProblemComponent implements OnInit {
}
ngOnInit() {
- this.code = this.route.snapshot.params['problem'];
- this.contest = this.route.snapshot.params['contest'];
+ this.code = this.route.snapshot.params['problem'];
+ this.contest = this.route.snapshot.params['contest'];
this.contestService.getProblem(this.code, this.contest).subscribe(data => {
this.problem = data.problem;
this.base64Image = this.problem.image;
- this.base64Image = this.domSanitizer.bypassSecurityTrustResourceUrl('data:image/jpg;base64,'
+ if(this.base64Image !== undefined) {
+ this.base64Image = this.domSanitizer.bypassSecurityTrustResourceUrl('data:image/jpg;base64,'
+ this.base64Image);
+ }
+
});
}
@@ -40,4 +45,14 @@ export class ProblemComponent implements OnInit {
onSelectSubmit() {
this.router.navigate([this.contest, 'submit', this.code]);
}
+
+ showComments() {
+ if (this.showComment) {
+ this.showComment = !(this.showComment);
+ this.caretType = 'fa-caret-right';
+ } else {
+ this.showComment = !(this.showComment);
+ this.caretType = 'fa-caret-down';
+ }
+ }
}
diff --git a/codecamp-front/src/app/components/problems/problems.component.css b/codecamp-front/src/app/components/problems/problems.component.css
index 665d63a..055ea71 100644
--- a/codecamp-front/src/app/components/problems/problems.component.css
+++ b/codecamp-front/src/app/components/problems/problems.component.css
@@ -2,7 +2,7 @@
background: white;
border-bottom: 1px solid rgba(39,39,39,.1);
padding: 1% 0.5%;
- box-shadow: 0 1px 15px 1px rgba(39,39,39,.1);
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
cursor: pointer;
}
@@ -26,14 +26,32 @@
.col-md-3 {
text-align: center;
+ padding-right:0% !important;
}
.display-4{
- padding-left: 1%;
+ padding-left: 1%;
}
.main {
margin-top: 1%;
background: white;
padding: 2%;
border: 4px;
-}
\ No newline at end of file
+ min-height: 800px;
+}
+
+
+button.btn.btn-info{
+ margin-top:4%;
+}
+
+#box-el{
+ padding:0.5rem!important;
+ color: rgb(15, 15, 15);
+ background: rgb(231, 240, 55);
+
+}
+
+.fa-check{
+ color: green;
+}
diff --git a/codecamp-front/src/app/components/problems/problems.component.html b/codecamp-front/src/app/components/problems/problems.component.html
index 3909c4f..3880634 100644
--- a/codecamp-front/src/app/components/problems/problems.component.html
+++ b/codecamp-front/src/app/components/problems/problems.component.html
@@ -1,23 +1,17 @@
+
{{ problem?.name }}
-
-
-
+ Problem Code: {{ problem?.code }}
+
+
+
+
-{{ problem?.name }}
+
+
-
-
+
Problem Code: {{ problem?.code }}
+
-
-
-
+
+
+ -
Problem Statement:
-{{ problem?.description}}
+Input
-{{ problem?.input_format}}
+Output
-{{ problem?.output_format }}
+Constraints
-{{problem?.constraints}}
+Input Testcase
- +Output Testcase
- +Explanations
- +
+
+
+
+ Time/Date
+
+
+ Res
+
+
+ Lang
+
+
+ Code
+
+
+
Explanations
Time Limit: ms
- Source Limit: byte
+ Source Limit: byte
Author:
Languages: C, C++, Java, Python
+ - Source Limit: byte
+ Source Limit: byte
Author:
Languages: C, C++, Java, Python
+
+
+
+
Comment
+
-
-
+
-
@@ -38,22 +32,27 @@
{{contestname}}
{{i.name}}
+
{{i.code}}
+
+ {{i.successfullSubmission}}
+
-
Time to start
+ {{typeOfNow}}
+
- {{times}} +
+ - {{times}} +
+
+
+ {{time_day}}
+
+ D +
+ + D +
+ {{time_hr}}
+
+ H +
+ + H +
+ {{time_min}}
+
+ M +
+ + M +
+ {{time_sec}}
+
+ S +
+ + S +
-
+
+
+
-
+
-
-
-
+ +
{{user.name}} ( {{user.username}})
-
-
- {{user.college}}
-
+
-
+
+
+
+ {{user.name}}
+
+
+
-
- -
-
-
- Email: {{user.email_id}} -
- Date Of Birth: {{ user.dob }} -
- City: {{ user.city }} -
- Gender: {{ user.gender }} -
- JoinedOn: {{ user.joinedOn }} -
+ +
+
diff --git a/codecamp-front/src/app/components/profile/profile.component.ts b/codecamp-front/src/app/components/profile/profile.component.ts
index 5d0e588..ec7b787 100644
--- a/codecamp-front/src/app/components/profile/profile.component.ts
+++ b/codecamp-front/src/app/components/profile/profile.component.ts
@@ -10,21 +10,28 @@ import { Router } from '@angular/router';
export class ProfileComponent implements OnInit {
user;
+ dob;
constructor(
private authService: AuthService,
private router: Router
) {
this.user = authService.getProfile().subscribe(profile => {
this.user = profile.msg;
- //console.log(JSON.stringify(this.user));
+ this.user.dob = this.replaceTZ(this.user.dob);
+ this.user.joinedOn = this.replaceTZ(this.user.joinedOn);
});
- //console.log(this.user);
}
ngOnInit() {
- console.log(this.user);
}
onSubmitSel() {
this.router.navigate([this.user.username, 'edit-profile']);
}
+ replaceTZ(time) {
+ if(time !== undefined ){
+ let t1 = time.replace(/[TZ]|.000/g , ' ');
+ t1 = t1.split(' ');
+ return t1[0];
+ }
+ }
}
diff --git a/codecamp-front/src/app/components/ranklist/ranklist.component.css b/codecamp-front/src/app/components/ranklist/ranklist.component.css
index e69de29..ae542a5 100644
--- a/codecamp-front/src/app/components/ranklist/ranklist.component.css
+++ b/codecamp-front/src/app/components/ranklist/ranklist.component.css
@@ -0,0 +1,7 @@
+.main{
+ min-height: 800px;
+}
+
+.reload{
+ color: gray;
+}
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/ranklist/ranklist.component.html b/codecamp-front/src/app/components/ranklist/ranklist.component.html
index 183765d..f9de386 100644
--- a/codecamp-front/src/app/components/ranklist/ranklist.component.html
+++ b/codecamp-front/src/app/components/ranklist/ranklist.component.html
@@ -1,9 +1,13 @@
-
-
+
+
+ -
+
- Name: +
- UserName: +
- College: +
- Email: +
- Contact Number +
- Date Of Birth: +
- City: +
- Gender: +
- JoinedOn: +
+
+ -
+
- {{user.name}} +
- {{user.username}} +
- {{user.college}} +
- {{user.email_id}} +
- {{user.contact_number}} +
- {{user.dob}} +
- {{ user.city }} +
- {{ user.gender }} +
- {{ user.joinedOn }} +
+
-
+
-
\ No newline at end of file
+
diff --git a/codecamp-front/src/app/components/ranklist/ranklist.component.ts b/codecamp-front/src/app/components/ranklist/ranklist.component.ts
index 84bb144..0d3293f 100644
--- a/codecamp-front/src/app/components/ranklist/ranklist.component.ts
+++ b/codecamp-front/src/app/components/ranklist/ranklist.component.ts
@@ -1,29 +1,51 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
import { ContestService } from '../../services/contest.service';
import { Router } from '@angular/router';
import { AuthService } from '../../services/auth.service';
import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { IntervalObservable } from 'rxjs/observable/IntervalObservable';
@Component({
selector: 'app-ranklist',
templateUrl: './ranklist.component.html',
styleUrls: ['./ranklist.component.css']
})
-export class RanklistComponent implements OnInit {
+export class RanklistComponent implements OnInit, OnDestroy {
contest;
+ ranks;
problems;
+ rank = [];
+ private alive: boolean;
constructor(
private contestService: ContestService,
private router: Router,
private authService: AuthService,
- private route: ActivatedRoute ) { }
+ private route: ActivatedRoute
+ ) {
+ this.alive = true;
+ }
ngOnInit() {
this.contest = this.route.snapshot.params['contest'];
this.contestService.getRankings(this.contest).subscribe(contest => {
- this.problems = contest.msg;
- });
+ this.ranks = contest.msg;
+ this.ranks.map( x=>{
+ if(x.score > 0)
+ this.rank.push(x)
+ })
+ })
+ IntervalObservable.create(10000)
+ .takeWhile(() => this.alive) // only fires when component is alive
+ .subscribe(() => {
+ this.contestService.getRankings(this.contest).subscribe(contest => {
+ this.ranks = contest.msg;
+ });
+ });
+ }
+ ngOnDestroy() {
+ this.alive = false;
}
}
diff --git a/codecamp-front/src/app/components/register/register.component.css b/codecamp-front/src/app/components/register/register.component.css
index 43c48cb..d4d83b1 100644
--- a/codecamp-front/src/app/components/register/register.component.css
+++ b/codecamp-front/src/app/components/register/register.component.css
@@ -27,4 +27,13 @@ label{
background: #2ca8ff;
border-color: #2ca8ff;
border-radius: 0;
+}
+
+.fa {
+ float: right;
+ margin-right: 15px;
+ margin-top: -27px;
+ position: relative;
+ z-index: 2;
+ color: black;
}
\ No newline at end of file
diff --git a/codecamp-front/src/app/components/register/register.component.html b/codecamp-front/src/app/components/register/register.component.html
index 6e55d74..a7949cc 100644
--- a/codecamp-front/src/app/components/register/register.component.html
+++ b/codecamp-front/src/app/components/register/register.component.html
@@ -95,6 +95,19 @@
No Successful Solutions Submitted Yet.
- + +Page Reloads in 10 seconds!!
+
+
+
+ No Successful Solutions Submitted Yet.
| # | @@ -28,13 +32,14 @@||
|---|---|---|
| {{i}} | -{{rank.name}} | -{{rank.score}} | -
| {{i+1}} | +{{rnk.name}} | +{{rnk.score}} | +
SIGN UP
+
+
+
+
+
+
+
+
+
+
@@ -136,7 +149,7 @@
SIGN UP
- SIGN UP
-
+
diff --git a/codecamp-front/src/app/components/register/register.component.ts b/codecamp-front/src/app/components/register/register.component.ts
index 6ea7fb1..df3048d 100644
--- a/codecamp-front/src/app/components/register/register.component.ts
+++ b/codecamp-front/src/app/components/register/register.component.ts
@@ -14,7 +14,9 @@ export class RegisterComponent implements OnInit {
form: FormGroup;
// message;
// messageClass;
-
+ showPassword = false;
+ text = 'password';
+ iconOfHide = 'fa-eye-slash';
constructor(
private authService: AuthService,
private router: Router,
@@ -33,7 +35,7 @@ export class RegisterComponent implements OnInit {
email_id: ['', Validators.compose([
Validators.required, // Field is required
Validators.minLength(5), // Minimum length is 5 characters
- Validators.maxLength(30), // Maximum length is 30 characters
+ Validators.maxLength(50), // Maximum length is 30 characters
this.validateEmail // Custom validation
])],
password: ['', Validators.compose([
@@ -44,6 +46,7 @@ export class RegisterComponent implements OnInit {
confirm: ['', Validators.required],
college: ['', Validators.required],
gender: ['', Validators.required],
+ contact_number: ['', Validators.required],
dob: ['', Validators.required],
city: ['', Validators.required]
}, { validator: this.matchingPasswords('password', 'confirm')});
@@ -83,7 +86,8 @@ export class RegisterComponent implements OnInit {
dob: this.form.get('dob').value,
city: this.form.get('city').value,
gender: this.form.get('gender').value,
- joinedOn: Date.now()
+ joinedOn: Date.now(),
+ contact_number: this.form.get('contact_number').value
};
this.authService.registerUser(user).subscribe(data => {
if (!data.success) {
@@ -93,9 +97,21 @@ export class RegisterComponent implements OnInit {
this._flashMessagesService.show('Email Id already exists', { cssClass: 'alert-danger', timeout: 5000});
}
} else {
- this._flashMessagesService.show('Registered Successfully', { cssClass: 'success', timeout: 5000});
+ this._flashMessagesService.show('Registered Successfully', { cssClass: 'alert-success', timeout: 5000});
this.router.navigate(['/login']);
}
});
}
+
+ onClick() {
+ this.showPassword = !this.showPassword;
+ // console.log(this.showPassword);
+ if ( this.showPassword ) {
+ this.text = 'text';
+ this.iconOfHide = 'fa-eye';
+ } else {
+ this.text = 'password';
+ this.iconOfHide = 'fa-eye-slash';
+ }
+ }
}
diff --git a/codecamp-front/src/app/components/sidebar/sidebar.component.css b/codecamp-front/src/app/components/sidebar/sidebar.component.css
index 68e2b80..519d0cf 100644
--- a/codecamp-front/src/app/components/sidebar/sidebar.component.css
+++ b/codecamp-front/src/app/components/sidebar/sidebar.component.css
@@ -10,6 +10,8 @@
position: fixed;
}
+
+
.background{
top: 0;
left: 0;
@@ -30,7 +32,6 @@
overflow: auto;
}
-.sidebar-nav {}
.background:after{
width: 100%;
@@ -100,10 +101,6 @@
.navbar-brand {
padding-bottom: 0;
margin: .7rem;
- color: red;
- text-shadow: 0.01em 0em 0 #000d80, 0em 0.01em 0 #000d80, 0.02em 0.01em 0 #000d80, 0.01em 0.02em 0 #000d80, 0.03em 0.02em 0 #000d80 ,
- 0.02em 0.03em 0 #000d80, 0.04em 0.03em 0 #000d80, 0.03em 0.04em 0 #000d80, 0.05em 0.04em 0 #000d80, 0.04em 0.05em 0 #000d80,
- 0.06em 0.05em 0 #000d80, 0.05em 0.06em 0 #000d80, 0.07em 0.06em 0 #000d80, 0.06em 0.07em 0 #000d80, 0.08em 0.07em 0 #000d80, 0.07em 0.08em 0 #000d80;
}
diff --git a/codecamp-front/src/app/components/sidebar/sidebar.component.html b/codecamp-front/src/app/components/sidebar/sidebar.component.html
index c14f36b..4995fd6 100644
--- a/codecamp-front/src/app/components/sidebar/sidebar.component.html
+++ b/codecamp-front/src/app/components/sidebar/sidebar.component.html
@@ -1,3 +1,4 @@
+
Password do not match
{{comment.username}}
++ {{comment.comment}} +
+ ++