Skip to content
Open

dfs #13

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "vendor/assets/bower_components"
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
/tmp
.DS_Store
Procfile.local
node_modules/
bower_components/

9 changes: 1 addition & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,15 @@ gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
gem 'jquery-rails'
gem 'bootstrap-sass'
gem 'font-awesome-rails'
gem 'owlcarousel-rails'
gem 'acts_as_votable'
gem 'browserify-rails'
gem 'steam-condenser'
#gem 'gulper', path: '../gulper'

group :development do
gem 'spring'
gem 'binding_of_caller'
gem 'better_errors'
gem 'meta_request'
gem 'quiet_assets'
gem 'coffee-rails-source-maps'
gem 'sass-rails-source-maps'
gem 'faker'
gem 'guard-livereload', require: false
gem 'rack-livereload'
end
66 changes: 0 additions & 66 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,14 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.1.0)
sass (~> 3.2)
browserify-rails (0.5.1)
sprockets (~> 2.0)
builder (3.2.2)
callsite (0.0.11)
celluloid (0.16.0)
timers (~> 4.0.0)
coderay (1.1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-rails-source-maps (1.4.0)
coffee-script-source (>= 1.6.1)
coffee-script (2.3.0)
coffee-script-source
execjs
Expand All @@ -82,19 +74,12 @@ GEM
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
equalizer (0.0.9)
erubis (2.7.0)
eventmachine (1.0.4)
execjs (2.2.2)
faker (1.4.3)
i18n (~> 0.5)
ffi (1.9.6)
font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.5)
globalid (0.3.0)
activesupport (>= 4.1.0)
grape (0.9.0)
Expand All @@ -120,23 +105,8 @@ GEM
grape-swagger-rails (0.0.10)
grape-swagger (~> 0.7.2)
railties (>= 3.2.12)
guard (2.11.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-livereload (2.4.0)
em-websocket (~> 0.5)
guard (~> 2.8)
multi_json (~> 1.8)
hashie (3.3.2)
hike (1.2.3)
hitimes (1.2.2)
http_parser.rb (0.6.0)
i18n (0.7.0)
ice_nine (0.11.1)
jquery-rails (4.0.3)
Expand All @@ -145,39 +115,25 @@ GEM
thor (>= 0.14, < 2.0)
json (1.8.2)
kramdown (1.5.0)
listen (2.8.5)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.1)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
meta_request (0.3.4)
callsite (~> 0.0, >= 0.0.11)
rack-contrib (~> 1.1)
railties (>= 3.0.0, < 5.0.0)
method_source (0.8.2)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
multi_xml (0.5.5)
nenv (0.1.1)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
notiffany (0.0.3)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
owlcarousel-rails (1.1.3.3)
jquery-rails
pg (0.18.1)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.0)
Expand All @@ -186,8 +142,6 @@ GEM
rack-contrib (1.2.0)
rack (>= 0.9.1)
rack-cors (0.3.1)
rack-livereload (0.3.15)
rack
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-test (0.6.3)
Expand Down Expand Up @@ -217,9 +171,6 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
responders (2.0.2)
railties (>= 4.2.0.alpha, < 5)
sass (3.4.9)
Expand All @@ -229,16 +180,9 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sass-rails-source-maps (0.0.4)
rails
sass (>= 3.3.0.rc.3)
sprockets (>= 2.3.0)
shellany (0.0.1)
slim (3.0.1)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.2.0)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -259,8 +203,6 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
timers (4.0.1)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.0)
Expand All @@ -281,29 +223,21 @@ DEPENDENCIES
acts_as_votable
better_errors
binding_of_caller
bootstrap-sass
browserify-rails
coffee-rails
coffee-rails-source-maps
devise
faker
font-awesome-rails
grape (= 0.9.0)
grape-active_model_serializers
grape-swagger-rails
guard-livereload
jquery-rails
meta_request
owlcarousel-rails
pg
quiet_assets
rack-cors
rack-livereload
rails
sass-rails
sass-rails-source-maps
slim
spring
steam-condenser
thin
uglifier
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
bundle
bundle exec rake db:{create,migrate,seed}
npm install
bundle exec rails server
gulp
28 changes: 0 additions & 28 deletions README.rdoc

This file was deleted.

11 changes: 3 additions & 8 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
//= require jquery
//= require bootstrap-sprockets
//= require bootstrap/tooltip
//= require_self
//= require bootstrap-sass/assets/javascripts/bootstrap/tooltip

var App = require('csgo.js.coffee');

$(document).ready(function(){
var app = new App();
});
// this file is compiled from gulp into public
//= require core
5 changes: 0 additions & 5 deletions app/assets/javascripts/controllers.js.coffee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
class SiteController
constructor: -> return

index: ->
$('select').on 'change', (e) => console.log true

module.exports = SiteController
15 changes: 15 additions & 0 deletions app/assets/javascripts/core/core.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Routes = require('./routes.js.coffee')
search = require('./libs/search.js.coffee')
servers = require('./libs/servers.js.coffee')
utils = require('./libs/utils.js.coffee')

class App
constructor: (namespaces) ->
@Routes = new Routes(@)
search.setupEvents()
servers.setupEvents()
utils.setupEvents()

$ ->
app = new App

Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ class Search
@keypress e
, 100)

module.exports = new Search()
module.exports = new Search
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Controllers = require('controllers')
Controllers = {
site_controller: require('./controllers/site_controller.js.coffee')
}

class Routes
constructor: (app) ->
Expand Down
14 changes: 0 additions & 14 deletions app/assets/javascripts/csgo.js.coffee

This file was deleted.

11 changes: 11 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Use this file to include any stylesheet assets from installed gems. All other css is compiled with
* libsass with Gulp.
*
* Pull compiled from /public/assets/stylesheets
*= require font-awesome
*= require core
*/
27 changes: 0 additions & 27 deletions app/assets/stylesheets/application.scss

This file was deleted.

File renamed without changes.
26 changes: 26 additions & 0 deletions app/assets/stylesheets/core/core.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// config
@import 'variables';
@import 'mixins';

// bootstrap
@import 'bootstrap';

// base
@import 'base';

// components
@import 'modules/alerts';
@import 'modules/box';
@import 'modules/buttons';
@import 'modules/footer';
@import 'modules/forms';
@import 'modules/navbar';
@import 'modules/overlay';
@import 'modules/panel';
@import 'modules/table';
@import 'modules/voting';

// partials/views
@import 'partials/servers';
@import 'partials/index';
@import 'partials/login';
Loading