refactored out old code and put everything into the proper directories

Author: Connoropolous

ModulesToPort.txt

@@ -1,16 +1,16 @@
 {
-  "name": "metamaps",
-  "version": "0.1.0",
+  "name": "Junto",
+  "version": "0.0.1",
   "authors": [
     "Connor Turland <[email protected]>"
   ],
-  "description": "Map Complexity",
-  "main": "metamaps_renderer.js",
+  "description": "Discover and connect with people with similar intentions",
+  "main": "junto.js",
   "moduleType": [
     "globals"
   ],
   "license": "AGPL",
-  "homepage": "http://metamaps.cc",
+  "homepage": "http://junto.cc",
   "private": true,
   "ignore": [
     "**/.*",
@@ -20,17 +20,10 @@
     "tests"
   ],
   "dependencies": {
+    "SimpleWebRTC": "*",
     "backbone": "1.0.0",
     "underscore": "1.4.4",
-    "Countable": "~2.1.0",
-    "typeahead.js": "0.9.3",
     "socket.io-client": "0.9.11",
-    "CloudCarousel": "https://github.com/Connoropolous/CloudCarousel.git",
-    "embedly": "https://github.com/Connoropolous/embedly.git",
-    "famous": "~0.3.4",
-    "hogan": "https://github.com/Connoropolous/Hogan.git"
-  },
-  "devDependencies": {
     "jquery": "1.9.0"
   }
-}
+}

_SpecRunner.html

@@ -5,34 +5,24 @@ module.exports = {
 	},
 	dist: {
 		src: [
-			'bower_components/snap.svg/dist/snap.svg-min.js',
+		  'bower_components/jquery/jquery.js',
 			'bower_components/underscore/underscore.js',
 			'bower_components/backbone/backbone.js',
-			'bower_components/Countable/Countable.js',
 			'bower_components/socket.io-client/dist/socket.io.js',
-			'bower_components/typeahead.js/dist/typeahead.bundle.min.js',
-			'bower_components/CloudCarousel/cloudcarousel.js',
-			'bower_components/embedly/embedly.js',
-			'bower_components/hogan/hogan-2.0.0.js',
-			'bower_components/famous/dist/famous-global.min.js',
-			'lib/JIT.js',
-			'lib/utility.js',
-			'lib/views/mixins.js',
-			'lib/views/juntoView.js',
+			'bower_components/SimpleWebRTC/simplewebrtc.bundle.js',
+			'lib/libraries/require.js',
+			'lib/libraries/classList.js',
+			'lib/libraries/libraries.js',
+			'lib/libraries/requestAnimationFrame.js',
+			'lib/libraries/famous.js',
+			'lib/libraries/firebase.js',
+			// we only modify code that appears below here
 			'lib/views/videoView.js',
 			'lib/views/roomTopicView.js',
 			'lib/views/chatView.js',
-			'lib/models/mapper.js',
-			'lib/modules/control.js',
-			'lib/modules/create.js',
-			'lib/modules/jit.js',
-			'lib/modules/realtime.js',
-			'lib/modules/visualize.js',
-			'lib/maker.js',
-			'lib/junto.js',
-			'lib/buildMaker.js',
-			'lib/models/collections.js',
+			'lib/room.js',
+			'lib/app.js'
 		],
-		dest: 'dist/metamaps_renderer.js'
+		dest: 'dist/junto.js'
 	}
 };

bower.json

@@ -21,14 +21,6 @@ module.exports = {
 			nonull: true,
 			flatten: true,
 			filter: 'isFile'
-		}, {
-			src: 'maps/*',
-			expand: true,
-			dest: 'serve/json/'
-		}, {
-			src: 'metacodes/*',
-			expand: true,
-			dest: 'serve/json/'
 		}, {
 			src: 'img/**/*',
 			expand: true,
@@ -42,27 +34,27 @@ module.exports = {
 		files: [{
 			src: 'lib/**/*',
 			expand: true,
-			dest: 'deploy/maprenderer/static/js/ds/',
+			dest: 'deploy/junto/static/js/',
 			flatten: true,
 			nonull: true,
 			filter: 'isFile'
 		}, {
 			src: 'css/*',
 			expand: true,
-			dest: 'deploy/maprenderer/static/css/',
+			dest: 'deploy/junto/static/css/',
 			flatten: true,
 			nonull: true,
 			filter: 'isFile'
 		}, {
 			src: 'img/*',
 			expand: true,
-			dest: 'deploy/maprenderer/static/img/',
+			dest: 'deploy/junto/static/img/',
 			flatten: true,
 			nonull: true,
 			filter: 'isFile'
 		}, {
-			src: 'dist/metamaps_renderer.js',
-			dest: 'deploy/maprenderer/static/js/dist/metamaps_renderer.js'
+			src: 'dist/junto.js',
+			dest: 'deploy/junto/static/js/dist/junto.js'
 		}]
 	}
 };

grunt/concat.js

@@ -5,7 +5,7 @@ module.exports = {
 			paths: "less/"
 		},
 		files: {
-			 "css/metamapsMapRender.css": "less/metamapsMapRenderer.less"
+			 "css/junto.css": "less/junto.less"
 		}
 	},
 	dist: {
@@ -14,7 +14,7 @@ module.exports = {
 			paths: "less/"
 		},
 		files: {
-			"css/metamapsMapRender.css": "less/metamapsMapRenderer.less"
+			"css/junto.css": "less/junto.less"
 		}
 	}
 };

grunt/copy.js

@@ -5,6 +5,6 @@ module.exports =
 	},
 	dist: {
 		src: '<%= concat.dist.dest %>',
-		dest: 'dist/metamaps_renderer.min.js'
+		dest: 'dist/junto.min.js'
 	}
 };

grunt/less.js

@@ -1,6 +1,6 @@
 body {
     /*background-image: url('../content/bg.jpg'); */
-    background-image: url('http://junto.cc/wsimages/junto-bg-glow.jpg');
+    background-image: url('/img/junto-bg-glow.jpg');
     background-repeat: no-repeat;
     background-size: cover;
     background-position: center center;
@@ -132,7 +132,7 @@ body {
 .play-button {
     width: 200px;
     height: 200px;
-    background-image: url('../content/play-button.png');
+    background-image: url('/img/play-button.png');
     background-repeat: no-repeat;
     background-position: center center;
     cursor: pointer;

grunt/uglify.js

@@ -0,0 +1,5 @@
+@import 'core';
+@import 'chatClient';
+@import 'topicView';
+@import 'famous';
+@import 'app';