- <%= generate_form_row_for(f, :name, nil, [{:action => 'character_name_generator', :icon => 'random'}]) %>
- <%= generate_form_row_for(f, :role, 'Role in story') %>
- <%= generate_form_row_for(f, :gender) %>
- <%= generate_form_row_for(f, :age, nil, [{:action => 'character_age_generator', :icon => 'random'}]) %>
- <%= generate_form_row_for(f, :universe, nil, [{:action => 'universe_picker', :icon => 'globe'}]) %>
-
-
-
- <%= generate_form_row_for(f, :height) %>
- <%= generate_form_row_for(f, :weight) %>
- <%= generate_form_row_for(f, :race) %>
- <%= generate_form_row_for(f, :haircolor) %>
- <%= generate_form_row_for(f, :hairstyle) %>
- <%= generate_form_row_for(f, :facialhair) %>
- <%= generate_form_row_for(f, :eyecolor, 'Eye color') %>
- <%= generate_form_row_for(f, :skintone) %>
- <%= generate_form_row_for(f, :bodytype) %>
- <%= generate_form_row_for(f, :identmarks, 'Identifying marks') %>
-
-
-
- <%= generate_form_row_for(f, :bestfriend, 'Best friend', [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :religion) %>
- <%= generate_form_row_for(f, :politics) %>
- <%= generate_form_row_for(f, :prejudices) %>
- <%= generate_form_row_for(f, :occupation) %>
- <%= generate_form_row_for(f, :pets) %>
-
-
-
- <%= generate_form_row_for(f, :birthday) %>
- <%= generate_form_row_for(f, :birthplace, nil, [{:action => 'location_picker', :icon => 'road'}]) %>
- <%= generate_form_row_for(f, :education) %>
- <%= generate_form_row_for(f, :background) %>
-
-
-
- <%= generate_form_row_for(f, :fave_color, 'Color') %>
- <%= generate_form_row_for(f, :fave_food, 'Food') %>
- <%= generate_form_row_for(f, :fave_possession, 'Possession', [{:action => 'equipment_picker', :icon => 'shopping-cart'}]) %>
- <%= generate_form_row_for(f, :fave_weapon, 'Weapon', [{:action => 'equipment_picker', :icon => 'shopping-cart'}]) %>
- <%= generate_form_row_for(f, :fave_animal, 'Animal') %>
-
-
-
- <%= generate_form_row_for(f, :father, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :mother, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :spouse, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :siblings, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :archenemy, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
-
-
-<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
new file mode 100644
index 00000000..b41daf47
--- /dev/null
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
+We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
new file mode 100644
index 00000000..f667dc12
--- /dev/null
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+Someone has requested a link to change your password. You can do this through the link below.
+
+<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
new file mode 100644
index 00000000..41e148bf
--- /dev/null
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+
+
- <%= generate_form_row_for(f, :name, nil) %>
- <%= generate_form_row_for(f, :equip_type, 'Type') %>
- <%= generate_form_row_for(f, :description, nil) %>
- <%= generate_form_row_for(f, :universe, nil, [{:action => 'universe_picker', :icon => 'globe'}]) %>
-
-
-
- <%= generate_form_row_for(f, :original_owner, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :current_owner, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :made_by, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :materials, nil) %>
- <%= generate_form_row_for(f, :year_made, nil) %>
-
-
-
<%= simple_format link_to equipment.name, equipment_path(equipment) %>
- <%= simple_format equipment.equip_type %>
+ <%= simple_format equipment.item_type %>
<%= simple_format equipment.description %>
<% if session[:user] and session[:user] == equipment.user.id %>
diff --git a/app/views/items/edit.html.erb b/app/views/items/edit.html.erb
new file mode 100644
index 00000000..9f2056a9
--- /dev/null
+++ b/app/views/items/edit.html.erb
@@ -0,0 +1,9 @@
+Editing an item
+<%= form_for @content, :url => item_edit_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+ <%= link_to "Delete #{@content.class.to_s} forever", @content,
+ :class => 'red btn right',
+ :method => :delete,
+ :confirm => 'Are you sure? This action cannot be undone!' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/items/index.html.erb b/app/views/items/index.html.erb
new file mode 100644
index 00000000..484974fc
--- /dev/null
+++ b/app/views/items/index.html.erb
@@ -0,0 +1,4 @@
+You've created <%= @content.count %> items
+<%= render partial: 'content/list/list', locals: { content_list: @content } %>
+
+<%= link_to 'Create another item', item_create_path, :class => 'btn' %>
diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb
new file mode 100644
index 00000000..2f300929
--- /dev/null
+++ b/app/views/items/new.html.erb
@@ -0,0 +1,5 @@
+Create a new item
+<%= form_for @content, :url => item_create_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb
new file mode 100644
index 00000000..dc052f22
--- /dev/null
+++ b/app/views/items/show.html.erb
@@ -0,0 +1,3 @@
+<%= render partial: 'content/show', locals: { content: @content } %>
+
+<%= link_to 'Edit this item', edit_item_path(@content), class: 'btn' %>
\ No newline at end of file
diff --git a/app/views/languages/_form.html.erb b/app/views/languages/_form.html.erb
deleted file mode 100644
index a9fd1df2..00000000
--- a/app/views/languages/_form.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-
- <%= generate_form_row_for(f, :name, nil) %>
- <%= generate_form_row_for(f, :universe, nil, [{:action => 'universe_picker', :icon => 'globe'}]) %>
-
-
-
-
- <%= f.label 'Words', :class => 'control-label' %>
-
- <%= f.text_area :words, :class => 'text_field', :rows => 6 %>
-
-
-
- <%= generate_form_row_for(f, :established_year, nil) %>
- <%= generate_form_row_for(f, :established_location, 'Established in', [{:action => 'location_picker', :icon => 'globe'}]) %>
-
-
-
- <%= generate_form_row_for(f, :characters, nil, [{:action => 'character_picker', :icon => 'user'}]) %>
- <%= generate_form_row_for(f, :locations, nil, [{:action => 'location_picker', :icon => 'globe'}]) %>
-
-
-
-
- <%= f.label 'Notes', :class => 'control-label' %>
-
- <%= f.text_area :notes, :class => 'text_area', :rows => 12, :style => "width: 80%;" %>
-
-
-
-
-
- Name
- <% if session[:user] %>
- <%=t '.actions', :default => t("helpers.actions") %>
- <% end %>
-
-
-
- <% @content.each do |language| %>
-
- <%= simple_format link_to language.name, language_path(language) %>
-
- <% if session[:user] and session[:user] == language.user.id %>
- <%= link_to t('.view', :default => t("helpers.links.view")),
- language_path(language), :class => 'btn' %>
- <%= link_to t('.edit', :default => t("helpers.links.edit")),
- language_edit_path(language), :class => 'btn' %>
- <% end %>
-
-
- <% end %>
-
-
-
diff --git a/app/views/languages/_tabs.html.erb b/app/views/languages/_tabs.html.erb
deleted file mode 100644
index f4c24957..00000000
--- a/app/views/languages/_tabs.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-
- <%= link_to "General", "#general", :id => "show_general" %>
- <%= link_to "Vocabulary", "#vocabulary", :id => "show_vocabulary" %>
- <%= link_to "History", "#history", :id => "show_history" %>
- <%= link_to "Speakers", "#speakers", :id => "show_speakers" %>
- <%= link_to "More...", "#more", :id => "show_more" %>
-
-
diff --git a/app/views/languages/edit.html.erb b/app/views/languages/edit.html.erb
deleted file mode 100644
index 6ca8e279..00000000
--- a/app/views/languages/edit.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%- model_class = @content.class -%>
-
-
-
-
-
Facets
- <%= render :partial => 'tabs' %>
-
-
-
-
Danger-zone
-
- <%= link_to 'Delete this language forever', language_path,
- :class => 'btn btn-danger',
- :method => :delete,
- :confirm => 'Are you sure? This action cannot be undone!' %>
-
-
-
-
-
-
-
Editing <%= @content.name %>
- <%= form_for @content,
- :url => language_edit_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
- <% end %>
-
-
-
-
- Languages
- <% if false and Universe.where(user_id: session[:user]).length > 0 %>
- spoken in <%= render 'universes/picker' %>
- <% end %>
-
-
- <%= render 'list' %>
-
-<% end %>
-
-
-
Planning languages
-
-
- English doesn't have to be the only language in your story. Whether you're planning differing dialects or completely new languages, you want to keep track of what defines them.
-
- <%= link_to 'New language', language_create_path, :class => 'btn btn-primary' %>
-
-
-
-
-
-
-
New language
- <%= render :partial => 'tabs' %>
-
-
-
-
-
- <%= form_for @content,
- :url => language_create_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
-
- <% end %>
-
-
-
-
-
-
-
- <%= render :partial => 'tabs' %>
-
-
-
-
-
-
- <%= @language.name %>
-
-
-
-
-
- <%= print_property("Name", @language.name, "") %>
- <%= print_property("Universe", @language.universe ? @language.universe.name : "", "universe") %>
-
-
-
- <%= print_property("Words", @language.words, "") %>
-
-
-
- <%= print_property("Established year", @language.established_year, "") %>
- <%= print_property("Established location", @language.established_location, "location") %>
-
-
-
- <%= print_property("Fluent characters", @language.characters, "") %>
- <%= print_property("Locations spoken", @language.locations, "") %>
-
-
-
- <%= print_property("Notes", @language.notes, "") %>
-
-
-
-
-
-
-
-
-
- <% if session[:user] %>
+ <% if user_signed_in? %>
<% else %>
- Login Register <%= link_to 'Sign up', new_user_registration_path %>
+ <%= link_to 'Log in', new_user_session_path %>
<% end %>
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index 31aaf30e..bd29ca01 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -1,29 +1,61 @@
-
-
+
+ <%= link_to 'Account settings', edit_user_registration_path %>
+ <%= link_to "Sign out", destroy_user_session_path, :method => :delete %>
+
-
-
+
+
+
+ <%= link_to 'Notebook', root_url, class: 'brand-logo center' %>
-
- <%= render 'layouts/login_box' %>
+
+
+
+ <%= link_to root_url do %>
+ home
+ <% end %>
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/app/views/layouts/_noscript_notice.html.erb b/app/views/layouts/_noscript_notice.html.erb
deleted file mode 100644
index 0a1afc39..00000000
--- a/app/views/layouts/_noscript_notice.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- Please enable Javascript for the site to function correctly. We promise not to do anything bad!
-
-
diff --git a/app/views/layouts/_session_protection.html.erb b/app/views/layouts/_session_protection.html.erb
deleted file mode 100644
index c06a1175..00000000
--- a/app/views/layouts/_session_protection.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%
- # Destroy old sessions if a user has been deleted
- begin
- User.find(session[:user]) if session[:user]
- rescue ActiveRecord::RecordNotFound
- session = {}
- %>
-
- <%
- end
-%>
\ No newline at end of file
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index b6df5d89..61b7aa0f 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -1,61 +1,17 @@
-<% if flash[:notice] %>
-
-
-
- <%= flash[:notice] %>
-
-
-
-<% end %>
+<%= render 'cards/ui/alert' %>
+<%= render 'cards/ui/notice' %>
-<% if flash[:alert] %>
-
-
-
- <%= flash[:alert] %>
-
-
-
-<% end %>
+<% if user_signed_in? %>
-<% if session[:anon_user] and session[:user] and User.find(session[:user]).content_count > 0 && !current_page?(account_path) %>
-
-
Anonymous accounts
-
- You are currently using an
anonymous account . In order to save the brilliant things you have created with it, please
click here to give yourself a username and password.
-
-
-
-<% end %>
+ <%= yield :sidebar_top %>
+ <%= render 'cards/user/recent_activity' %>
+ <%= yield :sidebar_bottom %>
+
+<% else %>
+
+ <%= render 'cards/universe_intro' %>
+ <%= render 'cards/character_intro' %>
+ <%= render 'cards/location_intro' %>
+ <%= render 'cards/item_intro' %>
-<% unless session[:user] %>
-
-
Get started instantly
-
- Nobody likes creating accounts just to try things out. You can get started making things immediately and create your account later if you want.
-
-
-
<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 56481aee..64116a2c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,44 +1,36 @@
-
Indent
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= javascript_include_tag "application" %>
+
Notebook
+ <%= stylesheet_link_tag 'application' %>
+ <%= javascript_include_tag 'application' %>
<%= csrf_meta_tags %>
- <%= render 'layouts/session_protection' %>
- <%= render 'layouts/bootstrap_includes' %>
+
+
+
+
+
<%= render 'layouts/navbar' %>
-<%= render 'layouts/noscript_notice' %>
-
-
-
- <%= yield %>
-
-
- <%= render 'layouts/sidebar' %>
+
+
+
+
<%= yield %>
+
+ <%= render 'layouts/sidebar' %>
+
-
+ <%= render 'layouts/ganalytics' %>
-<%= render 'layouts/ganalytics' %>
+
+
+
+<%= render 'layouts/footer' %>
-
diff --git a/app/views/locations/_form.html.erb b/app/views/locations/_form.html.erb
deleted file mode 100644
index a5490c31..00000000
--- a/app/views/locations/_form.html.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-
- <%= generate_form_row_for(f, :name, nil, [{:action => 'location_name_generator', :icon => 'random'}]) %>
- <%= generate_form_row_for(f, :type_of, 'Location type') %>
- <%= generate_form_row_for(f, :description, nil) %>
- <%= generate_form_row_for(f, :universe, nil, [{:action => 'universe_picker', :icon => 'globe'}]) %>
-
-
-
-
- <%= image_tag 'placeholders/map.png', id: 'placeholder_map_input' %>
- <%= f.label 'New map?', :class => 'control-label' %>
-
- <%= f.file_field :map, :class => 'text_field' %>
-
-
-
-
-
- <%= generate_form_row_for(f, :population) %>
- <%= generate_form_row_for(f, :language) %>
- <%= generate_form_row_for(f, :currency) %>
- <%= generate_form_row_for(f, :motto) %>
-
-
-
- <%= generate_form_row_for(f, :capital, nil, [{:action => 'location_picker', :icon => 'road'}]) %>
- <%= generate_form_row_for(f, :largest_city, nil, [{:action => 'location_picker', :icon => 'road'}]) %>
- <%= generate_form_row_for(f, :notable_cities, nil, [{:action => 'location_picker', :icon => 'road'}]) %>
-
-
-
- <%= generate_form_row_for(f, :area) %>
- <%= generate_form_row_for(f, :crops) %>
- <%= generate_form_row_for(f, :located_at, 'Located') %>
-
-
-
- <%= generate_form_row_for(f, :established_year) %>
- <%= generate_form_row_for(f, :notable_wars) %>
-
-
-
-
- <%= f.label 'Notes', :class => 'control-label' %>
-
- <%= f.text_area :notes, :class => 'text_area', :rows => 10, :style => "width: 80%;" %>
-
-
-
- <%= f.label 'Private notes', :class => 'control-label' %>
-
- <%= f.text_area :private_notes, :class => 'text_area', :rows => 8, :style => "width: 80%;" %>
-
-
-
diff --git a/app/views/locations/_list.html.erb b/app/views/locations/_list.html.erb
index 97cef6f9..f0c9e99c 100644
--- a/app/views/locations/_list.html.erb
+++ b/app/views/locations/_list.html.erb
@@ -20,7 +20,7 @@
<%= link_to t('.view', :default => t("helpers.links.view")),
location_path(location), :class => 'btn' %>
<%= link_to t('.edit', :default => t("helpers.links.edit")),
- location_edit_path(location), :class => 'btn' %>
+ edit_location_path(location), :class => 'btn' %>
<% end %>
diff --git a/app/views/locations/_tabs.html.erb b/app/views/locations/_tabs.html.erb
deleted file mode 100644
index 63ec8db0..00000000
--- a/app/views/locations/_tabs.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-
- <%= link_to "General", "#", :id => "show_general" %>
- <%= link_to "Map", "#", :id => "show_map" %>
- <%= link_to "Culture", "#", :id => "show_culture" %>
- <%= link_to "Cities", "#", :id => "show_cities" %>
- <%= link_to "Geography", "#", :id => "show_geography" %>
- <%= link_to "History", "#", :id => "show_history" %>
- <%= link_to "Notes", "#", :id => "show_notes" %>
-
-
diff --git a/app/views/locations/edit.html.erb b/app/views/locations/edit.html.erb
index 7571a822..025abcfb 100644
--- a/app/views/locations/edit.html.erb
+++ b/app/views/locations/edit.html.erb
@@ -1,37 +1,9 @@
-<%- model_class = @content.class -%>
-
-
-
-
-
Facets
- <%= render :partial => 'tabs' %>
-
-
-
-
Danger-zone
-
- <%= link_to 'Delete location forever', location_path,
- :class => 'btn btn-danger',
+
Editing a location
+<%= form_for @content, :url => location_edit_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+ <%= link_to "Delete #{@content.class.to_s} forever", @content,
+ :class => 'red btn right',
:method => :delete,
:confirm => 'Are you sure? This action cannot be undone!' %>
-
-
-
-
-
-
-
Editing <%= @content.name %>
- <%= form_for @content,
- :url => location_edit_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
- <% end %>
-
-
-
+<% end %>
\ No newline at end of file
diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
index b7b23c9b..edff6a87 100644
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -1,36 +1,4 @@
-<%- model_class = @content.class -%>
+
You've created <%= @content.count %> locations
+<%= render partial: 'content/list/list', locals: { content_list: @content } %>
-
-
-<% if @content.length > 0 %>
-
-
-
- Your locations
- <% if false and Universe.where(user_id: session[:user]).length > 0 %>
- from <%= render 'universes/picker' %>
- <% end %>
-
-
-
-
-<%= render 'list' %>
-<% end %>
-
-
-
-
Planning locations
-
-
- Worldbuilding should never be neglected; keep track of where your characters are, where they have been, and where they are going.
-
-
-
-
-
-
-
+<%= link_to 'Create another location', location_create_path, :class => 'btn' %>
diff --git a/app/views/locations/new.html.erb b/app/views/locations/new.html.erb
index 8a2ee3f7..2abb3000 100644
--- a/app/views/locations/new.html.erb
+++ b/app/views/locations/new.html.erb
@@ -1,30 +1,5 @@
-<%- model_class = @content.class -%>
-
-
-
-
-
New location
- <%= render :partial => 'tabs' %>
-
-
-
-
-
- <%= form_for @content,
- :url => location_create_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
-
- <% end %>
-
-
-
-
-
\ No newline at end of file
+
Create a new location
+<%= form_for @content, :url => location_create_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb
index bace461b..ed58f3d5 100644
--- a/app/views/locations/show.html.erb
+++ b/app/views/locations/show.html.erb
@@ -1,86 +1,3 @@
-<% @location = @content %>
-<%- model_class = @location.class -%>
+<%= render partial: 'content/show', locals: { content: @content } %>
-
-
-
- <%= render :partial => 'tabs' %>
-
-
-
-
-
-
- <%= @location.name %>
-
-
-
-
-
- <%= print_property("Name", @location.name, "") %>
- <%= print_property("Type of", @location.type_of, "") %>
- <%= print_property("Description", @location.description, "") %>
- <%= print_property("Universe", @location.universe ? @location.universe.name : "", "universe") %>
-
-
-
- <% if false && @location.map and @location.map.url(:original) %>
- <%= image_tag @location.map.url(:original) %>
- <% end %>
-
-
-
- <%= print_property("Population", @location.population, "") %>
- <%= print_property("Language", @location.language, "language") %>
- <%= print_property("Currency", @location.currency, "") %>
- <%= print_property("Motto", @location.motto, "") %>
-
-
-
- <%= print_property("Capital", @location.capital, "location") %>
- <%= print_property("Largest city", @location.largest_city, "location") %>
- <%= print_property("Notable cities", @location.notable_cities, "location") %>
-
-
-
- <%= print_property("Area", @location.area, "") %>
- <%= print_property("Crops", @location.crops, "equipment") %>
- <%= print_property("Located", @location.located_at, "location") %>
-
-
-
- <%= print_property("Established in", @location.established_year, "") %>
- <%= print_property("Notable wars", @location.notable_wars, "") %>
-
-
-
- <%= print_property("Notes", @location.notes, "") %>
- <% if session[:user] and session[:user] == @location.user.id %>
- <%= print_property("Private notes", @location.private_notes, "") %>
- <% end %>
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+<%= link_to 'Edit this location', edit_location_path(@content), class: 'btn' %>
\ No newline at end of file
diff --git a/app/views/magic/_edit_form.html.erb b/app/views/magic/_edit_form.html.erb
deleted file mode 100644
index 2c6dba18..00000000
--- a/app/views/magic/_edit_form.html.erb
+++ /dev/null
@@ -1,119 +0,0 @@
-<%= form_for @magic, :url => magic_edit_process_path, :html => { :class => 'form-horizontal' } do |f| %>
-
-
- <%= f.label :name, :class => 'control-label' %>
-
- <%= f.text_field :name, :class => 'text_field' %>
-
-
-
- <%= f.label :type_of_magic, :class => 'control-label' %>
-
- <%= f.text_field :type_of, :class => 'text_field', :value => (params[:type_of] || @magic.type_of || "").capitalize %>
- For example: Spell, Ability, Enchantment, etc
-
-
-
- <%= f.label :universe, :class => 'control-label' %>
-
- <%= f.text_field :universe, :class => 'text_field', :value => @magic.universe ? @magic.universe.name : "" %>
- <%= universe_picker %>
-
-
-
-
-
-
- <%= f.label 'Manifestation', :class => 'control-label' %>
-
- <%= f.text_area :manifestation, :class => 'text_area', :rows => 12, :style => "width: 80%;" %>
-
-
-
- <%= f.label 'Symptoms', :class => 'control-label' %>
-
- <%= f.text_area :symptoms, :class => 'text_area', :rows => 12, :style => "width: 80%;" %>
-
-
-
-
-
-
- <%= f.label 'Element', :class => 'control-label' %>
-
- <%= f.text_field :element, :class => 'text_field' %>
-
-
-
- <%= f.label 'Deity', :class => 'control-label' %>
-
- <%= f.text_field :diety, :class => 'text_field' %>
-
-
-
-
-
-
- <%= f.label 'Harmful effects', :class => 'control-label' %>
-
- <%= f.text_area :harmfulness, :class => 'text_area', :rows => 3 %>
-
-
-
- <%= f.label 'Helpful effects', :class => 'control-label' %>
-
- <%= f.text_area :helpfulness, :class => 'text_area', :rows => 3 %>
-
-
-
- <%= f.label 'Neutral effects', :class => 'control-label' %>
-
- <%= f.text_area :neutralness, :class => 'text_area', :rows => 3 %>
-
-
-
-
-
-
- <%= f.label 'Resource cost', :class => 'control-label' %>
-
- <%= f.text_field :resource, :class => 'text_field' %>
-
-
-
- <%= f.label 'Skill required', :class => 'control-label' %>
-
- <%= f.text_field :skill_level, :class => 'text_field' %>
-
-
-
- <%= f.label 'Limitations', :class => 'control-label' %>
-
- <%= f.text_field :limitations, :class => 'text_field' %>
-
What can't this magic do?
-
-
-
-
-
-
-
- <%= f.label 'Notes', :class => 'control-label' %>
-
- <%= f.text_area :notes, :class => 'text_area', :rows => 10, :style => "width: 80%;" %>
-
-
-
- <%= f.label 'Private notes', :class => 'control-label' %>
-
- <%= f.text_area :private_notes, :class => 'text_area', :rows => 8, :style => "width: 80%;" %>
-
-
-
-
-
- <%= f.submit nil, :class => 'btn btn-primary' %>
- <%= link_to t('.cancel', :default => t("helpers.links.cancel")),
- magic_list_path, :class => 'btn' %>
-
-<% end %>
diff --git a/app/views/magic/_form.html.erb b/app/views/magic/_form.html.erb
deleted file mode 100644
index 56125e0c..00000000
--- a/app/views/magic/_form.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-
- <%= generate_form_row_for(f, :name) %>
- <%= generate_form_row_for(f, :type_of, 'Type of magic') %>
- <%= generate_form_row_for(f, :universe, nil, [{:action => 'universe_picker', :icon => 'globe'}]) %>
-
-
-
- <%= generate_form_row_for(f, :manifestation) %>
- <%= generate_form_row_for(f, :symptoms) %>
-
-
-
- <%= generate_form_row_for(f, :element) %>
- <%= generate_form_row_for(f, :diety) %>
-
-
-
- <%= generate_form_row_for(f, :harmfulness) %>
- <%= generate_form_row_for(f, :helpfulness) %>
- <%= generate_form_row_for(f, :neutralness) %>
-
-
-
- <%= generate_form_row_for(f, :resource, 'Resource cost') %>
- <%= generate_form_row_for(f, :skill_level, 'Skill required') %>
- <%= generate_form_row_for(f, :limitations) %>
-
-
-
-
- <%= f.label 'Notes', :class => 'control-label' %>
-
- <%= f.text_area :notes, :class => 'text_area', :rows => 10, :style => "width: 80%;" %>
-
-
-
- <%= f.label 'Private notes', :class => 'control-label' %>
-
- <%= f.text_area :private_notes, :class => 'text_area', :rows => 8, :style => "width: 80%;" %>
-
-
-
diff --git a/app/views/magic/_list.html.erb b/app/views/magic/_list.html.erb
deleted file mode 100644
index d5c13fdf..00000000
--- a/app/views/magic/_list.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- Name
- Type
- <% if session[:user] %>
- <%=t '.actions', :default => t("helpers.actions") %>
- <% end %>
-
-
-
- <% @content.each do |magic| %>
-
- <%= simple_format link_to magic.name, magic %>
- <%= simple_format magic.type_of %>
-
- <% if session[:user] and session[:user] == magic.user.id %>
- <%= link_to t('.view', :default => t("helpers.links.view")),
- magic_path(magic), :class => 'btn' %>
- <%= link_to t('.edit', :default => t("helpers.links.edit")),
- magic_edit_path(magic), :class => 'btn' %>
- <% end %>
-
-
- <% end %>
-
-
-
diff --git a/app/views/magic/_tabs.html.erb b/app/views/magic/_tabs.html.erb
deleted file mode 100644
index 6f1bc165..00000000
--- a/app/views/magic/_tabs.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-
- <%= link_to "General", "#", :id => "show_general" %>
- <%= link_to "Appearance", "#", :id => "show_appearance" %>
- <%= link_to "Alignment", "#", :id => "show_alignment" %>
- <%= link_to "Effects", "#", :id => "show_effects" %>
- <%= link_to "Requirements", "#", :id => "show_requirements" %>
- <%= link_to "Notes", "#", :id => "show_notes" %>
-
-
diff --git a/app/views/magic/edit.html.erb b/app/views/magic/edit.html.erb
deleted file mode 100644
index caec2e25..00000000
--- a/app/views/magic/edit.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%- model_class = @content.class -%>
-
-
-
-
-
Facets
- <%= render :partial => 'tabs' %>
-
-
-
-
Danger-zone
-
- <%= link_to 'Delete magic forever', magic_path,
- :class => 'btn btn-danger',
- :method => :delete,
- :confirm => 'Are you sure? This action cannot be undone!' %>
-
-
-
-
-
-
-
Editing <%= @content.name %>
- <%= form_for @content,
- :url => magic_edit_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
- <% end %>
-
-
-
diff --git a/app/views/magic/index.html.erb b/app/views/magic/index.html.erb
deleted file mode 100644
index 120be60b..00000000
--- a/app/views/magic/index.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%- model_class = @content.class -%>
-<% if @content.length > 0 %>
-
-
- Magic
- <% if false and Universe.where(user_id: session[:user]).length > 0 %>
- from <%= render 'universes/picker' %>
- <% end %>
-
-
- <%= render 'list', locals: { content: @content } %>
-
-<% end %>
-
-
-
Planning magic
-
-
- Magic, the most wonderous thing! How does it work?
-
- <%= link_to 'New magic', magic_create_path, :class => 'btn btn-primary' %>
- <%= link_to 'New spell', magic_create_type_path(:spell), :class => 'btn' %>
- <%= link_to 'New enchantment', magic_create_type_path(:enchantment), :class => 'btn' %>
- <%= link_to 'New curse', magic_create_type_path(:curse), :class => 'btn' %>
- <%= link_to 'New potion', magic_create_type_path(:potion), :class => 'btn' %>
-
-
-
diff --git a/app/views/magic/new.html.erb b/app/views/magic/new.html.erb
deleted file mode 100644
index ff384f75..00000000
--- a/app/views/magic/new.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
New magic
- <%= render :partial => 'tabs' %>
-
-
-
-
-
- <%= form_for @content,
- :url => magic_create_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
-
- <% end %>
-
-
-
\ No newline at end of file
diff --git a/app/views/magic/show.html.erb b/app/views/magic/show.html.erb
deleted file mode 100644
index 0759fa8e..00000000
--- a/app/views/magic/show.html.erb
+++ /dev/null
@@ -1,69 +0,0 @@
-<%- model_class = @content.class -%>
-<% @magic = @content %>
-
-
-
-
- <%= render :partial => 'tabs' %>
-
-
-
-
-
-
- <%= @magic.name %>
-
-
-
-
- <%= print_property("Name", @magic.name, "") %>
- <%= print_property("Type of", @magic.type_of, "") %>
- <%= print_property("Universe", @magic.universe ? @magic.universe.name : "", "universe") %>
-
-
-
- <%= print_property("Manifestation", @magic.manifestation, "") %>
- <%= print_property("Symptoms", @magic.symptoms, "") %>
-
-
-
- <%= print_property("Element", @magic.element, "") %>
- <%= print_property("Deity", @magic.diety, "character") %>
-
-
-
- <%= print_property("Harmful effects", @magic.harmfulness, "") %>
- <%= print_property("Helpful effects", @magic.helpfulness, "") %>
- <%= print_property("Neutral effects", @magic.neutralness, "") %>
-
-
-
- <%= print_property("Resource cost", @magic.resource, "") %>
- <%= print_property("Skill required", @magic.skill_level, "") %>
- <%= print_property("Limitations", @magic.limitations, "") %>
-
-
-
- <%= print_property("Notes", @magic.notes, "") %>
- <% if session[:user] and session[:user] == @magic.user.id %>
- <%= print_property("Private notes", @magic.private_notes, "") %>
- <% end %>
-
-
-
-
-
-
-
-
diff --git a/app/views/main/_dashboard_intro.html.erb b/app/views/main/_dashboard_intro.html.erb
deleted file mode 100644
index 2a2846d4..00000000
--- a/app/views/main/_dashboard_intro.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
This is is your dashboard
-
-
- As you plan your stories, you can always return back here to get a view of everything
- you've created at a glance. To get back here from anywhere, simply click the
- Indent logo up top, or the
-
- Good luck and have fun!
-
-
-
-
-
-
-
-
-
Ready to get started?
-
-
- Welcome to Indent. Before you get started, it's recommended that you
- <%= link_to "create a universe", :universe_create %>.
-
-
- This universe will contain
- everything you create about your world, and is a handy way to keep multiple worlds
- cleanly separated during the planning process.
-
-
-
-
-
-
-
diff --git a/app/views/main/_quote_card.html.erb b/app/views/main/_quote_card.html.erb
deleted file mode 100644
index f1bae6ff..00000000
--- a/app/views/main/_quote_card.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<% quote = t(:quotes).sample %>
-
-
-
- <%= quote["text"] %>
-
- <%= quote["author"] %>,
- ">
- <%= quote["source"] %>
-
-
-
-
diff --git a/app/views/main/anoninfo.html.erb b/app/views/main/anoninfo.html.erb
deleted file mode 100644
index bd4ba0ed..00000000
--- a/app/views/main/anoninfo.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
What are "Anonymous" accounts?
-
-
- Nobody likes having to create an account before being able to check out something cool.
-
-
-
- So you don't need an account. If you're just browsing or deciding whether or not it's worth creating an account, you can simply log in with the big, blue Be Anonymous button.
-
-
-
- Clicking the button will generate a random account and automatically log you in, letting you jump right in to planning your stories. Everything acts exactly as it would if you were logged in to a "real" account, except with one caveat:
-
-
-
- If you log out or close your browser without setting a username and password for yourself , your account will be deleted. To keep all of your content, all you have to do is visit this page and type in the login information you want to use – it's that easy. All of your content will be saved and you can log in to your account with that username in the future.
-
-
-
-
-
-
- <%= render 'quote_card' %>
-
diff --git a/app/views/main/dashboard.html.erb b/app/views/main/dashboard.html.erb
index 6ef46cdf..01d94ade 100644
--- a/app/views/main/dashboard.html.erb
+++ b/app/views/main/dashboard.html.erb
@@ -1,35 +1,194 @@
-<% if @things > 0 %>
-
-
-
- You've created a total of <%= @things %> <%= "thing".pluralize(@things) %>!
-
-
-
-
- Keep it up!
-
+
+
+
+
+ <%= image_tag 'card-headers/universes.jpg', class: 'activator', style: 'height: 390px' %>
+
+
+
+ You've created <%= current_user.universes.count %> universes
+ <%= link_to universe_list_path, class: 'black-text' do %>
+ zoom_out_map
+ <% end %>
+ arrow_upward
+
+
Create another
+
+
+
+ Universes
+ close
+
+
+
+ Name
+ Description
+ Created at
+ Last modified
+
+ <% current_user.universes.each do |universe| %>
+
+ <%= link_to universe.name, universe %>
+ <%= universe.description %>
+ <%= universe.created_at.strftime("%m/%d/%Y") %>
+ <%= universe.updated_at.strftime("%m/%d/%Y") %>
+
+ <%= link_to edit_universe_path(universe) do %>
+ edit
+ <% end %>
+
+
+ <% end %>
+
+ <%= link_to 'Create another', universe_create_path, class: 'btn' %>
-
-
-
-
-
-
<%= @characters.length %> <%= link_to "character".pluralize(@characters.length), character_list_path %>
-
<%= @equipment.length %> <%= link_to "piece".pluralize(@equipment.length) + " of equipment", equipment_list_path %>
-
<%= @languages.length %> <%= link_to "language".pluralize(@languages.length), language_list_path %>
-
<%= @locations.length %> <%= link_to "location".pluralize(@locations.length), location_list_path %>
-
<%= @magics.length %> <%= link_to "manifestation".pluralize(@magics.length) + " of magic", magic_list_path %>
-
<%= @universes.length %> <%= link_to "universe".pluralize(@universes.length), universe_list_path %>
-
+
+
+
+ <%= image_tag 'card-headers/characters.jpg', class: 'activator', style: 'height: 390px' %>
+
+
+
+ You've created <%= current_user.characters.count %> characters
+ <%= link_to character_list_path, class: 'black-text' do %>
+ zoom_out_map
+ <% end %>
+ arrow_upward
+
+
Create another
+
+
+
+ Characters
+ close
+
+
+
+ Name
+ Role
+ Created at
+ Last modified
+
+ <% current_user.characters.each do |character| %>
+
+ <%= link_to character.name, character %>
+ <%= character.role %>
+ <%= character.created_at.strftime("%m/%d/%Y") %>
+ <%= character.updated_at.strftime("%m/%d/%Y") %>
+
+ <%= link_to edit_character_path(character) do %>
+ edit
+ <% end %>
+
+
+ <% end %>
+
+ <%= link_to 'Create another', character_create_path, class: 'btn' %>
-
-<% else %>
- <%= render 'dashboard_intro' %>
-<% end %>
+
+
+
+ <%= image_tag 'card-headers/locations.jpg', class: 'activator', style: 'height: 390px' %>
+
+
+
+ You've created <%= current_user.locations.count %> locations
+ <%= link_to location_list_path, class: 'black-text' do %>
+ zoom_out_map
+ <% end %>
+ arrow_upward
+
+
<%= link_to 'Create another', location_create_path %>
+
+
+
+ Locations
+ close
+
+
+
+ Name
+ Description
+ Type
+ Created at
+ Last modified
+
+ <% current_user.locations.each do |location| %>
+
+ <%= link_to location.name, location %>
+ <%= location.description %>
+ <%= location.type_of %>
+ <%= location.created_at.strftime("%m/%d/%Y") %>
+ <%= location.updated_at.strftime("%m/%d/%Y") %>
+
+ <%= link_to edit_location_path(location) do %>
+ edit
+ <% end %>
+
+
+ <% end %>
+
+ <%= link_to 'Create another', location_create_path, class: 'btn' %>
+
+
+
+
+
+
+
+ <%= image_tag 'card-headers/items.jpg', class: 'activator', style: 'height: 390px' %>
+
+
+
+ You've created <%= current_user.items.count %> items
+ <%= link_to item_list_path, class: 'black-text' do %>
+ zoom_out_map
+ <% end %>
+ arrow_upward
+
+
<%= link_to 'Create another', item_create_path %>
+
+
+
+ Items
+ close
+
+
+
+ Name
+ Description
+ Type
+ Created at
+ Last modified
+
+ <% current_user.items.each do |item| %>
+
+ <%= link_to item.name, item %>
+ <%= item.description %>
+ <%= item.item_type %>
+ <%= item.created_at.strftime("%m/%d/%Y") %>
+ <%= item.updated_at.strftime("%m/%d/%Y") %>
+
+ <%= link_to edit_item_path(item) do %>
+ edit
+ <% end %>
+
+
+ <% end %>
+
+ <%= link_to 'Create another', item_create_path, class: 'btn' %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index e13d530f..51181999 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -1,129 +1,22 @@
-
-
-
+
-
-
- Indent before you write
-
-
- Indent is a set of tools for writers, game designers, and roleplayers to create magnificent universes – and everything within them.
-
+
+ <%= image_tag 'card-headers/hero.jpg', width: '100%' %>
+ Your digital notebook is here.
+
+
+
+ Notebook is a set of tools for writers, game designers, and roleplayers to create magnificent universes – and everything within them.
+
From a simple interface in your browser, on your phone, or on your tablet, you can do everything you'd ever want to do while creating your own little (or big!) world.
-
- Ready?
-
-
-
-
-
-
-
- <%= image_tag "card-headers/hero.jpg", :style => "width: 100%;" %>
-
-
-
-
-
-
-
-
-
Characters
- <%= image_tag "card-headers/characters.jpg" %>
-
-
- Plan physical appearance, behaviorisms, social roles, family – even a favorite color!
-
-
-
-
-
-
-
-
-
Equipment
- <%= image_tag "card-headers/equipment.jpg" %>
-
-
- Every weapon was made by someone. Keep track of every aspect of your equipment.
-
-
-
-
-
-
-
-
-
Locations
- <%= image_tag "card-headers/locations.jpg" %>
-
-
- Upload maps, link areas, track demographics, and keep track of history.
-
-
-
-
-
-
-
-
-
Magic
- <%= image_tag "card-headers/magic.jpg" %>
-
-
- Whether it's fireballs or potions or nature or voodoo, craft every facet to how it works.
-
-
-
-
-
-
-
-
-
Languages
- <%= image_tag "card-headers/languages.jpg" %>
-
-
- English doesn't have to be the only language in your world. Everything is fair game.
-
-
-
-
-
-
-
Universes
- <%= image_tag "card-headers/universes.jpg" %>
-
-
- You know you've always wanted to create an entire universe . Now's your chance!
-
-
-
-
diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb
index e2027006..a573afe5 100644
--- a/app/views/sessions/_form.html.erb
+++ b/app/views/sessions/_form.html.erb
@@ -17,7 +17,7 @@
<% end %>
diff --git a/app/views/universes/_form.html.erb b/app/views/universes/_form.html.erb
deleted file mode 100644
index ff81addd..00000000
--- a/app/views/universes/_form.html.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
- <%= f.label :name, :class => 'control-label' %>
-
- <%= f.text_field :name, :class => 'text_field' %>
- Can't think of a name? Name it after your story!
-
-
-
- <%= f.label :description, :class => 'control-label' %>
-
- <%= f.text_area :description, :class => 'text_area', :rows => 4, :style => "width: 80%;" %>
-
-
-
-
-
-
-
- <%= f.label 'Relevant history', :class => 'control-label' %>
-
- <%= f.text_area :history, :class => 'text_area', :rows => 6, :style => "width: 80%;" %>
-
-
-
-
-
-
-
- <%= f.label 'Notes', :class => 'control-label' %>
-
- <%= f.text_area :notes, :class => 'text_area', :rows => 10, :style => "width: 80%;" %>
-
-
-
- <%= f.label 'Private Notes', :class => 'control-label' %>
-
- <%= f.text_area :private_notes, :class => 'text_area', :rows => 8, :style => "width: 80%;" %>
-
- By default, all content is private and only accessible by you. Even if you decide to make something
-
-
-
-
-
-
- <%= f.label :privacy, :class => 'control-label' %>
-
- <%= f.select :privacy, [['Private', 'Private'], ['Public', 'Public']] %>
-
- By default, all universes are private , which means only you
- can see them. If you choose to make your
- universe public , all content within it (characters,
- locations, etc) will be visible to anyone on the Internet, regardless of that
- content's individual privacy setting. Even if a universe is marked public, only
- you will have access to edit its contents.
-
-
-
-
diff --git a/app/views/universes/_tabs.html.erb b/app/views/universes/_tabs.html.erb
deleted file mode 100644
index 97cbb90d..00000000
--- a/app/views/universes/_tabs.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-
- <%= link_to "General", "#", :id => "show_general" %>
- <%= link_to "History", "#", :id => "show_history" %>
- <%= link_to "Notes", "#", :id => "show_notes" %>
- <%= link_to "Settings", "#", :id => "show_settings" %>
-
-
diff --git a/app/views/universes/edit.html.erb b/app/views/universes/edit.html.erb
index fb575366..27bceb05 100644
--- a/app/views/universes/edit.html.erb
+++ b/app/views/universes/edit.html.erb
@@ -1,37 +1,9 @@
-<%- model_class = @content.class -%>
-
-
-
-
-
Facets
- <%= render :partial => 'tabs' %>
-
-
-
-
Danger-zone
-
- <%= link_to 'Delete universe forever', universe_path,
- :class => 'btn btn-danger',
+
Editing a universe
+<%= form_for @content, :url => universe_edit_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+ <%= link_to "Delete #{@content.class.to_s} forever", @content,
+ :class => 'red btn right',
:method => :delete,
:confirm => 'Are you sure? This action cannot be undone!' %>
-
-
-
-
-
-
-
Editing <%= @content.name %>
- <%= form_for @content,
- :url => universe_edit_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
- <% end %>
-
-
-
+<% end %>
\ No newline at end of file
diff --git a/app/views/universes/index.html.erb b/app/views/universes/index.html.erb
index a9231b54..74955f61 100644
--- a/app/views/universes/index.html.erb
+++ b/app/views/universes/index.html.erb
@@ -1,41 +1,4 @@
-<%- model_class = @content.class -%>
-
-
-
- <% if @content.length > 0 %>
- <% @content.each do |universe| %>
-
-
-
- <% if universe.privacy and universe.privacy.downcase == "public" %>
-
-
-
<%= simple_format truncate(universe.description, length: 256) %>
-
-
-
-
- <% end %>
- <% end %>
-
-
-
-
What is a universe?
-
-
- Literally, a universe . The universe your character exists in. The universe their friends, family, and foes exist in. The universe that contains their hometown, their country, their planet – everything that exists in their world. Sticking it all in a universe keeps it separate from other universes that other stories might be happening in.
-
-
-
-
-
-
+
You've created <%= @content.count %> universes
+<%= render partial: 'content/list/list', locals: { content_list: @content } %>
+<%= link_to 'Create another universe', universe_create_path, :class => 'btn' %>
\ No newline at end of file
diff --git a/app/views/universes/new.html.erb b/app/views/universes/new.html.erb
index 79c60b66..849cc04e 100644
--- a/app/views/universes/new.html.erb
+++ b/app/views/universes/new.html.erb
@@ -1,29 +1,5 @@
-
-
-
-
-
New universe
- <%= render :partial => 'tabs' %>
-
-
-
-
-
- <%= form_for @content,
- :url => universe_create_process_path,
- :html => { :class => 'form-horizontal' } do |form| %>
-
-
- <%= render :partial => 'form', :locals => { :f => form } %>
-
-
-
- <% end %>
-
-
-
-
-
\ No newline at end of file
+
Create a new universe
+<%= form_for @content, :url => universe_create_process_path do |form| %>
+ <%= render partial: 'content/form', locals: { f: form, content: @content } %>
+ <%= form.submit nil, :class => 'btn btn-primary' %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/universes/show.html.erb b/app/views/universes/show.html.erb
index 172148da..cd652d1c 100644
--- a/app/views/universes/show.html.erb
+++ b/app/views/universes/show.html.erb
@@ -1,140 +1,3 @@
-<% @universe = @content %>
-<%- model_class = @universe.class -%>
+<%= render partial: 'content/show', locals: { content: @content } %>
-
-
-
- <%= render :partial => 'tabs' %>
-
-
-
-
-
-
- <% if @universe.privacy and @universe.privacy.downcase == "public" %>
- by <%= @universe.user.name %>
-
-
-
-
-
- <%= print_property("Name", @universe.name, "") %>
- <%= print_property("Description", @universe.description, "") %>
-
-
-
- <%= print_property("History", @universe.history, "") %>
-
-
-
- <%= print_property("Notes", @universe.notes, "") %>
- <% if session[:user] and session[:user] == @universe.user.id %>
- <%= print_property("Private notes", @universe.private_notes, "") %>
- <% end %>
-
-
-
- <%= print_property("Privacy", @universe.privacy, "") %>
-
-
-
-
-
-
-
-
-
-
-<% if @universe.content_count > 0 %>
-
-
-
- In this universe...
-
-
-
-
-
- <% if @universe.characters.length > 0 %>
- <% label = (@universe.characters.length == 1 ? "character" : "characters") %>
- <%= link_to @universe.characters.length.to_s + " " + label, "#", :id => "show_characters" %>
- <% end %>
- <% if @universe.equipment.length > 0 %>
- <%= link_to @universe.equipment.length.to_s + " equipment", "#", :id => "show_equipment" %>
- <% end %>
- <% if @universe.languages.length > 0 %>
- <% label = (@universe.languages.length == 1 ? "language" : "languages") %>
- <%= link_to @universe.languages.length.to_s + " " + label, "#", :id => "show_languages" %>
- <% end %>
- <% if @universe.locations.length > 0 %>
- <% label = (@universe.locations.length == 1 ? "location" : "locations") %>
- <%= link_to @universe.locations.length.to_s + " " + label, "#", :id => "show_locations" %>
- <% end %>
- <% if @universe.magics.length > 0 %>
- <%= link_to @universe.magics.length.to_s + " magic", "#", :id => "show_magic" %>
- <% end %>
-
-
-
-
-
-
-
- <% @characters = @universe.characters %>
- <%= render 'characters/list' %>
-
-
- <% @equipment = @universe.equipment %>
- <%= render 'equipment/list' %>
-
-
- <% @languages = @universe.languages %>
- <%= render 'languages/list' %>
-
-
- <% @locations = @universe.locations %>
- <%= render 'locations/list' %>
-
-
- <% @magics = @universe.magics %>
- <%= render 'magic/list' %>
-
-
-
-
-
-
-
-
-<% end %>
-
-<% u = User.find(session[:user]) if session[:user] %>
-<% if session[:user] and u.content_count == 1 and u.universes.length == 1 %>
-
-
Congratulations, you created your first universe! So... what next?
-
-
- Now that you know the basics of how to create, edit, and view your content, you're free to create anything you want! Personally I typically start with characters , but I know some people enjoy starting with a good map full of locations . Or if magic is more your thing, all power to you!
-
-
- Your universe is empty but ready to be filled with stuff now. You'll find everything you could think to fill it with within the Plan menu at the top of the page!
-
-
- Good luck!
-
-
-
-<% end %>
\ No newline at end of file
+<%= link_to 'Edit this universe', edit_universe_path(@content), class: 'btn' %>
\ No newline at end of file
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 239ba3a0..975b64a7 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -43,7 +43,7 @@
<%= f.submit nil, :class => 'btn btn-primary' %>
- <%= link_to t('.cancel', :default => t("helpers.links.cancel")), homepage_path, :class => 'btn' %>
+ <%= link_to t('.cancel', :default => t("helpers.links.cancel")), root_url, :class => 'btn' %>
<% end %>
diff --git a/config/database.yml b/config/database.yml
index 1c1a37ca..34cd6a6c 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -21,5 +21,4 @@ test:
database: db/test.sqlite3
production:
- <<: *default
- database: db/production.sqlite3
+ url: <%= ENV['DATABASE_URL'] %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index cb6a141c..362f7c58 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -26,6 +26,9 @@ PlanCharacters::Application.configure do
# Do not compress assets
config.assets.compress = false
+ # Devise default url options
+ config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
# DEVELOPMENT S3 settings for Paperclip uploads ON DEVELOPMENT
config.paperclip_defaults = {
storage: :s3,
diff --git a/config/environments/production.rb b/config/environments/production.rb
index c6316329..67f55c6f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -10,7 +10,7 @@ Rails.application.configure do
config.eager_load = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_files = false
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
@@ -62,6 +62,9 @@ Rails.application.configure do
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
+ # Devise default url options
+ config.action_mailer.default_url_options = { host: 'notebook.indentlabs.com', port: 80 }
+
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
diff --git a/config/environments/test.rb b/config/environments/test.rb
index aa5e9f37..f14c6e11 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,7 +8,7 @@ Rails.application.configure do
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
- config.serve_static_assets = true
+ config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'
config.eager_load = false
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 00000000..19252e65
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,265 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+ # The secret key used by Devise. Devise uses this key to generate
+ # random tokens. Changing this key will render invalid all existing
+ # confirmation, reset password and unlock tokens in the database.
+ # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
+ # by default. You can change it below and use your own secret key.
+ config.secret_key = '81af3b7e066c6e98abdc277d2f97b72c179d4b4332c4cf0434f99681d1f81693713e41b58d076e0493c003d12451b2c5953d42ab3f66e9c31d6fa760db0aad0c'
+
+ # ==> Mailer Configuration
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class
+ # with default "from" parameter.
+ config.mailer_sender = 'notebook@indentlabs.com'
+
+ # Configure the class responsible to send e-mails.
+ # config.mailer = 'Devise::Mailer'
+
+ # ==> ORM configuration
+ # Load and configure the ORM. Supports :active_record (default) and
+ # :mongoid (bson_ext recommended) by default. Other ORMs may be
+ # available as additional gems.
+ require 'devise/orm/active_record'
+
+ # ==> Configuration for any authentication mechanism
+ # Configure which keys are used when authenticating a user. The default is
+ # just :email. You can configure it to use [:username, :subdomain], so for
+ # authenticating a user, both parameters are required. Remember that those
+ # parameters are used only when authenticating and not when retrieving from
+ # session. If you need permissions, you should implement that in a before filter.
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [:email]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [:email]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [:email]
+
+ # Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
+ # config.params_authenticatable = true
+
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:database]` will
+ # enable it only for database authentication. The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # config.http_authenticatable = false
+
+ # If 401 status code should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. 'Application' by default.
+ # config.http_authentication_realm = 'Application'
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # particular strategies by setting this option.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing skip: :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
+
+ # ==> Configuration for :database_authenticatable
+ # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+ # using other encryptors, it sets how many times you want the password re-encrypted.
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments. Note that, for bcrypt (the default
+ # encryptor), the cost increases exponentially with the number of stretches (e.g.
+ # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+ config.stretches = Rails.env.test? ? 1 : 10
+
+ # Setup a pepper to generate the encrypted password.
+ # config.pepper = '663d2a93a1c348ef0c540729701ce6767ea5b3f6f68543ddd16549d8dd2f63022af9c7f54c429e5b247566b1b099c1c0d05ac64fdc1c6898dd7495c52b10862d'
+
+ # Send a notification email when the user's password is changed
+ # config.send_password_change_notification = false
+
+ # ==> Configuration for :confirmable
+ # A period that the user is allowed to access the website even without
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming their account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed, new email is stored in
+ # unconfirmed_email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [:email]
+
+ # ==> Configuration for :rememberable
+ # The time the user will be remembered without asking for credentials again.
+ # config.remember_for = 2.weeks
+
+ # Invalidates all the remember me tokens when the user signs out.
+ config.expire_all_remember_me_on_sign_out = true
+
+ # If true, extends the user's remember period when remembered via cookie.
+ # config.extend_remember_period = false
+
+ # Options to be passed to the created cookie. For instance, you can set
+ # secure: true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
+ # ==> Configuration for :validatable
+ # Range for password length.
+ config.password_length = 8..72
+
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+ # ==> Configuration for :timeoutable
+ # The time you want to timeout the user session without activity. After this
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # ==> Configuration for :lockable
+ # Defines which strategy will be used to lock an account.
+ # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+ # :none = No lock strategy. You should handle locking by yourself.
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [:email]
+
+ # Defines which strategy will be used to unlock an account.
+ # :email = Sends an unlock link to the user email
+ # :time = Re-enables login after a certain amount of time (see :unlock_in below)
+ # :both = Enables both strategies
+ # :none = No unlock strategy. You should handle unlocking by yourself.
+ # config.unlock_strategy = :both
+
+ # Number of authentication tries before locking an account if lock_strategy
+ # is failed attempts.
+ # config.maximum_attempts = 20
+
+ # Time interval to unlock the account if :time is enabled as unlock_strategy.
+ # config.unlock_in = 1.hour
+
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = true
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [:email]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 6.hours
+
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ # config.sign_in_after_reset_password = true
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+ # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+ # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+ # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+ # REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
+
+ # ==> Scopes configuration
+ # Turn scoped views on. Before rendering "sessions/new", it will first check for
+ # "users/sessions/new". It's turned off by default because it's slower if you
+ # are using only default views.
+ # config.scoped_views = false
+
+ # Configure the default scope given to Warden. By default it's the first
+ # devise role declared in your routes (usually :user).
+ # config.default_scope = :user
+
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
+
+ # ==> Navigation configuration
+ # Lists the formats that should be treated as navigational. Formats like
+ # :html, should redirect to the sign in page when the user does not have
+ # access, but formats like :xml or :json, should return 401.
+ #
+ # If you have any extra navigational formats, like :iphone or :mobile, you
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ['*/*', :html]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+ # ==> Warden configuration
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
+ #
+ # config.warden do |manager|
+ # manager.intercept_401 = false
+ # manager.default_strategies(scope: :user).unshift :some_external_strategy
+ # end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: '/my_engine'
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 00000000..bd4c3ebc
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,62 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+ devise:
+ confirmations:
+ confirmed: "Your email address has been successfully confirmed."
+ send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+ failure:
+ already_authenticated: "You are already signed in."
+ inactive: "Your account is not activated yet."
+ invalid: "Invalid %{authentication_keys} or password."
+ locked: "Your account is locked."
+ last_attempt: "You have one more attempt before your account is locked."
+ not_found_in_database: "Invalid %{authentication_keys} or password."
+ timeout: "Your session expired. Please sign in again to continue."
+ unauthenticated: "You need to sign in or sign up before continuing."
+ unconfirmed: "You have to confirm your email address before continuing."
+ mailer:
+ confirmation_instructions:
+ subject: "Confirmation instructions"
+ reset_password_instructions:
+ subject: "Reset password instructions"
+ unlock_instructions:
+ subject: "Unlock instructions"
+ password_change:
+ subject: "Password Changed"
+ omniauth_callbacks:
+ failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+ success: "Successfully authenticated from %{kind} account."
+ passwords:
+ no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+ send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ updated: "Your password has been changed successfully. You are now signed in."
+ updated_not_active: "Your password has been changed successfully."
+ registrations:
+ destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+ signed_up: "Welcome! You have signed up successfully."
+ signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+ signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+ signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+ updated: "Your account has been updated successfully."
+ sessions:
+ signed_in: "Signed in successfully."
+ signed_out: "Signed out successfully."
+ already_signed_out: "Signed out successfully."
+ unlocks:
+ send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+ send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+ unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+ errors:
+ messages:
+ already_confirmed: "was already confirmed, please try signing in"
+ confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+ expired: "has expired, please request a new one"
+ not_found: "not found"
+ not_locked: "was not locked"
+ not_saved:
+ one: "1 error prohibited this %{resource} from being saved:"
+ other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index 01cc6c08..cb0e620b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,8 +1,9 @@
PlanCharacters::Application.routes.draw do
+ devise_for :users
# rubocop:disable LineLength
# Main pages
- root to: 'main#index', as: :homepage
+ root to: 'main#index'
# Info pages
scope '/about' do
@@ -22,14 +23,6 @@ PlanCharacters::Application.routes.draw do
post '/login', to: 'sessions#create', as: :login_process
get '/logout', to: 'sessions#destroy', as: :logout
- # Users
- get '/register', to: 'users#new', as: :signup
- post '/register', to: 'users#create', as: :signup_process
- get '/account', to: 'users#edit', as: :account
- patch '/register', to: 'users#update', as: :account_process
- get '/be-anonymous', to: 'users#anonymous', as: :anonymous
- get '/anon-login', to: 'users#anonymous_login', as: :anonymous_login
-
# Planning
scope '/plan' do
# Characters
@@ -38,30 +31,20 @@ PlanCharacters::Application.routes.draw do
get '/character/new', to: 'characters#new', as: :character_create
post '/character/new', to: 'characters#create', as: :character_create_process
get '/character/:id', to: 'characters#show', as: :character
- get '/character/:id/edit', to: 'characters#edit', as: :character_edit
+ get '/character/:id/edit', to: 'characters#edit', as: :edit_character
patch '/character/:id', to: 'characters#update', as: :character_edit_process
delete '/character/:id', to: 'characters#destroy', as: :character_destroy
- # Equipment
- get '/equipment', to: 'equipment#index', as: :equipment_list
- get '/equipment/from/:universe', to: 'equipment#index', as: :equipment_by_universe
- get '/equipment/new', to: 'equipment#new', as: :equipment_create
- get '/equipment/new/:type_of', to: 'equipment#new', as: :equipment_create_type
- post '/equipment/new', to: 'equipment#create', as: :equipment_create_process
- get '/equipment/:id', to: 'equipment#show', as: :equipment
- get '/equipment/:id/edit', to: 'equipment#edit', as: :equipment_edit
- patch '/equipment/:id', to: 'equipment#update', as: :equipment_edit_process
- delete '/equipment/:id', to: 'equipment#destroy', as: :equipment_destroy
-
- # Languages
- get '/languages', to: 'languages#index', as: :language_list
- get '/languages/from/:universe', to: 'languages#index', as: :languages_by_universe
- get '/language/new', to: 'languages#new', as: :language_create
- post '/language/new', to: 'languages#create', as: :language_create_process
- get '/language/:id', to: 'languages#show', as: :language
- get '/language/:id/edit', to: 'languages#edit', as: :language_edit
- patch '/language/:id', to: 'languages#update', as: :language_edit_process
- delete '/language/:id', to: 'languages#destroy', as: :language_destroy
+ # Items
+ get '/items', to: 'items#index', as: :item_list
+ get '/items/from/:universe', to: 'items#index', as: :item_by_universe
+ get '/item/new', to: 'items#new', as: :item_create
+ get '/item/new/:type_of', to: 'items#new', as: :item_create_type
+ post '/item/new', to: 'items#create', as: :item_create_process
+ get '/item/:id', to: 'items#show', as: :item
+ get '/item/:id/edit', to: 'items#edit', as: :edit_item
+ patch '/item/:id', to: 'items#update', as: :item_edit_process
+ delete '/item/:id', to: 'items#destroy', as: :item_destroy
# Locations
get '/locations', to: 'locations#index', as: :location_list
@@ -70,27 +53,16 @@ PlanCharacters::Application.routes.draw do
post '/location/new', to: 'locations#create', as: :location_create_process
get '/location/new/:type_of', to: 'locations#new', as: :location_create_type
get '/location/:id', to: 'locations#show', as: :location
- get '/location/:id/edit', to: 'locations#edit', as: :location_edit
+ get '/location/:id/edit', to: 'locations#edit', as: :edit_location
patch '/location/:id', to: 'locations#update', as: :location_edit_process
delete '/location/:id', to: 'locations#destroy', as: :location_destroy
- # Magic
- get '/magic', to: 'magic#index', as: :magic_list
- get '/magic/from/:universe', to: 'magic#index', as: :magic_by_universe
- get '/magic/new', to: 'magic#new', as: :magic_create
- post '/magic/new', to: 'magic#create', as: :magic_create_process
- get '/magic/new/:type_of', to: 'magic#new', as: :magic_create_type
- get '/magic/:id', to: 'magic#show', as: :magic
- get '/magic/:id/edit', to: 'magic#edit', as: :magic_edit
- patch '/magic/:id', to: 'magic#update', as: :magic_edit_process
- delete '/magic/:id', to: 'magic#destroy', as: :magic_destroy
-
# Universes
get '/universes', to: 'universes#index', as: :universe_list
get '/universe/new', to: 'universes#new', as: :universe_create
post '/universe/new', to: 'universes#create', as: :universe_create_process
get '/universe/:id', to: 'universes#show', as: :universe
- get '/universe/:id/edit', to: 'universes#edit', as: :universe_edit
+ get '/universe/:id/edit', to: 'universes#edit', as: :edit_universe
patch '/universe/:id', to: 'universes#update', as: :universe_edit_process
delete '/universe/:id', to: 'universes#destroy', as: :universe_destroy
diff --git a/config/secrets.yml b/config/secrets.yml
index c2f2dfba..e07acc87 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -19,4 +19,5 @@ test:
# Do not keep production secrets in the repository,
# instead read values from the environment.
production:
+ secret_token: <%= ENV['SECRET_TOKEN'] %>
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/db/migrate/20140713043535_create_models.rb b/db/migrate/20140713043535_create_models.rb
index dcb26156..60f3a3a8 100644
--- a/db/migrate/20140713043535_create_models.rb
+++ b/db/migrate/20140713043535_create_models.rb
@@ -70,10 +70,10 @@ class CreateModels < ActiveRecord::Migration
t.timestamps
end
- create_table :equipment do |t|
+ create_table :items do |t|
# General
t.string :name, null: false
- t.string :equip_type
+ t.string :item_type
# Appearance
t.text :description
@@ -225,7 +225,7 @@ class CreateModels < ActiveRecord::Migration
end
create_table :users do |t|
- t.string :name, unique: true, null: false
+ t.string :name, null: true
t.string :email, unique: true, null: false
t.string :password, null: false
diff --git a/db/migrate/20160405035806_add_devise_to_users.rb b/db/migrate/20160405035806_add_devise_to_users.rb
new file mode 100644
index 00000000..8c1cba49
--- /dev/null
+++ b/db/migrate/20160405035806_add_devise_to_users.rb
@@ -0,0 +1,48 @@
+class AddDeviseToUsers < ActiveRecord::Migration
+ def self.up
+ change_table(:users) do |t|
+ ## Database authenticatable
+ t.string :encrypted_password, null: false, default: ""
+
+ ## Recoverable
+ t.string :reset_password_token
+ t.datetime :reset_password_sent_at
+
+ ## Rememberable
+ t.datetime :remember_created_at
+
+ ## Trackable
+ t.integer :sign_in_count, default: 0, null: false
+ t.datetime :current_sign_in_at
+ t.datetime :last_sign_in_at
+ t.string :current_sign_in_ip
+ t.string :last_sign_in_ip
+
+ ## Confirmable
+ # t.string :confirmation_token
+ # t.datetime :confirmed_at
+ # t.datetime :confirmation_sent_at
+ # t.string :unconfirmed_email # Only if using reconfirmable
+
+ ## Lockable
+ # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+ # t.string :unlock_token # Only if unlock strategy is :email or :both
+ # t.datetime :locked_at
+
+
+ # Uncomment below if timestamps were not included in your original model.
+ # t.timestamps null: false
+ end
+
+ add_index :users, :email, unique: true
+ add_index :users, :reset_password_token, unique: true
+ # add_index :users, :confirmation_token, unique: true
+ # add_index :users, :unlock_token, unique: true
+ end
+
+ def self.down
+ # By default, we don't want to make any assumption about how to roll back a migration when your
+ # model already existed. Please edit below which fields you would like to remove in this migration.
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index dd669321..fd9e1491 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,9 +11,9 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150419134141) do
+ActiveRecord::Schema.define(version: 20160405035806) do
- create_table "characters", force: true do |t|
+ create_table "characters", force: :cascade do |t|
t.string "name", null: false
t.string "role"
t.string "gender"
@@ -57,9 +57,9 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "equipment", force: true do |t|
+ create_table "items", force: :cascade do |t|
t.string "name", null: false
- t.string "equip_type"
+ t.string "item_type"
t.text "description"
t.string "weight"
t.string "original_owner"
@@ -76,7 +76,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "languages", force: true do |t|
+ create_table "languages", force: :cascade do |t|
t.string "name", null: false
t.text "words"
t.string "established_year"
@@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "locations", force: true do |t|
+ create_table "locations", force: :cascade do |t|
t.string "name", null: false
t.string "type_of"
t.text "description"
@@ -118,7 +118,7 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "magics", force: true do |t|
+ create_table "magics", force: :cascade do |t|
t.string "name", null: false
t.string "type_of"
t.text "manifestation"
@@ -139,14 +139,14 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "sessions", force: true do |t|
+ create_table "sessions", force: :cascade do |t|
t.string "username", null: false
t.string "password", null: false
t.datetime "created_at"
t.datetime "updated_at"
end
- create_table "universes", force: true do |t|
+ create_table "universes", force: :cascade do |t|
t.string "name", null: false
t.text "description"
t.text "history"
@@ -158,13 +158,25 @@ ActiveRecord::Schema.define(version: 20150419134141) do
t.datetime "updated_at"
end
- create_table "users", force: true do |t|
- t.string "name", null: false
- t.string "email", null: false
+ create_table "users", force: :cascade do |t|
+ t.string "name"
+ t.string "email", null: false
t.string "old_password"
t.datetime "created_at"
t.datetime "updated_at"
t.string "password_digest"
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
+ t.datetime "reset_password_sent_at"
+ t.datetime "remember_created_at"
+ t.integer "sign_in_count", default: 0, null: false
+ t.datetime "current_sign_in_at"
+ t.datetime "last_sign_in_at"
+ t.string "current_sign_in_ip"
+ t.string "last_sign_in_ip"
end
+ add_index "users", ["email"], name: "index_users_on_email", unique: true
+ add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+
end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d2995625..b5f056de 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -27,7 +27,7 @@ class UsersControllerTest < ActionController::TestCase
email: 'tolkienjr@example.com'
}
end
- assert_redirected_to homepage_path
+ assert_redirected_to root_url
end
test 'can create an anonymous account' do
@@ -42,7 +42,7 @@ class UsersControllerTest < ActionController::TestCase
password: 'Mellon',
email: 'jrr@localhost'
}
- assert_redirected_to homepage_path
+ assert_redirected_to root_url
assert_not_nil assigns(:user)
assert_equal assigns(:user).email, 'jrr@localhost'
end
diff --git a/test/integration/character_stories_test.rb b/test/integration/character_stories_test.rb
index 35afbbe6..d79ac729 100644
--- a/test/integration/character_stories_test.rb
+++ b/test/integration/character_stories_test.rb
@@ -15,7 +15,7 @@ class CharacterStoriesTest < ActionDispatch::IntegrationTest
log_in_as_user
visit character_list_path
click_on 'Edit'
- assert_equal character_edit_path(characters(:frodo)), current_path
+ assert_equal edit_character_path(characters(:frodo)), current_path
end
test 'view button shows character list' do
@@ -29,6 +29,6 @@ class CharacterStoriesTest < ActionDispatch::IntegrationTest
log_in_as_user
visit character_path(characters(:frodo))
click_on 'Edit'
- assert_equal character_edit_path(characters(:frodo)), current_path
+ assert_equal edit_character_path(characters(:frodo)), current_path
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d3b9b276..0a00b361 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -39,7 +39,7 @@ module ActionDispatch
include Capybara::DSL
def register_as(name, email, password)
- visit homepage_path
+ visit root_url
click_on 'Register'
fill_in 'user_name', with: name
fill_in 'user_email', with: email
@@ -48,7 +48,7 @@ module ActionDispatch
end
def log_in_as(user, password)
- visit homepage_path
+ visit root_url
click_on 'Login'
within('#new_session') do
fill_in 'session[username]', with: user
@@ -64,7 +64,7 @@ module ActionDispatch
end
def log_in_as_anon
- visit homepage_path
+ visit root_url
click_on 'Login'
click_on 'Be Anonymous'
click_on 'I understand, create an account for me'
- <% if session[:user] and session[:user] == character.user.id %> - <%= link_to t('.view', :default => t("helpers.links.view")), - character_path(character), :class => 'btn' %> - <%= link_to t('.edit', :default => t("helpers.links.edit")), - character_edit_path(character), :class => 'btn' %> - <% end %> - -
-