diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index ae80f46c..8888e000 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -12,7 +12,7 @@ class BasilController < ApplicationController Flora, Town, # TODO improve these before release, if possible; otherwise disable - Building, Vehicle, + Building, Vehicle, Creature, # TODO before release # Continent, Country, @@ -456,7 +456,8 @@ class BasilController < ApplicationController 'type of landmark': 1.25, 'type of magic': 1.25, 'type of school': 1.25, - 'type of vehicle': 1.25 + 'type of vehicle': 1.25, + 'type of creature': 1.25 } label_value_pairs_to_skip_entirely = [ ['race', 'human'] diff --git a/app/services/basil_service.rb b/app/services/basil_service.rb index 8f39cdb8..7a36ce32 100644 --- a/app/services/basil_service.rb +++ b/app/services/basil_service.rb @@ -11,14 +11,10 @@ class BasilService < Service %w(realistic painting sketch) when 'Building' %w(realistic sketch) - when 'Food' - %w(realistic) - when 'Planet' - %w(realistic) - when 'Landmark' - %w(realistic) when 'Town' %w(realistic map) + when 'Creature' + %w(realistic fantasy) else %w(realistic) end diff --git a/app/views/basil/content.html.erb b/app/views/basil/content.html.erb index 596039d9..73d61aaa 100644 --- a/app/views/basil/content.html.erb +++ b/app/views/basil/content.html.erb @@ -104,7 +104,7 @@ function commission_basil(style) { <%= link_to "javascript:commission_basil('#{style}')" do %>
<%= style.humanize %> - chevron_right + chevron_down
<% end %> @@ -121,7 +121,7 @@ function commission_basil(style) { <%= link_to "javascript:commission_basil('#{style}')" do %>
<%= style.humanize %> - chevron_right + chevron_down
<% end %> @@ -149,77 +149,76 @@ function commission_basil(style) { <% @commissions.each do |commission| %>
<% if commission.complete? %> - <%# image_tag commission.image, style: 'width: 100%' %> - <% - s3 = Aws::S3::Resource.new(region: "us-east-1") - obj = s3.bucket(commission.s3_bucket).object("job-#{commission.job_id}.png") - %> -
+
<%= link_to commission.image do %> <%= image_tag commission.image %> <% end %>
-
-
-
- <%= @content.name %> - <% if commission.style? %> - (<%= commission.style.humanize %>) +
+
+ <%= @content.name %> + <% if commission.style? %> + (<%= commission.style.humanize %>) + <% end %> +
+
+ Completed <%= time_ago_in_words commission.completed_at %> ago + ·
+ Took <%= distance_of_time_in_words commission.completed_at - commission.created_at %> +
+
+
Feedback for Basil
+
+ <%= form_for commission.basil_feedbacks.find_or_initialize_by(user: current_user), url: basil_feedback_path(commission.job_id), method: :POST, remote: true do |f| %> +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
<% end %>
-
- Completed <%= time_ago_in_words commission.completed_at %> ago - ·
- Took <%= distance_of_time_in_words commission.completed_at - commission.created_at %> -
-
-
Feedback for Basil
-
- <%= form_for commission.basil_feedbacks.find_or_initialize_by(user: current_user), url: basil_feedback_path(commission.job_id), method: :POST, remote: true do |f| %> -
- -
-
- -
-
- -
-
- -
- <% end %> -
-
-
-
- <% if commission.saved_at? %> - <%= link_to 'Saved', commission.entity, class: 'blue-text' %> - <% else %> - <%= link_to "Save", '#', class: 'js-save-commission purple-text', data: { endpoint: basil_save_path(commission) } %> - <% end %> - <%= link_to "Delete", '#', class: 'js-delete-commission red-text right right-align', style: 'margin-right: 0', data: { endpoint: basil_delete_path(commission) } %>
+
+ <% if commission.saved_at? %> + <%= link_to 'Saved', commission.entity, class: 'blue-text' %> + <% else %> + <%= link_to "Save to page", '#', class: 'js-save-commission purple-text', data: { endpoint: basil_save_path(commission) } %> + <% end %> + <%= link_to "Delete", '#', class: 'js-delete-commission red-text right right-align', style: 'margin-right: 0', data: { endpoint: basil_delete_path(commission) } %> +
<% else %>
Basil is still working on this commission... (style: <%= commission.style %>)
- (Requested <%= time_ago_in_words(commission.created_at) %> ago) + (Requested <%= time_ago_in_words(commission.created_at) %> ago · Refresh this page for updates)
<% end %> diff --git a/app/views/basil/index.html.erb b/app/views/basil/index.html.erb index 4e4ed0f0..3ec3ac72 100644 --- a/app/views/basil/index.html.erb +++ b/app/views/basil/index.html.erb @@ -6,7 +6,7 @@

Hey, I'm Basil.

I can help you visualize your characters and other pages.

- To get started, select the page you want to generate art for. Their description + To get started, select the page you want to generate images for. Their description will be pulled from any answers you've given to relevant fields on their notebook page.