Skip to content

Commit

Permalink
chore(): format
Browse files Browse the repository at this point in the history
  • Loading branch information
marcjulian committed Jul 26, 2019
1 parent e9c2dfa commit d18c5f6
Show file tree
Hide file tree
Showing 27 changed files with 180 additions and 188 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"format": "prettier --write \"src/**/*{.ts,.scss}\"",
"gh-pages": "ionic build --prod --base-href 'https://fivethree.io/' && npx ngh --dir=www/ --cname=fivethree.io"
},
"private": true,
Expand Down
16 changes: 13 additions & 3 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';

const routes: Routes = [
{ path: '', loadChildren: () => import('./pages/home/home.module').then(m => m.HomePageModule) },
{ path: '**', loadChildren: () => import('./pages/page-not-found/page-not-found.module').then(m => m.PageNotFoundPageModule) },
{
path: '',
loadChildren: () =>
import('./pages/home/home.module').then(m => m.HomePageModule)
},
{
path: '**',
loadChildren: () =>
import('./pages/page-not-found/page-not-found.module').then(
m => m.PageNotFoundPageModule
)
}
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule]
})
export class AppRoutingModule { }
export class AppRoutingModule {}
6 changes: 2 additions & 4 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
import { AppComponent } from './app.component';

describe('AppComponent', () => {

let statusBarSpy, splashScreenSpy, platformReadySpy, platformSpy;

beforeEach(async(() => {
Expand All @@ -23,8 +22,8 @@ describe('AppComponent', () => {
providers: [
{ provide: StatusBar, useValue: statusBarSpy },
{ provide: SplashScreen, useValue: splashScreenSpy },
{ provide: Platform, useValue: platformSpy },
],
{ provide: Platform, useValue: platformSpy }
]
}).compileComponents();
}));

Expand All @@ -43,5 +42,4 @@ describe('AppComponent', () => {
});

// TODO: add more tests!

});
8 changes: 5 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ export function HttpLoaderFactory(http: HttpClient) {
deps: [HttpClient]
}
}),
ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
LottieModule,
ServiceWorkerModule.register('ngsw-worker.js', {
enabled: environment.production
}),
LottieModule
],
providers: [
StatusBar,
Expand All @@ -48,4 +50,4 @@ export function HttpLoaderFactory(http: HttpClient) {
],
bootstrap: [AppComponent]
})
export class AppModule { }
export class AppModule {}
5 changes: 2 additions & 3 deletions src/app/components/about/about.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ describe('AboutComponent', () => {

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

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions src/app/components/about/about.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./about.component.scss']
})
export class AboutComponent implements OnInit {
constructor() {}

constructor() { }

ngOnInit() {
}

ngOnInit() {}
}
42 changes: 21 additions & 21 deletions src/app/components/components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ import { TeamComponent } from './team/team.component';
import { FivethreeCoreModule } from '@fivethree/core';

@NgModule({
declarations: [
HeaderComponent,
FooterComponent,
AboutComponent,
TeamComponent
],
imports: [
CommonModule,
IonicModule,
TranslateModule.forChild(),
FivethreeCoreModule
],
exports: [
HeaderComponent,
FooterComponent,
AboutComponent,
TeamComponent,
FivethreeCoreModule
],
providers: [],
declarations: [
HeaderComponent,
FooterComponent,
AboutComponent,
TeamComponent
],
imports: [
CommonModule,
IonicModule,
TranslateModule.forChild(),
FivethreeCoreModule
],
exports: [
HeaderComponent,
FooterComponent,
AboutComponent,
TeamComponent,
FivethreeCoreModule
],
providers: []
})
export class ComponentsModule { }
export class ComponentsModule {}
62 changes: 31 additions & 31 deletions src/app/components/footer/footer.component.scss
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
ion-footer {
background: var(--ion-color-dark);
padding: 64px 0 64px 0;
background: var(--ion-color-dark);
padding: 64px 0 64px 0;
}

h4 {
color: var(--ion-color-dark-contrast);
color: var(--ion-color-dark-contrast);
}

.links {
display: block;
margin-bottom: 8px;
font-size: 16px;
line-height: 1.3;
color: var(--ion-color-light);
display: block;
margin-bottom: 8px;
font-size: 16px;
line-height: 1.3;
color: var(--ion-color-light);
}

a:hover {
color: var(--ion-color-light-shade);
color: var(--ion-color-light-shade);
}

a {
text-decoration: none;
text-decoration: none;
}

#social {
display: flex;
justify-content: center;
align-items: center;

a {
color: var(--ion-color-light);
font-size: 2rem;
padding: 0 12px 0 12px;
}

a:first-child {
padding-left: 0;
}

a:last-child {
padding-right: 0;
}
display: flex;
justify-content: center;
align-items: center;

a {
color: var(--ion-color-light);
font-size: 2rem;
padding: 0 12px 0 12px;
}

a:first-child {
padding-left: 0;
}

a:last-child {
padding-right: 0;
}
}

@media screen and (max-width: 991px) {
#social {
order: -1;
}
}
#social {
order: -1;
}
}
5 changes: 2 additions & 3 deletions src/app/components/footer/footer.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ describe('FooterComponent', () => {

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

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions src/app/components/footer/footer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./footer.component.scss']
})
export class FooterComponent implements OnInit {
constructor() {}

constructor() { }

ngOnInit() {
}

ngOnInit() {}
}
6 changes: 3 additions & 3 deletions src/app/components/header/header.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ion-title {
cursor: pointer;
cursor: pointer;
}

#github {
color: var(--ion-color-light-contrast);
}
color: var(--ion-color-light-contrast);
}
5 changes: 2 additions & 3 deletions src/app/components/header/header.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ describe('HeaderComponent', () => {

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

beforeEach(() => {
Expand Down
7 changes: 2 additions & 5 deletions src/app/components/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@ import { NavController } from '@ionic/angular';
styleUrls: ['./header.component.scss']
})
export class HeaderComponent implements OnInit {
constructor(private navController: NavController) {}

constructor(private navController: NavController) { }

ngOnInit() {
}
ngOnInit() {}

onTitleClicked() {
this.navController.navigateRoot('/');
}

}
52 changes: 26 additions & 26 deletions src/app/components/team/team.component.scss
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#team {
background: var(--ion-color-dark);
background: var(--ion-color-dark);
}

h2 {
color: var(--ion-color-dark-contrast);
color: var(--ion-color-dark-contrast);
}

p {
color: var(--ion-color-light);
color: var(--ion-color-light);
}

a {
font-size: 2em;
color: var(--ion-color-light);
font-size: 2em;
color: var(--ion-color-light);
}

ion-card {
background: var(--ion-color-medium);
}
background: var(--ion-color-medium);
}

ion-col {
text-align: center;
img {
display: inline-block;
height: 200px;
width: 200px;
border-radius: 50%;
}
text-align: center;
img {
display: inline-block;
height: 200px;
width: 200px;
border-radius: 50%;
}
}

.links {
a {
padding: 0 8px 0 8px;
}

a:first-child {
padding-left: 0px;
}

a:last-child {
padding-right: 0px;
}
}
a {
padding: 0 8px 0 8px;
}

a:first-child {
padding-left: 0px;
}

a:last-child {
padding-right: 0px;
}
}
5 changes: 2 additions & 3 deletions src/app/components/team/team.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ describe('TeamComponent', () => {

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

beforeEach(() => {
Expand Down
Loading

0 comments on commit d18c5f6

Please sign in to comment.