Merge pull request #46 from booknds/beta-0.6

Beta 0.6
booknds · Mar 23, 2016 · d611575 · d611575
2 parents 65fc877 + f3f56f2
commit d611575
Show file tree

Hide file tree

Showing 78 changed files with 1,735 additions and 1,229 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+ "presets": ["es2015"]
+}
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,7 +4,6 @@ module.exports = {
  2,
  4
  ],
- // "no-console":[2, {"allow": ["log"] }],
  "quotes": [
  2,
  "double"
@@ -25,7 +24,8 @@ module.exports = {
  "no-extra-bind": 1,
  "no-invalid-this": 1,
  "consistent-return": 1,
-
+ "no-console": [2, { allow: ["warn"] }],
+ "no-unused-expressions": 1
  },
  "env": {
  "es6": true,
@@ -40,6 +40,7 @@ module.exports = {
  },
  },
  "globals": {
+ "Materialize": true,
  "describe": true,
  "it": true,
  "expect": true,
@@ -50,4 +51,4 @@ module.exports = {
  "after": true,
  "afterEach": true
  }
-};
+};
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 node_modules
+.idea
 .DS_Store
 .tmp
 .git
 dist
 Dockerfile
+server.js
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/index.html b/index.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <title>Swagger Graphical Editor</title>
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+ <meta charset="UTF-8">
+ <!-- angular material start -->
+ <!-- angular material end -->
+ <!--Import jQuery before materialize.js-->
+ <!-- dependencies -->
+ <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+ <!--materialize css-->
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css">
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js"></script>
+ <script src="./dist/bundle.js"></script>
+</head>
+<body>
+<div ng-app="SwaggerGraphicalEditor">
+ <app> </app>
+</div>
+
+</body>
+</html>
diff --git a/karma.conf.js b/karma.conf.js
diff --git a/package.json b/package.json
@@ -4,51 +4,47 @@
  "description": "Graphically define a swaggesr definition",
  "main": "index.js",
  "scripts": {
- "test": "karma start"
+ "test": "find ./src -name '*spec.js' | xargs mocha -R spec --compilers js:babel-core/register",
+ "lint": "eslint",
+ "compile": "weback",
+ "build": "npm test && npm run watch",
+ "watch": "webpack-dev-server"
  },
- "author": "",
- "license": "BSD-2-Clause",
+ "author": "Eric Henry Correia",
+ "license": "MIT",
  "devDependencies": {
- "angular": "1.5.0",
- "angular-animate": "1.5.0",
- "angular-aria": "1.5.0",
- "angular-file-saver": "1.0.2",
- "angular-material": "1.0.4",
- "angular-materialize": "0.1.2",
- "angular-messages": "1.5.0",
  "angular-mocks": "1.5.0",
- "babel-core": "6.4.0",
- "babel-loader": "6.2.1",
- "babel-preset-es2015": "6.3.13",
+ "babel-core": "^6.5.2",
+ "babel-loader": "^6.2.2",
+ "babel-polyfill": "^6.7.2",
+ "babel-preset-es2015": "^6.5.0",
+ "babel-register": "^6.7.2",
  "blob-polyfill": "1.0.20150320",
- "browser-sync": "2.11.0",
  "chai": "3.5.0",
  "css-loader": "0.23.1",
  "eslint": "2.1.0",
  "eslint-config-eslint": "3.0.0",
- "file-loader": "0.8.5",
- "gulp-connect": "2.3.1",
- "gulp-eslint": "1.1.1",
- "gulp-open": "1.0.0",
- "gulp-webpack": "1.5.0",
+ "eslint-loader": "^1.3.0",
+ "file-loader": "^0.8.5",
  "image-webpack-loader": "1.6.3",
- "jquery": "2.2.0",
- "karma": "0.13.21",
- "karma-chai": "0.1.0",
- "karma-chrome-launcher": "0.2.2",
- "karma-cli": "0.1.2",
- "karma-mocha": "0.2.2",
- "karma-mocha-reporter": "1.1.6",
- "karma-sourcemap-loader": "0.3.7",
- "karma-webpack": "1.7.0",
- "materialize-css": "0.97.5",
  "mocha": "2.4.5",
- "ng-annotate-loader": "0.1.0",
  "raw-loader": "0.5.1",
- "run-sequence": "1.1.5",
  "style-loader": "0.13.0",
  "stylus-loader": "1.4.3",
- "webpack": "1.12.10"
+ "webpack": "1.12.10",
+ "webpack-dev-server": "^1.14.1",
+ "webpack-livereload-plugin": "^0.7.0"
  },
- "dependencies": {}
+ "dependencies": {
+ "angular": "^1.5.0",
+ "angular-animate": "^1.5.0",
+ "angular-aria": "^1.5.0",
+ "angular-cookies": "^1.5.0",
+ "angular-file-saver": "^1.1.0",
+ "angular-material": "^1.0.6",
+ "angular-materialize": "^0.1.3",
+ "angular-messages": "^1.5.0",
+ "express": "^4.13.4",
+ "materialize-css": "^0.97.5"
+ }
 }
diff --git a/server.js b/server.js
@@ -0,0 +1,18 @@
+/**
+ * Created by eric on 3/15/16.
+ */
+const express = require("express");
+
+const app = express();
+const port = 3030;
+
+console.log(__dirname);
+
+app.use("/dist", express.static(__dirname + "/dist"));
+
+app.get("*", (req, res) => {
+ res.sendFile("./index.html", { root: __dirname });
+});
+
+app.listen(port);
+console.log("listening on port 3030");
diff --git a/src/app/app.js b/src/app/app.js
@@ -7,6 +7,7 @@ import AngularMaterial from "angular-material";
 import AngularAnimate from "angular-animate";
 import AngularAria from "angular-aria";
 import AngularMessages from "angular-messages";
+import AngularCookies from "angular-cookies";
 // import AngularMocks from "angular-mocks/ngMock";
 import "angular-material/angular-material.css";
 import "../css/main.css";
@@ -23,13 +24,14 @@ angular
  AngularMaterial,
  AngularAnimate,
  AngularAria,
- AngularMessages
- // AngularMocks
+ AngularMessages,
+ // AngularMocks,
+ AngularCookies
  // 'ngMaterial',
  // 'ngAnimate',
  // 'ngAria'
  ])
 
  .directive("app", appComponent);
 
-$log(FileSaver);
+console.warn(FileSaver);
diff --git a/src/app/common/components/dropdown/dropdown.html b/src/app/common/components/dropdown/dropdown.html
@@ -2,6 +2,7 @@
 <md-input-container class="md-block" flex-gt-sm>
  <label>{{dropdown.sgLabel}}</label>
  <md-select ng-model="dropdown.ngModel">
+ <md-option value="">None</md-option>
  <md-option ng-repeat="choice in dropdown.sgChoices" value="{{ choice }}">{{ choice }}</md-option>
  </md-select>
  <!-- <select class="" material-select watch>