Skip to content

Remove presentation app #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Utwo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove presentation app #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 3 additions & 48 deletions src/ClientApp/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/assets"
],
"assets": ["src/assets"],
"styles": [
"node_modules/@fortawesome/fontawesome-free/css/all.min.css",
"src/styles.scss"
Expand Down Expand Up @@ -66,32 +64,11 @@
"browserTarget": "VotRomania:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
],
"scripts": [],
"assets": [
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
}
},
"server": {
Expand Down Expand Up @@ -121,28 +98,6 @@
}
}
}
},
"VotRomania-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "VotRomania:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "VotRomania",
Expand Down
28 changes: 0 additions & 28 deletions src/ClientApp/e2e/protractor.conf.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/ClientApp/e2e/src/app.e2e-spec.ts
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/ClientApp/e2e/src/app.po.ts
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/ClientApp/e2e/tsconfig.e2e.json
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions src/ClientApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
"start": "ng serve",
"build": "ng build --prod",
"build:watch": "ng build --watch",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
"lint": "ng lint"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -42,23 +40,13 @@
"@angular/cli": "8.3.14",
"@angular/compiler-cli": "8.2.12",
"@angular/language-service": "8.2.12",
"@types/jasmine": "~3.4.4",
"@types/jasminewd2": "~2.0.8",
"@types/lodash": "^4.14.150",
"@types/node": "~12.11.6",
"codelyzer": "^5.2.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.4.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"typescript": "3.5.3"
},
"optionalDependencies": {
"node-sass": "^4.12.0",
"protractor": "~5.4.2",
"ts-node": "~8.4.1",
"tslint": "~5.20.0"
}
Expand Down
43 changes: 0 additions & 43 deletions src/ClientApp/src/app/about/about.component.html
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions src/ClientApp/src/app/about/about.component.scss
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/ClientApp/src/app/about/about.component.ts
View file
Open in desktop

This file was deleted.

91 changes: 31 additions & 60 deletions src/ClientApp/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,39 @@
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule, HttpClient } from '@angular/common/http';
import { RouterModule, Routes } from '@angular/router';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { HttpClientModule, HttpClient } from "@angular/common/http";
import { RouterModule, Routes } from "@angular/router";
import { MatAutocompleteModule } from "@angular/material/autocomplete";

import { EffectsModule } from '@ngrx/effects';
import { ApplicationEffects } from './state/effects';
import { AppComponent } from './app.component';
import { NavMenuComponent } from './nav-menu/nav-menu.component';
import { HomeComponent } from './home/home.component';
import { GeneralInfoComponent } from './general-info/general-info.component';
import { VotersGuideComponent } from './voters-guide/voters-guide.component';
import { FooterComponent } from './footer/footer.component';
import { StoreModule } from '@ngrx/store';
import { appStateReducer } from './state/reducers';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { CollapseModule } from 'ngx-bootstrap/collapse';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ShareCardComponent } from './share-card/share-card.component';
import { DonateCardComponent } from './donate-card/donate-card.component';
import { PollingStationCardInfoComponent } from './polling-station-card-info/polling-station-card-info.component';
import { PollingStationSearchComponent } from './polling-station-search/polling-station-search.component';
// import { HereAddressService } from './services/here-address.service';
import { DataService } from './services/data.service';
import { AboutComponent } from './about/about.component';
import { CookiePolicyComponent } from './cookie-policy/cookie-policy.component';
import { AdminModule } from './admin/admin.module';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
import { JoinTranslationsPipe } from './join-translations.pipe';
import { VotRomaniaComponent } from './vot-romania/vot.romania.component';
import { MapNoteComponent } from './map-note/map.note.component';
import { EffectsModule } from "@ngrx/effects";
import { ApplicationEffects } from "./state/effects";
import { AppComponent } from "./app.component";
import { NavMenuComponent } from "./nav-menu/nav-menu.component";
import { FooterComponent } from "./footer/footer.component";
import { StoreModule } from "@ngrx/store";
import { appStateReducer } from "./state/reducers";
import { BsDropdownModule } from "ngx-bootstrap/dropdown";
import { CollapseModule } from "ngx-bootstrap/collapse";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { DataService } from "./services/data.service";
import { AdminModule } from "./admin/admin.module";
import { TranslateHttpLoader } from "@ngx-translate/http-loader";
import { TranslateModule, TranslateLoader } from "@ngx-translate/core";
import { JoinTranslationsPipe } from "./join-translations.pipe";

const appRoutes: Routes = [
{ path: '', component: HomeComponent, pathMatch: 'full' },
{ path: 'about', component: AboutComponent },
{ path: 'cookies-policy', component: CookiePolicyComponent },
{
path: 'admin',
loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule)
path: "admin",
loadChildren: () =>
import("./admin/admin.module").then((m) => m.AdminModule),
},
];

@NgModule({
declarations: [
AppComponent,
NavMenuComponent,
HomeComponent,
GeneralInfoComponent,
VotersGuideComponent,
FooterComponent,
ShareCardComponent,
DonateCardComponent,
PollingStationCardInfoComponent,
PollingStationSearchComponent,
AboutComponent,
CookiePolicyComponent,
JoinTranslationsPipe,
VotRomaniaComponent,
MapNoteComponent,
],
imports: [
BrowserAnimationsModule,
Expand All @@ -74,20 +49,16 @@ const appRoutes: Routes = [
MatAutocompleteModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient]
}
})
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient],
},
}),
],
providers: [
// HereAddressService,
DataService
],
bootstrap: [AppComponent]
providers: [DataService],
bootstrap: [AppComponent],
})
export class AppModule { }

export class AppModule {}

// required for AOT compilation
export function HttpLoaderFactory(http: HttpClient) {
Expand Down
Loading