Skip to content

Commit

Permalink
Merge pull request #2 from Siggg/front
Browse files Browse the repository at this point in the history
Front
  • Loading branch information
sopial42 committed Mar 9, 2019
2 parents 7ea1105 + 4e153fa commit 9e9ac18
Show file tree
Hide file tree
Showing 44 changed files with 567 additions and 411 deletions.
54 changes: 54 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"truffle-contract": "^4.0.1",
"tslib": "^1.9.0",
"web3": "1.0.0-beta.37",
"zone.js": "^0.8.26"
"zone.js": "^0.8.26",
"ng2-semantic-ui": "^0.9.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.12.1",
Expand Down
Empty file.
10 changes: 10 additions & 0 deletions src/app/about/about.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<p>
Thanks to the Team:<br/>
<br/>
Mohammed<br/>
Sebastien<br/>
Jean<br/>
Axel<br/>
<br/>
special thanks to our Coder Scientist Ethic Eugène
</p>
25 changes: 25 additions & 0 deletions src/app/about/about.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { AboutComponent } from './about.component';

describe('AboutComponent', () => {
let component: AboutComponent;
let fixture: ComponentFixture<AboutComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AboutComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(AboutComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
15 changes: 15 additions & 0 deletions src/app/about/about.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-about',
templateUrl: './about.component.html',
styleUrls: ['./about.component.css']
})
export class AboutComponent implements OnInit {

constructor() { }

ngOnInit() {
}

}
16 changes: 16 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { CulottelistComponent } from './projects/culottelist/culottelist.component';
import { AboutComponent } from './about/about.component';

const routes: Routes = [
{ path: '', component: CulottelistComponent},
{ path: 'culottelist', component: CulottelistComponent},
{ path: 'about', component: AboutComponent},
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule { }
13 changes: 13 additions & 0 deletions src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.logo {
display: block;
margin-left: auto;
margin-right: auto;
width: 10%;
}

.mainbox {
margin-top: 50px;
margin: auto;
max-width: 80%
}

13 changes: 11 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
<mat-toolbar color="primary">Angular Truffle Box</mat-toolbar>
<app-meta-sender></app-meta-sender>
<!--The content below is only a placeholder and can be replaced.-->
<img src="../assets/logo/Bonnet_Phrygien.png" class="logo" routerLink="/culottelist">
<div class="ui raised segment mainbox ">
<div class="ui secondary menu">
<a class="item" routerLink="/culottelist">Culotte List</a>
<div class="right menu">
<a class="item" routerLink="/about">About</a>
</div>
</div>
<router-outlet></router-outlet>
</div>
35 changes: 35 additions & 0 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { TestBed, async } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';

describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule
],
declarations: [
AppComponent
],
}).compileComponents();
}));

it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
});

it(`should have as title 'my-app'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('my-app');
});

it('should render title in a h1 tag', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('Welcome to my-app!');
});
});
2 changes: 1 addition & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import { Component } from '@angular/core';
styleUrls: ['./app.component.css']
})
export class AppComponent {
title = 'app works!';
title = 'my-app';
}
36 changes: 13 additions & 23 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';

import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import {MetaModule} from './meta/meta.module';
import { CommonModule } from '@angular/common';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {
MatButtonModule,
MatCardModule,
MatFormFieldModule,
MatInputModule,
MatToolbarModule
} from '@angular/material';
import {SuiModule} from 'ng2-semantic-ui';
import { CulottelistComponent } from './projects/culottelist/culottelist.component';
import { AboutComponent } from './about/about.component';
import { OpenelectionComponent } from './projects/electionTabs/openelection/openelection.component';
import { CompletedelectionComponent } from './projects/electionTabs/completedelection/completedelection.component';

@NgModule({
declarations: [
AppComponent
AppComponent,
CulottelistComponent,
AboutComponent,
OpenelectionComponent,
CompletedelectionComponent,
],
imports: [
BrowserAnimationsModule,
CommonModule,
MatButtonModule,
MatCardModule,
MatFormFieldModule,
MatInputModule,
MatToolbarModule,
SuiModule,
BrowserModule,
FormsModule,
HttpClientModule,
MetaModule
AppRoutingModule
],
providers: [],
bootstrap: [AppComponent]
Expand Down
4 changes: 0 additions & 4 deletions src/app/meta/meta-sender/meta-sender.component.css

This file was deleted.

27 changes: 0 additions & 27 deletions src/app/meta/meta-sender/meta-sender.component.html

This file was deleted.

Loading

0 comments on commit 9e9ac18

Please sign in to comment.