Skip to content

Commit

Permalink
upgrade project & start implementing material look
Browse files Browse the repository at this point in the history
  • Loading branch information
João Domingues committed Feb 26, 2018
1 parent 7f7f294 commit c5268b7
Show file tree
Hide file tree
Showing 20 changed files with 2,921 additions and 4,454 deletions.
28 changes: 18 additions & 10 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "spotter-query-editor-demo"
"name": "ng5-es-query-builder"
},
"apps": [
{
Expand All @@ -10,8 +10,11 @@
"assets": [
"assets",
"favicon.ico",
{ "glob": "**/*", "input": "../node_modules/@angular/material/prebuilt-themes", "output": "dist/vendor/angular/material" }

{
"glob": "**/*",
"input": "../node_modules/@angular/material/prebuilt-themes",
"output": "vendor/angular-material"
}
],
"index": "index.html",
"main": "main.ts",
Expand All @@ -20,14 +23,16 @@
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"removed-styles": [
"../node_modules/materialize-css/dist/css/materialize.css",
"../node_modules/select2/dist/css/select2.css",
"mirage.assets/vendor/jquery.layout/jquery.layout.css"
],
"styles": [
"styles.css",
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
"../node_modules/select2/dist/css/select2.css",
"../node_modules/bootstrap/dist/css/bootstrap.css",
"../node_modules/font-awesome/css/font-awesome.css",
"../node_modules/@angular/material/prebuilt-themes/pink-bluegrey.css",
"../node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"mirage.assets/vendor/jquery.layout/jquery.layout.css",
"mirage.assets/styles/app.component.scss",
"mirage.assets/styles/autocomplete.scss",
"mirage.assets/styles/docsidebar.scss",
Expand All @@ -44,16 +49,19 @@
"mirage.assets/styles/select2.scss",
"mirage.assets/styles/variables.scss"
],
"scripts": [
"../node_modules/jquery/dist/jquery.min.js",
"../node_modules/bootstrap/dist/js/bootstrap.min.js",
"removed-scripts": [
"../node_modules/select2/dist/js/select2.full.min.js",
"../node_modules/materialize-css/dist/js/materialize.js",
"mirage.assets/js/helper.js",
"mirage.assets/vendor/jquery.layout/jquery-ui.js",
"mirage.assets/vendor/jquery.layout/jquery.layout.js",
"mirage.assets/vendor/jquery.simulate.js",
"mirage.assets/vendor/urlsafe-base64.bundle.js"
],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/bootstrap/dist/js/bootstrap.bundle.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ng5-es-query-builder
# Ng5EsQueryBuilder

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.4.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.1.

## Development server

Expand Down
2 changes: 1 addition & 1 deletion e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AppPage } from './app.po';

describe('spotter-query-editor-demo App', () => {
describe('ng5-es-query-builder App', () => {
let page: AppPage;

beforeEach(() => {
Expand Down
Loading

0 comments on commit c5268b7

Please sign in to comment.