Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
clean removal off ng2-admin (Bootstrap/Angular), replaced by Egret (M…
…aterial/Angular) - this should make for less bug hunting related to ng2-admin and egret not playing well together and allow us to focus on porting over services/components, etc...
  • Loading branch information
James T. Nixon III committed Aug 22, 2017
1 parent c27bf6d commit 3cb4ba6
Show file tree
Hide file tree
Showing 906 changed files with 4,906 additions and 56,959 deletions.
137 changes: 75 additions & 62 deletions .angular-cli.json
@@ -1,62 +1,75 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "FreeNAS Angular 4 WebUI"
},
"apps": [{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"app/app.scss"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/tether/dist/js/tether.js",
"../node_modules/bootstrap/dist/js/bootstrap.js",
"../node_modules/chartist/dist/chartist.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {},
"serve": {
"port": 3000
}
}
}
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "egret"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"../node_modules/quill/dist/quill.core.css",
"../node_modules/quill/dist/quill.snow.css",
"../node_modules/dragula/dist/dragula.css",
"../node_modules/angular-calendar/dist/css/angular-calendar.css",
"../node_modules/hopscotch/dist/css/hopscotch.min.css",
"../node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.css",
"vendor/pace/pace-theme-min.css",
"assets/styles/themes/egret-dark-purple.scss",
"assets/styles/themes/egret-indigo.scss",
"assets/styles/themes/egret-blue.scss",
"assets/styles/themes/egret-dark-pink.scss",
"assets/styles/styles.css"
],
"scripts": [
"vendor/pace/pace.min.js",
"../node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.js",
"../node_modules/hopscotch/dist/js/hopscotch.min.js",
"../node_modules/hammerjs/hammer.js",
"vendor/Chart.min.js",
"../node_modules/quill/dist/quill.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
112 changes: 0 additions & 112 deletions .bootstraprc

This file was deleted.

89 changes: 42 additions & 47 deletions .gitignore
@@ -1,47 +1,42 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings
package-lock.json

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

#ip/port config
proxy.config.json
src/environments/environment.ts
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

0 comments on commit 3cb4ba6

Please sign in to comment.