Building again and fixed dependency dissapearing from npm

hackAD · Jan 8, 2016 · b3078ad · b3078ad
1 parent d89b6a6
commit b3078ad
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 91 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 .git/
 packages/**/.build/
+.meteor/local
 .meteor/local/db/
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ ADD . /srv/nyu-vote
 
 WORKDIR /srv/nyu-vote
 RUN mkdir build
-RUN meteor build .
+RUN meteor build . && echo "1"
 RUN tar -xzf nyu-vote.tar.gz
 RUN (cd bundle/programs/server && npm install)
 

diff --git a/client/main.html b/client/main.html
@@ -1,5 +1,5 @@
 <head>
-  <title>NYU Vote</title>
+  <title>Student Vote</title>
   <link href='//fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
   <link href='//fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>

diff --git a/client/views/voter/includes/home.jsx b/client/views/voter/includes/home.jsx
@@ -11,13 +11,13 @@ Home = React.createClass({
       <div className="content-wrapper purple-bg">
         <div id="login-info">
           <h1>
-            NYU Vote
+            Student Vote
           </h1>
           <p className="login-caption">
-            Developed by NYU Abu Dhabi Research and Development. Sponsored by NYU SSC.
+            Designed, Developed, and Supported under the auspices of NYU Student Government
           </p>
           <a className="login-caption light-grey" href={Router.path("about")}>
-            Learn More
+            Get Help
           </a>
           <div className="centered-container">
             <a className="large-button" href="#" onClick={this.login}>

diff --git a/packages.json b/packages.json
@@ -1,4 +1,4 @@
 {
-  "winston": "1.0.1",
-  "winston-mongodb": "1.1.2"
+  "winston": "2.1.1",
+  "winston-mongodb": "1.3.0"
 }
diff --git a/packages/.gitignore b/packages/.gitignore
@@ -0,0 +1,3 @@
+npm-container/*
+!npm-container/index.js
+!npm-container/package.js
diff --git a/packages/npm-container/.npm/package/.gitignore b/packages/npm-container/.npm/package/.gitignore
diff --git a/packages/npm-container/.npm/package/README b/packages/npm-container/.npm/package/README
diff --git a/packages/npm-container/.npm/package/npm-shrinkwrap.json b/packages/npm-container/.npm/package/npm-shrinkwrap.json
diff --git a/public/stugov_logo.png b/public/stugov_logo.png