-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #77 from HWYA/prod-fix
Merge Prod-Fix Into Master
- Loading branch information
Showing
21 changed files
with
513 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #!/bin/bash | ||
|
|
||
| output_array=($(git remote 2>&1)) | ||
|
|
||
| h="heroku" | ||
| u="upstream" | ||
| o="origin" | ||
|
|
||
| h_remote="git remote add heroku https://git.heroku.com/shapeofteam.git" | ||
| u_remote="git remote add upstream [email protected]:HWYA/shapeOfTeam.git" | ||
|
|
||
| if [ ${#output_array[@]} == 3 ]; then | ||
| for remote in "${output_array[@]}" | ||
| do | ||
| echo $remote "remote is already present" | ||
| done | ||
| elif [ ${#output_array[@]} == 2 ]; then | ||
| for remote in "${output_array[@]}" | ||
| do | ||
| if [ "$remote" == $o ]; then | ||
| unset output_array[$remote] | ||
| fi | ||
| done | ||
|
|
||
| if [ ${output_array[@]} = $u ]; then | ||
| $h_remote | ||
| echo "heroku remote added!" | ||
| else | ||
| $u_remote | ||
| echo "upstream remote added!" | ||
| fi | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| language: ruby | ||
| rvm: | ||
| - 2.3.1 | ||
|
|
||
| services: | ||
| - postgresql | ||
|
|
||
| before_script: | ||
| - cp config/database.yml.travis config/database.yml | ||
| - psql -c 'create database travis_ci_test;' -U postgres | ||
|
|
||
| script: | ||
| - export RAILS_ENV=test | ||
| - bundle exec rake db:schema:load db:test:prepare | ||
| - bundle exec rspec spec --require spec_helper --require rails_helper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # A sample Guardfile | ||
| # More info at https://github.com/guard/guard#readme | ||
|
|
||
| ## Uncomment and set this to only include directories you want to watch | ||
| # directories %w(app lib config test spec features) \ | ||
| # .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} | ||
|
|
||
| ## Note: if you are using the `directories` clause above and you are not | ||
| ## watching the project directory ('.'), then you will want to move | ||
| ## the Guardfile to a watched dir and symlink it back, e.g. | ||
| # | ||
| # $ mkdir config | ||
| # $ mv Guardfile config/ | ||
| # $ ln -s config/Guardfile . | ||
| # | ||
| # and, you'll have to watch "config/Guardfile" instead of "Guardfile" | ||
|
|
||
| # Note: The cmd option is now required due to the increasing number of ways | ||
| # rspec may be run, below are examples of the most common uses. | ||
| # * bundler: 'bundle exec rspec' | ||
| # * bundler binstubs: 'bin/rspec' | ||
| # * spring: 'bin/rspec' (This will use spring if running and you have | ||
| # installed the spring binstubs per the docs) | ||
| # * zeus: 'zeus rspec' (requires the server to be started separately) | ||
| # * 'just' rspec: 'rspec' | ||
|
|
||
| guard :rspec, cmd: "bundle exec rspec" do | ||
| require "guard/rspec/dsl" | ||
| dsl = Guard::RSpec::Dsl.new(self) | ||
|
|
||
| # Feel free to open issues for suggestions and improvements | ||
|
|
||
| # RSpec files | ||
| rspec = dsl.rspec | ||
| watch(rspec.spec_helper) { rspec.spec_dir } | ||
| watch(rspec.spec_support) { rspec.spec_dir } | ||
| watch(rspec.spec_files) | ||
|
|
||
| # Ruby files | ||
| ruby = dsl.ruby | ||
| dsl.watch_spec_files_for(ruby.lib_files) | ||
|
|
||
| # Rails files | ||
| rails = dsl.rails(view_extensions: %w(erb haml slim)) | ||
| dsl.watch_spec_files_for(rails.app_files) | ||
| dsl.watch_spec_files_for(rails.views) | ||
|
|
||
| watch(rails.controllers) do |m| | ||
| [ | ||
| rspec.spec.call("routing/#{m[1]}_routing"), | ||
| rspec.spec.call("controllers/#{m[1]}_controller"), | ||
| rspec.spec.call("acceptance/#{m[1]}") | ||
| ] | ||
| end | ||
|
|
||
| # Rails config changes | ||
| watch(rails.spec_helper) { rspec.spec_dir } | ||
| watch(rails.routes) { "#{rspec.spec_dir}/routing" } | ||
| watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" } | ||
|
|
||
| # Capybara features specs | ||
| watch(rails.view_dirs) { |m| rspec.spec.call("features/#{m[1]}") } | ||
| watch(rails.layouts) { |m| rspec.spec.call("features/#{m[1]}") } | ||
|
|
||
| # Turnip features and steps | ||
| watch(%r{^spec/acceptance/(.+)\.feature$}) | ||
| watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m| | ||
| Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance" | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,30 @@ | ||
| $(document).ready(function() { | ||
| $("#the_only_button").on('click', function(event) { | ||
| $(window).ready(function() { | ||
| $("#get_club_name").on('change', function(event) { | ||
|
|
||
| event.preventDefault(); | ||
|
|
||
| // encodeURIComponent converts text field params for GET | ||
| var club_name = encodeURIComponent($("#the_only_text_field").val()); | ||
| var club_name = encodeURIComponent($("#get_club_name").val()); | ||
| // to prevent mixed content issues | ||
| if (window.location.protocol === "http:") { | ||
| var myDomain = "http://" + window.location.host; | ||
| } else { | ||
| myDomain = "https://" + window.location.host; | ||
| } | ||
|
|
||
| $.ajax({ | ||
|
|
||
| method: "GET", | ||
| url: "http://localhost:3000/clubs?name="+club_name, | ||
| url: myDomain + "/clubs?name=" + club_name, | ||
| dataType: "json", | ||
| success: function(data) { | ||
| for (i=0;i<data.length;i++){ | ||
| data[i].radius=2; | ||
| data[i].fillKey='playerFill'; | ||
| data[i].latitude=data[i].bp_latitude; | ||
| data[i].longitude=data[i].bp_longitude; | ||
| for (i=0; i < data.length; i++) { | ||
| data[i].radius = 2.5; | ||
| data[i].fillKey = 'playerFill'; | ||
| data[i].latitude = data[i].bp_latitude; | ||
| data[i].longitude = data[i].bp_longitude; | ||
| }; | ||
|
|
||
| map.bubbles(data); | ||
| } | ||
|
|
||
|
|
||
| }); | ||
|
|
||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #container { | ||
| height: 100%; | ||
| width: 100%; | ||
| position: relative; | ||
| } | ||
|
|
||
| #get_club_name { | ||
| border-color: #000000; | ||
| left: 45%; | ||
| position: absolute; | ||
| top: 95%; | ||
| z-index: 100001; | ||
| } | ||
|
|
||
| #player_info { | ||
| background-color: #e90052; | ||
| border-radius: 5px; | ||
| color: #ffffff; | ||
| font-size: x-small; | ||
| padding: 5px 5px; | ||
| } | ||
|
|
||
| #country_info { | ||
| background-color: #000000; | ||
| border-radius: 5px; | ||
| color: #ffffff; | ||
| font-size: x-small; | ||
| padding: 5px 5px; | ||
| } |
Oops, something went wrong.