From 261ed4997759e8109c9b73c436f6ed8907ccfeb7 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 20 Oct 2016 01:39:57 +0800 Subject: [PATCH] replace uservoice with docs.metamaps.cc + Hylo (#777) * replace uservoice with docs.metamaps.cc + Hylo * re-add the feedback tab as link to hylo --- .example-env | 1 - Gemfile | 1 - Gemfile.lock | 7 --- README.md | 14 +++-- app/assets/javascripts/lib/uservoice.js | 41 --------------- .../{uservoice.css.erb => feedback.css.erb} | 12 ++--- app/views/layouts/_foot.html.erb | 4 +- app/views/layouts/_lightboxes.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- app/views/shared/_cheatsheet.html.erb | 52 ++++++------------- config/initializers/uservoice.rb | 11 ---- 11 files changed, 31 insertions(+), 116 deletions(-) delete mode 100644 app/assets/javascripts/lib/uservoice.js rename app/assets/stylesheets/{uservoice.css.erb => feedback.css.erb} (63%) delete mode 100644 config/initializers/uservoice.rb diff --git a/.example-env b/.example-env index 51d89c5d..1afb010b 100644 --- a/.example-env +++ b/.example-env @@ -18,7 +18,6 @@ export SECRET_KEY_BASE='267c8a84f63963282f45bc3010eaddf027abfab58fc759d6e239c800 # export S3_BUCKET_NAME # export AWS_ACCESS_KEY_ID # export AWS_SECRET_ACCESS_KEY -# export SSO_KEY # # export SMTP_DOMAIN # export SMTP_PASSWORD diff --git a/Gemfile b/Gemfile index 8fae0328..5f22fdcb 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,6 @@ gem 'rack-cors' gem 'redis' gem 'slack-notifier' gem 'snorlax' -gem 'uservoice-ruby' # asset stuff gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5af227db..519795f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,6 @@ GEM actionmailer (>= 4.0, < 6) activesupport (>= 4.0, < 6) execjs (2.7.0) - ezcrypto (0.7.2) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) @@ -138,7 +137,6 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - oauth (0.5.1) orm_adapter (0.5.0) paperclip (5.1.0) activemodel (>= 4.2.0) @@ -255,10 +253,6 @@ GEM uglifier (3.0.2) execjs (>= 0.3.0, < 3) unicode-display_width (1.1.1) - uservoice-ruby (0.0.11) - ezcrypto (>= 0.7.2) - json (>= 1.7.5) - oauth (>= 0.4.7) warden (1.2.6) rack (>= 1.0) websocket-driver (0.6.4) @@ -307,7 +301,6 @@ DEPENDENCIES snorlax tunemygc uglifier - uservoice-ruby RUBY VERSION ruby 2.3.0p0 diff --git a/README.md b/README.md index 2ffa9708..533e1ef7 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,12 @@ You can find a version of this software running at [metamaps.cc][site-beta], whe Metamaps is created and maintained by a distributed, nomadic community comprised of technologists, artists and storytellers. You can get in touch by using whichever of these channels you prefer: -## Community - -- To send us a personal message or request an invite to the open beta, get in touch with us at team@metamaps.cc or @metamapps on Twitter. +## How do I learn more? + +- To send us a personal message or request an invite to the open beta, get in touch with us via email, Twitter, or Hylo +- User Documentation: [docs.metamaps.cc](https://docs.metamaps.cc) +- User Community: [hylo.com/c/metamaps](https://www.hylo.com/c/metamaps) +- Development Roadmap: [github.com/metamaps/metamaps/milestones](https://github.com/metamaps/metamaps/milestones) - If you would like to report a bug, please check the [issues][contributing-issues] section in our [contributing instructions][contributing]. - If you would like to get set up as a developer, that's great! Read on for help getting your development environment set up. @@ -51,10 +54,6 @@ We haven't set up instructions for using Vagrant on Windows, but there are instr - [For Windows][windows-installation] -## Contributing guidelines - -Cloning this repository directly is primarily for those wishing to contribute to our codebase. Check out our [contributing instructions][contributing] to get involved. - ## Licensing information This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or(at your option) any later version. @@ -65,7 +64,6 @@ The license can be read [here][license]. Copyright (c) 2016 Connor Turland -[site-blog]: http://blog.metamaps.cc [site-beta]: http://metamaps.cc [license]: https://github.com/metamaps/metamaps/blob/develop/LICENSE [contributing]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md diff --git a/app/assets/javascripts/lib/uservoice.js b/app/assets/javascripts/lib/uservoice.js deleted file mode 100644 index 991beff8..00000000 --- a/app/assets/javascripts/lib/uservoice.js +++ /dev/null @@ -1,41 +0,0 @@ -var USERVOICE; -if(USERVOICE == undefined) { - USERVOICE = {}; -} - -USERVOICE.load = function (name, id, email, sso_token) { -// Include the UserVoice JavaScript SDK (only needed once on a page) -UserVoice=window.UserVoice||[];(function(){var uv=document.createElement('script');uv.type='text/javascript';uv.async=true;uv.src='//widget.uservoice.com/wybK0nSMNuhlWkIKzTyWg.js';var s=document.getElementsByTagName('script')[0];s.parentNode.insertBefore(uv,s)})(); - -// -// UserVoice Javascript SDK developer documentation: -// https://www.uservoice.com/o/javascript-sdk -// - -// Set colors -UserVoice.push(['set', { - accent_color: '#448dd6', - trigger_color: 'white', - trigger_background_color: 'rgba(46, 49, 51, 0.6)' -}]); - -// Identify the user and pass traits -// To enable, replace sample data with actual user traits and uncomment the line -if (name) { - UserVoice.push(['setSSO', sso_token]); - UserVoice.push(['identify', { - 'email': email, // User’s email address - 'name': name, // User’s real name - 'id': id, // Optional: Unique id of the user - }]); -} - -// Add default trigger to the bottom-left corner of the window: -UserVoice.push(['addTrigger', { mode: 'contact', trigger_position: 'bottom-left' }]); - -// Or, use your own custom trigger: -//UserVoice.push(['addTrigger', '#barometer_tab', { mode: 'contact' }]); - -// Autoprompt for Satisfaction and SmartVote (only displayed under certain conditions) -UserVoice.push(['autoprompt', {}]); -}; \ No newline at end of file diff --git a/app/assets/stylesheets/uservoice.css.erb b/app/assets/stylesheets/feedback.css.erb similarity index 63% rename from app/assets/stylesheets/uservoice.css.erb rename to app/assets/stylesheets/feedback.css.erb index f633c367..ff5ef545 100644 --- a/app/assets/stylesheets/uservoice.css.erb +++ b/app/assets/stylesheets/feedback.css.erb @@ -1,11 +1,9 @@ -/* =USERVOICE ICON DEFINE ---------------------------------------------------------*/ - -.unauthenticated .uv-icon { +.unauthenticated .feedback-icon { display: none; } -div.uv-icon.uv-bottom-left { +.feedback-icon { + position: fixed; background-image: url(<%= asset_data_uri 'feedback_sprite.png' %>); background-repeat: no-repeat; color:#FFFFFF; @@ -20,6 +18,8 @@ div.uv-icon.uv-bottom-left { opacity: 1; } -div.uv-icon.uv-bottom-left:hover { +.feedback-icon:hover { background-position: 0 -110px; } + + diff --git a/app/views/layouts/_foot.html.erb b/app/views/layouts/_foot.html.erb index dcd7882e..1f5ad1c8 100644 --- a/app/views/layouts/_foot.html.erb +++ b/app/views/layouts/_foot.html.erb @@ -2,12 +2,14 @@ <%= render :partial => 'layouts/templates' %> <%= render :partial => 'shared/metacodeBgColors' %> <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 42c959d6..2e092151 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -74,7 +74,7 @@ Chrome Firefox Safari -

While it's downloading, explore our blog,
watch the tutorials, or visit our knowledge base! +

While it's downloading, explore our blog,
watch the tutorials, or visit our knowledge base! diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 61e8833a..0b66ac85 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@ "> - + <%= content_tag :div, class: "main" do %> diff --git a/app/views/shared/_cheatsheet.html.erb b/app/views/shared/_cheatsheet.html.erb index 78ea8dd3..bb12fd7f 100644 --- a/app/views/shared/_cheatsheet.html.erb +++ b/app/views/shared/_cheatsheet.html.erb @@ -39,7 +39,7 @@

Esc: Hides auto-suggestion results
Enter: create a new topic
Gear Icon: open up metacode settings
-

Learn More
+

Learn More
@@ -71,7 +71,7 @@ Open 'Context Menu': Right-click/alt+click on topic icon or synapse
*Hide/Remove/Delete topic within context menu
-

Learn More
+

Learn More
@@ -83,7 +83,7 @@
Create new Topic with Synapse: Right-click + drag from topic to open canvas
Enter: Create topic
Enter: Create synapse
-

Learn More
+

Learn More
@@ -96,7 +96,7 @@
Browse synapses / change visible synapse click on arrow icon and select desired synapse
Open 'Context Menu': Right-click/alt-click on Synapse
*Hide/Remove/Delete synapse within context menu
-

Learn More
+

Learn More
@@ -104,7 +104,7 @@
Move around Canvas: Click and drag
Zoom in/out: Scroll OR click on
&
Zoom to see all: Click
OR Ctrl + E
-

Learn More
+

Learn More
@@ -153,43 +153,21 @@

For more information about Metamaps.cc, visit our Knowledge Base or skip directly to a section by clicking on one of the categories below.

- Feedback Forums + Hylo User Community
- KNOWLEDGE BASE + KNOWLEDGE BASE
diff --git a/config/initializers/uservoice.rb b/config/initializers/uservoice.rb deleted file mode 100644 index 9375e3a1..00000000 --- a/config/initializers/uservoice.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true -require 'uservoice-ruby' - -def current_sso_token - @current_sso_token ||= UserVoice.generate_sso_token( - 'metamapscc', - ENV['SSO_KEY'], - { email: current_user.email }, - 300 # Default expiry time is 5 minutes = 300 seconds - ) -end