diff --git a/Gemfile b/Gemfile index 090dcb7..adeb6f3 100644 --- a/Gemfile +++ b/Gemfile @@ -39,26 +39,24 @@ gem 'spring', :group => :development #Installed by me - #For Heroku - group :production do - gem 'rails_12factor' - gem 'mysql2' - gem 'passenger' - gem 'therubyracer' - gem 'newrelic_rpm' - gem 'dalli' - end - #Other - gem 'devise' - gem 'cancancan' - gem 'round_robin_tournament' - gem 'rb-readline' - gem 'delayed_job_active_record' - gem 'puma' - gem 'brakeman' - gem 'rails-lineman' - group :development do - - #gem 'bullet' - end +group :production do + gem 'rails_12factor' + gem 'mysql2' + gem 'therubyracer' + gem 'newrelic_rpm' + gem 'dalli' +end + +gem 'devise' +gem 'cancancan' +gem 'round_robin_tournament' +gem 'rb-readline' +gem 'delayed_job_active_record' +gem 'puma' + +group :development do + gem 'rubocop' + gem 'bullet' + gem 'brakeman' +end diff --git a/Gemfile.lock b/Gemfile.lock index c4d6ee0..d05943c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,80 +36,73 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.3) - bcrypt (3.1.10) - brakeman (3.1.5) - erubis (~> 2.6) - fastercsv (~> 1.5) - haml (>= 3.0, < 5.0) - highline (>= 1.6.20, < 2.0) - multi_json (~> 1.2) - ruby2ruby (>= 2.1.1, < 2.3.0) - ruby_parser (~> 3.7.0) - safe_yaml (>= 1.0) - sass (~> 3.0) - slim (>= 1.3.6, < 4.0) - terminal-table (~> 1.4) - builder (3.2.2) - cancancan (1.10.1) + arel (6.0.4) + ast (2.3.0) + bcrypt (3.1.11) + brakeman (3.6.1) + builder (3.2.3) + bullet (5.5.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + cancancan (2.0.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - concurrent-ruby (1.0.0) - dalli (2.7.5) - delayed_job (4.1.1) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.1.0) - activerecord (>= 3.0, < 5) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + dalli (2.7.6) + delayed_job (4.1.2) + activesupport (>= 3.0, < 5.1) + delayed_job_active_record (4.1.1) + activerecord (>= 3.0, < 5.1) delayed_job (>= 3.0, < 5) - devise (3.4.1) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.2) responders - thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) - execjs (2.5.2) - fastercsv (1.5.5) - globalid (0.3.6) - activesupport (>= 4.1.0) - haml (4.0.7) - tilt - highline (1.7.8) - i18n (0.7.0) - jbuilder (2.2.13) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + execjs (2.7.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + jbuilder (2.6.4) + activesupport (>= 3.0.0) + multi_json (>= 1.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) - libv8 (3.16.14.7) + json (1.8.6) + libv8 (3.16.14.19) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.99) - mini_portile2 (2.0.0) - minitest (5.8.3) - multi_json (1.11.0) - mysql2 (0.3.18) - newrelic_rpm (3.13.2.302) - nokogiri (1.6.7) - mini_portile2 (~> 2.0.0.rc2) + mail (2.6.5) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.2) + multi_json (1.12.1) + mysql2 (0.4.6) + newrelic_rpm (4.1.0.333) + nokogiri (1.7.2) + mini_portile2 (~> 2.1.0) orm_adapter (0.5.0) - passenger (5.0.7) + parallel (1.11.2) + parser (2.4.0.0) + ast (~> 2.2) + passenger (5.1.4) rack rake (>= 0.8.1) - puma (2.11.2) - rack (>= 1.1, < 2.0) - rack (1.6.4) + powerpack (0.1.1) + puma (3.8.2) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) rails (4.2.5) @@ -125,71 +118,70 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails-lineman (0.3.0) rake rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.4) - rails_stdout_logging (0.0.3) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) railties (4.2.5) actionpack (= 4.2.5) activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rb-readline (0.5.2) - rdoc (4.2.0) - json (~> 1.4) - ref (1.0.5) - responders (2.1.0) - railties (>= 4.2.0, < 5) + rainbow (2.2.2) + rake + rake (12.0.0) + rb-readline (0.5.4) + rdoc (4.3.0) + ref (2.0.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) round_robin_tournament (0.0.1) - ruby2ruby (2.2.0) - ruby_parser (~> 3.1) - sexp_processor (~> 4.0) - ruby_parser (3.7.3) - sexp_processor (~> 4.1) - safe_yaml (1.0.4) - sass (3.4.21) - sdoc (0.4.1) + rubocop (0.49.1) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.8.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.6.1) - slim (3.0.6) - temple (~> 0.7.3) - tilt (>= 1.3.3, < 2.1) - spring (1.3.5) - sprockets (3.5.0) + spring (2.0.1) + activesupport (>= 4.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) - temple (0.7.6) - terminal-table (1.5.2) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.2) - turbolinks (2.5.3) - coffee-rails - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - warden (1.2.3) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + unicode-display_width (1.2.1) + uniform_notifier (1.10.0) + warden (1.2.7) rack (>= 1.0) PLATFORMS @@ -197,6 +189,7 @@ PLATFORMS DEPENDENCIES brakeman + bullet cancancan coffee-rails (~> 4.0.0) dalli @@ -213,6 +206,7 @@ DEPENDENCIES rails_12factor rb-readline round_robin_tournament + rubocop sdoc (~> 0.4.0) spring sqlite3 @@ -224,4 +218,4 @@ RUBY VERSION ruby 2.3.0p0 BUNDLED WITH - 1.13.5 + 1.14.6 diff --git a/Procfile b/Procfile index 93afc98..2561a76 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ worker: bundle exec rake jobs:work -web: bundle exec passenger start -p $PORT --max-pool-size 3 \ No newline at end of file +web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development} diff --git a/config/application.rb b/config/application.rb index 183d62a..bdf0de2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -29,8 +29,6 @@ module Wrestling config.active_job.queue_adapter = :delayed_job - config.rails_lineman.lineman_project_location = "frontend" - config.to_prepare do DeviseController.respond_to :html, :json end diff --git a/deploy/docker-compose-common.yml b/deploy/docker-compose-common.yml index 5bfe0fc..0de23b1 100644 --- a/deploy/docker-compose-common.yml +++ b/deploy/docker-compose-common.yml @@ -22,4 +22,4 @@ memcached: worker: image: wrestlingdev - command: /bin/bash -c "cd /var/www && bundle exec rake jobs:work RAILS_ENV=production" + command: /bin/bash -c "cd /rails && bundle exec rake jobs:work RAILS_ENV=production" diff --git a/frontend/.gitignore b/frontend/.gitignore deleted file mode 100644 index 275ec00..0000000 --- a/frontend/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -.DS_Store - -#ignore node_modules, as the node project is not "deployed" per se: http://www.mikealrogers.com/posts/nodemodules-in-git.html -/node_modules - -/dist -/generated - -.sass-cache diff --git a/frontend/.npmignore b/frontend/.npmignore deleted file mode 100644 index 275ec00..0000000 --- a/frontend/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -.DS_Store - -#ignore node_modules, as the node project is not "deployed" per se: http://www.mikealrogers.com/posts/nodemodules-in-git.html -/node_modules - -/dist -/generated - -.sass-cache diff --git a/frontend/.travis.yml b/frontend/.travis.yml deleted file mode 100644 index 53ce7b2..0000000 --- a/frontend/.travis.yml +++ /dev/null @@ -1,4 +0,0 @@ -language: node_js -node_js: -- 0.10 -script: "lineman spec-ci" diff --git a/frontend/Gruntfile.js b/frontend/Gruntfile.js deleted file mode 100644 index ed05645..0000000 --- a/frontend/Gruntfile.js +++ /dev/null @@ -1,4 +0,0 @@ -/*global module:false*/ -module.exports = function(grunt) { - require('./config/lineman').config.grunt.run(grunt); -}; diff --git a/frontend/Procfile b/frontend/Procfile deleted file mode 100644 index 8513c01..0000000 --- a/frontend/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: npm run production diff --git a/frontend/README.md b/frontend/README.md deleted file mode 100644 index debad91..0000000 --- a/frontend/README.md +++ /dev/null @@ -1 +0,0 @@ -# My Lineman Application \ No newline at end of file diff --git a/frontend/app/css/style.css b/frontend/app/css/style.css deleted file mode 100644 index 2c361ec..0000000 --- a/frontend/app/css/style.css +++ /dev/null @@ -1,4 +0,0 @@ -.hello { - background-color: #efefef; - border: 1px solid #dedede; -} diff --git a/frontend/app/img/.keep b/frontend/app/img/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/app/js/.keep b/frontend/app/js/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/app/js/app.js b/frontend/app/js/app.js deleted file mode 100644 index 395e7c2..0000000 --- a/frontend/app/js/app.js +++ /dev/null @@ -1,11 +0,0 @@ -var app = angular.module("wrestlingdev", ["ngRoute","Devise"]).run(function($rootScope) { - // adds some basic utilities to the $rootScope for debugging purposes - $rootScope.log = function(thing) { - console.log(thing); - }; - - $rootScope.alert = function(thing) { - alert(thing); - }; -}); - diff --git a/frontend/app/js/controllers/login-controller.js b/frontend/app/js/controllers/login-controller.js deleted file mode 100644 index c316d8b..0000000 --- a/frontend/app/js/controllers/login-controller.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; -app.controller("loginController", function($scope, $routeParams, Auth, $rootScope) { - $scope.credentials = { - email: '', - password: '' - }; - - var config = { - headers: { - 'X-HTTP-Method-Override': 'POST' - } - }; - - - $scope.login = function(){ - Auth.login($scope.credentials, config).then(function(user) { - console.log(user); // => {id: 1, ect: '...'} - $rootScope.user = user; - $rootScope.alertClass = "alert alert-success"; - $rootScope.alertMessage = "Logged in successfully"; - }, function(error) { - console.log(error); - $rootScope.alertClass = "alert alert-danger"; - $rootScope.alertMessage = "Username and/or password is incorrect"; - }); - }; - - $scope.logout = function(){ - Auth.logout(config).then(function(oldUser) { - // alert(oldUser.name + "you're signed out now."); - $rootScope.user = null; - $rootScope.alertClass = "alert alert-success"; - $rootScope.alertMessage = "Logged out successfully"; - }, function(error) { - // An error occurred logging out. - $rootScope.alertClass = "alert alert-danger"; - $rootScope.alertMessage = "There was an error logging out"; - }); - }; - - Auth.currentUser().then(function(user) { - // User was logged in, or Devise returned - // previously authenticated session. - $rootScope.user = user; - }, function(error) { - // unauthenticated error - $rootScope.user = null; - }); - - -}); \ No newline at end of file diff --git a/frontend/app/js/controllers/my-tournaments.js b/frontend/app/js/controllers/my-tournaments.js deleted file mode 100644 index 567374b..0000000 --- a/frontend/app/js/controllers/my-tournaments.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -app.controller("myTournamentsController", function($scope, tournamentsService, $rootScope) { - - tournamentsService.getMyTournaments().then(function(data) { - //this will execute when the - //AJAX call completes. - $scope.allTournaments = data; - }); - -}); \ No newline at end of file diff --git a/frontend/app/js/controllers/tournament-controller.js b/frontend/app/js/controllers/tournament-controller.js deleted file mode 100644 index 3871072..0000000 --- a/frontend/app/js/controllers/tournament-controller.js +++ /dev/null @@ -1,86 +0,0 @@ -'use strict'; -app.controller("tournamentController", function($scope, tournamentsService, $routeParams, Wrestler, Auth, $rootScope) { - $scope.message = "Test message in scope."; - - - // $scope.tournamentData = "test"; - tournamentsService.tournamentDetails($routeParams.id).then(function(data) { - //this will execute when the - //AJAX call completes. - $scope.tournament = data; - }); - - $scope.refreshTournamentData = function(){ - tournamentsService.tournamentDetails($routeParams.id).then(function(data) { - //this will execute when the - //AJAX call completes. - $scope.tournament = data; - }); - }; - - // refresh tournament data every 10 seconds - // setInterval(function(){ - // tournamentsService.tournamentDetails($routeParams.id).then(function(data) { - // //this will execute when the - // //AJAX call completes. - // $scope.tournament = data; - // }); - // }, 10000); - - $scope.wrestler = Wrestler; - - $scope.showSchools = false; - - $scope.toggleSchools = function(){ - $scope.showSchools = !$scope.showSchools; - }; - - $scope.showWeightSeeds = false; - - $scope.toggleWeightSeeds = function(){ - $scope.showWeightSeeds = !$scope.showWeightSeeds; - }; - - - $scope.showBoutBoard = false; - - $scope.toggleBoutBoard = function(){ - $scope.showBoutBoard = !$scope.showBoutBoard; - }; - - - $scope.isTournamentOwner = function(tournamentId,userId){ - if(userId == tournamentId){ - return true; - } else { - return false; - } - }; - - - $scope.newSchool = null; - - $scope.saveNewSchool = function(){ - $scope.newSchool.tournament_id = $scope.tournament.id; - tournamentsService.saveNewSchool($scope.newSchool).then(function(data) { - $scope.tournament.schools.push(data); - }); - $scope.newSchool = null; - $('#NewSchool').modal('hide'); - }; - - $scope.deleteSchool = function(school){ - if (confirm('Are you sure you want to delete ' + school.name + '?')) { - tournamentsService.deleteSchool(school).then(function(data) { - $scope.tournament.schools.splice( $scope.tournament.schools.indexOf(school), 1 ); - }); - } - }; - - $scope.updateSchool = function(school){ - tournamentsService.updateSchool(school); - $('#EditSchool' + school.id).modal('hide'); - }; - - -}); \ No newline at end of file diff --git a/frontend/app/js/controllers/tournaments-controller.js b/frontend/app/js/controllers/tournaments-controller.js deleted file mode 100644 index 5054906..0000000 --- a/frontend/app/js/controllers/tournaments-controller.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -app.controller("tournamentsController", function($scope, tournamentsService) { - - tournamentsService.getAllTournaments().then(function(data) { - //this will execute when the - //AJAX call completes. - $scope.allTournaments = data; - }); - - $scope.searchTournaments = function (){ - tournamentsService.searchTournaments($scope.searchTerms).then(function(data) { - //this will execute when the - //AJAX call completes. - $scope.allTournaments = data; - }); - }; - -}); \ No newline at end of file diff --git a/frontend/app/js/directives/loading.js b/frontend/app/js/directives/loading.js deleted file mode 100644 index 9635bea..0000000 --- a/frontend/app/js/directives/loading.js +++ /dev/null @@ -1,24 +0,0 @@ -(function(){ - app.directive('usSpinner', ['$http', '$rootScope' ,function ($http, $rootScope){ - return { - link: function (scope, elm, attrs) - { - $rootScope.spinnerActive = false; - scope.isLoading = function () { - return $http.pendingRequests.length > 0; - }; - - scope.$watch(scope.isLoading, function (loading) - { - $rootScope.spinnerActive = loading; - if(loading){ - elm.removeClass('ng-hide'); - }else{ - elm.addClass('ng-hide'); - } - }); - } - }; - - }]); -}).call(this); \ No newline at end of file diff --git a/frontend/app/js/models/wrestler.js b/frontend/app/js/models/wrestler.js deleted file mode 100644 index 30c2c89..0000000 --- a/frontend/app/js/models/wrestler.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -app.factory('Wrestler', function Wrestler(){ - var vm = this; - - - vm.matches = function(wrestler,matches){ - - console.log(matches); - return _.filter(matches, function(match){ - return match.w1 == wrestler.id || match.w2 == wrestler.id; - }); - - - }; - - return vm; -}); \ No newline at end of file diff --git a/frontend/app/js/routes.js b/frontend/app/js/routes.js deleted file mode 100644 index 84ba476..0000000 --- a/frontend/app/js/routes.js +++ /dev/null @@ -1,49 +0,0 @@ - - -// $routeProvider.when('/list-of-books', { -// templateUrl: 'angular/books.html', -// controller: 'BooksController' -// // uncomment if you want to see an example of a route that resolves a request prior to rendering -// // resolve: { -// // books : function(BookService) { -// // return BookService.get(); -// // } -// // } -// }); - - - -app.config(['$routeProvider', '$locationProvider', function($routeProvider,$locationProvider) { - - $routeProvider.when('/', { - templateUrl: 'home.html', - }); - - $routeProvider.when('/tournaments', { - templateUrl: 'tournaments-search.html', - controller: 'tournamentsController' - }); - - $routeProvider.when('/tournaments/user', { - templateUrl: 'my-tournaments.html', - controller: 'myTournamentsController' - }); - - $routeProvider.when('/tournaments/:id', { - templateUrl: 'tournaments-show.html', - controller: 'tournamentController' - }); - - $routeProvider.when('/about', { - templateUrl: 'about.html', - }); - - $routeProvider.when('/tutorials', { - templateUrl: 'tutorials.html', - }); - - $routeProvider.otherwise({redirectTo: '/'}); - - //this give me normal routes instead of /#/ - // $locationProvider.html5Mode(true); -}]); \ No newline at end of file diff --git a/frontend/app/js/services/tournaments-service.js b/frontend/app/js/services/tournaments-service.js deleted file mode 100644 index 4f5db46..0000000 --- a/frontend/app/js/services/tournaments-service.js +++ /dev/null @@ -1,101 +0,0 @@ - -app.factory('tournamentsService', tournamentsService); - -function tournamentsService($http,$rootScope){ - var service = {}; - - service.getMyTournaments = function(user){ - return $http({ - url: '/api/tournaments/user/', - method: "GET" - }).then(successResponse, errorCallback); - }; - - service.getAllTournaments = function(){ - return $http({ - url: '/api/tournaments/', - method: "GET" - }).then(successResponse, errorCallback); - }; - - service.searchTournaments = function(search){ - return $http({ - method: 'GET', - url: '/api/tournaments/', - params: { - search: search - } - }).then(successResponse, errorCallback); - }; - - service.tournamentDetails = function(tournamentId){ - return $http({ - url: '/api/tournaments/' + tournamentId, - method: "GET" - }).then(successResponse, errorCallback); - }; - - service.saveNewSchool = function(newSchool){ - return $http({ - url: '/schools.json', - method: "POST", - - data: { - school: { - 'name': newSchool.name, - 'tournament_id': newSchool.tournament_id - } - }, - headers: { - "Content-Type": "application/json" - } - }).then(successResponse, errorCallback); - }; - - service.deleteSchool = function(school){ - return $http({ - url: '/schools/' + school.id + '/', - method: "DELETE" - }).then(successResponse, errorCallback); - }; - - service.updateSchool = function(schoolToEdit){ - return $http({ - url: '/schools/' + schoolToEdit.id, - method: "PATCH", - data: { - school: { - 'name': schoolToEdit.name, - 'tournament_id': schoolToEdit.tournament_id - } - }, - headers: { - "Content-Type": "application/json" - } - }).then(successResponse, errorCallback); - }; - - function successResponse(response){ - // console.log("success log below"); - // console.log(response); - if(response.config.method == "POST" || response.config.method == "DELETE" || response.config.method == "PATCH"){ - $rootScope.alertClass = "alert alert-success"; - $rootScope.alertMessage = response.statusText; - } - return response.data; - } - - function errorCallback(err){ - // console.log("error log below"); - // console.log(err); - if(err.status > 0){ - $rootScope.alertClass = "alert alert-danger"; - $rootScope.alertMessage = err.statusText; - } - - return err; - } - - return service; -} - diff --git a/frontend/app/pages/index.us b/frontend/app/pages/index.us deleted file mode 100644 index 902d9da..0000000 --- a/frontend/app/pages/index.us +++ /dev/null @@ -1,98 +0,0 @@ - - - - - WrestlingDev - - - - - - - -
-
- - -
-
-
- - {{alertMessage}} -
-
- -
-
-
-
-
- -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/app/pages/static_pages/about.html b/frontend/app/pages/static_pages/about.html deleted file mode 100644 index f56e695..0000000 --- a/frontend/app/pages/static_pages/about.html +++ /dev/null @@ -1,46 +0,0 @@ -

About WrestlingDev

-
-

WrestlingDev was created to help bring wrestling into the 21st century for free. This site is open source and is supported by the ads on the sidebar.

-
-

Features

-
-

At this moment in time, WrestlingDev supports a pool to bracket type tournament for up to 16 teams. The bracket format follows OHSAA's 5 match per day rule. WrestlingDev will automatically generate brackets, generate bout numbers, generate and update a bout board, track team points, and update brackets.

-

For pool to bracket tournaments, pool tie breakers are the following:

- -

If three wrestlers are tied, they will be put through this sequence until two wrestlers are left. Once two wrestlers are left, the pool runner up will be decided by head to head.

-

For pool to bracket tournaments, team points will be calculated as follows:

- -

Finals matches will only recieve extra placement points for placing higher and bonus points for pin, tech, major, etc. Please note, only brackets with four pools place up to 8. Brackets with 1 or 2 pools only place top 4.

-
-

Future Plans

-
-

Future development plans to support normal double elimination brackets are underway and are planned to be finished in time for the 2016-2017 wrestling season.

-
-

Contact

-
-

Suggestions, criticism, and kind words are welcomed. Please contact us.

diff --git a/frontend/app/pages/static_pages/home.html b/frontend/app/pages/static_pages/home.html deleted file mode 100644 index adea8bd..0000000 --- a/frontend/app/pages/static_pages/home.html +++ /dev/null @@ -1,10 +0,0 @@ -
-

Welcome to WrestlingDev

-
-

This website was created to help wrestling coaches run their tournaments. It is 2015, why are we still running bout sheets to tables and why are we still using resources to push cards on a bout board? This website was created as a free way for coaches to run a tournament smoothly with as few workers as possible.

-
-

If you would like to run a tournament, please click log in and then click sign up.

-
-Browse Tournaments -

-
diff --git a/frontend/app/pages/static_pages/tutorials.html b/frontend/app/pages/static_pages/tutorials.html deleted file mode 100644 index 70f5141..0000000 --- a/frontend/app/pages/static_pages/tutorials.html +++ /dev/null @@ -1,17 +0,0 @@ -

Tutorials

-
-

Unfortunately, I do not have tutorials available at this moment in time. If you would like to learn how to use this software, please email me at jacob.wimer@gmail.com and I will gladly provide an overview of how to use this software. I've done my best to make the software intuitive and easy to use.

-
-

Planning on using this software?

-
-

Here is a list of features available:

-
- diff --git a/frontend/app/pages/tournaments/my-tournaments.html b/frontend/app/pages/tournaments/my-tournaments.html deleted file mode 100644 index 9038c29..0000000 --- a/frontend/app/pages/tournaments/my-tournaments.html +++ /dev/null @@ -1,17 +0,0 @@ -

My Tournaments

-
- - - - - - - - - - - - - - -
NameDate
{{ tournament.name }}{{ tournament.date }}
diff --git a/frontend/app/pages/tournaments/tournaments-search.html b/frontend/app/pages/tournaments/tournaments-search.html deleted file mode 100644 index 4afdaa8..0000000 --- a/frontend/app/pages/tournaments/tournaments-search.html +++ /dev/null @@ -1,25 +0,0 @@ -

Upcoming Tournaments

-
-
-
- - - - -
-
-
- - - - - - - - - - - - - -
NameDate
{{ tournament.name }}{{ tournament.date }}
diff --git a/frontend/app/pages/tournaments/tournaments-show.html b/frontend/app/pages/tournaments/tournaments-show.html deleted file mode 100644 index a0f2403..0000000 --- a/frontend/app/pages/tournaments/tournaments-show.html +++ /dev/null @@ -1,222 +0,0 @@ - - Back to browse tournaments -

- {{ tournament.name }} -

-

- Address: - {{ tournament.address }} -

-

- Director: - {{ tournament.director }} -

-

- Director email: - {{ tournament.director_email }} -

-

- Tournament Type: - {{ tournament.tournament_type }} -

-
-
- -

School Lineups and Team Scores -

- -
-
- - - - - - - - - - - - - - - - - - -
NameScoreActions
{{ school.name }}{{ school.score }} - - -
-
-
-
- -
- -

Weights and Seeds -

- -
-
-

Click weight class for seeds

-
- - - - - - - - - - - - - - -
Weight ClassBracket Size
{{ weight.max }}{{ weight.bracket_size }}
-
-
-
- -
- -

Mats and Bout Board -

- -
-
-

Matches have not been generated

- - - - - - - - - - - - - - - - - - - - -
NameOn MatOn DeckIn The HoleWarm Up
{{ mat.name }}{{ mat.unfinishedMatches[0].bout_number }} {{ mat.unfinishedMatches[0].w1_name }} vs. {{ mat.unfinishedMatches[0].w2_name }}{{ mat.unfinishedMatches[1].bout_number }} {{ mat.unfinishedMatches[0].w1_name }} vs. {{ mat.unfinishedMatches[0].w2_name }}{{ mat.unfinishedMatches[2].bout_number }} {{ mat.unfinishedMatches[0].w1_name }} vs. {{ mat.unfinishedMatches[0].w2_name }}{{ mat.unfinishedMatches[3].bout_number }} {{ mat.unfinishedMatches[0].w1_name }} vs. {{ mat.unfinishedMatches[0].w2_name }}
-
-

Matches not assigned

-
- - - - - - - - - - - - - - - - - - -
RoundBout NumberWeight ClassMatchup
Round {{ match.round }}{{ match.bout_number }}{{ match.weightClass }}{{ match.w1_name }} vs. {{ match.w2_name }}
-
-
-
- - -
- -
- - - - - -
- -
- - - - - diff --git a/frontend/app/static/favicon.ico b/frontend/app/static/favicon.ico deleted file mode 100644 index bd63207..0000000 Binary files a/frontend/app/static/favicon.ico and /dev/null differ diff --git a/frontend/app/templates/hello.us b/frontend/app/templates/hello.us deleted file mode 100644 index b17f363..0000000 --- a/frontend/app/templates/hello.us +++ /dev/null @@ -1,3 +0,0 @@ -
- <%= text %> -
\ No newline at end of file diff --git a/frontend/config/application.js b/frontend/config/application.js deleted file mode 100644 index 5eb19e0..0000000 --- a/frontend/config/application.js +++ /dev/null @@ -1,66 +0,0 @@ -/* Exports a function which returns an object that overrides the default & - * plugin grunt configuration object. - * - * You can familiarize yourself with Lineman's defaults by looking at: - * - * - https://github.com/linemanjs/lineman/blob/master/config/application.coffee - * - https://github.com/linemanjs/lineman/blob/master/config/plugins - * - * You can also ask about Lineman's config from the command line: - * - * $ lineman config #=> to print the entire config - * $ lineman config concat_sourcemap.js #=> to see the JS config for the concat task. - */ -module.exports = function(lineman) { - //Override application configuration here. Common examples follow in the comments. - return { - - // API Proxying - // - // During development, you'll likely want to make XHR (AJAX) requests to an API on the same - // port as your lineman development server. By enabling the API proxy and setting the port, all - // requests for paths that don't match a static asset in ./generated will be forwarded to - // whatever service might be running on the specified port. - // - server: { - apiProxy: { - enabled: true, - host: 'localhost', - port: 8080 - }, - web: { - port: 8081 - } - }, - - removeTasks: { - common: ["jshint"] - }, - - // Sass - // - // Lineman supports Sass via grunt-contrib-sass, which requires you first - // have Ruby installed as well as the `sass` gem. To enable it, uncomment the - // following line: - // - // enableSass: true, - - // Asset Fingerprints - // - // Lineman can fingerprint your static assets by appending a hash to the filename - // and logging a manifest of logical-to-hashed filenames in dist/assets.json - // via grunt-asset-fingerprint - // - // enableAssetFingerprint: true, - - // LiveReload - // - // Lineman can LiveReload browsers whenever a file is changed that results in - // assets to be processed, preventing the need to hit F5/Cmd-R every time you - // make a change in each browser you're working against. To enable LiveReload, - // comment out the following line: - // - // livereload: true - - }; -}; diff --git a/frontend/config/files.js b/frontend/config/files.js deleted file mode 100644 index 255275a..0000000 --- a/frontend/config/files.js +++ /dev/null @@ -1,26 +0,0 @@ -/* Exports a function which returns an object that overrides the default & - * plugin file patterns (used widely through the app configuration) - * - * To see the default definitions for Lineman's file paths and globs, see: - * - * - https://github.com/linemanjs/lineman/blob/master/config/files.coffee - */ -module.exports = function(lineman) { - //Override file patterns here - return { - - // As an example, to override the file patterns for - // the order in which to load third party JS libs: - // - // js: { - // vendor: [ - // "vendor/js/underscore.js", - // "vendor/js/**/*.js" - // ] - // } - - //Override file patterns here - - - }; -}; diff --git a/frontend/config/lineman.js b/frontend/config/lineman.js deleted file mode 100644 index 0ce0689..0000000 --- a/frontend/config/lineman.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require(process.env['LINEMAN_MAIN']); diff --git a/frontend/config/server.js b/frontend/config/server.js deleted file mode 100644 index 1654dc1..0000000 --- a/frontend/config/server.js +++ /dev/null @@ -1,21 +0,0 @@ -/* Define custom server-side HTTP routes for lineman's development server - * These might be as simple as stubbing a little JSON to - * facilitate development of code that interacts with an HTTP service - * (presumably, mirroring one that will be reachable in a live environment). - * - * It's important to remember that any custom endpoints defined here - * will only be available in development, as lineman only builds - * static assets, it can't run server-side code. - * - * This file can be very useful for rapid prototyping or even organically - * defining a spec based on the needs of the client code that emerge. - * - */ - -module.exports = { - drawRoutes: function(app) { - // app.get('/api/greeting/:message', function(req, res){ - // res.json({ message: "OK, "+req.params.message }); - // }); - } -}; \ No newline at end of file diff --git a/frontend/config/spec.json b/frontend/config/spec.json deleted file mode 100644 index b6258d5..0000000 --- a/frontend/config/spec.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "framework" : "jasmine", - "launch_in_dev" : ["Chrome"], - "launch_in_ci" : ["PhantomJS"], - "src_files" : [ - "generated/js/app.js", - "generated/js/spec.js" - ] -} \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json deleted file mode 100644 index f70fe33..0000000 --- a/frontend/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "frontend", - "description": "Frontend for wrestlingdev", - "version": "0.0.1", - "private": true, - "author": "Jacob Cody Wimer", - "devDependencies": { - "lineman": "~0.36.6" - }, - "scripts": { - "start": "lineman run", - "test": "lineman spec-ci", - "production": "lineman clean build && npm i express@3 && node -e \"var e = require('express'), a = e(); a.use(e.static('dist/')); a.listen(process.env.PORT)\"" - } -} diff --git a/frontend/spec/hello-spec.js b/frontend/spec/hello-spec.js deleted file mode 100644 index 208eca2..0000000 --- a/frontend/spec/hello-spec.js +++ /dev/null @@ -1,4 +0,0 @@ -describe(".helloText", function(){ - When(function(){ this.result = helloText(); }); - Then(function(){ expect(this.result).toEqual("Hello, World!"); }); -}); diff --git a/frontend/spec/helpers/helper.js b/frontend/spec/helpers/helper.js deleted file mode 100644 index 3c9ebf8..0000000 --- a/frontend/spec/helpers/helper.js +++ /dev/null @@ -1,2 +0,0 @@ -window.context = window.describe; -window.xcontext = window.xdescribe; diff --git a/frontend/spec/helpers/jasmine-fixture.js b/frontend/spec/helpers/jasmine-fixture.js deleted file mode 100644 index 1d28910..0000000 --- a/frontend/spec/helpers/jasmine-fixture.js +++ /dev/null @@ -1,433 +0,0 @@ -/* jasmine-fixture - 1.3.2 - * Makes injecting HTML snippets into the DOM easy & clean! - * https://github.com/searls/jasmine-fixture - */ -(function() { - var createHTMLBlock, - __slice = [].slice; - - (function($) { - var ewwSideEffects, jasmineFixture, originalAffix, originalJasmineDotFixture, originalJasmineFixture, root, _, _ref; - root = (1, eval)('this'); - originalJasmineFixture = root.jasmineFixture; - originalJasmineDotFixture = (_ref = root.jasmine) != null ? _ref.fixture : void 0; - originalAffix = root.affix; - _ = function(list) { - return { - inject: function(iterator, memo) { - var item, _i, _len, _results; - _results = []; - for (_i = 0, _len = list.length; _i < _len; _i++) { - item = list[_i]; - _results.push(memo = iterator(memo, item)); - } - return _results; - } - }; - }; - root.jasmineFixture = function($) { - var $whatsTheRootOf, affix, create, jasmineFixture, noConflict; - affix = function(selectorOptions) { - return create.call(this, selectorOptions, true); - }; - create = function(selectorOptions, attach) { - var $top; - $top = null; - _(selectorOptions.split(/[ ](?![^\{]*\})(?=[^\]]*?(?:\[|$))/)).inject(function($parent, elementSelector) { - var $el; - if (elementSelector === ">") { - return $parent; - } - $el = createHTMLBlock($, elementSelector); - if (attach || $top) { - $el.appendTo($parent); - } - $top || ($top = $el); - return $el; - }, $whatsTheRootOf(this)); - return $top; - }; - noConflict = function() { - var currentJasmineFixture, _ref1; - currentJasmineFixture = jasmine.fixture; - root.jasmineFixture = originalJasmineFixture; - if ((_ref1 = root.jasmine) != null) { - _ref1.fixture = originalJasmineDotFixture; - } - root.affix = originalAffix; - return currentJasmineFixture; - }; - $whatsTheRootOf = function(that) { - if ((that != null ? that.jquery : void 0) != null) { - return that; - } else if ($('#jasmine_content').length > 0) { - return $('#jasmine_content'); - } else { - return $('
').appendTo('body'); - } - }; - jasmineFixture = { - affix: affix, - create: create, - noConflict: noConflict - }; - ewwSideEffects(jasmineFixture); - return jasmineFixture; - }; - ewwSideEffects = function(jasmineFixture) { - var _ref1; - if ((_ref1 = root.jasmine) != null) { - _ref1.fixture = jasmineFixture; - } - $.fn.affix = root.affix = jasmineFixture.affix; - return afterEach(function() { - return $('#jasmine_content').remove(); - }); - }; - if ($) { - return jasmineFixture = root.jasmineFixture($); - } else { - return root.affix = function() { - var nowJQueryExists; - nowJQueryExists = window.jQuery || window.$; - if (nowJQueryExists != null) { - jasmineFixture = root.jasmineFixture(nowJQueryExists); - return affix.call.apply(affix, [this].concat(__slice.call(arguments))); - } else { - throw new Error("jasmine-fixture requires jQuery to be defined at window.jQuery or window.$"); - } - }; - } - })(window.jQuery || window.$); - - createHTMLBlock = (function() { - var bindData, bindEvents, parseAttributes, parseClasses, parseContents, parseEnclosure, parseReferences, parseVariableScope, regAttr, regAttrDfn, regAttrs, regCBrace, regClass, regClasses, regData, regDatas, regEvent, regEvents, regExclamation, regId, regReference, regTag, regTagNotContent, regZenTagDfn; - createHTMLBlock = function($, ZenObject, data, functions, indexes) { - var ZenCode, arr, block, blockAttrs, blockClasses, blockHTML, blockId, blockTag, blocks, el, el2, els, forScope, indexName, inner, len, obj, origZenCode, paren, result, ret, zc, zo; - if ($.isPlainObject(ZenObject)) { - ZenCode = ZenObject.main; - } else { - ZenCode = ZenObject; - ZenObject = { - main: ZenCode - }; - } - origZenCode = ZenCode; - if (indexes === undefined) { - indexes = {}; - } - if (ZenCode.charAt(0) === "!" || $.isArray(data)) { - if ($.isArray(data)) { - forScope = ZenCode; - } else { - obj = parseEnclosure(ZenCode, "!"); - obj = obj.substring(obj.indexOf(":") + 1, obj.length - 1); - forScope = parseVariableScope(ZenCode); - } - while (forScope.charAt(0) === "@") { - forScope = parseVariableScope("!for:!" + parseReferences(forScope, ZenObject)); - } - zo = ZenObject; - zo.main = forScope; - el = $(); - if (ZenCode.substring(0, 5) === "!for:" || $.isArray(data)) { - if (!$.isArray(data) && obj.indexOf(":") > 0) { - indexName = obj.substring(0, obj.indexOf(":")); - obj = obj.substr(obj.indexOf(":") + 1); - } - arr = ($.isArray(data) ? data : data[obj]); - zc = zo.main; - if ($.isArray(arr) || $.isPlainObject(arr)) { - $.map(arr, function(value, index) { - var next; - zo.main = zc; - if (indexName !== undefined) { - indexes[indexName] = index; - } - if (!$.isPlainObject(value)) { - value = { - value: value - }; - } - next = createHTMLBlock($, zo, value, functions, indexes); - if (el.length !== 0) { - return $.each(next, function(index, value) { - return el.push(value); - }); - } - }); - } - if (!$.isArray(data)) { - ZenCode = ZenCode.substr(obj.length + 6 + forScope.length); - } else { - ZenCode = ""; - } - } else if (ZenCode.substring(0, 4) === "!if:") { - result = parseContents("!" + obj + "!", data, indexes); - if (result !== "undefined" || result !== "false" || result !== "") { - el = createHTMLBlock($, zo, data, functions, indexes); - } - ZenCode = ZenCode.substr(obj.length + 5 + forScope.length); - } - ZenObject.main = ZenCode; - } else if (ZenCode.charAt(0) === "(") { - paren = parseEnclosure(ZenCode, "(", ")"); - inner = paren.substring(1, paren.length - 1); - ZenCode = ZenCode.substr(paren.length); - zo = ZenObject; - zo.main = inner; - el = createHTMLBlock($, zo, data, functions, indexes); - } else { - blocks = ZenCode.match(regZenTagDfn); - block = blocks[0]; - if (block.length === 0) { - return ""; - } - if (block.indexOf("@") >= 0) { - ZenCode = parseReferences(ZenCode, ZenObject); - zo = ZenObject; - zo.main = ZenCode; - return createHTMLBlock($, zo, data, functions, indexes); - } - block = parseContents(block, data, indexes); - blockClasses = parseClasses($, block); - if (regId.test(block)) { - blockId = regId.exec(block)[1]; - } - blockAttrs = parseAttributes(block, data); - blockTag = (block.charAt(0) === "{" ? "span" : "div"); - if (ZenCode.charAt(0) !== "#" && ZenCode.charAt(0) !== "." && ZenCode.charAt(0) !== "{") { - blockTag = regTag.exec(block)[1]; - } - if (block.search(regCBrace) !== -1) { - blockHTML = block.match(regCBrace)[1]; - } - blockAttrs = $.extend(blockAttrs, { - id: blockId, - "class": blockClasses, - html: blockHTML - }); - el = $("<" + blockTag + ">", blockAttrs); - el.attr(blockAttrs); - el = bindEvents(block, el, functions); - el = bindData(block, el, data); - ZenCode = ZenCode.substr(blocks[0].length); - ZenObject.main = ZenCode; - } - if (ZenCode.length > 0) { - if (ZenCode.charAt(0) === ">") { - if (ZenCode.charAt(1) === "(") { - zc = parseEnclosure(ZenCode.substr(1), "(", ")"); - ZenCode = ZenCode.substr(zc.length + 1); - } else if (ZenCode.charAt(1) === "!") { - obj = parseEnclosure(ZenCode.substr(1), "!"); - forScope = parseVariableScope(ZenCode.substr(1)); - zc = obj + forScope; - ZenCode = ZenCode.substr(zc.length + 1); - } else { - len = Math.max(ZenCode.indexOf("+"), ZenCode.length); - zc = ZenCode.substring(1, len); - ZenCode = ZenCode.substr(len); - } - zo = ZenObject; - zo.main = zc; - els = $(createHTMLBlock($, zo, data, functions, indexes)); - els.appendTo(el); - } - if (ZenCode.charAt(0) === "+") { - zo = ZenObject; - zo.main = ZenCode.substr(1); - el2 = createHTMLBlock($, zo, data, functions, indexes); - $.each(el2, function(index, value) { - return el.push(value); - }); - } - } - ret = el; - return ret; - }; - bindData = function(ZenCode, el, data) { - var datas, i, split; - if (ZenCode.search(regDatas) === 0) { - return el; - } - datas = ZenCode.match(regDatas); - if (datas === null) { - return el; - } - i = 0; - while (i < datas.length) { - split = regData.exec(datas[i]); - if (split[3] === undefined) { - $(el).data(split[1], data[split[1]]); - } else { - $(el).data(split[1], data[split[3]]); - } - i++; - } - return el; - }; - bindEvents = function(ZenCode, el, functions) { - var bindings, fn, i, split; - if (ZenCode.search(regEvents) === 0) { - return el; - } - bindings = ZenCode.match(regEvents); - if (bindings === null) { - return el; - } - i = 0; - while (i < bindings.length) { - split = regEvent.exec(bindings[i]); - if (split[2] === undefined) { - fn = functions[split[1]]; - } else { - fn = functions[split[2]]; - } - $(el).bind(split[1], fn); - i++; - } - return el; - }; - parseAttributes = function(ZenBlock, data) { - var attrStrs, attrs, i, parts; - if (ZenBlock.search(regAttrDfn) === -1) { - return undefined; - } - attrStrs = ZenBlock.match(regAttrDfn); - attrs = {}; - i = 0; - while (i < attrStrs.length) { - parts = regAttr.exec(attrStrs[i]); - attrs[parts[1]] = ""; - if (parts[3] !== undefined) { - attrs[parts[1]] = parseContents(parts[3], data); - } - i++; - } - return attrs; - }; - parseClasses = function($, ZenBlock) { - var classes, clsString, i; - ZenBlock = ZenBlock.match(regTagNotContent)[0]; - if (ZenBlock.search(regClasses) === -1) { - return undefined; - } - classes = ZenBlock.match(regClasses); - clsString = ""; - i = 0; - while (i < classes.length) { - clsString += " " + regClass.exec(classes[i])[1]; - i++; - } - return $.trim(clsString); - }; - parseContents = function(ZenBlock, data, indexes) { - var html; - if (indexes === undefined) { - indexes = {}; - } - html = ZenBlock; - if (data === undefined) { - return html; - } - while (regExclamation.test(html)) { - html = html.replace(regExclamation, function(str, str2) { - var begChar, fn, val; - begChar = ""; - if (str.indexOf("!for:") > 0 || str.indexOf("!if:") > 0) { - return str; - } - if (str.charAt(0) !== "!") { - begChar = str.charAt(0); - str = str.substring(2, str.length - 1); - } - fn = new Function("data", "indexes", "var r=undefined;" + "with(data){try{r=" + str + ";}catch(e){}}" + "with(indexes){try{if(r===undefined)r=" + str + ";}catch(e){}}" + "return r;"); - val = unescape(fn(data, indexes)); - return begChar + val; - }); - } - html = html.replace(/\\./g, function(str) { - return str.charAt(1); - }); - return unescape(html); - }; - parseEnclosure = function(ZenCode, open, close, count) { - var index, ret; - if (close === undefined) { - close = open; - } - index = 1; - if (count === undefined) { - count = (ZenCode.charAt(0) === open ? 1 : 0); - } - if (count === 0) { - return; - } - while (count > 0 && index < ZenCode.length) { - if (ZenCode.charAt(index) === close && ZenCode.charAt(index - 1) !== "\\") { - count--; - } else { - if (ZenCode.charAt(index) === open && ZenCode.charAt(index - 1) !== "\\") { - count++; - } - } - index++; - } - ret = ZenCode.substring(0, index); - return ret; - }; - parseReferences = function(ZenCode, ZenObject) { - ZenCode = ZenCode.replace(regReference, function(str) { - var fn; - str = str.substr(1); - fn = new Function("objs", "var r=\"\";" + "with(objs){try{" + "r=" + str + ";" + "}catch(e){}}" + "return r;"); - return fn(ZenObject, parseReferences); - }); - return ZenCode; - }; - parseVariableScope = function(ZenCode) { - var forCode, rest, tag; - if (ZenCode.substring(0, 5) !== "!for:" && ZenCode.substring(0, 4) !== "!if:") { - return undefined; - } - forCode = parseEnclosure(ZenCode, "!"); - ZenCode = ZenCode.substr(forCode.length); - if (ZenCode.charAt(0) === "(") { - return parseEnclosure(ZenCode, "(", ")"); - } - tag = ZenCode.match(regZenTagDfn)[0]; - ZenCode = ZenCode.substr(tag.length); - if (ZenCode.length === 0 || ZenCode.charAt(0) === "+") { - return tag; - } else if (ZenCode.charAt(0) === ">") { - rest = ""; - rest = parseEnclosure(ZenCode.substr(1), "(", ")", 1); - return tag + ">" + rest; - } - return undefined; - }; - regZenTagDfn = /([#\.\@]?[\w-]+|\[([\w-!?=:"']+(="([^"]|\\")+")? {0,})+\]|\~[\w$]+=[\w$]+|&[\w$]+(=[\w$]+)?|[#\.\@]?!([^!]|\\!)+!){0,}(\{([^\}]|\\\})+\})?/i; - regTag = /(\w+)/i; - regId = /(?:^|\b)#([\w-!]+)/i; - regTagNotContent = /((([#\.]?[\w-]+)?(\[([\w!]+(="([^"]|\\")+")? {0,})+\])?)+)/i; - /* - See lookahead syntax (?!) at https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp - */ - - regClasses = /(\.[\w-]+)(?!["\w])/g; - regClass = /\.([\w-]+)/i; - regReference = /(@[\w$_][\w$_\d]+)/i; - regAttrDfn = /(\[([\w-!]+(="?([^"]|\\")+"?)? {0,})+\])/ig; - regAttrs = /([\w-!]+(="([^"]|\\")+")?)/g; - regAttr = /([\w-!]+)(="?((([\w]+(\[.*?\])+)|[^"\]]|\\")+)"?)?/i; - regCBrace = /\{(([^\}]|\\\})+)\}/i; - regExclamation = /(?:([^\\]|^))!([^!]|\\!)+!/g; - regEvents = /\~[\w$]+(=[\w$]+)?/g; - regEvent = /\~([\w$]+)=([\w$]+)/i; - regDatas = /&[\w$]+(=[\w$]+)?/g; - regData = /&([\w$]+)(=([\w$]+))?/i; - return createHTMLBlock; - })(); - -}).call(this); diff --git a/frontend/spec/helpers/jasmine-given.js b/frontend/spec/helpers/jasmine-given.js deleted file mode 100644 index a1c911e..0000000 --- a/frontend/spec/helpers/jasmine-given.js +++ /dev/null @@ -1,373 +0,0 @@ -/* jasmine-given - 2.6.3 - * Adds a Given-When-Then DSL to jasmine as an alternative style for specs - * https://github.com/searls/jasmine-given - */ -/* jasmine-matcher-wrapper - 0.0.3 - * Wraps Jasmine 1.x matchers for use with Jasmine 2 - * https://github.com/testdouble/jasmine-matcher-wrapper - */ -(function() { - var __hasProp = {}.hasOwnProperty, - __slice = [].slice; - - (function(jasmine) { - var comparatorFor, createMatcher; - if (jasmine == null) { - return typeof console !== "undefined" && console !== null ? console.warn("jasmine was not found. Skipping jasmine-matcher-wrapper. Verify your script load order.") : void 0; - } - if (jasmine.matcherWrapper != null) { - return; - } - jasmine.matcherWrapper = { - wrap: function(matchers) { - var matcher, name, wrappedMatchers; - if (jasmine.addMatchers == null) { - return matchers; - } - wrappedMatchers = {}; - for (name in matchers) { - if (!__hasProp.call(matchers, name)) continue; - matcher = matchers[name]; - wrappedMatchers[name] = createMatcher(name, matcher); - } - return wrappedMatchers; - } - }; - createMatcher = function(name, matcher) { - return function() { - return { - compare: comparatorFor(matcher, false), - negativeCompare: comparatorFor(matcher, true) - }; - }; - }; - return comparatorFor = function(matcher, isNot) { - return function() { - var actual, context, message, params, pass, _ref; - actual = arguments[0], params = 2 <= arguments.length ? __slice.call(arguments, 1) : []; - context = { - actual: actual, - isNot: isNot - }; - pass = matcher.apply(context, params); - if (isNot) { - pass = !pass; - } - if (!pass) { - message = (_ref = context.message) != null ? _ref.apply(context, params) : void 0; - } - return { - pass: pass, - message: message - }; - }; - }; - })(jasmine || getJasmineRequireObj()); - -}).call(this); - -(function() { - var __slice = [].slice; - - (function(jasmine) { - var Waterfall, additionalInsightsForErrorMessage, apparentReferenceError, attemptedEquality, cloneArray, comparisonInsight, currentSpec, declareJasmineSpec, deepEqualsNotice, doneWrapperFor, errorWithRemovedLines, evalInContextOfSpec, finalStatementFrom, getBlock, invariantList, mostRecentExpectations, mostRecentStacks, mostRecentlyUsed, o, root, stringifyExpectation, wasComparison, whenList, wrapAsExpectations; - mostRecentlyUsed = null; - root = (1, eval)('this'); - currentSpec = null; - beforeEach(function() { - return currentSpec = this; - }); - root.Given = function() { - mostRecentlyUsed = root.Given; - return beforeEach(getBlock(arguments)); - }; - whenList = []; - root.When = function() { - var b; - mostRecentlyUsed = root.When; - b = getBlock(arguments); - beforeEach(function() { - return whenList.push(b); - }); - return afterEach(function() { - return whenList.pop(); - }); - }; - invariantList = []; - root.Invariant = function() { - var invariantBehavior; - mostRecentlyUsed = root.Invariant; - invariantBehavior = getBlock(arguments); - beforeEach(function() { - return invariantList.push(invariantBehavior); - }); - return afterEach(function() { - return invariantList.pop(); - }); - }; - getBlock = function(thing) { - var assignResultTo, setupFunction; - setupFunction = o(thing).firstThat(function(arg) { - return o(arg).isFunction(); - }); - assignResultTo = o(thing).firstThat(function(arg) { - return o(arg).isString(); - }); - return doneWrapperFor(setupFunction, function(done) { - var context, result; - context = currentSpec; - result = setupFunction.call(context, done); - if (assignResultTo) { - if (!context[assignResultTo]) { - return context[assignResultTo] = result; - } else { - throw new Error("Unfortunately, the variable '" + assignResultTo + "' is already assigned to: " + context[assignResultTo]); - } - } - }); - }; - mostRecentExpectations = null; - mostRecentStacks = null; - declareJasmineSpec = function(specArgs, itFunction) { - var expectationFunction, expectations, label, stacks; - if (itFunction == null) { - itFunction = it; - } - label = o(specArgs).firstThat(function(arg) { - return o(arg).isString(); - }); - expectationFunction = o(specArgs).firstThat(function(arg) { - return o(arg).isFunction(); - }); - mostRecentlyUsed = root.subsequentThen; - mostRecentExpectations = expectations = [expectationFunction]; - mostRecentStacks = stacks = [errorWithRemovedLines("failed expectation", 3)]; - itFunction("then " + (label != null ? label : stringifyExpectation(expectations)), doneWrapperFor(expectationFunction, function(jasmineDone) { - var userCommands; - userCommands = [].concat(whenList, invariantList, wrapAsExpectations(expectations, stacks)); - return new Waterfall(userCommands, jasmineDone).flow(); - })); - return { - Then: subsequentThen, - And: subsequentThen - }; - }; - wrapAsExpectations = function(expectations, stacks) { - var expectation, i, _i, _len, _results; - _results = []; - for (i = _i = 0, _len = expectations.length; _i < _len; i = ++_i) { - expectation = expectations[i]; - _results.push((function(expectation, i) { - return doneWrapperFor(expectation, function(maybeDone) { - return expect(expectation).not.toHaveReturnedFalseFromThen(currentSpec, i + 1, stacks[i], maybeDone); - }); - })(expectation, i)); - } - return _results; - }; - doneWrapperFor = function(func, toWrap) { - if (func.length === 0) { - return function() { - return toWrap(); - }; - } else { - return function(done) { - return toWrap(done); - }; - } - }; - root.Then = function() { - return declareJasmineSpec(arguments); - }; - root.Then.only = function() { - return declareJasmineSpec(arguments, it.only); - }; - root.subsequentThen = function(additionalExpectation) { - mostRecentExpectations.push(additionalExpectation); - mostRecentStacks.push(errorWithRemovedLines("failed expectation", 3)); - return this; - }; - errorWithRemovedLines = function(msg, n) { - var error, lines, stack, _ref; - if (stack = new Error(msg).stack) { - _ref = stack.split("\n"), error = _ref[0], lines = 2 <= _ref.length ? __slice.call(_ref, 1) : []; - return "" + error + "\n" + (lines.slice(n).join("\n")); - } - }; - mostRecentlyUsed = root.Given; - root.And = function() { - return mostRecentlyUsed.apply(this, jasmine.util.argsToArray(arguments)); - }; - o = function(thing) { - return { - isFunction: function() { - return Object.prototype.toString.call(thing) === "[object Function]"; - }, - isString: function() { - return Object.prototype.toString.call(thing) === "[object String]"; - }, - firstThat: function(test) { - var i; - i = 0; - while (i < thing.length) { - if (test(thing[i]) === true) { - return thing[i]; - } - i++; - } - return void 0; - } - }; - }; - Waterfall = (function() { - function Waterfall(functions, finalCallback) { - if (functions == null) { - functions = []; - } - this.finalCallback = finalCallback != null ? finalCallback : function() {}; - this.functions = cloneArray(functions); - } - - Waterfall.prototype.flow = function() { - var func, - _this = this; - if (this.functions.length === 0) { - return this.finalCallback(); - } - func = this.functions.shift(); - if (func.length > 0) { - return func(function() { - return _this.flow(); - }); - } else { - func(); - return this.flow(); - } - }; - - return Waterfall; - - })(); - cloneArray = function(a) { - return a.slice(0); - }; - jasmine._given = { - matchers: { - toHaveReturnedFalseFromThen: function(context, n, stackTrace, done) { - var e, exception, result; - result = false; - exception = void 0; - try { - result = this.actual.call(context, done); - } catch (_error) { - e = _error; - exception = e; - } - this.message = function() { - var msg, stringyExpectation; - stringyExpectation = stringifyExpectation(this.actual); - msg = "Then clause" + (n > 1 ? " #" + n : "") + " `" + stringyExpectation + "` failed by "; - if (exception) { - msg += "throwing: " + exception.toString(); - } else { - msg += "returning false"; - } - msg += additionalInsightsForErrorMessage(stringyExpectation); - if (stackTrace != null) { - msg += "\n\n" + stackTrace; - } - return msg; - }; - return result === false; - } - }, - __Waterfall__: Waterfall - }; - stringifyExpectation = function(expectation) { - var matches; - matches = expectation.toString().replace(/\n/g, '').match(/function\s?\(.*\)\s?{\s*(return\s+)?(.*?)(;)?\s*}/i); - if (matches && matches.length >= 3) { - return matches[2].replace(/\s+/g, ' '); - } else { - return ""; - } - }; - additionalInsightsForErrorMessage = function(expectationString) { - var comparison, expectation; - expectation = finalStatementFrom(expectationString); - if (comparison = wasComparison(expectation)) { - return comparisonInsight(expectation, comparison); - } else { - return ""; - } - }; - finalStatementFrom = function(expectationString) { - var multiStatement; - if (multiStatement = expectationString.match(/.*return (.*)/)) { - return multiStatement[multiStatement.length - 1]; - } else { - return expectationString; - } - }; - wasComparison = function(expectation) { - var comparator, comparison, left, right, s; - if (comparison = expectation.match(/(.*) (===|!==|==|!=|>|>=|<|<=) (.*)/)) { - s = comparison[0], left = comparison[1], comparator = comparison[2], right = comparison[3]; - return { - left: left, - comparator: comparator, - right: right - }; - } - }; - comparisonInsight = function(expectation, comparison) { - var left, msg, right; - left = evalInContextOfSpec(comparison.left); - right = evalInContextOfSpec(comparison.right); - if (apparentReferenceError(left) && apparentReferenceError(right)) { - return ""; - } - msg = "\n\nThis comparison was detected:\n " + expectation + "\n " + left + " " + comparison.comparator + " " + right; - if (attemptedEquality(left, right, comparison.comparator)) { - msg += "\n\n" + (deepEqualsNotice(comparison.left, comparison.right)); - } - return msg; - }; - apparentReferenceError = function(result) { - return /^"; - } - }; - attemptedEquality = function(left, right, comparator) { - var _ref; - if (!(comparator === "==" || comparator === "===")) { - return false; - } - if (((_ref = jasmine.matchersUtil) != null ? _ref.equals : void 0) != null) { - return jasmine.matchersUtil.equals(left, right); - } else { - return jasmine.getEnv().equals_(left, right); - } - }; - deepEqualsNotice = function(left, right) { - return "However, these items are deeply equal! Try an expectation like this instead:\n expect(" + left + ").toEqual(" + right + ")"; - }; - return beforeEach(function() { - if (jasmine.addMatchers != null) { - return jasmine.addMatchers(jasmine.matcherWrapper.wrap(jasmine._given.matchers)); - } else { - return this.addMatchers(jasmine._given.matchers); - } - }); - })(jasmine); - -}).call(this); diff --git a/frontend/spec/helpers/jasmine-only.js b/frontend/spec/helpers/jasmine-only.js deleted file mode 100644 index c60fb0b..0000000 --- a/frontend/spec/helpers/jasmine-only.js +++ /dev/null @@ -1,98 +0,0 @@ -/* jasmine-only - 0.1.1 - * Exclusivity spec helpers for jasmine: `describe.only` and `it.only` - * https://github.com/davemo/jasmine-only - */ -(function() { - var __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - (function(jasmine) { - var describeOnly, env, itOnly, root; - root = (1, eval)('this'); - env = jasmine.getEnv(); - describeOnly = function(description, specDefinitions) { - var suite; - suite = new jasmine.Suite(this, description, null, this.currentSuite); - suite.exclusive_ = 1; - this.exclusive_ = Math.max(this.exclusive_, 1); - return this.describe_(suite, specDefinitions); - }; - itOnly = function(description, func) { - var spec; - spec = this.it(description, func); - spec.exclusive_ = 2; - this.exclusive_ = 2; - return spec; - }; - env.exclusive_ = 0; - env.describe = function(description, specDefinitions) { - var suite; - suite = new jasmine.Suite(this, description, null, this.currentSuite); - return this.describe_(suite, specDefinitions); - }; - env.describe_ = function(suite, specDefinitions) { - var declarationError, e, parentSuite; - parentSuite = this.currentSuite; - if (parentSuite) { - parentSuite.add(suite); - } else { - this.currentRunner_.add(suite); - } - this.currentSuite = suite; - declarationError = null; - try { - specDefinitions.call(suite); - } catch (_error) { - e = _error; - declarationError = e; - } - if (declarationError) { - this.it("encountered a declaration exception", function() { - throw declarationError; - }); - } - this.currentSuite = parentSuite; - return suite; - }; - env.specFilter = function(spec) { - return this.exclusive_ <= spec.exclusive_; - }; - env.describe.only = function() { - return describeOnly.apply(env, arguments); - }; - env.it.only = function() { - return itOnly.apply(env, arguments); - }; - root.describe.only = function(description, specDefinitions) { - return env.describe.only(description, specDefinitions); - }; - root.it.only = function(description, func) { - return env.it.only(description, func); - }; - root.iit = root.it.only; - root.ddescribe = root.describe.only; - jasmine.Spec = (function(_super) { - __extends(Spec, _super); - - function Spec(env, suite, description) { - this.exclusive_ = suite.exclusive_; - Spec.__super__.constructor.call(this, env, suite, description); - } - - return Spec; - - })(jasmine.Spec); - return jasmine.Suite = (function(_super) { - __extends(Suite, _super); - - function Suite(env, suite, specDefinitions, parentSuite) { - this.exclusive_ = parentSuite && parentSuite.exclusive_ || 0; - Suite.__super__.constructor.call(this, env, suite, specDefinitions, parentSuite); - } - - return Suite; - - })(jasmine.Suite); - })(jasmine); - -}).call(this); diff --git a/frontend/spec/helpers/jasmine-stealth.js b/frontend/spec/helpers/jasmine-stealth.js deleted file mode 100644 index 774afc6..0000000 --- a/frontend/spec/helpers/jasmine-stealth.js +++ /dev/null @@ -1,214 +0,0 @@ -/* jasmine-stealth - 0.0.17 - * Makes Jasmine spies a bit more robust - * https://github.com/searls/jasmine-stealth - */ -(function() { - var __hasProp = {}.hasOwnProperty, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; - - (function() { - var Captor, fake, root, stubChainer, unfakes, whatToDoWhenTheSpyGetsCalled, _; - root = (1, eval)('this'); - _ = function(obj) { - return { - each: function(iterator) { - var item, _i, _len, _results; - _results = []; - for (_i = 0, _len = obj.length; _i < _len; _i++) { - item = obj[_i]; - _results.push(iterator(item)); - } - return _results; - }, - isFunction: function() { - return Object.prototype.toString.call(obj) === "[object Function]"; - }, - isString: function() { - return Object.prototype.toString.call(obj) === "[object String]"; - } - }; - }; - root.spyOnConstructor = function(owner, classToFake, methodsToSpy) { - var fakeClass, spies; - if (methodsToSpy == null) { - methodsToSpy = []; - } - if (_(methodsToSpy).isString()) { - methodsToSpy = [methodsToSpy]; - } - spies = { - constructor: jasmine.createSpy("" + classToFake + "'s constructor") - }; - fakeClass = (function() { - function _Class() { - spies.constructor.apply(this, arguments); - } - - return _Class; - - })(); - _(methodsToSpy).each(function(methodName) { - spies[methodName] = jasmine.createSpy("" + classToFake + "#" + methodName); - return fakeClass.prototype[methodName] = function() { - return spies[methodName].apply(this, arguments); - }; - }); - fake(owner, classToFake, fakeClass); - return spies; - }; - unfakes = []; - afterEach(function() { - _(unfakes).each(function(u) { - return u(); - }); - return unfakes = []; - }); - fake = function(owner, thingToFake, newThing) { - var originalThing; - originalThing = owner[thingToFake]; - owner[thingToFake] = newThing; - return unfakes.push(function() { - return owner[thingToFake] = originalThing; - }); - }; - root.stubFor = root.spyOn; - jasmine.createStub = jasmine.createSpy; - jasmine.createStubObj = function(baseName, stubbings) { - var name, obj, stubbing; - if (stubbings.constructor === Array) { - return jasmine.createSpyObj(baseName, stubbings); - } else { - obj = {}; - for (name in stubbings) { - stubbing = stubbings[name]; - obj[name] = jasmine.createSpy(baseName + "." + name); - if (_(stubbing).isFunction()) { - obj[name].andCallFake(stubbing); - } else { - obj[name].andReturn(stubbing); - } - } - return obj; - } - }; - whatToDoWhenTheSpyGetsCalled = function(spy) { - var matchesStub, priorPlan; - matchesStub = function(stubbing, args, context) { - switch (stubbing.type) { - case "args": - return jasmine.getEnv().equals_(stubbing.ifThis, jasmine.util.argsToArray(args)); - case "context": - return jasmine.getEnv().equals_(stubbing.ifThis, context); - } - }; - priorPlan = spy.plan; - return spy.andCallFake(function() { - var i, stubbing; - i = 0; - while (i < spy._stealth_stubbings.length) { - stubbing = spy._stealth_stubbings[i]; - if (matchesStub(stubbing, arguments, this)) { - if (stubbing.satisfaction === "callFake") { - return stubbing.thenThat.apply(stubbing, arguments); - } else { - return stubbing.thenThat; - } - } - i++; - } - return priorPlan.apply(spy, arguments); - }); - }; - jasmine.Spy.prototype.whenContext = function(context) { - var spy; - spy = this; - spy._stealth_stubbings || (spy._stealth_stubbings = []); - whatToDoWhenTheSpyGetsCalled(spy); - return stubChainer(spy, "context", context); - }; - jasmine.Spy.prototype.when = function() { - var ifThis, spy; - spy = this; - ifThis = jasmine.util.argsToArray(arguments); - spy._stealth_stubbings || (spy._stealth_stubbings = []); - whatToDoWhenTheSpyGetsCalled(spy); - return stubChainer(spy, "args", ifThis); - }; - stubChainer = function(spy, type, ifThis) { - var addStubbing; - addStubbing = function(satisfaction) { - return function(thenThat) { - spy._stealth_stubbings.unshift({ - type: type, - ifThis: ifThis, - satisfaction: satisfaction, - thenThat: thenThat - }); - return spy; - }; - }; - return { - thenReturn: addStubbing("return"), - thenCallFake: addStubbing("callFake") - }; - }; - jasmine.Spy.prototype.mostRecentCallThat = function(callThat, context) { - var i; - i = this.calls.length - 1; - while (i >= 0) { - if (callThat.call(context || this, this.calls[i]) === true) { - return this.calls[i]; - } - i--; - } - }; - jasmine.Matchers.ArgThat = (function(_super) { - __extends(ArgThat, _super); - - function ArgThat(matcher) { - this.matcher = matcher; - } - - ArgThat.prototype.jasmineMatches = function(actual) { - return this.matcher(actual); - }; - - return ArgThat; - - })(jasmine.Matchers.Any); - jasmine.Matchers.ArgThat.prototype.matches = jasmine.Matchers.ArgThat.prototype.jasmineMatches; - jasmine.argThat = function(expected) { - return new jasmine.Matchers.ArgThat(expected); - }; - jasmine.Matchers.Capture = (function(_super) { - __extends(Capture, _super); - - function Capture(captor) { - this.captor = captor; - } - - Capture.prototype.jasmineMatches = function(actual) { - this.captor.value = actual; - return true; - }; - - return Capture; - - })(jasmine.Matchers.Any); - jasmine.Matchers.Capture.prototype.matches = jasmine.Matchers.Capture.prototype.jasmineMatches; - Captor = (function() { - function Captor() {} - - Captor.prototype.capture = function() { - return new jasmine.Matchers.Capture(this); - }; - - return Captor; - - })(); - return jasmine.captor = function() { - return new Captor(); - }; - })(); - -}).call(this); diff --git a/frontend/tasks/.keep b/frontend/tasks/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/vendor/css/.keep b/frontend/vendor/css/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/vendor/img/.keep b/frontend/vendor/img/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/vendor/js/devise-min.js b/frontend/vendor/js/devise-min.js deleted file mode 100644 index 97a577f..0000000 --- a/frontend/vendor/js/devise-min.js +++ /dev/null @@ -1,10 +0,0 @@ -// AngularDevise -// ------------------- -// v1.2.1 -// -// Copyright (c)2016 Justin Ridgewell -// Distributed under MIT license -// -// https://github.com/cloudspace/angular_devise - -!function(a){"use strict";var b=a.module("Devise",[]);b.provider("AuthIntercept",function(){var a=!1;this.interceptAuth=function(b){return a=!!b||void 0===b,this},this.$get=["$rootScope","$q",function(b,c){return{responseError:function(d){var e=d.config.interceptAuth;if(e=!!e||a&&void 0===e,e&&401===d.status){var f=c.defer();return b.$broadcast("devise:unauthorized",d,f),f.reject(d),f.promise}return c.reject(d)}}}]}).config(["$httpProvider",function(a){a.interceptors.push("AuthIntercept")}]),b.provider("Auth",function(){function b(b,c,d){var h={method:f[b].toLowerCase(),url:e[b]};return c&&(g?(h.data={},h.data[g]=c):h.data=c),a.extend(h,d),h}function c(b,c){a.forEach(b,function(a,d){this[d+c]=function(a){return void 0===a?b[d]:(b[d]=a,this)}},this)}function d(a){return function(){return a}}var e={login:"/users/sign_in.json",logout:"/users/sign_out.json",register:"/users.json",sendResetPasswordInstructions:"/users/password.json",resetPassword:"/users/password.json"},f={login:"POST",logout:"DELETE",register:"POST",sendResetPasswordInstructions:"POST",resetPassword:"PUT"},g="user",h=function(a){return a.data};c.call(this,f,"Method"),c.call(this,e,"Path"),this.resourceName=function(a){return void 0===a?g:(g=a,this)},this.parse=function(a){return"function"!=typeof a?h:(h=a,this)},this.$get=["$q","$http","$rootScope",function(a,c,e){function f(a){return j._currentUser=a,a}function g(){f(null),j._promise=null}function i(a){return function(b){return e.$broadcast("devise:"+a,b),b}}var j={_currentUser:null,parse:h,_promise:null,reset:function(){g(),j.currentUser()},login:function(a,d){var e=arguments.length>0,g=j.isAuthenticated();return a=a||{},c(b("login",a,d)).then(j.parse).then(f).then(function(a){return e&&!g?i("new-session")(a):a}).then(i("login"))},logout:function(a){var e=d(j._currentUser);return c(b("logout",void 0,a)).then(g).then(e).then(i("logout"))},register:function(a,d){return a=a||{},c(b("register",a,d)).then(j.parse).then(f).then(i("new-registration"))},sendResetPasswordInstructions:function(a){return a=a||{},c(b("sendResetPasswordInstructions",a)).then(j.parse).then(i("send-reset-password-instructions-successfully"))},resetPassword:function(a){return a=a||{},c(b("resetPassword",a)).then(j.parse).then(f).then(i("reset-password-successfully"))},currentUser:function(){return j.isAuthenticated()?a.when(j._currentUser):(null===j._promise&&(j._promise=j.login()),j._promise)},isAuthenticated:function(){return!!j._currentUser}};return j}]})}(angular); \ No newline at end of file diff --git a/frontend/vendor/js/underscore.js b/frontend/vendor/js/underscore.js deleted file mode 100644 index 9a4cabe..0000000 --- a/frontend/vendor/js/underscore.js +++ /dev/null @@ -1,1343 +0,0 @@ -// Underscore.js 1.6.0 -// http://underscorejs.org -// (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors -// Underscore may be freely distributed under the MIT license. - -(function() { - - // Baseline setup - // -------------- - - // Establish the root object, `window` in the browser, or `exports` on the server. - var root = this; - - // Save the previous value of the `_` variable. - var previousUnderscore = root._; - - // Establish the object that gets returned to break out of a loop iteration. - var breaker = {}; - - // Save bytes in the minified (but not gzipped) version: - var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype; - - // Create quick reference variables for speed access to core prototypes. - var - push = ArrayProto.push, - slice = ArrayProto.slice, - concat = ArrayProto.concat, - toString = ObjProto.toString, - hasOwnProperty = ObjProto.hasOwnProperty; - - // All **ECMAScript 5** native function implementations that we hope to use - // are declared here. - var - nativeForEach = ArrayProto.forEach, - nativeMap = ArrayProto.map, - nativeReduce = ArrayProto.reduce, - nativeReduceRight = ArrayProto.reduceRight, - nativeFilter = ArrayProto.filter, - nativeEvery = ArrayProto.every, - nativeSome = ArrayProto.some, - nativeIndexOf = ArrayProto.indexOf, - nativeLastIndexOf = ArrayProto.lastIndexOf, - nativeIsArray = Array.isArray, - nativeKeys = Object.keys, - nativeBind = FuncProto.bind; - - // Create a safe reference to the Underscore object for use below. - var _ = function(obj) { - if (obj instanceof _) return obj; - if (!(this instanceof _)) return new _(obj); - this._wrapped = obj; - }; - - // Export the Underscore object for **Node.js**, with - // backwards-compatibility for the old `require()` API. If we're in - // the browser, add `_` as a global object via a string identifier, - // for Closure Compiler "advanced" mode. - if (typeof exports !== 'undefined') { - if (typeof module !== 'undefined' && module.exports) { - exports = module.exports = _; - } - exports._ = _; - } else { - root._ = _; - } - - // Current version. - _.VERSION = '1.6.0'; - - // Collection Functions - // -------------------- - - // The cornerstone, an `each` implementation, aka `forEach`. - // Handles objects with the built-in `forEach`, arrays, and raw objects. - // Delegates to **ECMAScript 5**'s native `forEach` if available. - var each = _.each = _.forEach = function(obj, iterator, context) { - if (obj == null) return obj; - if (nativeForEach && obj.forEach === nativeForEach) { - obj.forEach(iterator, context); - } else if (obj.length === +obj.length) { - for (var i = 0, length = obj.length; i < length; i++) { - if (iterator.call(context, obj[i], i, obj) === breaker) return; - } - } else { - var keys = _.keys(obj); - for (var i = 0, length = keys.length; i < length; i++) { - if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return; - } - } - return obj; - }; - - // Return the results of applying the iterator to each element. - // Delegates to **ECMAScript 5**'s native `map` if available. - _.map = _.collect = function(obj, iterator, context) { - var results = []; - if (obj == null) return results; - if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context); - each(obj, function(value, index, list) { - results.push(iterator.call(context, value, index, list)); - }); - return results; - }; - - var reduceError = 'Reduce of empty array with no initial value'; - - // **Reduce** builds up a single result from a list of values, aka `inject`, - // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. - _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { - var initial = arguments.length > 2; - if (obj == null) obj = []; - if (nativeReduce && obj.reduce === nativeReduce) { - if (context) iterator = _.bind(iterator, context); - return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator); - } - each(obj, function(value, index, list) { - if (!initial) { - memo = value; - initial = true; - } else { - memo = iterator.call(context, memo, value, index, list); - } - }); - if (!initial) throw new TypeError(reduceError); - return memo; - }; - - // The right-associative version of reduce, also known as `foldr`. - // Delegates to **ECMAScript 5**'s native `reduceRight` if available. - _.reduceRight = _.foldr = function(obj, iterator, memo, context) { - var initial = arguments.length > 2; - if (obj == null) obj = []; - if (nativeReduceRight && obj.reduceRight === nativeReduceRight) { - if (context) iterator = _.bind(iterator, context); - return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator); - } - var length = obj.length; - if (length !== +length) { - var keys = _.keys(obj); - length = keys.length; - } - each(obj, function(value, index, list) { - index = keys ? keys[--length] : --length; - if (!initial) { - memo = obj[index]; - initial = true; - } else { - memo = iterator.call(context, memo, obj[index], index, list); - } - }); - if (!initial) throw new TypeError(reduceError); - return memo; - }; - - // Return the first value which passes a truth test. Aliased as `detect`. - _.find = _.detect = function(obj, predicate, context) { - var result; - any(obj, function(value, index, list) { - if (predicate.call(context, value, index, list)) { - result = value; - return true; - } - }); - return result; - }; - - // Return all the elements that pass a truth test. - // Delegates to **ECMAScript 5**'s native `filter` if available. - // Aliased as `select`. - _.filter = _.select = function(obj, predicate, context) { - var results = []; - if (obj == null) return results; - if (nativeFilter && obj.filter === nativeFilter) return obj.filter(predicate, context); - each(obj, function(value, index, list) { - if (predicate.call(context, value, index, list)) results.push(value); - }); - return results; - }; - - // Return all the elements for which a truth test fails. - _.reject = function(obj, predicate, context) { - return _.filter(obj, function(value, index, list) { - return !predicate.call(context, value, index, list); - }, context); - }; - - // Determine whether all of the elements match a truth test. - // Delegates to **ECMAScript 5**'s native `every` if available. - // Aliased as `all`. - _.every = _.all = function(obj, predicate, context) { - predicate || (predicate = _.identity); - var result = true; - if (obj == null) return result; - if (nativeEvery && obj.every === nativeEvery) return obj.every(predicate, context); - each(obj, function(value, index, list) { - if (!(result = result && predicate.call(context, value, index, list))) return breaker; - }); - return !!result; - }; - - // Determine if at least one element in the object matches a truth test. - // Delegates to **ECMAScript 5**'s native `some` if available. - // Aliased as `any`. - var any = _.some = _.any = function(obj, predicate, context) { - predicate || (predicate = _.identity); - var result = false; - if (obj == null) return result; - if (nativeSome && obj.some === nativeSome) return obj.some(predicate, context); - each(obj, function(value, index, list) { - if (result || (result = predicate.call(context, value, index, list))) return breaker; - }); - return !!result; - }; - - // Determine if the array or object contains a given value (using `===`). - // Aliased as `include`. - _.contains = _.include = function(obj, target) { - if (obj == null) return false; - if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1; - return any(obj, function(value) { - return value === target; - }); - }; - - // Invoke a method (with arguments) on every item in a collection. - _.invoke = function(obj, method) { - var args = slice.call(arguments, 2); - var isFunc = _.isFunction(method); - return _.map(obj, function(value) { - return (isFunc ? method : value[method]).apply(value, args); - }); - }; - - // Convenience version of a common use case of `map`: fetching a property. - _.pluck = function(obj, key) { - return _.map(obj, _.property(key)); - }; - - // Convenience version of a common use case of `filter`: selecting only objects - // containing specific `key:value` pairs. - _.where = function(obj, attrs) { - return _.filter(obj, _.matches(attrs)); - }; - - // Convenience version of a common use case of `find`: getting the first object - // containing specific `key:value` pairs. - _.findWhere = function(obj, attrs) { - return _.find(obj, _.matches(attrs)); - }; - - // Return the maximum element or (element-based computation). - // Can't optimize arrays of integers longer than 65,535 elements. - // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797) - _.max = function(obj, iterator, context) { - if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) { - return Math.max.apply(Math, obj); - } - var result = -Infinity, lastComputed = -Infinity; - each(obj, function(value, index, list) { - var computed = iterator ? iterator.call(context, value, index, list) : value; - if (computed > lastComputed) { - result = value; - lastComputed = computed; - } - }); - return result; - }; - - // Return the minimum element (or element-based computation). - _.min = function(obj, iterator, context) { - if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) { - return Math.min.apply(Math, obj); - } - var result = Infinity, lastComputed = Infinity; - each(obj, function(value, index, list) { - var computed = iterator ? iterator.call(context, value, index, list) : value; - if (computed < lastComputed) { - result = value; - lastComputed = computed; - } - }); - return result; - }; - - // Shuffle an array, using the modern version of the - // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle). - _.shuffle = function(obj) { - var rand; - var index = 0; - var shuffled = []; - each(obj, function(value) { - rand = _.random(index++); - shuffled[index - 1] = shuffled[rand]; - shuffled[rand] = value; - }); - return shuffled; - }; - - // Sample **n** random values from a collection. - // If **n** is not specified, returns a single random element. - // The internal `guard` argument allows it to work with `map`. - _.sample = function(obj, n, guard) { - if (n == null || guard) { - if (obj.length !== +obj.length) obj = _.values(obj); - return obj[_.random(obj.length - 1)]; - } - return _.shuffle(obj).slice(0, Math.max(0, n)); - }; - - // An internal function to generate lookup iterators. - var lookupIterator = function(value) { - if (value == null) return _.identity; - if (_.isFunction(value)) return value; - return _.property(value); - }; - - // Sort the object's values by a criterion produced by an iterator. - _.sortBy = function(obj, iterator, context) { - iterator = lookupIterator(iterator); - return _.pluck(_.map(obj, function(value, index, list) { - return { - value: value, - index: index, - criteria: iterator.call(context, value, index, list) - }; - }).sort(function(left, right) { - var a = left.criteria; - var b = right.criteria; - if (a !== b) { - if (a > b || a === void 0) return 1; - if (a < b || b === void 0) return -1; - } - return left.index - right.index; - }), 'value'); - }; - - // An internal function used for aggregate "group by" operations. - var group = function(behavior) { - return function(obj, iterator, context) { - var result = {}; - iterator = lookupIterator(iterator); - each(obj, function(value, index) { - var key = iterator.call(context, value, index, obj); - behavior(result, key, value); - }); - return result; - }; - }; - - // Groups the object's values by a criterion. Pass either a string attribute - // to group by, or a function that returns the criterion. - _.groupBy = group(function(result, key, value) { - _.has(result, key) ? result[key].push(value) : result[key] = [value]; - }); - - // Indexes the object's values by a criterion, similar to `groupBy`, but for - // when you know that your index values will be unique. - _.indexBy = group(function(result, key, value) { - result[key] = value; - }); - - // Counts instances of an object that group by a certain criterion. Pass - // either a string attribute to count by, or a function that returns the - // criterion. - _.countBy = group(function(result, key) { - _.has(result, key) ? result[key]++ : result[key] = 1; - }); - - // Use a comparator function to figure out the smallest index at which - // an object should be inserted so as to maintain order. Uses binary search. - _.sortedIndex = function(array, obj, iterator, context) { - iterator = lookupIterator(iterator); - var value = iterator.call(context, obj); - var low = 0, high = array.length; - while (low < high) { - var mid = (low + high) >>> 1; - iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid; - } - return low; - }; - - // Safely create a real, live array from anything iterable. - _.toArray = function(obj) { - if (!obj) return []; - if (_.isArray(obj)) return slice.call(obj); - if (obj.length === +obj.length) return _.map(obj, _.identity); - return _.values(obj); - }; - - // Return the number of elements in an object. - _.size = function(obj) { - if (obj == null) return 0; - return (obj.length === +obj.length) ? obj.length : _.keys(obj).length; - }; - - // Array Functions - // --------------- - - // Get the first element of an array. Passing **n** will return the first N - // values in the array. Aliased as `head` and `take`. The **guard** check - // allows it to work with `_.map`. - _.first = _.head = _.take = function(array, n, guard) { - if (array == null) return void 0; - if ((n == null) || guard) return array[0]; - if (n < 0) return []; - return slice.call(array, 0, n); - }; - - // Returns everything but the last entry of the array. Especially useful on - // the arguments object. Passing **n** will return all the values in - // the array, excluding the last N. The **guard** check allows it to work with - // `_.map`. - _.initial = function(array, n, guard) { - return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n)); - }; - - // Get the last element of an array. Passing **n** will return the last N - // values in the array. The **guard** check allows it to work with `_.map`. - _.last = function(array, n, guard) { - if (array == null) return void 0; - if ((n == null) || guard) return array[array.length - 1]; - return slice.call(array, Math.max(array.length - n, 0)); - }; - - // Returns everything but the first entry of the array. Aliased as `tail` and `drop`. - // Especially useful on the arguments object. Passing an **n** will return - // the rest N values in the array. The **guard** - // check allows it to work with `_.map`. - _.rest = _.tail = _.drop = function(array, n, guard) { - return slice.call(array, (n == null) || guard ? 1 : n); - }; - - // Trim out all falsy values from an array. - _.compact = function(array) { - return _.filter(array, _.identity); - }; - - // Internal implementation of a recursive `flatten` function. - var flatten = function(input, shallow, output) { - if (shallow && _.every(input, _.isArray)) { - return concat.apply(output, input); - } - each(input, function(value) { - if (_.isArray(value) || _.isArguments(value)) { - shallow ? push.apply(output, value) : flatten(value, shallow, output); - } else { - output.push(value); - } - }); - return output; - }; - - // Flatten out an array, either recursively (by default), or just one level. - _.flatten = function(array, shallow) { - return flatten(array, shallow, []); - }; - - // Return a version of the array that does not contain the specified value(s). - _.without = function(array) { - return _.difference(array, slice.call(arguments, 1)); - }; - - // Split an array into two arrays: one whose elements all satisfy the given - // predicate, and one whose elements all do not satisfy the predicate. - _.partition = function(array, predicate) { - var pass = [], fail = []; - each(array, function(elem) { - (predicate(elem) ? pass : fail).push(elem); - }); - return [pass, fail]; - }; - - // Produce a duplicate-free version of the array. If the array has already - // been sorted, you have the option of using a faster algorithm. - // Aliased as `unique`. - _.uniq = _.unique = function(array, isSorted, iterator, context) { - if (_.isFunction(isSorted)) { - context = iterator; - iterator = isSorted; - isSorted = false; - } - var initial = iterator ? _.map(array, iterator, context) : array; - var results = []; - var seen = []; - each(initial, function(value, index) { - if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) { - seen.push(value); - results.push(array[index]); - } - }); - return results; - }; - - // Produce an array that contains the union: each distinct element from all of - // the passed-in arrays. - _.union = function() { - return _.uniq(_.flatten(arguments, true)); - }; - - // Produce an array that contains every item shared between all the - // passed-in arrays. - _.intersection = function(array) { - var rest = slice.call(arguments, 1); - return _.filter(_.uniq(array), function(item) { - return _.every(rest, function(other) { - return _.contains(other, item); - }); - }); - }; - - // Take the difference between one array and a number of other arrays. - // Only the elements present in just the first array will remain. - _.difference = function(array) { - var rest = concat.apply(ArrayProto, slice.call(arguments, 1)); - return _.filter(array, function(value){ return !_.contains(rest, value); }); - }; - - // Zip together multiple lists into a single array -- elements that share - // an index go together. - _.zip = function() { - var length = _.max(_.pluck(arguments, 'length').concat(0)); - var results = new Array(length); - for (var i = 0; i < length; i++) { - results[i] = _.pluck(arguments, '' + i); - } - return results; - }; - - // Converts lists into objects. Pass either a single array of `[key, value]` - // pairs, or two parallel arrays of the same length -- one of keys, and one of - // the corresponding values. - _.object = function(list, values) { - if (list == null) return {}; - var result = {}; - for (var i = 0, length = list.length; i < length; i++) { - if (values) { - result[list[i]] = values[i]; - } else { - result[list[i][0]] = list[i][1]; - } - } - return result; - }; - - // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**), - // we need this function. Return the position of the first occurrence of an - // item in an array, or -1 if the item is not included in the array. - // Delegates to **ECMAScript 5**'s native `indexOf` if available. - // If the array is large and already in sort order, pass `true` - // for **isSorted** to use binary search. - _.indexOf = function(array, item, isSorted) { - if (array == null) return -1; - var i = 0, length = array.length; - if (isSorted) { - if (typeof isSorted == 'number') { - i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted); - } else { - i = _.sortedIndex(array, item); - return array[i] === item ? i : -1; - } - } - if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted); - for (; i < length; i++) if (array[i] === item) return i; - return -1; - }; - - // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available. - _.lastIndexOf = function(array, item, from) { - if (array == null) return -1; - var hasIndex = from != null; - if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) { - return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item); - } - var i = (hasIndex ? from : array.length); - while (i--) if (array[i] === item) return i; - return -1; - }; - - // Generate an integer Array containing an arithmetic progression. A port of - // the native Python `range()` function. See - // [the Python documentation](http://docs.python.org/library/functions.html#range). - _.range = function(start, stop, step) { - if (arguments.length <= 1) { - stop = start || 0; - start = 0; - } - step = arguments[2] || 1; - - var length = Math.max(Math.ceil((stop - start) / step), 0); - var idx = 0; - var range = new Array(length); - - while(idx < length) { - range[idx++] = start; - start += step; - } - - return range; - }; - - // Function (ahem) Functions - // ------------------ - - // Reusable constructor function for prototype setting. - var ctor = function(){}; - - // Create a function bound to a given object (assigning `this`, and arguments, - // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if - // available. - _.bind = function(func, context) { - var args, bound; - if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); - if (!_.isFunction(func)) throw new TypeError; - args = slice.call(arguments, 2); - return bound = function() { - if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments))); - ctor.prototype = func.prototype; - var self = new ctor; - ctor.prototype = null; - var result = func.apply(self, args.concat(slice.call(arguments))); - if (Object(result) === result) return result; - return self; - }; - }; - - // Partially apply a function by creating a version that has had some of its - // arguments pre-filled, without changing its dynamic `this` context. _ acts - // as a placeholder, allowing any combination of arguments to be pre-filled. - _.partial = function(func) { - var boundArgs = slice.call(arguments, 1); - return function() { - var position = 0; - var args = boundArgs.slice(); - for (var i = 0, length = args.length; i < length; i++) { - if (args[i] === _) args[i] = arguments[position++]; - } - while (position < arguments.length) args.push(arguments[position++]); - return func.apply(this, args); - }; - }; - - // Bind a number of an object's methods to that object. Remaining arguments - // are the method names to be bound. Useful for ensuring that all callbacks - // defined on an object belong to it. - _.bindAll = function(obj) { - var funcs = slice.call(arguments, 1); - if (funcs.length === 0) throw new Error('bindAll must be passed function names'); - each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); }); - return obj; - }; - - // Memoize an expensive function by storing its results. - _.memoize = function(func, hasher) { - var memo = {}; - hasher || (hasher = _.identity); - return function() { - var key = hasher.apply(this, arguments); - return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments)); - }; - }; - - // Delays a function for the given number of milliseconds, and then calls - // it with the arguments supplied. - _.delay = function(func, wait) { - var args = slice.call(arguments, 2); - return setTimeout(function(){ return func.apply(null, args); }, wait); - }; - - // Defers a function, scheduling it to run after the current call stack has - // cleared. - _.defer = function(func) { - return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1))); - }; - - // Returns a function, that, when invoked, will only be triggered at most once - // during a given window of time. Normally, the throttled function will run - // as much as it can, without ever going more than once per `wait` duration; - // but if you'd like to disable the execution on the leading edge, pass - // `{leading: false}`. To disable execution on the trailing edge, ditto. - _.throttle = function(func, wait, options) { - var context, args, result; - var timeout = null; - var previous = 0; - options || (options = {}); - var later = function() { - previous = options.leading === false ? 0 : _.now(); - timeout = null; - result = func.apply(context, args); - context = args = null; - }; - return function() { - var now = _.now(); - if (!previous && options.leading === false) previous = now; - var remaining = wait - (now - previous); - context = this; - args = arguments; - if (remaining <= 0) { - clearTimeout(timeout); - timeout = null; - previous = now; - result = func.apply(context, args); - context = args = null; - } else if (!timeout && options.trailing !== false) { - timeout = setTimeout(later, remaining); - } - return result; - }; - }; - - // Returns a function, that, as long as it continues to be invoked, will not - // be triggered. The function will be called after it stops being called for - // N milliseconds. If `immediate` is passed, trigger the function on the - // leading edge, instead of the trailing. - _.debounce = function(func, wait, immediate) { - var timeout, args, context, timestamp, result; - - var later = function() { - var last = _.now() - timestamp; - if (last < wait) { - timeout = setTimeout(later, wait - last); - } else { - timeout = null; - if (!immediate) { - result = func.apply(context, args); - context = args = null; - } - } - }; - - return function() { - context = this; - args = arguments; - timestamp = _.now(); - var callNow = immediate && !timeout; - if (!timeout) { - timeout = setTimeout(later, wait); - } - if (callNow) { - result = func.apply(context, args); - context = args = null; - } - - return result; - }; - }; - - // Returns a function that will be executed at most one time, no matter how - // often you call it. Useful for lazy initialization. - _.once = function(func) { - var ran = false, memo; - return function() { - if (ran) return memo; - ran = true; - memo = func.apply(this, arguments); - func = null; - return memo; - }; - }; - - // Returns the first function passed as an argument to the second, - // allowing you to adjust arguments, run code before and after, and - // conditionally execute the original function. - _.wrap = function(func, wrapper) { - return _.partial(wrapper, func); - }; - - // Returns a function that is the composition of a list of functions, each - // consuming the return value of the function that follows. - _.compose = function() { - var funcs = arguments; - return function() { - var args = arguments; - for (var i = funcs.length - 1; i >= 0; i--) { - args = [funcs[i].apply(this, args)]; - } - return args[0]; - }; - }; - - // Returns a function that will only be executed after being called N times. - _.after = function(times, func) { - return function() { - if (--times < 1) { - return func.apply(this, arguments); - } - }; - }; - - // Object Functions - // ---------------- - - // Retrieve the names of an object's properties. - // Delegates to **ECMAScript 5**'s native `Object.keys` - _.keys = function(obj) { - if (!_.isObject(obj)) return []; - if (nativeKeys) return nativeKeys(obj); - var keys = []; - for (var key in obj) if (_.has(obj, key)) keys.push(key); - return keys; - }; - - // Retrieve the values of an object's properties. - _.values = function(obj) { - var keys = _.keys(obj); - var length = keys.length; - var values = new Array(length); - for (var i = 0; i < length; i++) { - values[i] = obj[keys[i]]; - } - return values; - }; - - // Convert an object into a list of `[key, value]` pairs. - _.pairs = function(obj) { - var keys = _.keys(obj); - var length = keys.length; - var pairs = new Array(length); - for (var i = 0; i < length; i++) { - pairs[i] = [keys[i], obj[keys[i]]]; - } - return pairs; - }; - - // Invert the keys and values of an object. The values must be serializable. - _.invert = function(obj) { - var result = {}; - var keys = _.keys(obj); - for (var i = 0, length = keys.length; i < length; i++) { - result[obj[keys[i]]] = keys[i]; - } - return result; - }; - - // Return a sorted list of the function names available on the object. - // Aliased as `methods` - _.functions = _.methods = function(obj) { - var names = []; - for (var key in obj) { - if (_.isFunction(obj[key])) names.push(key); - } - return names.sort(); - }; - - // Extend a given object with all the properties in passed-in object(s). - _.extend = function(obj) { - each(slice.call(arguments, 1), function(source) { - if (source) { - for (var prop in source) { - obj[prop] = source[prop]; - } - } - }); - return obj; - }; - - // Return a copy of the object only containing the whitelisted properties. - _.pick = function(obj) { - var copy = {}; - var keys = concat.apply(ArrayProto, slice.call(arguments, 1)); - each(keys, function(key) { - if (key in obj) copy[key] = obj[key]; - }); - return copy; - }; - - // Return a copy of the object without the blacklisted properties. - _.omit = function(obj) { - var copy = {}; - var keys = concat.apply(ArrayProto, slice.call(arguments, 1)); - for (var key in obj) { - if (!_.contains(keys, key)) copy[key] = obj[key]; - } - return copy; - }; - - // Fill in a given object with default properties. - _.defaults = function(obj) { - each(slice.call(arguments, 1), function(source) { - if (source) { - for (var prop in source) { - if (obj[prop] === void 0) obj[prop] = source[prop]; - } - } - }); - return obj; - }; - - // Create a (shallow-cloned) duplicate of an object. - _.clone = function(obj) { - if (!_.isObject(obj)) return obj; - return _.isArray(obj) ? obj.slice() : _.extend({}, obj); - }; - - // Invokes interceptor with the obj, and then returns obj. - // The primary purpose of this method is to "tap into" a method chain, in - // order to perform operations on intermediate results within the chain. - _.tap = function(obj, interceptor) { - interceptor(obj); - return obj; - }; - - // Internal recursive comparison function for `isEqual`. - var eq = function(a, b, aStack, bStack) { - // Identical objects are equal. `0 === -0`, but they aren't identical. - // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). - if (a === b) return a !== 0 || 1 / a == 1 / b; - // A strict comparison is necessary because `null == undefined`. - if (a == null || b == null) return a === b; - // Unwrap any wrapped objects. - if (a instanceof _) a = a._wrapped; - if (b instanceof _) b = b._wrapped; - // Compare `[[Class]]` names. - var className = toString.call(a); - if (className != toString.call(b)) return false; - switch (className) { - // Strings, numbers, dates, and booleans are compared by value. - case '[object String]': - // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is - // equivalent to `new String("5")`. - return a == String(b); - case '[object Number]': - // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for - // other numeric values. - return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b); - case '[object Date]': - case '[object Boolean]': - // Coerce dates and booleans to numeric primitive values. Dates are compared by their - // millisecond representations. Note that invalid dates with millisecond representations - // of `NaN` are not equivalent. - return +a == +b; - // RegExps are compared by their source patterns and flags. - case '[object RegExp]': - return a.source == b.source && - a.global == b.global && - a.multiline == b.multiline && - a.ignoreCase == b.ignoreCase; - } - if (typeof a != 'object' || typeof b != 'object') return false; - // Assume equality for cyclic structures. The algorithm for detecting cyclic - // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. - var length = aStack.length; - while (length--) { - // Linear search. Performance is inversely proportional to the number of - // unique nested structures. - if (aStack[length] == a) return bStack[length] == b; - } - // Objects with different constructors are not equivalent, but `Object`s - // from different frames are. - var aCtor = a.constructor, bCtor = b.constructor; - if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) && - _.isFunction(bCtor) && (bCtor instanceof bCtor)) - && ('constructor' in a && 'constructor' in b)) { - return false; - } - // Add the first object to the stack of traversed objects. - aStack.push(a); - bStack.push(b); - var size = 0, result = true; - // Recursively compare objects and arrays. - if (className == '[object Array]') { - // Compare array lengths to determine if a deep comparison is necessary. - size = a.length; - result = size == b.length; - if (result) { - // Deep compare the contents, ignoring non-numeric properties. - while (size--) { - if (!(result = eq(a[size], b[size], aStack, bStack))) break; - } - } - } else { - // Deep compare objects. - for (var key in a) { - if (_.has(a, key)) { - // Count the expected number of properties. - size++; - // Deep compare each member. - if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break; - } - } - // Ensure that both objects contain the same number of properties. - if (result) { - for (key in b) { - if (_.has(b, key) && !(size--)) break; - } - result = !size; - } - } - // Remove the first object from the stack of traversed objects. - aStack.pop(); - bStack.pop(); - return result; - }; - - // Perform a deep comparison to check if two objects are equal. - _.isEqual = function(a, b) { - return eq(a, b, [], []); - }; - - // Is a given array, string, or object empty? - // An "empty" object has no enumerable own-properties. - _.isEmpty = function(obj) { - if (obj == null) return true; - if (_.isArray(obj) || _.isString(obj)) return obj.length === 0; - for (var key in obj) if (_.has(obj, key)) return false; - return true; - }; - - // Is a given value a DOM element? - _.isElement = function(obj) { - return !!(obj && obj.nodeType === 1); - }; - - // Is a given value an array? - // Delegates to ECMA5's native Array.isArray - _.isArray = nativeIsArray || function(obj) { - return toString.call(obj) == '[object Array]'; - }; - - // Is a given variable an object? - _.isObject = function(obj) { - return obj === Object(obj); - }; - - // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp. - each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) { - _['is' + name] = function(obj) { - return toString.call(obj) == '[object ' + name + ']'; - }; - }); - - // Define a fallback version of the method in browsers (ahem, IE), where - // there isn't any inspectable "Arguments" type. - if (!_.isArguments(arguments)) { - _.isArguments = function(obj) { - return !!(obj && _.has(obj, 'callee')); - }; - } - - // Optimize `isFunction` if appropriate. - if (typeof (/./) !== 'function') { - _.isFunction = function(obj) { - return typeof obj === 'function'; - }; - } - - // Is a given object a finite number? - _.isFinite = function(obj) { - return isFinite(obj) && !isNaN(parseFloat(obj)); - }; - - // Is the given value `NaN`? (NaN is the only number which does not equal itself). - _.isNaN = function(obj) { - return _.isNumber(obj) && obj != +obj; - }; - - // Is a given value a boolean? - _.isBoolean = function(obj) { - return obj === true || obj === false || toString.call(obj) == '[object Boolean]'; - }; - - // Is a given value equal to null? - _.isNull = function(obj) { - return obj === null; - }; - - // Is a given variable undefined? - _.isUndefined = function(obj) { - return obj === void 0; - }; - - // Shortcut function for checking if an object has a given property directly - // on itself (in other words, not on a prototype). - _.has = function(obj, key) { - return hasOwnProperty.call(obj, key); - }; - - // Utility Functions - // ----------------- - - // Run Underscore.js in *noConflict* mode, returning the `_` variable to its - // previous owner. Returns a reference to the Underscore object. - _.noConflict = function() { - root._ = previousUnderscore; - return this; - }; - - // Keep the identity function around for default iterators. - _.identity = function(value) { - return value; - }; - - _.constant = function(value) { - return function () { - return value; - }; - }; - - _.property = function(key) { - return function(obj) { - return obj[key]; - }; - }; - - // Returns a predicate for checking whether an object has a given set of `key:value` pairs. - _.matches = function(attrs) { - return function(obj) { - if (obj === attrs) return true; //avoid comparing an object to itself. - for (var key in attrs) { - if (attrs[key] !== obj[key]) - return false; - } - return true; - } - }; - - // Run a function **n** times. - _.times = function(n, iterator, context) { - var accum = Array(Math.max(0, n)); - for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i); - return accum; - }; - - // Return a random integer between min and max (inclusive). - _.random = function(min, max) { - if (max == null) { - max = min; - min = 0; - } - return min + Math.floor(Math.random() * (max - min + 1)); - }; - - // A (possibly faster) way to get the current timestamp as an integer. - _.now = Date.now || function() { return new Date().getTime(); }; - - // List of HTML entities for escaping. - var entityMap = { - escape: { - '&': '&', - '<': '<', - '>': '>', - '"': '"', - "'": ''' - } - }; - entityMap.unescape = _.invert(entityMap.escape); - - // Regexes containing the keys and values listed immediately above. - var entityRegexes = { - escape: new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'), - unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g') - }; - - // Functions for escaping and unescaping strings to/from HTML interpolation. - _.each(['escape', 'unescape'], function(method) { - _[method] = function(string) { - if (string == null) return ''; - return ('' + string).replace(entityRegexes[method], function(match) { - return entityMap[method][match]; - }); - }; - }); - - // If the value of the named `property` is a function then invoke it with the - // `object` as context; otherwise, return it. - _.result = function(object, property) { - if (object == null) return void 0; - var value = object[property]; - return _.isFunction(value) ? value.call(object) : value; - }; - - // Add your own custom functions to the Underscore object. - _.mixin = function(obj) { - each(_.functions(obj), function(name) { - var func = _[name] = obj[name]; - _.prototype[name] = function() { - var args = [this._wrapped]; - push.apply(args, arguments); - return result.call(this, func.apply(_, args)); - }; - }); - }; - - // Generate a unique integer id (unique within the entire client session). - // Useful for temporary DOM ids. - var idCounter = 0; - _.uniqueId = function(prefix) { - var id = ++idCounter + ''; - return prefix ? prefix + id : id; - }; - - // By default, Underscore uses ERB-style template delimiters, change the - // following template settings to use alternative delimiters. - _.templateSettings = { - evaluate : /<%([\s\S]+?)%>/g, - interpolate : /<%=([\s\S]+?)%>/g, - escape : /<%-([\s\S]+?)%>/g - }; - - // When customizing `templateSettings`, if you don't want to define an - // interpolation, evaluation or escaping regex, we need one that is - // guaranteed not to match. - var noMatch = /(.)^/; - - // Certain characters need to be escaped so that they can be put into a - // string literal. - var escapes = { - "'": "'", - '\\': '\\', - '\r': 'r', - '\n': 'n', - '\t': 't', - '\u2028': 'u2028', - '\u2029': 'u2029' - }; - - var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g; - - // JavaScript micro-templating, similar to John Resig's implementation. - // Underscore templating handles arbitrary delimiters, preserves whitespace, - // and correctly escapes quotes within interpolated code. - _.template = function(text, data, settings) { - var render; - settings = _.defaults({}, settings, _.templateSettings); - - // Combine delimiters into one regular expression via alternation. - var matcher = new RegExp([ - (settings.escape || noMatch).source, - (settings.interpolate || noMatch).source, - (settings.evaluate || noMatch).source - ].join('|') + '|$', 'g'); - - // Compile the template source, escaping string literals appropriately. - var index = 0; - var source = "__p+='"; - text.replace(matcher, function(match, escape, interpolate, evaluate, offset) { - source += text.slice(index, offset) - .replace(escaper, function(match) { return '\\' + escapes[match]; }); - - if (escape) { - source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'"; - } - if (interpolate) { - source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'"; - } - if (evaluate) { - source += "';\n" + evaluate + "\n__p+='"; - } - index = offset + match.length; - return match; - }); - source += "';\n"; - - // If a variable is not specified, place data values in local scope. - if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; - - source = "var __t,__p='',__j=Array.prototype.join," + - "print=function(){__p+=__j.call(arguments,'');};\n" + - source + "return __p;\n"; - - try { - render = new Function(settings.variable || 'obj', '_', source); - } catch (e) { - e.source = source; - throw e; - } - - if (data) return render(data, _); - var template = function(data) { - return render.call(this, data, _); - }; - - // Provide the compiled function source as a convenience for precompilation. - template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}'; - - return template; - }; - - // Add a "chain" function, which will delegate to the wrapper. - _.chain = function(obj) { - return _(obj).chain(); - }; - - // OOP - // --------------- - // If Underscore is called as a function, it returns a wrapped object that - // can be used OO-style. This wrapper holds altered versions of all the - // underscore functions. Wrapped objects may be chained. - - // Helper function to continue chaining intermediate results. - var result = function(obj) { - return this._chain ? _(obj).chain() : obj; - }; - - // Add all of the Underscore functions to the wrapper object. - _.mixin(_); - - // Add all mutator Array functions to the wrapper. - each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { - var method = ArrayProto[name]; - _.prototype[name] = function() { - var obj = this._wrapped; - method.apply(obj, arguments); - if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0]; - return result.call(this, obj); - }; - }); - - // Add all accessor Array functions to the wrapper. - each(['concat', 'join', 'slice'], function(name) { - var method = ArrayProto[name]; - _.prototype[name] = function() { - return result.call(this, method.apply(this._wrapped, arguments)); - }; - }); - - _.extend(_.prototype, { - - // Start chaining a wrapped Underscore object. - chain: function() { - this._chain = true; - return this; - }, - - // Extracts the result from a wrapped and chained object. - value: function() { - return this._wrapped; - } - - }); - - // AMD registration happens at the end for compatibility with AMD loaders - // that may not enforce next-turn semantics on modules. Even though general - // practice for AMD registration is to be anonymous, underscore registers - // as a named module because, like jQuery, it is a base library that is - // popular enough to be bundled in a third party lib, but not be part of - // an AMD load request. Those cases could generate an error when an - // anonymous define() is called outside of a loader request. - if (typeof define === 'function' && define.amd) { - define('underscore', [], function() { - return _; - }); - } -}).call(this); diff --git a/frontend/vendor/static/.keep b/frontend/vendor/static/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/rails-apache-config.conf b/rails-apache-config.conf deleted file mode 100644 index ed66cf3..0000000 --- a/rails-apache-config.conf +++ /dev/null @@ -1,10 +0,0 @@ - - DocumentRoot /var/www/public - RailsEnv production - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - Options FollowSymLinks - Require all granted - - \ No newline at end of file diff --git a/rails-apache-ssl-config.conf b/rails-apache-ssl-config.conf deleted file mode 100644 index b1ead4e..0000000 --- a/rails-apache-ssl-config.conf +++ /dev/null @@ -1,21 +0,0 @@ - - - DocumentRoot /var/www/public - RailsEnv production - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - SSLEngine on - SSLCertificateFile /etc/apache2/ssl/apache.crt - SSLCertificateKeyFile /etc/apache2/ssl/apache.key - - SSLOptions +StdEnvVars - - - SSLOptions +StdEnvVars - - BrowserMatch "MSIE [2-6]" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 - BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown - - \ No newline at end of file diff --git a/rails-dev-Dockerfile b/rails-dev-Dockerfile index 6626f8b..12c1525 100644 --- a/rails-dev-Dockerfile +++ b/rails-dev-Dockerfile @@ -3,7 +3,7 @@ FROM ruby:2.3.0 RUN apt-get update RUN apt-get install -y build-essential -RUN apt-get install -y nodejs-legacy nodejs sqlite3 npm +RUN apt-get install -y sqlite3 ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa @@ -13,8 +13,6 @@ ADD Gemfile* /tmp/ WORKDIR /tmp RUN bundle install --without production -RUN npm install -g lineman - RUN mkdir /rails WORKDIR /rails diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index 3c2716d..01e98dd 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -1,10 +1,9 @@ FROM ruby:2.3.0 - RUN apt-get clean && apt-get update RUN apt-get -y upgrade -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libssl-dev libyaml-dev libreadline-dev openssl curl git-core zlib1g-dev bison libxml2-dev libxslt1-dev libcurl4-openssl-dev libsqlite3-dev sqlite3 wget apache2 apt-transport-https nodejs nodejs-legacy npm mysql-client postfix +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libssl-dev libyaml-dev libreadline-dev openssl curl git-core zlib1g-dev bison libxml2-dev libxslt1-dev libcurl4-openssl-dev libsqlite3-dev sqlite3 wget apt-transport-https mysql-client postfix #New Relic #RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list @@ -13,77 +12,28 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libssl-dev #RUN apt-get install newrelic-sysmond -y #RUN nrsysmond-config --set license_key=$NEW_RELIC_LICENSE_KEY -#Passenger -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7 -RUN echo deb https://oss-binaries.phusionpassenger.com/apt/passenger trusty main >> /etc/apt/sources.list.d/passenger.list -RUN chown root: /etc/apt/sources.list.d/passenger.list -RUN chmod 600 /etc/apt/sources.list.d/passenger.list -RUN apt-get update -RUN apt-get install -y libapache2-mod-passenger - -# Enable apache mods. -RUN a2enmod rewrite -RUN a2enmod proxy -RUN a2enmod proxy_http -RUN a2enmod passenger -RUN a2enmod ssl - #SSL -RUN mkdir /etc/apache2/ssl -RUN openssl req -sha256 -subj '/CN=home/O=home LTD./C=US' -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/apache2/ssl/apache.key -out /etc/apache2/ssl/apache.crt - - -# Manually set up the apache environment variables -ENV APACHE_RUN_USER www-data -ENV APACHE_RUN_GROUP www-data -ENV APACHE_LOG_DIR /var/log/apache2 -ENV APACHE_LOCK_DIR /var/lock/apache2 -ENV APACHE_PID_FILE /var/run/apache2.pid +RUN mkdir /ssl +RUN openssl req -sha256 -subj '/CN=home/O=home LTD./C=US' -x509 -nodes -days 365 -newkey rsa:2048 -keyout /ssl/server.key -out /ssl/server.crt EXPOSE 80 EXPOSE 443 - #Cache gems so they don't install on every code change WORKDIR /tmp COPY Gemfile Gemfile COPY Gemfile.lock Gemfile.lock RUN bundle install --without test -#Cache node_modules -WORKDIR /tmp -COPY frontend/package.json package.json -RUN npm install -RUN npm install lineman -RUN npm install -g lineman - # Copy site into place. -RUN rm -rf /var/www - - +RUN mkdir /rails ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa -WORKDIR /var/www/ -ADD . /var/www/ +WORKDIR /rails +ADD . /rails -#Copy node_modules to /var/www -RUN mv /tmp/node_modules /var/www/frontend/node_modules - -#RUN RAILS_ENV=production bundle exec rake db:migrate RUN RAILS_ENV=production bundle exec rake assets:precompile -#RUN cp /var/www/frontend/dist/*.html /var/www/public/ -# Update the default apache site with the config we created. -RUN rm /etc/apache2/sites-enabled/000-default.conf -ADD ./rails-apache-ssl-config.conf /etc/apache2/sites-available/default-ssl.conf -ADD ./rails-apache-config.conf /etc/apache2/sites-enabled/000-default.conf -RUN a2ensite default-ssl.conf - -# Add apache tuning stuff -RUN echo PassengerMaxPoolSize 3 >> /etc/apache2/apache2.conf -RUN echo PassengerMinInstances 3 >> /etc/apache2/apache2.conf -RUN echo PassengerPreStart *:443 >> /etc/apache2/apache2.conf - - -# By default, simply start apache. -CMD /usr/sbin/apache2ctl -D FOREGROUND +# By default, simply start puma. +WORKDIR /rails +CMD bundle exec puma -t 5:5 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt' -e production diff --git a/rails-prod.sh b/rails-prod.sh index 5210542..e03aa95 100755 --- a/rails-prod.sh +++ b/rails-prod.sh @@ -13,4 +13,4 @@ docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do docker kill $id done -docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /var/log/apache2:/var/log/apache2 -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1 +docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1