Name: <%=@freelancer.name%>
<%=@freelancer.description%>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5187e22..8699a28 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,16 @@
Rails.application.configure do
+
+ config.paperclip_defaults = {
+ storage: :s3,
+ s3_credentials: {
+ bucket: ENV.fetch('S3_BUCKET_NAME'),
+ access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+ secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+ s3_region: ENV.fetch('AWS_REGION'),
+ }
+ }
+ Paperclip.options[:command_path] = "/usr/local/bin/config"
+
# Settings specified here will take precedence over those in config/application.rb.
# In the development environment your application's code is reloaded on
@@ -51,4 +63,7 @@
# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+
+
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0eee56f..8b8c913 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,17 @@
Rails.application.configure do
+
+ config.paperclip_defaults = {
+ storage: :s3,
+ s3_credentials: {
+ bucket: ENV.fetch('S3_BUCKET_NAME'),
+ access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+ secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+ s3_region: ENV.fetch('AWS_REGION'),
+ }
+ }
+
+ Paperclip.options[:command_path] = "/usr/local/bin/config"
+
# Settings specified here will take precedence over those in config/application.rb.
# Code is not reloaded between requests.
@@ -28,7 +41,7 @@
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
+ config.assets.compile = true
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
@@ -88,4 +101,7 @@
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
+
+
+
end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8e5cbde..b58fb61 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,16 @@
Rails.application.configure do
+
+ config.paperclip_defaults = {
+ storage: :s3,
+ s3_credentials: {
+ bucket: ENV['S3_BUCKET_NAME'],
+ access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+ secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+ s3_region: ENV['S3_REGION'],
+ s3_host_name: ENV['S3_HOST_NAME']
+ }
+ }
+
# Settings specified here will take precedence over those in config/application.rb.
# The test environment is used exclusively to run your application's
@@ -39,4 +51,6 @@
# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
+
+
end
diff --git a/config/routes.rb b/config/routes.rb
index c11496e..3b41073 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,8 +9,8 @@
namespace :admin do
resources :users, only: [:edit, :update, :show]
- resources :freelancers, only: [:new, :create]
-
+ resources :freelancers, only: [:new, :create, :index]
+
resources :orders, only: [:show]
get '/dashboard', to: 'orders#index'
patch '/dashboard', to: 'orders#update'
diff --git a/data/freelancers.csv b/data/freelancers.csv
index 6160054..63c65ca 100644
--- a/data/freelancers.csv
+++ b/data/freelancers.csv
@@ -1,4 +1,4 @@
-name,description,price,image,category_id
+name,description,price,image,category_id, status
Kelly ,"I am a professional front-end web developer, with more than 5 years experience building beautiful websites. I primarily serve solopreneurs, other freelancers, and small businesses.",100,chelsea-ferenando-201350.jpg,1
Peter,Engineer and creative mind with over 5 years of experience in software development. Very interested in creating appealing web and mobile solutions and developing fun 'out of the box' alternatives to user needs.,125,dami-adebayo-208876.jpg,4
Jacob,"Since 2011, I have focused on building top-notch native iOS apps, embracing new technologies, and developing great client relationships.",200,brooke-cagle-224815.jpg,4
@@ -7,7 +7,7 @@ Michael,"User Experience Design, User Interface Design, Responsive Web Design, M
Olivia,I have almost 10 years experience working with packaging and I have knowledge in both graphic design and product design. One of my designs was a finalist at the 2012 HBA International Package Design Awards in New York City.,75,priscilla-du-preez-216787.jpg,7
Angela,"In over 20 years of professional writing, I have flexed my style to suit the audience and meet the goals of my clients from across the spectrum of economic sectors: business, journalism, government, education, and non-profits. ",45,pete-bellis-199853.jpg,5
Samantha,"I have worked as a Quality Assurance Engineer for over 10 years. I have tested UI, Data scraping and Websites. Look forward in working with you",30,michael-dam-258165.jpg,8
-George," 20+ years experience in Business Applications consulting, desing and development",150,warren-wong-242286.jpg,6
+George," 20+ years experience in Business Applications consulting, desing and development",150,warren-wong-242286.jpg,6, 1
Timothy,"Web Developer interested in freelance opportunities. A strong focus on modern web development: multithreaded programming, OOP, operation with huge Databases. Experience of nearly 10 years.",30,ivana-cajina-322968.jpg,2
-Francis,"I am a Graphic Designer/Illustrator with over 36 years of experience. I have spent the last nineteen years working digitally but am also able to do illustrations and drawings by hand. I am comfortable doing any design/illustration work by computer as well and have experience doing everything from cartoons, banners, vector art, logos, business card design, brochure design, posters, ebook cover designs, post cards, dvd covers, editorial cartoons, etc.. ",75,brooke-cagle-171800.jpg,7
-Janet,I am UI designer with 3 years working experience. Several times per year I am improving my skills and knowledge by passing design courses. ,110,foto-sushi-128246.jpg,3
+Francis,"I am a Graphic Designer/Illustrator with over 36 years of experience. I have spent the last nineteen years working digitally but am also able to do illustrations and drawings by hand. I am comfortable doing any design/illustration work by computer as well and have experience doing everything from cartoons, banners, vector art, logos, business card design, brochure design, posters, ebook cover designs, post cards, dvd covers, editorial cartoons, etc.. ",75,brooke-cagle-171800.jpg,7, 1
+Janet,I am UI designer with 3 years working experience. Several times per year I am improving my skills and knowledge by passing design courses. ,110,foto-sushi-128246.jpg,3, 1
diff --git a/db/migrate/20171107234018_add_avatar_to_freelancers.rb b/db/migrate/20171107234018_add_avatar_to_freelancers.rb
new file mode 100644
index 0000000..1013bb6
--- /dev/null
+++ b/db/migrate/20171107234018_add_avatar_to_freelancers.rb
@@ -0,0 +1,11 @@
+class AddAvatarToFreelancers < ActiveRecord::Migration[5.1]
+
+ def self.up
+ add_attachment :freelancers, :avatar
+ end
+
+ def self.down
+ remove_attachment :freelancers, :avatar
+ end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index cac4782..746d8d5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171106210511) do
+ActiveRecord::Schema.define(version: 20171107234018) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -31,6 +31,10 @@
t.datetime "updated_at", null: false
t.bigint "category_id"
t.integer "status", default: 0
+ t.string "avatar_file_name"
+ t.string "avatar_content_type"
+ t.integer "avatar_file_size"
+ t.datetime "avatar_updated_at"
t.index ["category_id"], name: "index_freelancers_on_category_id"
end
@@ -53,6 +57,7 @@
t.string "username"
t.string "password_digest"
t.string "email"
+ t.string "full_name"
t.string "company"
t.string "address1"
t.string "address2"
@@ -61,8 +66,7 @@
t.integer "zip"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
- t.integer "role", default: 0
- t.string "full_name"
+ t.integer "role"
end
add_foreign_key "freelancers", "categories"
diff --git a/app/assets/images/.keep b/environment
similarity index 100%
rename from app/assets/images/.keep
rename to environment
diff --git a/public/alejandra-higareda-295603.jpg b/public/alejandra-higareda-295603.jpg
deleted file mode 100644
index e64b53d..0000000
Binary files a/public/alejandra-higareda-295603.jpg and /dev/null differ
diff --git a/public/brooke-cagle-171800.jpg b/public/brooke-cagle-171800.jpg
deleted file mode 100644
index 1dc9b12..0000000
Binary files a/public/brooke-cagle-171800.jpg and /dev/null differ
diff --git a/public/brooke-cagle-224815.jpg b/public/brooke-cagle-224815.jpg
deleted file mode 100644
index ba9d28e..0000000
Binary files a/public/brooke-cagle-224815.jpg and /dev/null differ
diff --git a/public/chelsea-ferenando-201350.jpg b/public/chelsea-ferenando-201350.jpg
deleted file mode 100644
index d5e5a0f..0000000
Binary files a/public/chelsea-ferenando-201350.jpg and /dev/null differ
diff --git a/public/dami-adebayo-208876.jpg b/public/dami-adebayo-208876.jpg
deleted file mode 100644
index ec7070f..0000000
Binary files a/public/dami-adebayo-208876.jpg and /dev/null differ
diff --git a/public/domenico-loia-272251.jpg b/public/domenico-loia-272251.jpg
deleted file mode 100644
index b33f1cd..0000000
Binary files a/public/domenico-loia-272251.jpg and /dev/null differ
diff --git a/public/foto-sushi-128246.jpg b/public/foto-sushi-128246.jpg
deleted file mode 100644
index 7373c91..0000000
Binary files a/public/foto-sushi-128246.jpg and /dev/null differ
diff --git a/public/ilya-pavlov-87438.jpg b/public/ilya-pavlov-87438.jpg
deleted file mode 100644
index 0016377..0000000
Binary files a/public/ilya-pavlov-87438.jpg and /dev/null differ
diff --git a/public/ivana-cajina-322968.jpg b/public/ivana-cajina-322968.jpg
deleted file mode 100644
index 658be93..0000000
Binary files a/public/ivana-cajina-322968.jpg and /dev/null differ
diff --git a/public/joseph-gonzalez-399972.jpg b/public/joseph-gonzalez-399972.jpg
deleted file mode 100644
index 64634ff..0000000
Binary files a/public/joseph-gonzalez-399972.jpg and /dev/null differ
diff --git a/public/michael-dam-258165.jpg b/public/michael-dam-258165.jpg
deleted file mode 100644
index 9825c59..0000000
Binary files a/public/michael-dam-258165.jpg and /dev/null differ
diff --git a/public/pete-bellis-199853.jpg b/public/pete-bellis-199853.jpg
deleted file mode 100644
index 6a4561c..0000000
Binary files a/public/pete-bellis-199853.jpg and /dev/null differ
diff --git a/public/priscilla-du-preez-216787.jpg b/public/priscilla-du-preez-216787.jpg
deleted file mode 100644
index f0de883..0000000
Binary files a/public/priscilla-du-preez-216787.jpg and /dev/null differ
diff --git a/public/rawpixel-com-196509.jpg b/public/rawpixel-com-196509.jpg
deleted file mode 100644
index f663a19..0000000
Binary files a/public/rawpixel-com-196509.jpg and /dev/null differ
diff --git a/public/tanja-heffner-196114.jpg b/public/tanja-heffner-196114.jpg
deleted file mode 100644
index 9d9b163..0000000
Binary files a/public/tanja-heffner-196114.jpg and /dev/null differ
diff --git a/public/warren-wong-242286.jpg b/public/warren-wong-242286.jpg
deleted file mode 100644
index bd7bf00..0000000
Binary files a/public/warren-wong-242286.jpg and /dev/null differ
diff --git a/spec/features/freelancers/admin_can_create_a_new_freelancer_spec.rb b/spec/features/freelancers/admin_can_create_a_new_freelancer_spec.rb
index 770cc96..0ad2435 100644
--- a/spec/features/freelancers/admin_can_create_a_new_freelancer_spec.rb
+++ b/spec/features/freelancers/admin_can_create_a_new_freelancer_spec.rb
@@ -26,7 +26,7 @@
scenario "I can create a new freelancer" do
- visit freelancers_path
+ visit admin_freelancers_path
click_on 'Add a New Freelancer'
diff --git a/spec/features/orders/admin_can_view_orders_on_dashboard_spec.rb b/spec/features/orders/admin_can_view_orders_on_dashboard_spec.rb
index 383ce50..a86b689 100644
--- a/spec/features/orders/admin_can_view_orders_on_dashboard_spec.rb
+++ b/spec/features/orders/admin_can_view_orders_on_dashboard_spec.rb
@@ -32,7 +32,7 @@
expect(page).to have_link("View Order 4")
click_on "View Order 1"
- expect(current_path).to eq(order_path(@order_1))
+ expect(current_path).to eq(admin_order_path(@order_1))
end
end
+