Skip to content
Snippets Groups Projects
Commit ef13e0a0 authored by Tim Donohue's avatar Tim Donohue Committed by GitHub
Browse files

Merge pull request #157 from wwelling/coveralls 

Coveralls, this connects to #155
parents 202891b5 eef63dc7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 98 deletions
.gitignore
+ 2
− 0
View file @ ef13e0a0
......@@ -29,3 +29,5 @@ morgan.log
yarn-error.log
*.css
package-lock.json
.travis.yml
+ 2
− 0
View file @ ef13e0a0
......@@ -25,6 +25,7 @@ install:
- travis_retry yarn install
before_script:
- travis_wait yarn run lint
- travis_wait yarn run build
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
......@@ -33,3 +34,4 @@ before_script:
script:
- yarn run ci
- cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
README.md
+ 13
− 11
View file @ ef13e0a0
[![Build Status](https://travis-ci.org/DSpace/dspace-angular.svg?branch=master)](https://travis-ci.org/DSpace/dspace-angular) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
[![Build Status](https://travis-ci.org/DSpace/dspace-angular.svg?branch=master)](https://travis-ci.org/DSpace/dspace-angular) [![Coverage Status](https://coveralls.io/repos/github/DSpace/dspace-angular/badge.svg?branch=master)](https://coveralls.io/github/DSpace/dspace-angular?branch=master) [![Universal Angular](https://img.shields.io/badge/universal-angular2-brightgreen.svg?style=flat)](https://github.com/angular/universal)
dspace-angular
==============
> The next UI for DSpace, based on Angular 2 Universal.
> The next UI for DSpace, based on Angular Universal.
This project is currently in pre-alpha.
......@@ -255,12 +255,12 @@ dspace-angular
│ │ ├── app.module.ts *
│ │ ├── app.reducer.ts *
│ │ ├── browser-app.module.ts * The root module for the client
│ │ ├── collection-page *
│ │ ├── community-page *
│ │ ├── +collection-page * Lazily loaded route for collection module
│ │ ├── +community-page * Lazily loaded route for community module
│ │ ├── core *
│ │ ├── header *
│ │ ├── home *
│ │ ├── item-page *
│ │ ├── +home * Lazily loaded route for home module
│ │ ├── +item-page * Lazily loaded route for item module
│ │ ├── object-list *
│ │ ├── pagenotfound *
│ │ ├── server-app.module.ts * The root module for the server
......@@ -276,13 +276,15 @@ dspace-angular
│ │ └── db.ts *
│ ├── config *
│ │ ├── cache-config.interface.ts *
│ │ ├── config.interface.ts *
│ │ ├── global-config.interface.ts *
│ │ └── server-config.interface.ts *
│ │ ├── server-config.interface.ts *
│ │ └── universal-config.interface.ts *
│ ├── config.ts * File that loads environmental and shareable settings and makes them available to app components
│ ├── index.html * The index.html file
│ ├── index.csr.html * The index file for client side rendering fallback
│ ├── index.html * The index file
│ ├── main.browser.ts * The bootstrap file for the client
│ ├── main.server.aot.ts * The express (http://expressjs.com/) config and bootstrap file for the server, in production
│ ├── main.server.ts * The express (http://expressjs.com/) config and bootstrap file for the server, during development
│ ├── main.server.ts * The express (http://expressjs.com/) config and bootstrap file for the server
│ ├── modules *
│ │ ├── cookies *
│ │ ├── data-loader *
......@@ -295,7 +297,6 @@ dspace-angular
│ │ ├── _mixins.scss *
│ │ └── variables.scss * Global sass variables file
│ ├── tsconfig.browser.json * TypeScript config for the client build
│ ├── tsconfig.server.aot.json * TypeScript config for the server build with Ahead of Time
│ ├── tsconfig.server.json * TypeScript config for the server build
│ └── tsconfig.test.json * TypeScript config for the test build
├── tsconfig.json * TypeScript config
......@@ -303,6 +304,7 @@ dspace-angular
├── typedoc.json * TYPEDOC configuration
├── webpack * Webpack (https://webpack.github.io/) config directory
│ ├── helpers.js *
│ ├── webpack.aot.js * Webpack (https://webpack.github.io/) config for AoT build
│ ├── webpack.client.js * Webpack (https://webpack.github.io/) config for client build
│ ├── webpack.common.js *
│ ├── webpack.prod.js * Webpack (https://webpack.github.io/) config for production build
......
package.json
+ 76
− 74
View file @ ef13e0a0
......@@ -18,7 +18,7 @@
"clean:log": "rimraf *.log*",
"clean:json": "rimraf *.records.json",
"clean:node": "rimraf node_modules",
"clean:prod": "yarn run clean:coverage && yarn run clean:doc && yarn run clean:dist && yarn run clean:log && yarn run clean:json ",
"clean:prod": "yarn run clean:coverage && yarn run clean:doc && yarn run clean:dist && yarn run clean:log && yarn run clean:json",
"clean": "yarn run clean:prod && yarn run clean:node",
"prebuild": "yarn run clean:dist",
"prebuild:aot": "yarn run prebuild",
......@@ -68,101 +68,104 @@
"coverage": "http-server -c-1 -o -p 9875 ./coverage"
},
"dependencies": {
"@angular/animations": "4.3.1",
"@angular/common": "4.3.1",
"@angular/core": "4.3.1",
"@angular/forms": "4.3.1",
"@angular/http": "4.3.1",
"@angular/platform-browser": "4.3.1",
"@angular/platform-browser-dynamic": "4.3.1",
"@angular/platform-server": "4.3.1",
"@angular/router": "4.3.1",
"@angular/animations": "4.4.4",
"@angular/common": "4.4.4",
"@angular/core": "4.4.4",
"@angular/forms": "4.4.4",
"@angular/http": "4.4.4",
"@angular/platform-browser": "4.4.4",
"@angular/platform-browser-dynamic": "4.4.4",
"@angular/platform-server": "4.4.4",
"@angular/router": "4.4.4",
"@angularclass/bootloader": "1.0.1",
"@angularclass/idle-preload": "1.0.4",
"@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.1",
"@ngrx/effects": "^4.0.5",
"@ngrx/router-store": "^4.0.4",
"@ngrx/store": "^4.0.3",
"@nguniversal/express-engine": "1.0.0-beta.2",
"@ngx-translate/core": "7.1.0",
"@ngx-translate/http-loader": "0.1.0",
"body-parser": "1.17.2",
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
"@ngrx/effects": "4.0.5",
"@ngrx/router-store": "4.0.4",
"@ngrx/store": "4.0.3",
"@nguniversal/express-engine": "1.0.0-beta.3",
"@ngx-translate/core": "8.0.0",
"@ngx-translate/http-loader": "2.0.0",
"body-parser": "1.18.2",
"bootstrap": "v4.0.0-beta",
"cerialize": "0.1.15",
"compression": "1.7.0",
"cerialize": "0.1.16",
"compression": "1.7.1",
"cookie-parser": "1.4.3",
"core-js": "2.4.1",
"express": "4.15.3",
"express-session": "1.15.4",
"core-js": "2.5.1",
"express": "4.16.0",
"express-session": "1.15.6",
"font-awesome": "4.7.0",
"http-server": "0.10.0",
"https": "1.0.0",
"js.clone": "0.0.3",
"jsonschema": "1.1.1",
"jsonschema": "1.2.0",
"methods": "1.1.2",
"morgan": "1.8.2",
"morgan": "1.9.0",
"ngx-pagination": "3.0.1",
"pem": "1.9.7",
"pem": "1.12.0",
"reflect-metadata": "0.1.10",
"rxjs": "5.4.2",
"ts-md5": "1.2.0",
"rxjs": "5.4.3",
"ts-md5": "1.2.2",
"webfontloader": "1.6.28",
"zone.js": "0.8.14"
"zone.js": "0.8.18"
},
"devDependencies": {
"@angular/compiler": "4.3.1",
"@angular/compiler-cli": "4.3.1",
"@ngrx/store-devtools": "^4.0.0",
"@ngtools/webpack": "1.5.1",
"@types/cookie-parser": "1.3.30",
"@angular/compiler": "4.4.4",
"@angular/compiler-cli": "4.4.4",
"@ngrx/store-devtools": "4.0.0",
"@ngtools/webpack": "1.7.2",
"@types/cookie-parser": "1.4.1",
"@types/deep-freeze": "0.1.1",
"@types/express": "4.0.36",
"@types/express-serve-static-core": "4.0.49",
"@types/hammerjs": "2.0.34",
"@types/jasmine": "^2.6.0",
"@types/memory-cache": "0.0.29",
"@types/mime": "1.3.1",
"@types/node": "8.0.14",
"@types/serve-static": "1.7.31",
"@types/source-map": "0.5.0",
"@types/webfontloader": "1.6.28",
"ajv": "5.2.2",
"@types/express": "4.0.37",
"@types/express-serve-static-core": "4.0.53",
"@types/hammerjs": "2.0.35",
"@types/jasmine": "2.6.0",
"@types/memory-cache": "0.0.31",
"@types/mime": "2.0.0",
"@types/node": "8.0.26",
"@types/serve-static": "1.7.32",
"@types/source-map": "0.5.1",
"@types/webfontloader": "1.6.29",
"ajv": "5.2.3",
"ajv-keywords": "2.1.0",
"angular2-template-loader": "0.6.2",
"autoprefixer": "7.1.2",
"awesome-typescript-loader": "3.2.1",
"codelyzer": "3.1.2",
"autoprefixer": "7.1.4",
"awesome-typescript-loader": "3.2.3",
"caniuse-lite": "1.0.30000697",
"codelyzer": "3.2.0",
"compression-webpack-plugin": "1.0.0",
"copy-webpack-plugin": "4.0.1",
"css-loader": "0.28.4",
"copy-webpack-plugin": "4.1.0",
"coveralls": "3.0.0",
"css-loader": "0.28.7",
"deep-freeze": "0.0.1",
"exports-loader": "0.6.4",
"html-webpack-plugin": "2.29.0",
"html-webpack-plugin": "2.30.1",
"imports-loader": "0.7.1",
"istanbul-instrumenter-loader": "2.0.0",
"jasmine-core": "2.6.4",
"jasmine-marbles": "^0.1.0",
"jasmine-spec-reporter": "4.1.1",
"json-loader": "0.5.4",
"karma": "1.7.0",
"istanbul-instrumenter-loader": "3.0.0",
"jasmine-core": "2.8.0",
"jasmine-marbles": "0.1.0",
"jasmine-spec-reporter": "4.2.1",
"json-loader": "0.5.7",
"karma": "1.7.1",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage": "1.1.1",
"karma-istanbul-preprocessor": "0.0.2",
"karma-jasmine": "1.1.0",
"karma-mocha-reporter": "2.2.3",
"karma-mocha-reporter": "2.2.4",
"karma-phantomjs-launcher": "1.0.4",
"karma-remap-coverage": "0.1.4",
"karma-remap-istanbul": "0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webdriver-launcher": "1.0.5",
"karma-webpack": "2.0.4",
"ngrx-store-freeze": "0.2.0",
"node-sass": "4.5.3",
"nodemon": "1.11.0",
"npm-run-all": "4.0.2",
"postcss": "6.0.8",
"nodemon": "1.12.1",
"npm-run-all": "4.1.1",
"postcss": "6.0.12",
"postcss-apply": "0.8.0",
"postcss-cli": "4.1.0",
"postcss-cli": "4.1.1",
"postcss-cssnext": "3.0.2",
"postcss-loader": "2.0.6",
"postcss-responsive-type": "1.0.0",
......@@ -171,9 +174,9 @@
"protractor-istanbul-plugin": "2.0.0",
"raw-loader": "0.5.1",
"resolve-url-loader": "2.1.0",
"rimraf": "2.6.1",
"rollup": "0.45.2",
"rollup-plugin-commonjs": "8.0.2",
"rimraf": "2.6.2",
"rollup": "0.50.0",
"rollup-plugin-commonjs": "8.2.1",
"rollup-plugin-node-globals": "1.1.0",
"rollup-plugin-node-resolve": "3.0.0",
"rollup-plugin-uglify": "2.0.1",
......@@ -183,15 +186,14 @@
"string-replace-loader": "1.3.0",
"to-string-loader": "1.1.5",
"ts-helpers": "1.1.2",
"ts-node": "3.2.0",
"tslint": "5.1.0",
"tslint-loader": "3.5.3",
"typedoc": "0.7.1",
"typescript": "2.4.1",
"webpack": "3.3.0",
"webpack-bundle-analyzer": "2.8.3",
"webpack-dev-middleware": "1.11.0",
"webpack-dev-server": "2.5.1",
"ts-node": "3.3.0",
"tslint": "5.7.0",
"typedoc": "0.8.0",
"typescript": "2.5.3",
"webpack": "3.6.0",
"webpack-bundle-analyzer": "2.9.0",
"webpack-dev-middleware": "1.12.0",
"webpack-dev-server": "2.9.1",
"webpack-merge": "4.1.0",
"webpack-node-externals": "1.6.0"
}
......
src/app/collection-page/collection-page-routing.module.ts → src/app/+collection-page/collection-page-routing.module.ts
+ 1
− 1
View file @ ef13e0a0
......@@ -6,7 +6,7 @@ import { CollectionPageComponent } from './collection-page.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: 'collections/:id', component: CollectionPageComponent }
{ path: ':id', component: CollectionPageComponent, pathMatch: 'full' }
])
]
})
......
src/app/collection-page/collection-page.module.ts → src/app/+collection-page/collection-page.module.ts
+ 4
− 4
View file @ ef13e0a0
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../shared/shared.module';
......@@ -9,13 +8,14 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
@NgModule({
imports: [
CollectionPageRoutingModule,
CommonModule,
SharedModule,
TranslateModule,
CollectionPageRoutingModule
],
declarations: [
CollectionPageComponent,
]
})
export class CollectionPageModule { }
export class CollectionPageModule {
}
src/app/community-page/community-page-routing.module.ts → src/app/+community-page/community-page-routing.module.ts
+ 1
− 1
View file @ ef13e0a0
......@@ -6,7 +6,7 @@ import { CommunityPageComponent } from './community-page.component';
@NgModule({
imports: [
RouterModule.forChild([
{ path: 'communities/:id', component: CommunityPageComponent }
{ path: ':id', component: CommunityPageComponent, pathMatch: 'full' }
])
]
})
......
src/app/community-page/community-page.module.ts → src/app/+community-page/community-page.module.ts
+ 5
− 7
View file @ ef13e0a0
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../shared/shared.module';
import { CommunityPageComponent } from './community-page.component';
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
import { CommunityPageRoutingModule } from './community-page-routing.module';
@NgModule({
imports: [
CommunityPageRoutingModule,
CommonModule,
TranslateModule,
RouterModule,
SharedModule,
CommunityPageRoutingModule
],
declarations: [
CommunityPageComponent,
CommunityPageSubCollectionListComponent,
]
})
export class CommunityPageModule { }
export class CommunityPageModule {
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment