Skip to content

Commit

Permalink
Get app running again
Browse files Browse the repository at this point in the history
  • Loading branch information
richard-cox committed Jan 30, 2018
1 parent 961b86c commit 2c7b728
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "stra2ous-ui"
"name": "stratos"
},
"apps": [{
"root": "src",
"root": "src/frontend",
"outDir": "dist",
"assets": [
"assets",
Expand All @@ -18,8 +18,8 @@
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.scss",
"../node_modules/xterm/dist/xterm.css"
"styles.scss",
"../../node_modules/xterm/dist/xterm.css"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
Expand All @@ -34,11 +34,11 @@
}
},
"lint": [{
"project": "src/tsconfig.app.json",
"project": "src/frontend/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"project": "src/frontend/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
Expand Down
2 changes: 1 addition & 1 deletion .sass-lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
options:
formatter: stylish
files:
include: 'src/**/*.s+(a|c)ss'
include: 'src/frontend/**/*.s+(a|c)ss'
ignore:
- '/dist/*'
- '/tmp/*'
Expand Down
2 changes: 1 addition & 1 deletion docs/developers-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Configuration information can be found in two places
}
```
* `./src/environments/environment.ts` for UAA config
* `./src/frontend/environments/environment.ts` for UAA config
* This contains more general settings for the frontend
* By default we output every Redux action to the console. If this is too verbose for yourself, simply set `logEnableConsoleActions` to false
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = function (config) {
browsers: process.env.CI_ENV ? ['ChromeHeadless'] : ['Chrome'],
singleRun: process.env.CI_ENV ? true : false,
files: [{
pattern: './src/**/*.spec.ts',
pattern: './src/frontend**/*.spec.ts',
watched: false
},
{
Expand Down
File renamed without changes.

0 comments on commit 2c7b728

Please sign in to comment.