more intelligent support for variable root_urls

Author: samuelcolvin

README.md

@@ -23,7 +23,7 @@ Parameters:
 | `element` | `#socket` | The id of the element created |
 | `router_mode` | `hash` | The routing mode when clicking on a tutor's profile. |
 | `mode` | `grid` | Which mode you want to use (explained below) |
-| `url_root` | `\` | The root URL of the page you are using Socket from eg. '/our-tutors/'|
+| `url_root` | `/` | The root URL of the page you are using Socket from eg. '/our-tutors/'|
 
 We use some strings within Socket that you may want to change by passing them as parameters also.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tutorcruncher-socket",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "TutorCruncher socket",
   "author": "Samuel Colvin <[email protected]>",
   "private": false,

src/components/footer.vue

@@ -40,13 +40,14 @@ export default {}
       color: $brand-colour;
       svg {
         opacity: 1;
+        transform: translate(0, 8px);
       }
     }
     svg {
       transition: all .8s ease;
       width: 25px;
       height: 25px;
-      transform: translate(0, 8px);
+      transform: translate(0px, 4px);
       opacity: 0;
       path {
         fill: $hightlight;

src/main.js

@@ -8,7 +8,7 @@ import enquiry_button from './components/enquiry-button'
 import enquiry_modal from './components/enquiry-modal'
 import grid from './components/grid'
 import con_modal from './components/con-modal'
-import {to_markdown, clean} from './utils'
+import {to_markdown, clean, auto_url_root} from './utils'
 
 let dsn = process.env.NODE_ENV === 'production' && 'https://[email protected]/128441'
 Raven.config(dsn, {release: process.env.RELEASE}).addPlugin(RavenVue, Vue).install()
@@ -91,12 +91,16 @@ module.exports = function (public_key, config) {
   }
 
   if (config.url_root === undefined) {
-    config.url_root = window.location.pathname
-  } else if (config.url_root[0] !== '/') {
-    config.url_root = window.location.pathname
+    config.url_root = 'auto'
+  } else if (config.url_root !== 'auto' && config.url_root[0] !== '/') {
+    config.url_root = '/'
     error = 'the "url_root" config parameter should start (and probably end) with a slash "/"'
   }
 
+  if (config.url_root === 'auto') {
+    config.url_root = auto_url_root(window.location.pathname)
+  }
+
   if (config.router_mode === undefined) {
     config.router_mode = 'hash'
   } else if (ROUTER_MODES.indexOf(config.router_mode) === -1) {

src/utils.js

@@ -6,7 +6,7 @@ marked.setOptions({
   smartLists: true,
 })
 
-function to_markdown (t) {
+const to_markdown = (t) => {
   if (t === null || t === undefined) {
     return ''
   } else {
@@ -26,4 +26,12 @@ const clean = (obj) => {
   return new_obj
 }
 
-export { to_markdown, clean }
+const auto_url_root = (path) => {
+  // remove :
+  // * contractor slug
+  // * /enquiry
+  path = path.replace(/\/\d+-[\w-]+$/, '/').replace(/\/enquiry$/, '/')
+  return path
+}
+
+export {to_markdown, clean, auto_url_root}

test/unit/specs/utils.js

@@ -0,0 +1,19 @@
+import {auto_url_root} from 'src/utils'
+
+describe('utils.js.auto_url_root', () => {
+  it('should remove /enquiry', () => {
+    expect(auto_url_root('/foobar/bar/enquiry')).equal('/foobar/bar/')
+  })
+
+  it('should not remove /enquiry/', () => {
+    expect(auto_url_root('/foobar/bar/enquiry/')).equal('/foobar/bar/enquiry/')
+  })
+
+  it('should remove /123-frank-s', () => {
+    expect(auto_url_root('/123-frank-s')).equal('/')
+  })
+
+  it('should not remove /-frank-s', () => {
+    expect(auto_url_root('/-frank-s')).equal('/-frank-s')
+  })
+})