Skip to content

Commit ab400ee

Browse files
iamsaquib8iamsaquib8
committed
frontend added
1 parent 1ac7428 commit ab400ee

15 files changed

Lines changed: 207 additions & 147 deletions

‎codecamp-front/.angular-cli.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
"../node_modules/bootstrap/dist/js/bootstrap.min.js",
3030
"../node_modules/ace-builds/src-min/ace.js",
3131
"../node_modules/ace-builds/src-min/theme-sqlserver.js",
32-
"../node_modules/ace-builds/src-min/mode-c.js",
33-
"../node_modules/ace-builds/src-min/mode-cpp.js",
3432
"../node_modules/ace-builds/src-min/mode-python.js",
3533
"../node_modules/ace-builds/src-min/mode-java.js"
3634
],

‎codecamp-front/package-lock.json‎

Lines changed: 45 additions & 45 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: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@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",
25-
"@types/jquery": "^3.3.0",
26-
"angular2-flash-messages": "^2.0.5",
27-
"angular2-jwt": "^0.2.3",
28-
"bootstrap": "^4.0.0-beta.2",
29-
"core-js": "^2.4.1",
30-
"font-awesome": "^4.7.0",
31-
"jquery": "^3.3.1",
32-
"jquery-slimscroll": "^1.3.8",
33-
"ng2-ace-editor": "^0.3.4",
34-
"ng2-file-upload": "^1.3.0",
35-
"ngx-progressbar": "^2.1.1",
36-
"popper.js": "^1.12.9",
37-
"rxjs": "^5.5.6",
38-
"zone.js": "^0.8.19"
15+
"@angular/animations": "5.2.7",
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",
25+
"@types/jquery": "3.3.0",
26+
"angular2-flash-messages": "2.0.5",
27+
"angular2-jwt": "0.2.3",
28+
"bootstrap": "4.0.0-beta.2",
29+
"core-js": "2.4.1",
30+
"font-awesome": "4.7.0",
31+
"jquery": "3.3.1",
32+
"jquery-slimscroll": "1.3.8",
33+
"ng2-ace-editor": "0.3.4",
34+
"ng2-file-upload": "1.3.0",
35+
"ngx-progressbar": "2.1.1",
36+
"popper.js": "1.12.9",
37+
"rxjs": "5.5.6",
38+
"zone.js": "0.8.19"
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",
@@ -57,6 +57,6 @@
5757
"protractor": "~5.1.2",
5858
"ts-node": "~4.1.0",
5959
"tslint": "~5.9.1",
60-
"typescript": "~2.5.3"
60+
"typescript": "^2.7.2"
6161
}
6262
}

‎codecamp-front/src/app/app-routing.module.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ const appRoutes: Routes = [
7070
},
7171
{
7272
path: 'submit/complete',
73-
component: SolutionComponent
73+
component: SolutionComponent,
74+
canActivate: [AuthGuard]
7475
},
7576
{
7677
path: 'contest/add-contest',

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
margin: 0;
1919
}
2020
.nav-link {
21-
padding: 0.5% 2%;
21+
padding: 0.5%;
22+
}
23+
24+
.main {
25+
background: white;
26+
padding: 2%;
2227
}
2328
.col-md-2 {
2429
text-align: center;

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

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,39 @@
88

99
<br>
1010

11-
<div class="container">
12-
<div class="row">
11+
<div class="container main">
12+
13+
<h5>Present Contest</h5>
14+
<div class="row">
1315
<div class="col-md-6 head">
14-
Contest
15-
</div>
16-
<div class="col-md-2 head">
17-
Contest Code
18-
</div>
19-
<div class="col-md-2 head">
20-
Start Time
21-
</div>
22-
<div class="col-md-2 head">
23-
End Time
24-
</div>
25-
</div>
26-
<a
27-
class="nav-link contest"
28-
*ngFor="let i of contest"
29-
(click)="onSelectContest(i)">
30-
<div class="row">
31-
<div class="col-md-6">
32-
{{i.name}}
33-
</div>
34-
<div class="col-md-2">
35-
{{i.id}}
36-
</div>
37-
<div class="col-md-2" [innerHTML]="replaceTZ(i.startTime)">
38-
</div>
39-
<div class="col-md-2" [innerHTML]="replaceTZ(i.endTime)">
40-
</div>
41-
</div>
42-
</a>
16+
Contest
17+
</div>
18+
<div class="col-md-2 head">
19+
Contest Code
20+
</div>
21+
<div class="col-md-2 head">
22+
Start Time
23+
</div>
24+
<div class="col-md-2 head">
25+
End Time
26+
</div>
27+
</div>
28+
<a
29+
class="nav-link contest"
30+
*ngFor="let i of contest"
31+
(click)="onSelectContest(i)">
32+
<div class="row">
33+
<div class="col-md-6">
34+
{{i.name}}
35+
</div>
36+
<div class="col-md-2">
37+
{{i.id}}
38+
</div>
39+
<div class="col-md-2" [innerHTML]="replaceTZ(i.startTime)">
40+
</div>
41+
<div class="col-md-2" [innerHTML]="replaceTZ(i.endTime)">
42+
</div>
43+
</div>
44+
</a>
4345
</div>
46+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
.page-header {
22
height: 90vh;
33
overflow: hidden;
4+
45
}
56
.header-filter {
67
position: relative;
78
}
89

910
.page-header {
10-
height: 100vh;
11+
height: 60vh;
1112
background-position: 50%;
1213
background-size: cover;
1314
margin: 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h2 class="card-title">SIGN IN</h2>
4040
</div>
4141
</div>
4242
</div>
43-
43+
<p>{{message}}</p>
4444
<div class="row">
4545
<div class="col-md-9 offset-md-3">
4646
<div class="row">

0 commit comments

Comments
 (0)