Skip to content

Commit efeb53b

Browse files
drcoolsanjeevdrcoolsanjeev
committed
modfied
1 parent 1ac7428 commit efeb53b

16 files changed

Lines changed: 158 additions & 1018 deletions

‎codecamp-front/package-lock.json‎

Lines changed: 34 additions & 940 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codecamp-front/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"private": true,
1414
"dependencies": {
1515
"@angular/animations": "^5.2.7",
16-
"@angular/common": "^6.0.0-beta.6",
17-
"@angular/compiler": "^6.0.0-beta.6",
18-
"@angular/core": "^6.0.0-beta.6",
19-
"@angular/forms": "^6.0.0-beta.6",
20-
"@angular/http": "^6.0.0-beta.6",
21-
"@angular/platform-browser": "^6.0.0-beta.6",
22-
"@angular/platform-browser-dynamic": "^6.0.0-beta.6",
23-
"@angular/platform-server": "^6.0.0-beta.6",
24-
"@angular/router": "^6.0.0-beta.6",
16+
"@angular/common": "^5.2.7",
17+
"@angular/compiler": "^5.2.7",
18+
"@angular/core": "^5.2.7",
19+
"@angular/forms": "^5.2.7",
20+
"@angular/http": "^5.2.7",
21+
"@angular/platform-browser": "^5.2.7",
22+
"@angular/platform-browser-dynamic": "^5.2.7",
23+
"@angular/platform-server": "^5.2.7",
24+
"@angular/router": "^5.2.7",
2525
"@types/jquery": "^3.3.0",
2626
"angular2-flash-messages": "^2.0.5",
2727
"angular2-jwt": "^0.2.3",
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@angular/cli": "1.6.5",
42-
"@angular/compiler-cli": "^6.0.0-beta.6",
42+
"@angular/compiler-cli": "^5.2.7",
4343
"@angular/language-service": "^5.2.0",
4444
"@types/jasmine": "~2.8.3",
4545
"@types/jasminewd2": "~2.0.2",

‎codecamp-front/src/app/components/navbar/navbar.component.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<i class="fa fa-th-list" aria-hidden="true"></i>
1616
</li>
1717
</ul>
18-
<ul class="navbar-nav my-lg-0">
18+
<ul class="navbar-nav my-lg-0 ml-auto">
1919

2020
<div class="dropdown show mr-4" *ngIf="authService.loggedIn()">
2121
<a class="btn btn-light dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true"
@@ -51,22 +51,22 @@
5151
</div>
5252
<div class="col-md-11">
5353
<nav class="navbar navbar-expand-lg navbar-light bg-transparent">
54-
<i class="fa fa-bars"></i>
54+
<i class="fa fa-bars"></i>
5555
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
5656
<span class="navbar-toggler-icon"></span>
5757
</button>
5858
<div class="collapse navbar-collapse" id="navbarText">
5959
<ul class="navbar-nav mr-auto">
60-
<li class="nav-item" >
61-
<a
62-
class="nav-link"
63-
routerLink="/"
60+
<li class="nav-item" >
61+
<a
62+
class="nav-link"
63+
routerLink="/"
6464
[routerLinkActiveOptions]="{exact: true}"
6565
routerLinkActive="active"
6666
>Home</a>
6767
</li>
6868
<li class="nav-item" >
69-
<a
69+
<a
7070
class="nav-link"
7171
routerLink="/about"
7272
routerLinkActive="active"
@@ -75,56 +75,56 @@
7575
</li>
7676
<li class="nav-item">
7777
<a class="nav-link"
78-
routerLink="/practice"
78+
routerLink="/practice"
7979
routerLinkActive="active"
8080
>Practice</a>
8181
</li>
8282
<li class="nav-item">
8383
<a class="nav-link"
84-
routerLink="/discuss"
84+
routerLink="/discuss"
8585
routerLinkActive="active"
8686
>Discuss</a>
8787
</li>
8888
<li class="nav-item" >
8989
<a class="nav-link"
90-
routerLink="/contest"
90+
routerLink="/contest"
9191
routerLinkActive="active"
9292
>Contest</a>
9393
</li>
9494
<li class="nav-item" >
9595
<a class="nav-link"
96-
routerLink="/ide"
96+
routerLink="/ide"
9797
routerLinkActive="active"
9898
>Online IDE</a>
9999
</li>
100100
</ul>
101101
<ul class="navbar-nav ml-auto">
102102
<li class="nav-item">
103-
<a class="nav-link"
104-
routerLink="/login"
103+
<a class="nav-link"
104+
routerLink="/login"
105105
routerLinkActive="active"
106106
*ngIf="!authService.loggedIn()"
107107
>Login</a>
108108
</li>
109-
109+
110110
<li class="nav-item">
111111
<a class="nav-link"
112-
routerLink="/profile"
112+
routerLink="/profile"
113113
routerLinkActive="active"
114114
*ngIf="authService.loggedIn()"
115115
>My Profile</a>
116116
</li>
117-
117+
118118
<li class="nav-item">
119119
<a class="nav-link"
120-
routerLink="/register"
120+
routerLink="/register"
121121
routerLinkActive="active"
122122
*ngIf="!authService.loggedIn()"
123123
>Register</a>
124124
</li>
125125
<li class="nav-item" >
126126
<a class="nav-link"
127-
(click)="onLogoutClick()"
127+
(click)="onLogoutClick()"
128128
*ngIf="authService.loggedIn()"
129129
>Logout</a>
130130
</li>
@@ -137,4 +137,4 @@
137137
138138
-->
139139

140-
<!--*ngIf="authService.loggedIn()" -->
140+
<!--*ngIf="authService.loggedIn()" -->

‎codecamp-front/src/app/components/problem/problem.component.css‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.main {
2-
background: white;
2+
background: white;
33
box-shadow: 0 1px 15px 1px rgba(39,39,39,.1);
4-
padding-top: 30px;
4+
padding-top: 30px;
55
}
66

77
hr{
@@ -14,4 +14,8 @@ hr{
1414

1515
h5{
1616
font-weight: bold;
17-
}
17+
}
18+
19+
button{
20+
margin-left: 3.5%;
21+
}

‎codecamp-front/src/app/components/profile/mode-cpp.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codecamp-front/src/app/components/profile/profile.component.css‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.circle{
2+
margin-top: 40px;
3+
width: 80%;
4+
border-radius: 120px;
5+
margin-left: 25%;
6+
}
7+
.bold{
8+
text-align: center;
9+
font-size:35px !important;
10+
}
11+
.college{
12+
text-align: center;
13+
font-size: 25px;
14+
}

‎codecamp-front/src/app/components/profile/profile.component.html‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1-
<div *ngIf="user">
2-
<h2 class="page-header">{{user.name}}</h2>
1+
2+
<div class="row" *ngIf="user" >
3+
<div class="col col-md-4">
4+
<div class="profile-img">
5+
<img src="../assets/undefined.jpg" class="circle img-fluid" alt="user">
6+
</div>
7+
</div>
8+
<div class="col col-md-8">
9+
<div class="bold"><b>{{user.name}}</b> ( {{user.username}})</div>
10+
<div class="college">
11+
{{user.college}}
12+
</div>
13+
<br>
314
<ul class="list-group">
4-
<li class="list-group-item">Username: {{user.username}}</li>
5-
<li class="list-group-item">Email: {{user.email_id}}</li>
6-
<li class="list-group-item">Name: {{ user.name }}</li>
7-
<li class="list-group-item">College: {{ user.college }}</li>
8-
<li class="list-group-item">Date Of Birth: {{ user.dob }}</li>
9-
<li class="list-group-item">City: {{ user.city }}</li>
10-
<li class="list-group-item">Gender: {{ user.gender }}</li>
11-
<li class="list-group-item">JoinedOn: {{ user.joinedOn }}</li>
15+
<li class="list-group-item">Email: {{user.email_id}}</li>
16+
<li class="list-group-item">Date Of Birth: {{ user.dob }}</li>
17+
<li class="list-group-item">City: {{ user.city }}</li>
18+
<li class="list-group-item">Gender: {{ user.gender }}</li>
19+
<li class="list-group-item">JoinedOn: {{ user.joinedOn }}</li>
1220
</ul>
1321
</div>
22+
</div>

‎codecamp-front/src/app/components/sidebar/sidebar.component.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
font-size: .7142em;
2424
padding: 10px 20px;
2525
line-height: 1.625rem;
26-
}
26+
}
2727

2828
.fa{
2929
margin-right: 2px;
@@ -55,13 +55,13 @@
5555
}
5656

5757
.m{
58-
margin-left: 5rem;
58+
margin-left: 5rem;
5959
}
6060

6161
.circle{
6262
width: 100px;
6363
border-radius: 120px;
64-
margin-left: 4%;
64+
margin-left: 25%;
6565
}
6666

6767

@@ -72,4 +72,4 @@
7272
.imageHomeIcon
7373
{
7474
padding-left : 10px;
75-
}
75+
}

0 commit comments

Comments
 (0)