From 6e79b58e16e4b6a9c69051e31fb387b478f8af73 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 27 Oct 2015 21:44:38 -0700 Subject: [PATCH] updated files to use amazon assets --- .gitignore | 2 + app/models/map.rb | 2 +- app/models/user.rb | 2 +- public/404.html | 4 +- test/fixtures/metacodes.yml | 94 ++++++++++++++++++------------------- 5 files changed, 53 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 9eded787..c6358ead 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,6 @@ log/*.log tmp .DS_Store +*/.DS_Store +.DS_Store? .vagrant diff --git a/app/models/map.rb b/app/models/map.rb index eab88814..75774df8 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -12,7 +12,7 @@ class Map < ActiveRecord::Base :thumb => ['188x126#', :png] #:full => ['940x630#', :png] }, - :default_url => ActionController::Base.helpers.asset_path('missing-map.png') + :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/missing-map.png' # Validate the attached image is image/jpg, image/png, etc validates_attachment_content_type :screenshot, :content_type => /\Aimage\/.*\Z/ diff --git a/app/models/user.rb b/app/models/user.rb index effa6ec5..f6b0d65a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -35,7 +35,7 @@ class User < ActiveRecord::Base :ninetysix => ['96x96#', :png], :onetwentyeight => ['128x128#', :png] }, - :default_url => ActionController::Base.helpers.asset_path('user.png') + :default_url => 'https://s3.amazonaws.com/metamaps-assets/site/user.png' # Validate the attached image is image/jpg, image/png, etc validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ diff --git a/public/404.html b/public/404.html index 643a5ded..da435ea6 100644 --- a/public/404.html +++ b/public/404.html @@ -26,7 +26,7 @@ } body { - background: #d8d9da url(/assets/shattered_@2X.png); + background: #d8d9da url(https://s3.amazonaws.com/metamaps-assets/site/shattered_%402X.png); font-family: 'din-regular', helvetica, sans-serif; color: #424242; text-align: justify; @@ -61,7 +61,7 @@ border-radius: 225px; -webkit-border-radius: 225px; -moz-border-radius: 225px; - background: url(/assets/monkeyselfie.jpg) no-repeat; + background: url(https://s3.amazonaws.com/metamaps-assets/site/monkeyselfie.jpg) no-repeat; float: left; background-position:50% 20%; background-size: 100%; diff --git a/test/fixtures/metacodes.yml b/test/fixtures/metacodes.yml index 02ec0663..80780734 100644 --- a/test/fixtures/metacodes.yml +++ b/test/fixtures/metacodes.yml @@ -6,235 +6,235 @@ # one: name: Action - icon: /assets/icons/blueprint_96px/bp_action.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_action.png color: #BD6C85 two: name: Activity - icon: /assets/icons/blueprint_96px/bp_activity.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_activity.png color: #6EBF65 three: name: Catalyst - icon: /assets/icons/blueprint_96px/bp_catalyst.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_catalyst.png color: #EF8964 four: name: Closed - icon: /assets/icons/blueprint_96px/bp_closedissue.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_closedissue.png color: #ABB49F five: name: Process - icon: /assets/icons/blueprint_96px/bp_process.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_process.png color: #BDB25E six: name: Future Dev - icon: /assets/icons/blueprint_96px/bp_futuredev.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_futuredev.png color: #25A17F seven: name: Group - icon: /assets/icons/blueprint_96px/bp_group.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_group.png color: #7076BC eight: name: Implication - icon: /assets/icons/blueprint_96px/bp_implication.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_implication.png color: #83DECA nine: name: Insight - icon: /assets/icons/blueprint_96px/bp_insight.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_insight.png color: #B074AD ten: name: Intention - icon: /assets/icons/blueprint_96px/bp_intention.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_intention.png color: #BAEAFF eleven: name: Knowledge - icon: /assets/icons/blueprint_96px/bp_knowledge.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_knowledge.png color: #60ACF7 twelve: name: Location - icon: /assets/icons/blueprint_96px/bp_location.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_location.png color: #ABD9A7 thirteen: name: Need - icon: /assets/icons/blueprint_96px/bp_need.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_need.png color: #D2A7D4 fourteen: name: Open Issue - icon: /assets/icons/blueprint_96px/bp_openissue.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_openissue.png color: #9BBF71 fifteen: name: Opportunity - icon: /assets/icons/blueprint_96px/bp_opportunity.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_opportunity.png color: #889F64 sixteen: name: Person - icon: /assets/icons/blueprint_96px/bp_person.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_person.png color: #DE925F seventeen: name: Platform - icon: /assets/icons/blueprint_96px/bp_platform.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_platform.png color: #21C8FE eighteen: name: Problem - icon: /assets/icons/blueprint_96px/bp_problem.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_problem.png color: #99CFC4 nineteen: name: Resource - icon: /assets/icons/blueprint_96px/bp_resource.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_resource.png color: #C98C63 twenty: name: Role - icon: /assets/icons/blueprint_96px/bp_role.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_role.png color: #A8595D twenty-one: name: Task - icon: /assets/icons/blueprint_96px/bp_task.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_task.png color: #3397C4 twenty-two: name: Trajectory - icon: /assets/icons/blueprint_96px/bp_trajectory.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/blueprint/96px/bp_trajectory.png color: #D3AA4C twenty-three: name: Argument - icon: /assets/icons/generics_96px/gen_argument.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_argument.png color: #7FAEFD twenty-four: name: Con - icon: /assets/icons/generics_96px/gen_con.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_con.png color: #CF7C74 twenty-five: name: Subject - icon: /assets/icons/generics_96px/gen_subject.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_subject.png color: #8293D8 twenty-six: name: Decision - icon: /assets/icons/generics_96px/gen_decision.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_decision.png color: #CCA866 twenty-seven: name: Event - icon: /assets/icons/generics_96px/gen_event.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_event.png color: #F5854B twenty-eight: name: Example - icon: /assets/icons/generics_96px/gen_example.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_example.png color: #618C61 twenty-nine: name: Experience - icon: /assets/icons/generics_96px/gen_experience.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_experience.png color: #BE995F thirty: name: Feedback - icon: /assets/icons/generics_96px/gen_feedback.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_feedback.png color: #54A19D thirty-one: name: Aim - icon: /assets/icons/generics_96px/gen_aim.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_aim.png color: #B0B0B0 thirty-two: name: Good Practice - icon: /assets/icons/generics_96px/gen_goodpractice.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_goodpractice.png color: #BD9E86 thirty-three: name: Idea - icon: /assets/icons/generics_96px/gen_idea.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_idea.png color: #C4BC5E thirty-four: name: List - icon: /assets/icons/generics_96px/gen_list.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_list.png color: #B7A499 thirty-five: name: Media - icon: /assets/icons/generics_96px/gen_media.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_media.png color: #6D94CC thirty-six: name: Metamap - icon: /assets/icons/generics_96px/gen_metamap.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_metamap.png color: #AEA9FD thirty-seven: name: Model - icon: /assets/icons/generics_96px/gen_model.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_model.png color: #B385BA thirty-eight: name: Note - icon: /assets/icons/generics_96px/gen_note.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_note.png color: #A389A1 thirty-nine: name: Perspective - icon: /assets/icons/generics_96px/gen_perspective.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_perspective.png color: #2EB6CC forty: name: Pro - icon: /assets/icons/generics_96px/gen_pro.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_pro.png color: #89B879 forty-one: name: Project - icon: /assets/icons/generics_96px/gen_project.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_project.png color: #85A050 forty-two: name: Question - icon: /assets/icons/generics_96px/gen_question.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_question.png color: #5CB3B3 forty-three: name: Reference - icon: /assets/icons/generics_96px/gen_reference.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_reference.png color: #A7A7A7 forty-four: name: Research - icon: /assets/icons/generics_96px/gen_research.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_research.png color: #CD8E89 forty-five: name: Status update - icon: /assets/icons/generics_96px/gen_status.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_status.png color: #EFA7C0 forty-six: name: Tool - icon: /assets/icons/generics_96px/gen_tool.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_tool.png color: #828282 forty-seven: name: Wildcard - icon: /assets/icons/generics_96px/gen_wildcard.png + icon: https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png color: #73C7DE