diff --git a/app/assets/stylesheets/sidenav.css.scss b/app/assets/stylesheets/sidenav.css.scss
index bcad62d2..1a5c0222 100644
--- a/app/assets/stylesheets/sidenav.css.scss
+++ b/app/assets/stylesheets/sidenav.css.scss
@@ -1,5 +1,35 @@
.sidenav {
- padding-top: 64px;
+ li {
+ display: block;
+ }
+
+ .logo-container {
+ padding: 0 16px;
+ height: 64px;
+ line-height: 64px;
+ font-size: 24px;
+ border-bottom: 1px solid rgba(0,0,0,0.2);
+ box-sizing: content-box;
+ }
+
+ .collapsible .collapsible-header {
+ text-transform: uppercase;
+ height: 64px;
+ line-height: 64px;
+ }
+
+ .collapsible .collapsible-header .chevron {
+ float: right;
+ height: 24px;
+ width: 24px;
+ line-height: 24px;
+ margin: 20px 0 0 0;
+ transition: transform .2s;
+ }
+
+ .collapsible>.active .collapsible-header .chevron {
+ transform: rotate(-90deg);
+ }
.header {
background: #10B6FF;
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
index fb0c00c5..22a6a56f 100644
--- a/app/views/layouts/_navbar.html.erb
+++ b/app/views/layouts/_navbar.html.erb
@@ -1,30 +1,4 @@
-
-
- <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLSe0jnqJlcPJDqwogGere5j8-8F1nSGGYkzbsI-XkOeMnGwLrA/viewform', target: '_new' do %>
- feedback
- Report a problem
- <% end %>
-
-
- <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLScOhSMdDqWqJu9HGPQdmd0R9s90_AcSo0g6_Nc1qNjQIbSaXA/viewform', target: '_new' do %>
- feedback
- Request a feature
- <% end %>
-
-
- <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLScZWEVMgm8hBWIIVj1LPzo0GqflmWUrLQlc4TAYqsaS087oAA/viewform', target: '_new' do %>
- feedback
- Leave feedback
- <% end %>
-
-
-
- <%= link_to main_app.privacy_policy_path do %>
- verified_user
- Privacy policy
- <% end %>
-
-
+
<% if user_signed_in? %>
@@ -64,104 +38,21 @@
-
- <% if current_user %>
-
- <%= link_to current_user do %>
- person
- Creator profile
-
- <% end %>
-
-
-
- <%= link_to main_app.subscription_path do %>
- credit_card
- Account billing
-
- <% end %>
-
-
- <%= link_to main_app.edit_user_registration_path do %>
- settings
- Account settings
-
- <% end %>
-
-
- <% end %>
-
- <%= link_to main_app.prompts_path do %>
- lightbulb_outline
- Worldbuilding prompts
- <% end %>
-
-
- <%= link_to main_app.notebook_export_path do %>
- file_download
- Notebook downloads
- <% end %>
-
-
- <%= link_to main_app.recently_deleted_content_path do %>
- delete
- Recently-deleted pages
- <% end %>
-
-
-
- <%= link_to main_app.destroy_user_session_path do %>
- power_settings_new
- Sign out
- <% end %>
-
-
-
-
- <%= link_to 'Sign in', main_app.new_user_session_path %>
- <%= link_to 'Sign up', main_app.new_user_registration_path %>
-
- <%= link_to 'Report a problem', 'https://docs.google.com/forms/d/e/1FAIpQLSe0jnqJlcPJDqwogGere5j8-8F1nSGGYkzbsI-XkOeMnGwLrA/viewform', target: '_new' %>
- <%= link_to 'Request a feature', 'https://docs.google.com/forms/d/e/1FAIpQLScOhSMdDqWqJu9HGPQdmd0R9s90_AcSo0g6_Nc1qNjQIbSaXA/viewform', target: '_new' %>
- <%= link_to 'Leave feedback', 'https://docs.google.com/forms/d/e/1FAIpQLScZWEVMgm8hBWIIVj1LPzo0GqflmWUrLQlc4TAYqsaS087oAA/viewform', target: '_new' %>
-
- <%= link_to 'Privacy policy', main_app.privacy_policy_path %>
-
-
- <%= link_to 'Notebook.ai', main_app.root_url, class: 'brand-logo center' %>
-
-
- <%= link_to 'https://www.notebook.ai/forum/announcements/remembering-james-brown' do %>
- favorite_border
- <% end %>
-
- <% if user_signed_in? %>
-
-
- help
-
-
-
-
- book
- <%= current_user.name %> ▾
-
-
- <% else %>
+ <% unless user_signed_in? %>
+
<%= link_to 'Sign in', main_app.new_user_session_path %>
<%= link_to 'Sign up', main_app.new_user_registration_path %>
- <% end %>
-
+
+ <% end %>
menu
-
<% if user_signed_in? %>
diff --git a/app/views/layouts/_sidenav.html.erb b/app/views/layouts/_sidenav.html.erb
index 4ac0cade..70925ff5 100644
--- a/app/views/layouts/_sidenav.html.erb
+++ b/app/views/layouts/_sidenav.html.erb
@@ -1,104 +1,200 @@
-
-
-
-
-
-
- <%= link_to root_path do %>
-
- adjust
-
- Your assistant
+
+
+ <%= link_to root_path, class: 'logo-container white-text' do %>
+ Notebook.ai
<% end %>
-
-
- <%= link_to main_app.dashboard_path do %>
-
- dashboard
-
- Home
- <% end %>
-
-
-
- <%= link_to main_app.thredded_path do %>
-
- forum
-
- Discussions
- <% if @unread_threads > 0 || @unread_private_messages > 0 %>
-
- <%= @unread_threads %><%= "/#{@unread_private_messages}" if @unread_private_messages > 0 %>
-
- <% end %>
- <% end %>
-
-
-
-
-
- <%= link_to main_app.documents_path do %>
-
- <%= Document.icon %>
-
- Documents
-
- <%= current_user.documents.count %>
-
- <% end %>
-
-
- <%
- @activated_content_types.each do |content_type|
- %>
- <% content_type_klass = content_type.constantize %>
-
- <%#
- todo define missing colors using the "Custom colors" section article
- https://materializecss.com/waves.html#!
- %>
- <%= link_to main_app.polymorphic_path(content_type_klass), class: "white waves-effect waves-#{content_type_klass.color.split(' ').last}" do %>
-
- <%= content_type_klass.icon %>
-
- <%= content_type.pluralize %>
-
- <%=
- pluralized_name = content_type.downcase.pluralize
- if content_type_klass != Universe && @universe_scope
- @universe_scope.send(pluralized_name).count
- else
- (
- @current_user_content[content_type] || [] +
- current_user.send("contributable_#{pluralized_name}") +
- (content_type_klass == Universe ? [] : content_type_klass.where(universe_id: current_user.universes.pluck(:id)))
- ).uniq.count
- end
- %>
-
- <% end %>
-
- <% end %>
-
-
-
- <%= link_to main_app.customization_content_types_path do %>
- add
- Add more...
- <% end %>
+
+
+
+
+
+
+
+ <%= link_to main_app.dashboard_path, class: 'waves-effect' do %>
+
+ dashboard
+
+ Home
+ <% end %>
+
+
+ <%= link_to main_app.thredded_path, class: 'waves-effect' do %>
+
+ forum
+
+ Discussions
+ <% if @unread_threads > 0 || @unread_private_messages > 0 %>
+
+ <%= @unread_threads %><%= "/#{@unread_private_messages}" if @unread_private_messages > 0 %>
+
+ <% end %>
+ <% end %>
+
+
+
+
+
+
+
+
+ <%
+ @activated_content_types.each do |content_type|
+ %>
+ <% content_type_klass = content_type.constantize %>
+
+ <%#
+ todo define missing colors using the "Custom colors" section article
+ https://materializecss.com/waves.html#!
+ %>
+ <%= link_to main_app.polymorphic_path(content_type_klass), class: "waves-effect waves-#{content_type_klass.color.split(' ').last}" do %>
+
+ <%= content_type_klass.icon %>
+
+ <%= content_type.pluralize %>
+
+ <%=
+ pluralized_name = content_type.downcase.pluralize
+ if content_type_klass != Universe && @universe_scope
+ @universe_scope.send(pluralized_name).count
+ else
+ (
+ @current_user_content[content_type] || [] +
+ current_user.send("contributable_#{pluralized_name}") +
+ (content_type_klass == Universe ? [] : content_type_klass.where(universe_id: current_user.universes.pluck(:id)))
+ ).uniq.count
+ end
+ %>
+
+ <% end %>
+
+ <% end %>
+
+ <%= link_to main_app.customization_content_types_path, class: 'waves-effect' do %>
+ add
+ Add more...
+ <% end %>
+
+
+
+
+
+
+
+
+
+ <%= link_to main_app.documents_path, class: 'waves-effect' do %>
+
+ <%= Document.icon %>
+
+ Documents
+
+ <%= current_user.documents.count %>
+
+ <% end %>
+
+
+ <%= link_to main_app.prompts_path, class: 'waves-effect' do %>
+ lightbulb_outline
+ Prompts
+ <% end %>
+
+
+
+
+
+
+
+
+
+ <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLSe0jnqJlcPJDqwogGere5j8-8F1nSGGYkzbsI-XkOeMnGwLrA/viewform', target: '_new', class: 'waves-effect' do %>
+ feedback
+ Report a problem
+ <% end %>
+
+
+ <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLScOhSMdDqWqJu9HGPQdmd0R9s90_AcSo0g6_Nc1qNjQIbSaXA/viewform', target: '_new', class: 'waves-effect' do %>
+ feedback
+ Request a feature
+ <% end %>
+
+
+ <%= link_to 'https://docs.google.com/forms/d/e/1FAIpQLScZWEVMgm8hBWIIVj1LPzo0GqflmWUrLQlc4TAYqsaS087oAA/viewform', target: '_new', class: 'waves-effect' do %>
+ feedback
+ Leave feedback
+ <% end %>
+
+
+
+ <%= link_to main_app.privacy_policy_path, class: 'waves-effect' do %>
+ verified_user
+ Privacy policy
+ <% end %>
+
+
+
+
+
+
+
+
+
+ <%= link_to current_user, class: 'waves-effect' do %>
+ person
+ Profile
+ <% end %>
+
+
+ <%= link_to main_app.subscription_path, class: 'waves-effect' do %>
+ credit_card
+ Billing
+ <%= current_user.on_premium_plan? ? 'Premium' : 'Starter' %>
+ <% end %>
+
+
+ <%= link_to main_app.notebook_export_path, class: 'waves-effect' do %>
+ file_download
+ Data export
+ <% end %>
+
+
+ <%= link_to main_app.recently_deleted_content_path, class: 'waves-effect' do %>
+ delete
+ Recycle bin
+ <% end %>
+
+
+ <%= link_to main_app.edit_user_registration_path, class: 'waves-effect' do %>
+ settings
+ Settings
+
+ <% end %>
+
+
+
+ <%= link_to main_app.destroy_user_session_path, class: 'waves-effect' do %>
+ power_settings_new
+ Sign out
+ <% end %>
+
+
+
+
+
-
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c8747a1e..30df3199 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,7 +4,8 @@
<%= render 'layouts/common_head' %>
- <%= render 'layouts/navbar' %>
+ <%= render 'layouts/sidenav' %>
+ <%# render 'layouts/navbar' %>
<% if user_signed_in? %>
- <%= render 'layouts/sidenav' %>
<% end %>