Fix url in emails, add frontendURL helper (#19)

Fixes #16

.circleci/config.yml

@@ -53,9 +53,20 @@ jobs:
           name: eslint
           command: yarn run eslint
 
-      - run:
-          name: brakeman
-          command: brakeman
+      # - run:
+      #     name: brakeman
+      #     command: brakeman
+
+      # - run:
+      #     name: Copy files
+      #     command: |
+      #       cp shared/config/database.yml config/database.yml
+      #       cp shared/config/application.yml config/application.yml
+
+      # Run rails tests
+      - type: shell
+        command: |
+          rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
 
       # Store yarn / webpacker cache
       - save_cache:

.eslintrc.js

@@ -25,7 +25,8 @@ module.exports = {
         'allowFirstLine': false
       }
     }],
-    'vue/html-self-closing': false
+    'vue/html-self-closing': 'off',
+    "vue/no-v-html": 'off'
   },
   settings: {
     'import/resolver': {

.rspec

@@ -0,0 +1 @@
+--require spec_helper

Gemfile

@@ -56,13 +56,17 @@ gem 'foreman'
 # static analysis
 gem 'brakeman'
 
+group :development do
+  gem 'web-console'
+  gem 'letter_opener'
+end
+
 group :development, :test do
   gem 'byebug', platform: :mri
-  gem 'letter_opener'
-  gem 'web-console'
   gem 'listen'
   gem 'spring'
   gem 'spring-watcher-listen'
   gem 'seed_dump'
   gem 'rubocop', '~> 0.74.0', require: false
+  gem 'rspec-rails', '~> 3.8'
 end

Gemfile.lock

@@ -172,6 +172,7 @@ GEM
     crass (1.0.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (0.7.0)
@@ -329,6 +330,23 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -456,6 +474,7 @@ DEPENDENCIES
   redis-rack-cache
   responders
   rest-client
+  rspec-rails (~> 3.8)
   rubocop (~> 0.74.0)
   sass-rails (~> 5.0)
   seed_dump

app/controllers/confirmations_controller.rb

@@ -28,6 +28,6 @@ def create_reset_token_link(user)
     user.reset_password_token   = enc
     user.reset_password_sent_at = Time.now.utc
     user.save(validate: false)
-    "/u/auth/password/edit?config=default&redirect_url=&reset_password_token="+raw
+    "/app/auth/password/edit?config=default&redirect_url=&reset_password_token="+raw
   end
 end

app/helpers/frontend_urls_helper.rb

@@ -0,0 +1,6 @@
+module FrontendUrlsHelper
+  def frontend_url(path, **query_params)
+    url_params = query_params.blank? ? "" : "?#{query_params.to_query}"
+    "#{root_url}app/#{path}#{url_params}"
+  end
+end

app/javascript/src/api/auth.js

@@ -7,6 +7,7 @@
 import moment from 'moment';
 import Cookies from 'js-cookie';
 import endPoints from './endPoints';
+import { frontendURL } from '../helper/URLHelper';
 
 export default {
   login(creds) {
@@ -65,7 +66,7 @@ export default {
           if (error.response.status === 401) {
             Cookies.remove('auth_data');
             Cookies.remove('user');
-            window.location = '/login';
+            window.location = frontendURL('login');
           }
           reject(error);
         });
@@ -80,7 +81,7 @@ export default {
         .then(response => {
           Cookies.remove('auth_data');
           Cookies.remove('user');
-          window.location = '/u/login';
+          window.location = frontendURL('login');
           resolve(response);
         })
         .catch(error => {

app/javascript/src/components/buttons/FormSubmitButton.vue

@@ -1,28 +1,43 @@
 <template>
   <button type="submit" :disabled="disabled" :class="computedClass">
-    <i :class="iconClass" class="icon" v-if="!!iconClass"></i>
-    <span>{{buttonText}}</span>
-    <spinner v-if="loading"/>
+    <i v-if="!!iconClass" :class="iconClass" class="icon"></i>
+    <span>{{ buttonText }}</span>
+    <spinner v-if="loading" />
   </button>
 </template>
 
 <script>
 import Spinner from '../Spinner';
 
 export default {
-  props: {
-    disabled: Boolean,
-    loading: Boolean,
-    buttonText: String,
-    buttonClass: String,
-    iconClass: String,
-  },
   components: {
     Spinner,
   },
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    buttonText: {
+      type: String,
+      default: '',
+    },
+    buttonClass: {
+      type: String,
+      default: '',
+    },
+    iconClass: {
+      type: String,
+      default: '',
+    },
+  },
   computed: {
     computedClass() {
-      return `button ${this.buttonClass || ' '}`;
+      return `button nice ${this.buttonClass || ' '}`;
     },
   },
 };

app/javascript/src/components/buttons/ResolveButton.vue

@@ -1,8 +1,13 @@
 <template>
-  <button type="button" v-on:click="toggleStatus" class="button round resolve--button" :class="buttonClass">
-    <i class="icon" :class="buttonIconClass"  v-if="!isLoading"></i>
-    <spinner v-if="isLoading"/>
-   {{ currentStatus }}
+  <button
+    type="button"
+    class="button nice resolve--button"
+    :class="buttonClass"
+    @click="toggleStatus"
+  >
+    <i v-if="!isLoading" class="icon" :class="buttonIconClass"></i>
+    <spinner v-if="isLoading" />
+    {{ currentStatus }}
   </button>
 </template>
 
@@ -13,9 +18,7 @@ import { mapGetters } from 'vuex';
 import Spinner from '../Spinner';
 
 export default {
-  props: [
-    'conversationId',
-  ],
+  props: ['conversationId'],
   data() {
     return {
       isLoading: false,
@@ -50,5 +53,3 @@ export default {
   },
 };
 </script>
-
-

app/javascript/src/components/layout/Sidebar.vue

@@ -1,47 +1,56 @@
 <template>
   <aside class="sidebar animated shrink columns">
     <div class="logo">
-      <router-link to="{ path: '/u/dashboard' }" replace>
-        <img src="~assets/images/woot-logo.svg" alt="Woot-logo"/>
+      <router-link :to="dashboardPath" replace>
+        <img src="~assets/images/woot-logo.svg" alt="Woot-logo" />
       </router-link>
     </div>
 
     <div class="main-nav">
       <transition-group name="menu-list" tag="ul" class="menu vertical">
         <sidebar-item
-          v-for="item in sidebarItems"
+          v-for="item in accessibleMenuItems"
+          :key="item.toState"
           :menu-item="item"
-          :key="item"
-          v-if="showItem(item)"
         />
       </transition-group>
     </div>
     <transition name="fade" mode="out-in">
       <woot-status-bar
+        v-if="shouldShowStatusBox"
         :message="trialMessage"
-        :buttonText="$t('APP_GLOBAL.TRAIL_BUTTON')"
-        :buttonRoute="{ name: 'billing' }"
+        :button-text="$t('APP_GLOBAL.TRAIL_BUTTON')"
+        :button-route="{ name: 'billing' }"
         :type="statusBarClass"
         :show-button="isAdmin()"
-        v-if="shouldShowStatusBox"
       />
     </transition>
     <div class="bottom-nav">
       <transition name="menu-slide">
-        <div class="dropdown-pane top" v-if="showOptionsMenu" v-on-clickaway="showOptions">
+        <div
+          v-if="showOptionsMenu"
+          v-on-clickaway="showOptions"
+          class="dropdown-pane top"
+        >
           <ul class="vertical dropdown menu">
-            <li><a href="#">Help & Support</a></li>
+            <!-- <li><a href="#">Help & Support</a></li> -->
             <li><a href="#" @click.prevent="logout()">Logout</a></li>
           </ul>
         </div>
       </transition>
       <div class="current-user" @click.prevent="showOptions()">
-        <img class="current-user--thumbnail" :src="gravatarUrl()"/>
+        <img class="current-user--thumbnail" :src="gravatarUrl()" />
         <div class="current-user--data">
-          <h3 class="current-user--name">{{ currentUser.name }}</h3>
-          <h5 class="current-user--role">{{ currentUser.role }}</h5>
+          <h3 class="current-user--name">
+            {{ currentUser.name }}
+          </h3>
+          <h5 class="current-user--role">
+            {{ currentUser.role }}
+          </h5>
         </div>
-        <span class="current-user--options icon ion-android-more-vertical"></span>
+        <span
+          class="current-user--options icon ion-android-more-vertical"
+        ></span>
       </div>
       <!-- <router-link class="icon ion-arrow-graph-up-right" tag="span" to="/settings/reports" active-class="active"></router-link> -->
     </div>
@@ -57,17 +66,20 @@ import adminMixin from '../../mixins/isAdmin';
 import Auth from '../../api/auth';
 import SidebarItem from './SidebarItem';
 import WootStatusBar from '../widgets/StatusBar';
-/* eslint-disable no-console */
+import { frontendURL } from '../../helper/URLHelper';
+
 export default {
+  mixins: [clickaway, adminMixin],
   props: {
-    route: String,
+    route: {
+      type: String,
+    },
   },
   data() {
     return {
       showOptionsMenu: false,
     };
   },
-  mixins: [clickaway, adminMixin],
   mounted() {
     // this.$store.dispatch('fetchLabels');
     this.$store.dispatch('fetchInboxes');
@@ -78,22 +90,30 @@ export default {
       daysLeft: 'getTrialLeft',
       subscriptionData: 'getSubscription',
     }),
-    sidebarItems() {
-      // Get Current Route
+    accessibleMenuItems() {
       const currentRoute = this.$store.state.route.name;
       // get all keys in menuGroup
       const groupKey = Object.keys(this.sidebarList);
+
+      let menuItems = [];
       // Iterate over menuGroup to find the correct group
       for (let i = 0; i < groupKey.length; i += 1) {
         const groupItem = this.sidebarList[groupKey[i]];
         // Check if current route is included
         const isRouteIncluded = groupItem.routes.indexOf(currentRoute) > -1;
         if (isRouteIncluded) {
-          return groupItem.menuItems;
+          menuItems = Object.values(groupItem.menuItems);
         }
       }
-      // If not found return empty array
-      return [];
+
+      const { role } = this.currentUser;
+      return menuItems.filter(
+        menuItem =>
+          window.roleWiseRoutes[role].indexOf(menuItem.toStateName) > -1
+      );
+    },
+    dashboardPath() {
+      return frontendURL('dashboard');
     },
     currentUser() {
       return Auth.getCurrentUser();
@@ -102,12 +122,16 @@ export default {
       return `${this.daysLeft} ${this.$t('APP_GLOBAL.TRIAL_MESSAGE')}`;
     },
     shouldShowStatusBox() {
-      return this.subscriptionData.state === 'trial' || this.subscriptionData.state === 'cancelled';
+      return (
+        this.subscriptionData.state === 'trial' ||
+        this.subscriptionData.state === 'cancelled'
+      );
     },
     statusBarClass() {
       if (this.subscriptionData.state === 'trial') {
         return 'warning';
-      } else if (this.subscriptionData.state === 'cancelled') {
+      }
+      if (this.subscriptionData.state === 'cancelled') {
         return 'danger';
       }
       return '';
@@ -122,11 +146,6 @@ export default {
       const hash = md5(this.currentUser.email);
       return `${window.WootConstants.GRAVATAR_URL}${hash}?d=monsterid`;
     },
-    // Show if user has access to the route
-    showItem(item) {
-      const { role } = this.currentUser;
-      return window.roleWiseRoutes[role].indexOf(item.toStateName) > -1;
-    },
     showOptions() {
       this.showOptionsMenu = !this.showOptionsMenu;
     },