Removed hash from Plugin Store URLs using Vue Router’s history mode.

michaelrog · Nov 24, 2017 · 1f13422 · 1f13422
1 parent c8e4d2c
commit 1f13422
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/config/cproutes/common.php b/src/config/cproutes/common.php
@@ -71,15 +71,6 @@
     'utilities' => 'utilities',
     'utilities/<id:[\w\-]+>' => 'utilities/show-utility',
     'plugin-store' => 'plugin-store',
-    'plugin-store/all-plugins' => 'plugin-store/all-plugins',
-    'plugin-store/categories/<categoryId:\d+>' => 'plugin-store/category',
-    'plugin-store/developer/<developerId:\d+>' => 'plugin-store/developer',
-    'plugin-store/install' => 'pluginstore/install',
-    'plugin-store/cart' => 'plugin-store/cart',
-    'plugin-store/vue' => 'plugin-store/vue',
-    'plugin-store/vue/<slug:([^\/]+)?>' => 'plugin-store/vue-plugin',
-    'plugin-store/account' => 'plugin-store/account',
     'plugin-store/callback' => 'plugin-store/callback',
-    'plugin-store/<slug:([^\/]+)?>' => 'plugin-store/plugin',
-    'plugin-store/<slug:([^\/]+)?>/license' => 'plugin-store/plugin-license',
+    'plugin-store/<url:(.*)>' => 'plugin-store',
 ];
diff --git a/src/controllers/PluginStoreController.php b/src/controllers/PluginStoreController.php
@@ -47,10 +47,13 @@ public function init()
      */
     public function actionIndex()
     {
+        $vueRouterBase = '/'.Craft::$app->getConfig()->getGeneral()->cpTrigger.'/plugin-store/';
+
         Craft::$app->getView()->registerJsFile('https://js.stripe.com/v3/');
         Craft::$app->getView()->registerJs('window.craftApiEndpoint = "'.Craft::$app->getPluginStore()->craftApiEndpoint.'";', View::POS_BEGIN);
         Craft::$app->getView()->registerJs('window.stripeApiKey = "'.Craft::$app->getPluginStore()->stripeApiKey.'";', View::POS_BEGIN);
         Craft::$app->getView()->registerJs('window.enableCraftId = "'.Craft::$app->getPluginStore()->enableCraftId.'";', View::POS_BEGIN);
+        Craft::$app->getView()->registerJs('window.vueRouterBase = "'.$vueRouterBase.'";', View::POS_BEGIN);
         Craft::$app->getView()->registerAssetBundle(PluginStoreAsset::class);
 
         return $this->renderTemplate('plugin-store/_index', [

diff --git a/src/web/assets/pluginstore/dist/js/main.js b/src/web/assets/pluginstore/dist/js/main.js
diff --git a/src/web/assets/pluginstore/src/js/router/index.js b/src/web/assets/pluginstore/src/js/router/index.js
@@ -10,6 +10,8 @@ import Tests from '../Tests';
 Vue.use(Router);
 
 export default new Router({
+    base: window.vueRouterBase,
+    mode: 'history',
     routes: [
         {
             path: '/',