wrote more codes

lavelle · lavelle · commit 4a29d3b63603 · 2015-01-29T18:43:33.000Z
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -12,18 +12,11 @@ module.exports = (grunt) ->
             'vendor/jquery/jquery.js'
           ]
 
-    coffee:
-      compile:
-        files:
-          'js/all.js': 'coffee/*.coffee'
-
     stylus:
       compile:
         files:
           'css/style.css': 'stylus/style.styl'
 
-    clean: ['js/*.js', 'css/*.css', 'build']
-
     watch:
       scripts:
         files: ['stylus/*.styl', 'coffee/*.coffee', 'templates/*.html']
@@ -42,23 +35,15 @@ module.exports = (grunt) ->
           keepalive: true
           port: 8002
 
-    copy:
+    browserify:
       main:
-        files: [
-          expand: true
-          src: [
-            # App stuff
-            'index.html'
-            'js/**'
-            'css/**'
-
-            # CSS and fonts
-            'vendor/normalize-css/normalize.css'
-          ]
-          dest: 'build'
-        ]
+        options:
+          browserifyOptions:
+            extensions: '.coffee'
+          transform: ['coffeeify']
+        files:
+          'js/main.js': 'coffee/main.coffee'
 
   require('load-grunt-tasks')(grunt)
 
-  grunt.registerTask 'default', ['stylus']
-  grunt.registerTask 'build', ['default', 'copy', 'uglify']
+  grunt.registerTask 'default', ['stylus', 'jst', 'browserify']
diff --git a/bower.json b/bower.json
@@ -1,13 +1,13 @@
 {
-  "name": "",
+  "name": "netvis",
   "version": "0.0.1",
   "ignore": [
     "**/.*",
     "node_modules",
     "components"
   ],
   "dependencies": {
-    "jquery": "1",
-    "normalize-css": "2"
+    "jquery": "2",
+    "backbone": "~1.1.2"
   }
 }
diff --git a/coffee/main.coffee b/coffee/main.coffee
@@ -1 +1,19 @@
-$ ->
+VulnView = require './views/vuln.coffee'
+
+data =
+  vulnerabilities: [
+    {
+      name: 'BadStuff'
+      description: 'Bad things happen to your computer.'
+    }
+    {
+      name: 'NaughtyCode'
+      description: 'This perfoms rm -rf /.'
+    }
+  ]
+
+vulnlist = $('.vulnlist')
+
+for vuln in data.vulnerabilities
+  view = new VulnView(vuln)
+  view.render().$el.appendTo(vulnlist)
diff --git a/coffee/views/vuln.coffee b/coffee/views/vuln.coffee
@@ -1,12 +1,14 @@
 VulnView = Backbone.View.extend
   tagName: 'li'
 
+  className: 'vuln'
+
+  initialize: (data) ->
+    @data = data
+
   render: ->
-    @$el.html(JST.vuln({
-      title: "Some title",
-      description: "A bad thing happens"
-    }))
+    @$el.html(JST.vuln(@data))
 
     return this
 
-Module.exports = VulnView
+module.exports = VulnView
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 
 <head>
@@ -31,18 +31,18 @@ <h2>Devices</h2>
     <h1>Some server</h1>
     <div class="vulns">
       <h2>Vulnerabilities</h2>
-      <ul>
-        <li>
+      <ul class="vulnlist">
 
-        </li>
       </ul>
     </div>
   </div>
 </div>
 
-<script src="vendor/jquery/jquery.js"></script>
+<script src="vendor/jquery/dist/jquery.js"></script>
+<script src="vendor/underscore/underscore.js"></script>
+<script src="vendor/backbone/backbone.js"></script>
 <script src="js/templates/index.js" charset="utf-8"></script>
-<script src="js/all.js" charset="utf-8"></script>
+<script src="js/main.js" charset="utf-8"></script>
 
 </body>
 
diff --git a/package.json b/package.json
@@ -3,14 +3,17 @@
   "version": "0.0.1",
   "description": "",
   "main": "js/all.js",
-  "dependencies": {},
+  "dependencies": {
+    "coffeeify": "^1.0.0",
+    "grunt-browserify": "^3.3.0"
+  },
   "devDependencies": {
     "grunt": "*",
-    "grunt-contrib-jst": "*",
-    "grunt-contrib-coffee": "*",
+    "grunt-contrib-coffee": "^0.12.0",
+    "grunt-contrib-connect": "*",
+    "grunt-contrib-jst": "^0.6.0",
     "grunt-contrib-stylus": "*",
-    "grunt-contrib-watch": "*",
-    "grunt-contrib-connect": "*"
+    "grunt-contrib-watch": "*"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/stylus/style.styl b/stylus/style.styl
@@ -40,6 +40,14 @@ header
   width: 100%
   display: block
   margin: 0
+  padding: 5px
+
+  h1
+    margin: 0
+
+ul
+  padding: 0px
+  margin: 0px
 
 #main
   width: 100%
@@ -57,10 +65,6 @@ header
   h2
     margin: 20px
 
-  ul
-    padding: 0px
-    margin: 0px
-
   li
     padding: 15px 0px 15px 20px
     margin: 0px
@@ -77,4 +81,13 @@ header
   padding: 20px
   width: 100%
 
+.vuln
+  padding: 10px
+  list-style-type: none
+  border-bottom: 1px solid wet_asphalt
+
+  div
+    padding: 5px
 
+  h3
+    margin: 5px
diff --git a/templates/vuln.html b/templates/vuln.html
@@ -1,2 +1,2 @@
-<div class="title"><%= title %></div>
+<h3 class="title"><%= name %></h3>
 <div class="details"><%= description %></div>

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`		`- "name": "",`
	`2`	`+ "name": "netvis",`
`3`	`3`	`"version": "0.0.1",`
`4`	`4`	`"ignore": [`
`5`	`5`	`"*/.",`
`6`	`6`	`"node_modules",`
`7`	`7`	`"components"`
`8`	`8`	`],`
`9`	`9`	`"dependencies": {`
`10`		`- "jquery": "1",`
`11`		`- "normalize-css": "2"`
	`10`	`+ "jquery": "2",`
	`11`	`+ "backbone": "~1.1.2"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-<div class="title"><%= title %></div>`
	`1`	`+<h3 class="title"><%= name %></h3>`
`2`	`2`	`<div class="details"><%= description %></div>`