sfbrigade · Shimin-Zhang · Apr 23, 2015 · Apr 23, 2015 · Apr 23, 2015 · Apr 23, 2015
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 env/
+node_modules/
+.DS_Store
diff --git a/README.md b/README.md
@@ -6,12 +6,16 @@ Clone the repo from your command line
 
 `git clone [email protected]:jmcelroy5/SF-in-Progress.git`
 
-Change to the directory SF-in-Progress/www
+Change to the directory SF-in-Progress
 
-`cd SF-in-Progress/www`
+`cd SF-in-Progress`
+
+Install the npm libraries
+
+`npm install`
 
 Start the server
 
 `npm start`
 
-Open your browser and navigate to localhost:5000/ or localhost:5000/map
+Open your browser and navigate to localhost:8888/ or localhost:8888/map
diff --git a/www/assets/css/bootstrap.css → app/css/bootstrap.css b/www/assets/css/bootstrap.css → app/css/bootstrap.css
diff --git a/www/assets/css/bootstrap.min.css → app/css/bootstrap.min.css b/www/assets/css/bootstrap.min.css → app/css/bootstrap.min.css
diff --git a/www/assets/css/font-awesome.min.css → app/css/font-awesome.min.css b/www/assets/css/font-awesome.min.css → app/css/font-awesome.min.css
diff --git a/www/assets/css/in-progress.css → app/css/in-progress.css b/www/assets/css/in-progress.css → app/css/in-progress.css
diff --git a/www/assets/css/main.css → app/css/main.css b/www/assets/css/main.css → app/css/main.css
diff --git a/app/css/meeting-info.css b/app/css/meeting-info.css
@@ -0,0 +1,69 @@
+body, html {
+	width: 100%;
+  height: auto;
+	margin: 0px;
+  padding: 20px 0px;
+  font-family:sans-serif;
+  background-color:#ccc;
+
+  /*background:linear-gradient(0deg, rgba(68,116,169, .3), rgb(3,33,96) 100%) no-repeat;*/
+}
+
+a.bar {
+    color:white;
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out;
+}
+
+a.bar:hover,
+a.bar:focus {
+    text-decoration: none;
+   /* color: #1d9b6c;*/
+}
+
+
+#content {
+	width: 100%;
+  color: black;
+  margin-top: 40px;
+  padding: 0px;
+
+}
+
+#form-container {
+  width: 600px;
+  height: auto;
+  clear: both;
+  /*background-color:#ccc;*/
+
+  text-align: center;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#form {
+  width: 100%;
+  display: block;
+  font-size: 18px;   
+}
+
+#title {
+	font-size: 30px;
+  margin-bottom: 20px;
+}
+
+button {
+
+}
+
+ul.form {
+	margin: 5px 20px;
+  align: left;
+}
+
+ul.form li {
+	list-style: none;
+  display: table;
+  margin: 8px 0px;
+}
diff --git a/www/assets/font-awesome/css/font-awesome.css → app/font-awesome/css/font-awesome.css b/www/assets/font-awesome/css/font-awesome.css → app/font-awesome/css/font-awesome.css
diff --git a/...ets/font-awesome/css/font-awesome.min.css → app/font-awesome/css/font-awesome.min.css b/...ets/font-awesome/css/font-awesome.min.css → app/font-awesome/css/font-awesome.min.css
diff --git a/...assets/font-awesome/fonts/FontAwesome.otf → app/font-awesome/fonts/FontAwesome.otf b/...assets/font-awesome/fonts/FontAwesome.otf → app/font-awesome/fonts/FontAwesome.otf
diff --git a/...ont-awesome/fonts/fontawesome-webfont.eot → ...ont-awesome/fonts/fontawesome-webfont.eot b/...ont-awesome/fonts/fontawesome-webfont.eot → ...ont-awesome/fonts/fontawesome-webfont.eot
diff --git a/...ont-awesome/fonts/fontawesome-webfont.svg → ...ont-awesome/fonts/fontawesome-webfont.svg b/...ont-awesome/fonts/fontawesome-webfont.svg → ...ont-awesome/fonts/fontawesome-webfont.svg
diff --git a/...ont-awesome/fonts/fontawesome-webfont.ttf → ...ont-awesome/fonts/fontawesome-webfont.ttf b/...ont-awesome/fonts/fontawesome-webfont.ttf → ...ont-awesome/fonts/fontawesome-webfont.ttf
diff --git a/...nt-awesome/fonts/fontawesome-webfont.woff → ...nt-awesome/fonts/fontawesome-webfont.woff b/...nt-awesome/fonts/fontawesome-webfont.woff → ...nt-awesome/fonts/fontawesome-webfont.woff
diff --git a/...ts/font-awesome/less/bordered-pulled.less → app/font-awesome/less/bordered-pulled.less b/...ts/font-awesome/less/bordered-pulled.less → app/font-awesome/less/bordered-pulled.less
diff --git a/www/assets/font-awesome/less/core.less → app/font-awesome/less/core.less b/www/assets/font-awesome/less/core.less → app/font-awesome/less/core.less
diff --git a/...assets/font-awesome/less/fixed-width.less → app/font-awesome/less/fixed-width.less b/...assets/font-awesome/less/fixed-width.less → app/font-awesome/less/fixed-width.less
diff --git a/...ssets/font-awesome/less/font-awesome.less → app/font-awesome/less/font-awesome.less b/...ssets/font-awesome/less/font-awesome.less → app/font-awesome/less/font-awesome.less
diff --git a/www/assets/font-awesome/less/icons.less → app/font-awesome/less/icons.less b/www/assets/font-awesome/less/icons.less → app/font-awesome/less/icons.less
diff --git a/www/assets/font-awesome/less/larger.less → app/font-awesome/less/larger.less b/www/assets/font-awesome/less/larger.less → app/font-awesome/less/larger.less
diff --git a/www/assets/font-awesome/less/list.less → app/font-awesome/less/list.less b/www/assets/font-awesome/less/list.less → app/font-awesome/less/list.less
diff --git a/www/assets/font-awesome/less/mixins.less → app/font-awesome/less/mixins.less b/www/assets/font-awesome/less/mixins.less → app/font-awesome/less/mixins.less
diff --git a/www/assets/font-awesome/less/path.less → app/font-awesome/less/path.less b/www/assets/font-awesome/less/path.less → app/font-awesome/less/path.less
diff --git a/...ts/font-awesome/less/rotated-flipped.less → app/font-awesome/less/rotated-flipped.less b/...ts/font-awesome/less/rotated-flipped.less → app/font-awesome/less/rotated-flipped.less
diff --git a/www/assets/font-awesome/less/spinning.less → app/font-awesome/less/spinning.less b/www/assets/font-awesome/less/spinning.less → app/font-awesome/less/spinning.less
diff --git a/www/assets/font-awesome/less/stacked.less → app/font-awesome/less/stacked.less b/www/assets/font-awesome/less/stacked.less → app/font-awesome/less/stacked.less
diff --git a/www/assets/font-awesome/less/variables.less → app/font-awesome/less/variables.less b/www/assets/font-awesome/less/variables.less → app/font-awesome/less/variables.less
diff --git a/...s/font-awesome/scss/_bordered-pulled.scss → app/font-awesome/scss/_bordered-pulled.scss b/...s/font-awesome/scss/_bordered-pulled.scss → app/font-awesome/scss/_bordered-pulled.scss
diff --git a/www/assets/font-awesome/scss/_core.scss → app/font-awesome/scss/_core.scss b/www/assets/font-awesome/scss/_core.scss → app/font-awesome/scss/_core.scss
diff --git a/...ssets/font-awesome/scss/_fixed-width.scss → app/font-awesome/scss/_fixed-width.scss b/...ssets/font-awesome/scss/_fixed-width.scss → app/font-awesome/scss/_fixed-width.scss
diff --git a/www/assets/font-awesome/scss/_icons.scss → app/font-awesome/scss/_icons.scss b/www/assets/font-awesome/scss/_icons.scss → app/font-awesome/scss/_icons.scss
diff --git a/www/assets/font-awesome/scss/_larger.scss → app/font-awesome/scss/_larger.scss b/www/assets/font-awesome/scss/_larger.scss → app/font-awesome/scss/_larger.scss
diff --git a/www/assets/font-awesome/scss/_list.scss → app/font-awesome/scss/_list.scss b/www/assets/font-awesome/scss/_list.scss → app/font-awesome/scss/_list.scss
diff --git a/www/assets/font-awesome/scss/_mixins.scss → app/font-awesome/scss/_mixins.scss b/www/assets/font-awesome/scss/_mixins.scss → app/font-awesome/scss/_mixins.scss
diff --git a/www/assets/font-awesome/scss/_path.scss → app/font-awesome/scss/_path.scss b/www/assets/font-awesome/scss/_path.scss → app/font-awesome/scss/_path.scss
diff --git a/...s/font-awesome/scss/_rotated-flipped.scss → app/font-awesome/scss/_rotated-flipped.scss b/...s/font-awesome/scss/_rotated-flipped.scss → app/font-awesome/scss/_rotated-flipped.scss
diff --git a/www/assets/font-awesome/scss/_spinning.scss → app/font-awesome/scss/_spinning.scss b/www/assets/font-awesome/scss/_spinning.scss → app/font-awesome/scss/_spinning.scss
diff --git a/www/assets/font-awesome/scss/_stacked.scss → app/font-awesome/scss/_stacked.scss b/www/assets/font-awesome/scss/_stacked.scss → app/font-awesome/scss/_stacked.scss
diff --git a/www/assets/font-awesome/scss/_variables.scss → app/font-awesome/scss/_variables.scss b/www/assets/font-awesome/scss/_variables.scss → app/font-awesome/scss/_variables.scss
diff --git a/...ssets/font-awesome/scss/font-awesome.scss → app/font-awesome/scss/font-awesome.scss b/...ssets/font-awesome/scss/font-awesome.scss → app/font-awesome/scss/font-awesome.scss
diff --git a/...ts/fonts/glyphicons-halflings-regular.eot → app/fonts/glyphicons-halflings-regular.eot b/...ts/fonts/glyphicons-halflings-regular.eot → app/fonts/glyphicons-halflings-regular.eot
diff --git a/...ts/fonts/glyphicons-halflings-regular.svg → app/fonts/glyphicons-halflings-regular.svg b/...ts/fonts/glyphicons-halflings-regular.svg → app/fonts/glyphicons-halflings-regular.svg
diff --git a/...ts/fonts/glyphicons-halflings-regular.ttf → app/fonts/glyphicons-halflings-regular.ttf b/...ts/fonts/glyphicons-halflings-regular.ttf → app/fonts/glyphicons-halflings-regular.ttf
diff --git a/...s/fonts/glyphicons-halflings-regular.woff → app/fonts/glyphicons-halflings-regular.woff b/...s/fonts/glyphicons-halflings-regular.woff → app/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → app/fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → app/fonts/glyphicons-halflings-regular.woff2
diff --git a/www/assets/img/Concrete_Blocks.jpg → app/img/Concrete_Blocks.jpg b/www/assets/img/Concrete_Blocks.jpg → app/img/Concrete_Blocks.jpg
diff --git a/www/assets/img/Crowded_DT.jpg → app/img/Crowded_DT.jpg b/www/assets/img/Crowded_DT.jpg → app/img/Crowded_DT.jpg
diff --git a/www/assets/img/Downtown.jpg → app/img/Downtown.jpg b/www/assets/img/Downtown.jpg → app/img/Downtown.jpg
diff --git a/www/assets/img/GG_Nice.jpg → app/img/GG_Nice.jpg b/www/assets/img/GG_Nice.jpg → app/img/GG_Nice.jpg
diff --git a/www/assets/img/NEW_slide-1.jpg → app/img/NEW_slide-1.jpg b/www/assets/img/NEW_slide-1.jpg → app/img/NEW_slide-1.jpg
diff --git a/www/assets/img/Tall_Buldings.jpg → app/img/Tall_Buldings.jpg b/www/assets/img/Tall_Buldings.jpg → app/img/Tall_Buldings.jpg
diff --git a/www/assets/img/active-downtown-blue.jpg → app/img/active-downtown-blue.jpg b/www/assets/img/active-downtown-blue.jpg → app/img/active-downtown-blue.jpg
diff --git a/www/assets/img/active-downtown.jpg → app/img/active-downtown.jpg b/www/assets/img/active-downtown.jpg → app/img/active-downtown.jpg
diff --git a/www/assets/img/bcg_slide-1.jpg → app/img/bcg_slide-1.jpg b/www/assets/img/bcg_slide-1.jpg → app/img/bcg_slide-1.jpg
diff --git a/www/assets/img/bcg_slide-2.jpg → app/img/bcg_slide-2.jpg b/www/assets/img/bcg_slide-2.jpg → app/img/bcg_slide-2.jpg
diff --git a/www/assets/img/bcg_slide-3.jpg → app/img/bcg_slide-3.jpg b/www/assets/img/bcg_slide-3.jpg → app/img/bcg_slide-3.jpg
diff --git a/www/assets/img/bcg_slide-4.jpg → app/img/bcg_slide-4.jpg b/www/assets/img/bcg_slide-4.jpg → app/img/bcg_slide-4.jpg
diff --git a/www/assets/img/commercial.svg → app/img/commercial.svg b/www/assets/img/commercial.svg → app/img/commercial.svg
diff --git a/www/assets/img/dirty-city-blue.jpg → app/img/dirty-city-blue.jpg b/www/assets/img/dirty-city-blue.jpg → app/img/dirty-city-blue.jpg
diff --git a/www/assets/img/downtown-05-B.jpg → app/img/downtown-05-B.jpg b/www/assets/img/downtown-05-B.jpg → app/img/downtown-05-B.jpg
diff --git a/www/assets/img/downtown-05.jpg → app/img/downtown-05.jpg b/www/assets/img/downtown-05.jpg → app/img/downtown-05.jpg
diff --git a/www/assets/img/downtown-07-blue-2.jpg → app/img/downtown-07-blue-2.jpg b/www/assets/img/downtown-07-blue-2.jpg → app/img/downtown-07-blue-2.jpg
diff --git a/www/assets/img/downtown-07-blue-3.jpg → app/img/downtown-07-blue-3.jpg b/www/assets/img/downtown-07-blue-3.jpg → app/img/downtown-07-blue-3.jpg
diff --git a/www/assets/img/downtown-07-blue.jpg → app/img/downtown-07-blue.jpg b/www/assets/img/downtown-07-blue.jpg → app/img/downtown-07-blue.jpg
diff --git a/www/assets/img/downtown-07-hue.jpg → app/img/downtown-07-hue.jpg b/www/assets/img/downtown-07-hue.jpg → app/img/downtown-07-hue.jpg
diff --git a/www/assets/img/downtown-07-light.jpg → app/img/downtown-07-light.jpg b/www/assets/img/downtown-07-light.jpg → app/img/downtown-07-light.jpg
diff --git a/www/assets/img/downtown-07.jpg → app/img/downtown-07.jpg b/www/assets/img/downtown-07.jpg → app/img/downtown-07.jpg
diff --git a/www/assets/img/housing_1.jpg → app/img/housing_1.jpg b/www/assets/img/housing_1.jpg → app/img/housing_1.jpg
diff --git a/www/assets/img/housing_2.jpg → app/img/housing_2.jpg b/www/assets/img/housing_2.jpg → app/img/housing_2.jpg
diff --git a/www/assets/img/housing_3.jpg → app/img/housing_3.jpg b/www/assets/img/housing_3.jpg → app/img/housing_3.jpg
diff --git a/www/assets/img/ico_loading.gif → app/img/ico_loading.gif b/www/assets/img/ico_loading.gif → app/img/ico_loading.gif
diff --git a/www/assets/img/industrial.svg → app/img/industrial.svg b/www/assets/img/industrial.svg → app/img/industrial.svg
diff --git a/www/assets/img/landing.svg → app/img/landing.svg b/www/assets/img/landing.svg → app/img/landing.svg
diff --git a/www/assets/img/logo_notext.png → app/img/logo_notext.png b/www/assets/img/logo_notext.png → app/img/logo_notext.png
diff --git a/www/assets/img/map.jpg → app/img/map.jpg b/www/assets/img/map.jpg → app/img/map.jpg
diff --git a/www/assets/img/mixeduse.svg → app/img/mixeduse.svg b/www/assets/img/mixeduse.svg → app/img/mixeduse.svg
diff --git a/www/assets/img/public.svg → app/img/public.svg b/www/assets/img/public.svg → app/img/public.svg
diff --git a/www/assets/img/residential.svg → app/img/residential.svg b/www/assets/img/residential.svg → app/img/residential.svg
diff --git a/www/assets/img/sf-skyline-03.jpg → app/img/sf-skyline-03.jpg b/www/assets/img/sf-skyline-03.jpg → app/img/sf-skyline-03.jpg
diff --git a/www/assets/img/sfip_logo_v1.png → app/img/sfip_logo_v1.png b/www/assets/img/sfip_logo_v1.png → app/img/sfip_logo_v1.png
diff --git a/www/assets/img/twin-peaks-05.jpg → app/img/twin-peaks-05.jpg b/www/assets/img/twin-peaks-05.jpg → app/img/twin-peaks-05.jpg
diff --git a/app/index.html b/app/index.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+
+<!--[if lt IE 7]>      <html lang="en" ng-app="sfip" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html lang="en" ng-app="sfip" class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html lang="en" ng-app="sfip" class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html lang="en" ng-app="sfip" class="no-js"> <!--<![endif]-->
+
+<head>
+
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="description" content="">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <title>SF in Progress - {{pageTitle}}</title>
+
+  <base href="/">
+
+  <link rel='stylesheet' href='https://api.tiles.mapbox.com/mapbox.js/v2.1.6/mapbox.css'>
+
+	<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+  <!-- Bootstrap Core CSS -->
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <!-- Custom CSS -->
+  <link href="/css/in-progress.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
+  <!-- Custom Fonts -->
+  <link href="/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+  <link href="/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+    <!-- <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700|Raleway:400,200,300|Open+Sans' rel='stylesheet' type='text/css'> -->
+
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,800,300|Open+Sans+Condensed:300|Raleway:400,900,800' rel='stylesheet' type='text/css'>
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+        <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+
+
+</head>
+
+<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
+  <div ng-include="'/views/sfip/navbar.html'"></div>
+
+  <!--[if lt IE 7]>
+      <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+  <![endif]-->
+
+  <div ng-view></div>
+
+  <script src="https://api.tiles.mapbox.com/mapbox.js/v2.1.5/mapbox.js"></script>
+  <script src="/lib/jquery.js"></script>
+  <script src="/lib/jquery-ui.js"></script>
+  <script src="/lib/bootstrap.min.js"></script>
+  <script src="/lib/jquery.easing.min.js"></script>
+  <script src="/lib/skrollr.min.js"></script>
+  <script src="/lib/angular.js"></script>
+  <script src="/lib/angular-route.js"></script>
+  <script src="/lib/custom.js"></script>
+
+
+
+  <script src="/lib/underscore.js"></script>
+  <script src="/lib/backbone.js"></script>
+  <script src="/lib/map.js" type="text/javascript"></script>
+  <script src="/lib/react/bundle.js"></script>
+
+	<script src="/lib/admin-form.js"></script>
+
+  <script src="/src/sfip/module.js"></script>
+  <script src="/src/sfip/routes.js"></script>
+  <script src="/src/sfip/controllers.js"></script>
+  <script src="/src/sfip/directives.js"></script>
+
+</body>
+</html>
diff --git a/www/assets/js/admin-form.js → app/lib/admin-form.js b/www/assets/js/admin-form.js → app/lib/admin-form.js