zmiguel
/
ENEI2019-Public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

This commit is contained in:
henrydays 2018-09-09 21:15:05 +01:00
parent 55e5e039b6
commit 4fc6736133
30 changed files with 141 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
api/Data/AuthRepository.cs
View File

@ -25,47 +25,15 @@ namespace api.Data
return null;
}
// if(!VerifyPasswordHash(password,user.passwordhash,user.passwordsalt))
//return null;
return user;
}
private bool VerifyPasswordHash(string password, byte[] passwordHash, byte[] passwordSalt)
{
using(var hmac = new System.Security.Cryptography.HMACSHA512(passwordSalt))
{
var computedHash = hmac.ComputeHash(System.Text.Encoding.UTF8.GetBytes(password));
for(int i=0; i< computedHash.Length; i++)
{
if(computedHash[i]!= passwordHash[i]) return false;
}
return true;
}
}
private void CreatePasswordHash(string password, out byte[] passwordHash, out byte[] passwordSalt)
{
using(var hmac = new System.Security.Cryptography.HMACSHA512())
{
passwordSalt = hmac.Key;
passwordHash = hmac.ComputeHash(System.Text.Encoding.UTF8.GetBytes(password));
}
}
public async Task<User> Register(User user, string Password)
{
byte[] passwordHash, passwordSalt;
CreatePasswordHash(Password,out passwordHash, out passwordSalt);
//user.PasswordHash=passwordHash;
// user.PasswordSalt=passwordSalt;
await Context.Users.AddAsync(user);
await Context.SaveChangesAsync();
@ -74,14 +42,5 @@ namespace api.Data
}
public async Task<bool> UserExists(string username)
{
if(await Context.Users.AnyAsync(x=>x.UserName== username))
{
return true;
}
return false;
}
}
}

1
api/Data/IAuthRepository.cs
View File

@ -10,7 +10,6 @@ namespace api.Data
Task<User> Login(string username, string password);
Task<bool> UserExists(string username);
}
}

BIN
api/api.db
View File

Binary file not shown.

BIN
api/bin/Debug/netcoreapp2.1/api.dll
View File

Binary file not shown.

BIN
api/bin/Debug/netcoreapp2.1/api.pdb
View File

Binary file not shown.

BIN
api/obj/Debug/netcoreapp2.1/api.dll
View File

Binary file not shown.

BIN
api/obj/Debug/netcoreapp2.1/api.pdb
View File

Binary file not shown.

7
backoffice/src/app/app.component.html
View File

@ -5,11 +5,4 @@
<router-outlet></router-outlet>
</div>
<!-- ./wrapper -->
<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
<script src="assets/dashboard.js"></script>
<!-- AdminLTE for demo purposes -->
<script src="assets/demo.js"></script>
</body>

13
backoffice/src/app/app.module.ts
View File

@ -6,7 +6,6 @@ import { NgxAdminLteModule } from 'ngx-admin-lte';
import { AppComponent } from './app.component';
import {HttpClientModule} from '@angular/common/http';
import { ValueComponent } from './value/value.component';
import { HttpClient } from '../../node_modules/@types/selenium-webdriver/http';
import { LoginComponent } from './login/login.component';
import { FormsModule } from '@angular/forms';
@ -19,17 +18,22 @@ import { appRoutes } from './routes';
import { AuthGuard } from './guards/auth.guard';
import { NavigationComponent } from './navigation/navigation.component';
import { CalendarComponent } from './calendar/calendar.component';
import { UserService } from './services/user.service';
import { UsersModule } from './admin/users/users.module';
import { UsersComponent } from './admin/users/users.component';
import { UserComponent } from './admin/users/user/user.component';
@NgModule({
declarations: [
AppComponent,
ValueComponent,
LoginComponent,
DashboardComponent,
ProfileComponent,
HomeComponent,
NavigationComponent,
CalendarComponent
CalendarComponent,
UsersComponent,
UserComponent
],
imports: [
BrowserModule,
@ -40,7 +44,8 @@ import { CalendarComponent } from './calendar/calendar.component';
],
providers: [
AuthService,
AuthGuard
AuthGuard,
UserService
],
bootstrap: [
AppComponent

0
backoffice/src/app/calendar/calendar.component.css
View File

262
backoffice/src/app/calendar/calendar.component.html
View File

@ -1,262 +0,0 @@
<app-navigation></app-navigation>
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
Calendar
<small>Control panel</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
<li class="active">Calendar</li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-md-3">
<div class="box box-solid">
<div class="box-header with-border">
<h4 class="box-title">Draggable Events</h4>
</div>
<div class="box-body">
<!-- the events -->
<div id="external-events">
<div class="external-event bg-green">Lunch</div>
<div class="external-event bg-yellow">Go home</div>
<div class="external-event bg-aqua">Do homework</div>
<div class="external-event bg-light-blue">Work on UI design</div>
<div class="external-event bg-red">Sleep tight</div>
<div class="checkbox">
<label for="drop-remove">
<input type="checkbox" id="drop-remove">
remove after drop
</label>
</div>
</div>
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
<div class="box box-solid">
<div class="box-header with-border">
<h3 class="box-title">Create Event</h3>
</div>
<div class="box-body">
<div class="btn-group" style="width: 100%; margin-bottom: 10px;">
<!--<button type="button" id="color-chooser-btn" class="btn btn-info btn-block dropdown-toggle" data-toggle="dropdown">Color <span class="caret"></span></button>-->
<ul class="fc-color-picker" id="color-chooser">
<li><a class="text-aqua" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-blue" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-light-blue" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-teal" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-yellow" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-orange" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-green" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-lime" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-red" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-purple" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-fuchsia" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-muted" href="#"><i class="fa fa-square"></i></a></li>
<li><a class="text-navy" href="#"><i class="fa fa-square"></i></a></li>
</ul>
</div>
<!-- /btn-group -->
<div class="input-group">
<input id="new-event" type="text" class="form-control" placeholder="Event Title">
<div class="input-group-btn">
<button id="add-new-event" type="button" class="btn btn-primary btn-flat">Add</button>
</div>
<!-- /btn-group -->
</div>
<!-- /input-group -->
</div>
</div>
</div>
<!-- /.col -->
<div class="col-md-9">
<div class="box box-primary">
<div class="box-body no-padding">
<!-- THE CALENDAR -->
<div id="calendar"></div>
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
<!-- /.content -->
</div>
<!-- /.content-wrapper -->
<!-- fullCalendar -->
<script src="assets/moment.js"></script>
<script src="assets/fullcalendar.min.js"></script>
<!-- Page specific script -->
<script>
$(function () {
/* initialize the external events
-----------------------------------------------------------------*/
function init_events(ele) {
ele.each(function () {
// create an Event Object (http://arshaw.com/fullcalendar/docs/event_data/Event_Object/)
// it doesn't need to have a start or end
var eventObject = {
title: $.trim($(this).text()) // use the element's text as the event title
}
// store the Event Object in the DOM element so we can get to it later
$(this).data('eventObject', eventObject)
// make the event draggable using jQuery UI
$(this).draggable({
zIndex : 1070,
revert : true, // will cause the event to go back to its
revertDuration: 0 // original position after the drag
})
})
}
init_events($('#external-events div.external-event'))
/* initialize the calendar
-----------------------------------------------------------------*/
//Date for the calendar events (dummy data)
var date = new Date()
var d = date.getDate(),
m = date.getMonth(),
y = date.getFullYear()
$('#calendar').fullCalendar({
header : {
left : 'prev,next today',
center: 'title',
right : 'month,agendaWeek,agendaDay'
},
buttonText: {
today: 'today',
month: 'month',
week : 'week',
day : 'day'
},
//Random default events
events : [
{
title : 'All Day Event',
start : new Date(y, m, 1),
backgroundColor: '#f56954', //red
borderColor : '#f56954' //red
},
{
title : 'Long Event',
start : new Date(y, m, d - 5),
end : new Date(y, m, d - 2),
backgroundColor: '#f39c12', //yellow
borderColor : '#f39c12' //yellow
},
{
title : 'Meeting',
start : new Date(y, m, d, 10, 30),
allDay : false,
backgroundColor: '#0073b7', //Blue
borderColor : '#0073b7' //Blue
},
{
title : 'Lunch',
start : new Date(y, m, d, 12, 0),
end : new Date(y, m, d, 14, 0),
allDay : false,
backgroundColor: '#00c0ef', //Info (aqua)
borderColor : '#00c0ef' //Info (aqua)
},
{
title : 'Birthday Party',
start : new Date(y, m, d + 1, 19, 0),
end : new Date(y, m, d + 1, 22, 30),
allDay : false,
backgroundColor: '#00a65a', //Success (green)
borderColor : '#00a65a' //Success (green)
},
{
title : 'Click for Google',
start : new Date(y, m, 28),
end : new Date(y, m, 29),
url : 'http://google.com/',
backgroundColor: '#3c8dbc', //Primary (light-blue)
borderColor : '#3c8dbc' //Primary (light-blue)
}
],
editable : true,
droppable : true, // this allows things to be dropped onto the calendar !!!
drop : function (date, allDay) { // this function is called when something is dropped
// retrieve the dropped element's stored Event Object
var originalEventObject = $(this).data('eventObject')
// we need to copy it, so that multiple events don't have a reference to the same object
var copiedEventObject = $.extend({}, originalEventObject)
// assign it the date that was reported
copiedEventObject.start = date
copiedEventObject.allDay = allDay
copiedEventObject.backgroundColor = $(this).css('background-color')
copiedEventObject.borderColor = $(this).css('border-color')
// render the event on the calendar
// the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/)
$('#calendar').fullCalendar('renderEvent', copiedEventObject, true)
// is the "remove after drop" checkbox checked?
if ($('#drop-remove').is(':checked')) {
// if so, remove the element from the "Draggable Events" list
$(this).remove()
}
}
})
/* ADDING EVENTS */
var currColor = '#3c8dbc' //Red by default
//Color chooser button
var colorChooser = $('#color-chooser-btn')
$('#color-chooser > li > a').click(function (e) {
e.preventDefault()
//Save color
currColor = $(this).css('color')
//Add color effect to button
$('#add-new-event').css({ 'background-color': currColor, 'border-color': currColor })
})
$('#add-new-event').click(function (e) {
e.preventDefault()
//Get value and make sure it is not null
var val = $('#new-event').val()
if (val.length == 0) {
return
}
//Create events
var event = $('<div />')
event.css({
'background-color': currColor,
'border-color' : currColor,
'color' : '#fff'
}).addClass('external-event')
event.html(val)
$('#external-events').prepend(event)
//Add draggable funtionality
init_events(event)
//Remove event from text input
$('#new-event').val('')
})
})
</script>

28
backoffice/src/app/calendar/calendar.component.spec.ts
View File

@ -1,28 +0,0 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { CalendarComponent } from './calendar.component';
describe('CalendarComponent', () => {
let component: CalendarComponent;
let fixture: ComponentFixture<CalendarComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ CalendarComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(CalendarComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

15
backoffice/src/app/calendar/calendar.component.ts
View File

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

5
backoffice/src/app/dashboard/dashboard.component.html
View File

@ -719,7 +719,4 @@
<!-- /.tab-pane -->
</div>
</aside>
<!-- /.control-sidebar -->
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class="control-sidebar-bg"></div>

0
backoffice/src/app/home/home.component.css
View File

3
backoffice/src/app/home/home.component.html
View File

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

28
backoffice/src/app/home/home.component.spec.ts
View File

@ -1,28 +0,0 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { HomeComponent } from './home.component';
describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(HomeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

15
backoffice/src/app/home/home.component.ts
View File

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

5
backoffice/src/app/models/photo.ts Normal file
View File

@ -0,0 +1,5 @@
export interface Photo {
id: number;
url: string;
description: string;
}

16
backoffice/src/app/models/user.ts Normal file
View File

@ -0,0 +1,16 @@
import { Photo } from './photo';
export interface User {
id: number;
username: string;
age: string;
created: Date;
lastActive: Date;
profileId: string;
city: string;
country: string;
photos ?: Photo[];
fullName: string;
}

16
backoffice/src/app/navigation/navigation.component.html
View File

@ -15,10 +15,18 @@
<div class="collapse navbar-collapse pull-left" id="navbar-collapse">
<ul class="nav navbar-nav">
<li class="active"><a routerLink="/dashboard" routerLinkActive="active"><i class="fa fa-dashboard"></i> Dashboard <span class="sr-only">(current)</span></a></li>
<li><a routerLink="/profile" routerLinkActive="active"><i class="fa fa-users"></i> Users</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li class="dropdown">
<a href="dashboard/#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-users"></i> Users<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a routerLink="../dashboard" > Dashboard</a></li>
<li><a href="#">User</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
<li class="divider"></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a href="dashboard/#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">

53
backoffice/src/app/routes.ts
View File

@ -5,13 +5,54 @@ import { LoginComponent } from './login/login.component';
import { ProfileComponent } from './profile/profile.component';
import { AuthGuard } from './guards/auth.guard';
import { CalendarComponent } from './calendar/calendar.component';
import { AdminComponent } from './admin/admin.component';
import { UsersComponent } from './admin/users/users.component';
import { UserComponent } from './admin/users/user/user.component';
export const appRoutes: Routes = [
{ path: 'home', component: HomeComponent},
{ path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard]},
{ path: 'login', component: LoginComponent},
{ path: 'profile', component: ProfileComponent, canActivate: [AuthGuard]},
{ path: 'calendar', component: CalendarComponent, canActivate: [AuthGuard] },
{ path: '**', redirectTo: 'dashboard', pathMatch: 'full'}
{
path: 'home',
component: HomeComponent
},
{
path: 'admin',
canActivate: [AuthGuard],
children: [
{
path: 'users',
component: UsersComponent,
canActivate: [AuthGuard],
},
{
path: 'user',
component: UserComponent,
canActivate: [AuthGuard],
}
]
},
{
path: 'login',
component: LoginComponent
},
{
path: 'profile',
component: ProfileComponent,
canActivate: [AuthGuard]
},
{
path: 'calendar',
component: CalendarComponent,
canActivate: [AuthGuard]
},
{
path: 'dashboard',
component: DashboardComponent,
canActivate: [AuthGuard]
},
{
path: '**',
redirectTo: 'dashboard',
pathMatch: 'full'
}
];

4
backoffice/src/app/services/auth.service.ts
View File

@ -2,11 +2,13 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
import { JwtHelperService } from '@auth0/angular-jwt';
import { environment } from '../../environments/environment';
@Injectable()
export class AuthService {
baseUrl= 'http://localhost:5000/api/';
baseUrl= environment.apiUrl + '';
jwtHelper = new JwtHelperService();
decodedToken: any;

16
backoffice/src/app/services/user.service.spec.ts Normal file
View File

@ -0,0 +1,16 @@
/* tslint:disable:no-unused-variable */
import { TestBed, async, inject } from '@angular/core/testing';
import { UserService } from './user.service';
describe('Service: User', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [UserService]
});
});
it('should ...', inject([UserService], (service: UserService) => {
expect(service).toBeTruthy();
}));
});

30
backoffice/src/app/services/user.service.ts Normal file
View File

@ -0,0 +1,30 @@
import { Injectable } from '@angular/core';
import { environment } from '../../environments/environment';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs/';
import { User } from '../models/user';
const httpOptions = {
headers: new HttpHeaders({
'Authorization': 'Bearer ' + localStorage.getItem('token')
})
};
@Injectable()
export class UserService {
baseUrl= environment.apiUrl;
constructor(private http: HttpClient ) {}
getUsers(): Observable<User[]> {
return this.http.get<User[]>(this.baseUrl + 'users', httpOptions);
}
getUser(id): Observable<User> {
return this.http.get<User>(this.baseUrl + 'users/' + id , httpOptions);
}
}

0
backoffice/src/app/value/value.component.css
View File

4
backoffice/src/app/value/value.component.html
View File

@ -1,4 +0,0 @@
<p *ngFor="let value of values" >
{{value.id}}/{{value.name}}
</p>

28
backoffice/src/app/value/value.component.spec.ts
View File

@ -1,28 +0,0 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { ValueComponent } from './value.component';
describe('ValueComponent', () => {
let component: ValueComponent;
let fixture: ComponentFixture<ValueComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ValueComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ValueComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

25
backoffice/src/app/value/value.component.ts
View File

@ -1,25 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http';
@Component({
selector: 'app-value',
templateUrl: './value.component.html',
styleUrls: ['./value.component.css']
})
export class ValueComponent implements OnInit {
values: any;
constructor(private http: HttpClient) { }
ngOnInit() {
this.getValues();
}
getValues() {
this.http.get('http://localhost:5000/api/values').subscribe(response => {
this.values = response;
}, error => {
console.log(error);
});
}
}

3
backoffice/src/environments/environment.ts
View File

@ -4,5 +4,6 @@
// The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = {
production: false
production: false,
apiUrl: 'http://localhost:5000/api/'
};