Skip to content

Commit

Permalink
update angular + restructure project
Browse files Browse the repository at this point in the history
  • Loading branch information
ryzizub committed Apr 6, 2019
1 parent d0198ed commit c66a10a
Show file tree
Hide file tree
Showing 86 changed files with 2,282 additions and 2,071 deletions.
18 changes: 15 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
Expand All @@ -25,7 +29,8 @@
"styles": [
"src/styles.scss"
],
"scripts": []
"scripts": [],
"es5BrowserSupport": true
},
"configurations": {
"production": {
Expand All @@ -43,7 +48,14 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
Expand Down
3,581 changes: 1,845 additions & 1,736 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 28 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,50 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build"
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular/animations": "^6.1.10",
"@angular/cdk": "^7.1.1",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/fire": "^5.1.1",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/material": "^7.1.1",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"@angular/animations": "~7.2.0",
"@angular/cdk": "^7.3.7",
"@angular/common": "~7.2.0",
"@angular/compiler": "~7.2.0",
"@angular/core": "~7.2.0",
"@angular/fire": "^5.1.2",
"@angular/forms": "~7.2.0",
"@angular/material": "^7.3.7",
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"core-js": "^2.5.4",
"firebase": "^5.7.1",
"ng-simple-slideshow": "^1.2.8",
"rxjs": "~6.2.0",
"firebase": "^5.9.3",
"ng-simple-slideshow": "^1.2.9",
"rxjs": "~6.3.3",
"tslib": "^1.9.0",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.13.1",
"@angular/cli": "~6.2.6",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@angular-devkit/build-angular": "~0.13.0",
"@angular/cli": "~7.3.6",
"@angular/compiler-cli": "~7.2.0",
"@angular/language-service": "~7.2.0",
"@types/node": "~8.9.4",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.3.0",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma": "~4.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "^2.9.2"
"typescript": "~3.2.2"
}
}
6 changes: 3 additions & 3 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
const routes: Routes = [
{
path: 'home',
loadChildren: './home/home.module#HomeModule'
loadChildren: './pages/home/home.module#HomeModule'
},
{
path: 'team',
loadChildren: './team/team.module#TeamModule'
loadChildren: './pages/team/team.module#TeamModule'
},
{
path: 'partners',
loadChildren: './partners/partners.module#PartnersModule'
loadChildren: './pages/partners/partners.module#PartnersModule'
},
{ path: '**', redirectTo: 'home' }
];
Expand Down
27 changes: 20 additions & 7 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,41 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';

import { AppComponent } from './app.component';

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { SharedModule } from './shared/shared.module';
import { CoreModule } from './core/core.module';
import { AngularFireModule } from '@angular/fire';
import { environment } from '../environments/environment';
import { AngularFirestoreModule } from '@angular/fire/firestore';
import { AngularFireStorageModule } from '@angular/fire/storage';
import { AngularFireFunctionsModule } from '@angular/fire/functions';
import { AppRoutingModule } from './app-routing.module';
import { HttpClientModule } from '@angular/common/http';

import { MatSidenavModule } from '@angular/material/sidenav';
import { MatListModule } from '@angular/material/list';

import { NavigationComponentModule } from './components/navigation/navigation.module';
import { ContributePanelComponentModule } from './components/contribute-panel/contribue-panel.module';
import { FooterComponentModule } from './components/footer/footer.module';
import { NeonLogoComponentModule } from './components/neon-logo/neon-logo.module';
import { NeonDateComponentModule } from './components/neon-date/neon-date.module';
@NgModule({
declarations: [
AppComponent,
],
imports: [
AngularFireModule.initializeApp(environment.firebase),
AngularFirestoreModule.enablePersistence({experimentalTabSynchronization: true}),
AngularFireStorageModule,
AngularFireFunctionsModule,
HttpClientModule,
BrowserModule,
BrowserAnimationsModule,
AppRoutingModule,
SharedModule,
CoreModule,

NavigationComponentModule,
ContributePanelComponentModule,
FooterComponentModule,
NeonLogoComponentModule,
NeonDateComponentModule,
MatSidenavModule,
MatListModule
],
Expand Down
16 changes: 16 additions & 0 deletions src/app/components/contribute-panel/contribue-panel.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ContributePanelComponent } from './contribute-panel.component';

@NgModule({
imports: [
CommonModule,
],
declarations: [
ContributePanelComponent,
],
exports: [
ContributePanelComponent
]
})
export class ContributePanelComponentModule { }
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { SocialIconsService } from '../social-icons.service';

@Component({
selector: 'app-contribute-panel',
Expand All @@ -8,7 +7,7 @@ import { SocialIconsService } from '../social-icons.service';
})
export class ContributePanelComponent implements OnInit {

constructor( private socialsSer: SocialIconsService) { }
constructor() { }

ngOnInit() {
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions src/app/components/footer/footer.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FooterComponent } from './footer.component';
import { MatButtonModule } from '@angular/material/button';

@NgModule({
imports: [
CommonModule,
MatButtonModule
],
declarations: [
FooterComponent,
],
exports: [
FooterComponent
]
})
export class FooterComponentModule { }
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TicketView } from '../iticket/ticket-view';
import { HttpClient } from '@angular/common/http';
import { MatDialogRef } from '@angular/material/dialog';
import { FormControl, Validators } from '@angular/forms';
import { NewInvoice } from 'src/app/dto/new-invoice';
import { NewInvoice } from 'src/app/data/new-invoice';
import { AngularFirestore } from '@angular/fire/firestore';
import { elementEnd } from '@angular/core/src/render3/instructions';
import { MatSnackBar } from '@angular/material/snack-bar';
Expand Down
32 changes: 32 additions & 0 deletions src/app/components/invoice-form/invoice-form.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { InvoiceFormComponent } from './invoice-form.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import {MatInputModule} from '@angular/material/input';
import {MatSelectModule} from '@angular/material/select';
import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { MatButtonModule } from '@angular/material/button';


@NgModule({
imports: [
CommonModule,
FormsModule,
HttpClientModule,
ReactiveFormsModule,
MatInputModule,
MatSelectModule,
MatDialogModule,
MatButtonModule,
MatSnackBarModule
],
declarations: [
InvoiceFormComponent,
],
exports: [
InvoiceFormComponent
]
})
export class InvoiceFormComponentModule { }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TicketGroup } from "src/app/dto/ticket-group";
import { TicketGroup } from "src/app/data/ticket-group";
import { TicketView } from './ticket-view';

export interface TicketGroupView extends TicketGroup {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Ticket } from "src/app/dto/ticket-group";
import { Ticket } from "src/app/data/ticket-group";

export interface TicketView extends Ticket {
title: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Component, OnInit, Input, ɵConsole } from '@angular/core';
import { Observable } from 'rxjs';
import { AngularFireStorage } from '@angular/fire/storage';
import { trigger, state, style, transition, animate } from '@angular/animations';
import { Social } from 'src/app/dto/social';
import { SocialIconsService } from 'src/app/shared/social-icons.service';
import { Social } from 'src/app/data/social';
import { SocialIconsService } from 'src/app/services/social-icons.service';

export enum PhotoVisibilityState {
Visible = 'visible',
Expand Down Expand Up @@ -60,6 +60,7 @@ export class MemberCardComponent implements OnInit {
}

ngOnInit() {

const photoUrlPromise = this.firestorage.ref(this.photoPath).getDownloadURL().toPromise();
const photoUrlCringePromise = this.firestorage.ref(this.photoPathCringe).getDownloadURL().toPromise();
Promise.all([photoUrlPromise, photoUrlCringePromise]).then(urls => {
Expand Down
30 changes: 30 additions & 0 deletions src/app/components/member-card/member-card.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AngularFirestoreModule } from '@angular/fire/firestore';
import { MemberCardComponent } from './member-card.component';
import { MatCardModule } from '@angular/material/card';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { SocialIconsService } from 'src/app/services/social-icons.service';
import { SocialsPipe } from './socials.pipe';

@NgModule({
imports: [
CommonModule,
AngularFirestoreModule,
MatCardModule,
MatButtonModule,
MatIconModule
],
declarations: [
MemberCardComponent,
SocialsPipe
],
exports: [
MemberCardComponent
],
providers: [
SocialIconsService
]
})
export class MemberCardComponentModule { }
File renamed without changes.
28 changes: 28 additions & 0 deletions src/app/components/navigation/navigation.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NavigationComponent } from './navigation.component';
import { MatToolbarModule } from '@angular/material/toolbar';
import { MatButtonModule } from '@angular/material/button';
import { MatTabsModule } from '@angular/material/tabs';
import { NeonLogoComponentModule } from '../neon-logo/neon-logo.module';
import { MatIconModule } from '@angular/material/icon';
import { RouterModule } from '@angular/router';

@NgModule({
imports: [
CommonModule,
RouterModule,
MatToolbarModule,
MatButtonModule,
MatTabsModule,
MatIconModule,
NeonLogoComponentModule
],
declarations: [
NavigationComponent,
],
exports: [
NavigationComponent
]
})
export class NavigationComponentModule { }
16 changes: 16 additions & 0 deletions src/app/components/neon-date/neon-date.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NeonDateComponent } from './neon-date.component';

@NgModule({
imports: [
CommonModule,
],
declarations: [
NeonDateComponent,
],
exports: [
NeonDateComponent
]
})
export class NeonDateComponentModule { }
16 changes: 16 additions & 0 deletions src/app/components/neon-logo/neon-logo.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NeonLogoComponent } from './neon-logo.component';

@NgModule({
imports: [
CommonModule,
],
declarations: [
NeonLogoComponent,
],
exports: [
NeonLogoComponent
]
})
export class NeonLogoComponentModule { }
Loading

0 comments on commit c66a10a

Please sign in to comment.