Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added logo. changed over to thin.

  • Loading branch information...
commit 0b0432730e13261a49a1c284c61e0f55a8696cd6 1 parent d53e2e0
Nathan Herzing nherzing authored
3  Gemfile
View
@@ -9,4 +9,5 @@ gem 'foreman'
gem 'datamapper'
gem 'dm-postgres-adapter'
gem 'pusher'
-gem 'json'
+gem 'json'
+gem 'thin'
6 Gemfile.lock
View
@@ -8,6 +8,7 @@ GEM
backports (2.6.4)
bcrypt-ruby (3.0.1)
builder (3.1.0)
+ daemons (1.1.9)
data_objects (0.10.8)
addressable (~> 2.1)
datamapper (1.2.0)
@@ -91,6 +92,10 @@ GEM
sinatra (~> 1.3.0)
tilt (~> 1.3)
stringex (1.4.0)
+ thin (1.4.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
twilio-rb (2.2.0)
@@ -112,4 +117,5 @@ DEPENDENCIES
pusher
sinatra
sinatra-contrib
+ thin
twilio-rb
1  Procfile
View
@@ -0,0 +1 @@
+web: bundle exec thin start -p $PORT
1  Procfile.dev
View
@@ -1 +0,0 @@
-web: rackup -I lib -p $PORT config.ru
3  config.ru
View
@@ -1,3 +1,4 @@
-require './lib/crowdring'
+$LOAD_PATH.unshift 'lib'
+require 'crowdring'
run Crowdring::Server
6 lib/crowdring.rb
View
@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'bundler'
require 'twilio-rb'
require 'sinatra/base'
require 'sinatra/json'
@@ -6,8 +6,8 @@
require 'pusher'
require 'json'
-require_relative 'crowdring/campaign'
-require_relative 'crowdring/supporter'
+require 'crowdring/campaign'
+require 'crowdring/supporter'
module Crowdring
class Server < Sinatra::Base
BIN  lib/public/crowdringlogo.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 lib/public/stylesheets/application.less
View
@@ -7,10 +7,24 @@ body {
width: 960px;
}
+ header {
+ padding: 4px;
+ border-bottom: 1px solid #eee;
+
+ img {
+ display: inline-block;
+ vertical-align: bottom;
+ }
+
+ h1 {
+ display: inline-block;
+ margin: 0 0 0 8px;
+ vertical-align: bottom;
+ }
+ }
+
h1 {
color: #067EBF;
- padding-bottom: 4px;
- border-bottom: 1px solid #eee;
}
h2 {
@@ -18,8 +32,6 @@ body {
}
#campaign {
- width: 400px;
- border-style: groove;
border-width: 2px;
padding-left: 3px;
margin-top: 3px;
8 lib/views/index.erb
View
@@ -10,12 +10,16 @@
</head>
<body>
<div class="content">
- <h1>Crowdring</h1>
+ <header>
+ <img class="logo" src="crowdringlogo.png" width="40" />
+ <h1>Crowdring</h1>
+ </header>
+
<h2>Campaigns</h2>
<select name="number" class="number">
<option value="">Select a number to see subscribers</option>
<% for @campaign in @campaigns %>
- <option value=<%= @campaign.phone_number %>><%= @campaign.title %>(<%= @campaign.phone_number %>)</option>
+ <option value=<%= @campaign.phone_number %>><%= @campaign.title %> (<%= @campaign.phone_number %>)</option>
<% end %>
</select>
Please sign in to comment.
Something went wrong with that request. Please try again.