Add setting to manage visibility of vote count, vote button and decide root page (#197)

app/controllers/static_pages_controller.rb

@@ -1,14 +1,19 @@
 class StaticPagesController < ApplicationController
   skip_before_action :load_tenant_data, only: [:showcase, :pending_tenant, :blocked_tenant]
 
-  def roadmap
+  def root
-    @post_statuses = PostStatus
+    @board = Board.find_by(id: Current.tenant.tenant_setting.root_board_id)
-      .find_roadmap
-      .select(:id, :name, :color)
 
-    @posts = Post
+    if @board
-      .find_with_post_status_in(@post_statuses)
+      render 'boards/show'
-      .select(:id, :title, :board_id, :post_status_id, :user_id, :created_at)
+    else
+      get_roadmap_data
+      render 'static_pages/roadmap'
+    end
+  end
+
+  def roadmap
+    get_roadmap_data
   end
 
   def showcase
@@ -20,4 +25,16 @@ class StaticPagesController < ApplicationController
 
   def blocked_tenant
   end
+
+  private
+
+    def get_roadmap_data
+      @post_statuses = PostStatus
+        .find_roadmap
+        .select(:id, :name, :color)
+
+      @posts = Post
+        .find_with_post_status_in(@post_statuses)
+        .select(:id, :title, :board_id, :post_status_id, :user_id, :created_at)
+    end
 end

app/javascript/actions/Tenant/updateTenant.ts

@@ -76,8 +76,6 @@ export const updateTenant = ({
       },
     });
 
-    console.log(body)
-
     const res = await fetch(`/tenants/0`, {
       method: 'PATCH',
       headers: buildRequestHeaders(authenticityToken),

app/javascript/components/Board/BoardP.tsx

@@ -7,6 +7,7 @@ import PostList from './PostList';
 import Sidebar from '../common/Sidebar';
 
 import IBoard from '../../interfaces/IBoard';
+import ITenantSetting from '../../interfaces/ITenantSetting';
 
 import { PostsState } from '../../reducers/postsReducer';
 import { PostStatusesState } from '../../reducers/postStatusesReducer';
@@ -14,6 +15,8 @@ import { PostStatusesState } from '../../reducers/postStatusesReducer';
 interface Props {
   board: IBoard;
   isLoggedIn: boolean;
+  isPowerUser: boolean;
+  tenantSetting: ITenantSetting;
   authenticityToken: string;
   posts: PostsState;
   postStatuses: PostStatusesState;
@@ -63,6 +66,8 @@ class BoardP extends React.Component<Props> {
     const {
       board,
       isLoggedIn,
+      isPowerUser,
+      tenantSetting,
       authenticityToken,
       posts,
       postStatuses,
@@ -97,6 +102,8 @@ class BoardP extends React.Component<Props> {
 
         <PostList
           posts={posts.items}
+          showLikeCount={isPowerUser || tenantSetting.show_vote_count}
+          showLikeButtons={tenantSetting.show_vote_button_in_board}
           postStatuses={postStatuses.items}
           areLoading={posts.areLoading}
           error={posts.error}

app/javascript/components/Board/PostList.tsx

@@ -14,6 +14,8 @@ import IPostStatus from '../../interfaces/IPostStatus';
 
 interface Props {
   posts: Array<IPost>;
+  showLikeCount: boolean;
+  showLikeButtons: boolean;
   postStatuses: Array<IPostStatus>;
   areLoading: boolean;
   error: string;
@@ -27,6 +29,8 @@ interface Props {
 
 const PostList = ({
   posts,
+  showLikeCount,
+  showLikeButtons,
   postStatuses,
   areLoading,
   error,
@@ -53,7 +57,9 @@ const PostList = ({
               title={post.title}
               description={post.description}
               postStatus={postStatuses.find(postStatus => postStatus.id === post.postStatusId)}
-              likesCount={post.likesCount}
+              likeCount={post.likeCount}
+              showLikeCount={showLikeCount}
+              showLikeButtons={showLikeButtons}
               liked={post.liked}
               commentsCount={post.commentsCount}
 

app/javascript/components/Board/PostListItem.tsx

@@ -12,7 +12,9 @@ interface Props {
   title: string;
   description?: string;
   postStatus: IPostStatus;
-  likesCount: number;
+  likeCount: number;
+  showLikeCount: boolean;
+  showLikeButtons: boolean;
   liked: number;
   commentsCount: number;
 
@@ -25,7 +27,9 @@ const PostListItem = ({
   title,
   description,
   postStatus,
-  likesCount,
+  likeCount,
+  showLikeCount,
+  showLikeButtons,
   liked,
   commentsCount,
 
@@ -35,7 +39,9 @@ const PostListItem = ({
   <div onClick={() => window.location.href = `/posts/${id}`} className="postListItem">
     <LikeButton
       postId={id}
-      likesCount={likesCount}
+      likeCount={likeCount}
+      showLikeCount={showLikeCount}
+      showLikeButton={showLikeButtons}
       liked={liked}
       isLoggedIn={isLoggedIn}
       authenticityToken={authenticityToken}

app/javascript/components/Board/index.tsx

@@ -8,10 +8,13 @@ import IBoard from '../../interfaces/IBoard';
 
 import { Store } from 'redux';
 import { State } from '../../reducers/rootReducer';
+import ITenantSetting from '../../interfaces/ITenantSetting';
 
 interface Props {
   board: IBoard;
   isLoggedIn: boolean;
+  isPowerUser: boolean;
+  tenantSetting: ITenantSetting;
   authenticityToken: string;
 }
 
@@ -25,13 +28,21 @@ class BoardRoot extends React.Component<Props> {
   }
 
   render() {
-    const { board, isLoggedIn, authenticityToken } = this.props;
+    const {
+      board,
+      isLoggedIn,
+      isPowerUser,
+      tenantSetting,
+      authenticityToken,
+    } = this.props;
 
     return (
       <Provider store={this.store}>
         <Board
           board={board}
           isLoggedIn={isLoggedIn}
+          isPowerUser={isPowerUser}
+          tenantSetting={tenantSetting}
           authenticityToken={authenticityToken}
         />
       </Provider>

app/javascript/components/LikeButton/LikeButtonP.tsx

@@ -2,7 +2,9 @@ import * as React from 'react';
 
 interface Props {
   postId: number;
-  likesCount: number;
+  likeCount: number;
+  showLikeCount?: boolean;
+  showLikeButton?: boolean;
   liked: number;
   handleLikeSubmit(
     postId: number,
@@ -15,7 +17,9 @@ interface Props {
 
 const LikeButtonP = ({
   postId,
-  likesCount,
+  likeCount,
+  showLikeCount = true,
+  showLikeButton = true,
   liked,
   handleLikeSubmit,
   authenticityToken,
@@ -29,9 +33,10 @@ const LikeButtonP = ({
       else window.location.href = `/users/sign_in`;
       }}
       className={`likeButton${liked ? ' liked' : ''}`}
+      hidden={!showLikeButton}
     >
     </div>
-    <span className="likesCountLabel">{likesCount}</span>
+    { showLikeCount && <span className="likeCountLabel">{likeCount}</span> }
   </div>
 );
 

app/javascript/components/Post/PostBoardSelect.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { getLabel } from '../../helpers/formUtils';
 
 import IBoard from '../../interfaces/IBoard';
 
@@ -25,7 +26,7 @@ const PostBoardSelect = ({
     id="selectPickerBoard"
     className="selectPicker"
   >
-    <optgroup label="Boards">
+    <optgroup label={getLabel('board')}>
       {boards.map((board, i) => (
         <option value={board.id} key={i}>
           {board.name}

app/javascript/components/Post/PostP.tsx

@@ -4,6 +4,7 @@ import ReactMarkdown from 'react-markdown';
 import IPost from '../../interfaces/IPost';
 import IPostStatus from '../../interfaces/IPostStatus';
 import IBoard from '../../interfaces/IBoard';
+import ITenantSetting from '../../interfaces/ITenantSetting';
 
 import PostUpdateList from './PostUpdateList';
 import PostEditForm from './PostEditForm';
@@ -39,6 +40,7 @@ interface Props {
   isPowerUser: boolean;
   currentUserFullName: string;
   currentUserEmail: string;
+  tenantSetting: ITenantSetting;
   authenticityToken: string;
 
   requestPost(postId: number): void;
@@ -148,6 +150,7 @@ class PostP extends React.Component<Props> {
       isLoggedIn,
       isPowerUser,
       currentUserEmail,
+      tenantSetting,
       authenticityToken,
 
       submitFollow,
@@ -176,11 +179,14 @@ class PostP extends React.Component<Props> {
             error={comments.error}
           />
 
-          <LikeList
+          {
-            likes={likes.items}
+            isPowerUser &&
-            areLoading={likes.areLoading}
+              <LikeList
-            error={likes.error}
+                likes={likes.items}
-          />
+                areLoading={likes.areLoading}
+                error={likes.error}
+              />
+          }
 
           <ActionBox
             followed={followed}
@@ -213,7 +219,8 @@ class PostP extends React.Component<Props> {
               <div className="postHeader">
                 <LikeButton
                   postId={post.id}
-                  likesCount={likes.items.length}
+                  likeCount={likes.items.length}
+                  showLikeCount={isPowerUser || tenantSetting.show_vote_count}
                   liked={likes.items.find(like => like.email === currentUserEmail) ? 1 : 0}
                   isLoggedIn={isLoggedIn}
                   authenticityToken={authenticityToken}

app/javascript/components/Post/PostStatusSelect.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import I18n from 'i18n-js';
 
 import IPostStatus from '../../interfaces/IPostStatus';
+import { getLabel } from '../../helpers/formUtils';
 
 const NO_POST_STATUS_VALUE = 'none';
 
@@ -28,16 +29,16 @@ const PostStatusSelect = ({
     id="selectPickerStatus"
     className="selectPicker"
   >
-    <optgroup label="Post statuses">
+    <optgroup label={getLabel('post_status')}>
       {postStatuses.map((postStatus, i) => (
         <option value={postStatus.id} key={i}>
           {postStatus.name}
         </option>
       ))}
     </optgroup>
-    <optgroup label="No post status">
+    <option value={NO_POST_STATUS_VALUE}>
-      <option value={NO_POST_STATUS_VALUE}>{I18n.t('post.post_status_select.no_post_status')}</option>
+      {I18n.t('post.post_status_select.no_post_status')}
-    </optgroup>
+    </option>
   </select>
 );
 

app/javascript/components/Post/index.tsx

@@ -10,6 +10,7 @@ import IPostStatus from '../../interfaces/IPostStatus';
 
 import { Store } from 'redux';
 import { State } from '../../reducers/rootReducer';
+import ITenantSetting from '../../interfaces/ITenantSetting';
 
 interface Props {
   postId: number;
@@ -19,6 +20,7 @@ interface Props {
   isPowerUser: boolean;
   currentUserFullName: string;
   currentUserEmail: string;
+  tenantSetting: ITenantSetting;
   authenticityToken: string;
 }
 
@@ -40,6 +42,7 @@ class PostRoot extends React.Component<Props> {
       isPowerUser,
       currentUserFullName,
       currentUserEmail,
+      tenantSetting,
       authenticityToken
     } = this.props;
 
@@ -54,6 +57,7 @@ class PostRoot extends React.Component<Props> {
           isPowerUser={isPowerUser}
           currentUserFullName={currentUserFullName}
           currentUserEmail={currentUserEmail}
+          tenantSetting={tenantSetting}
           authenticityToken={authenticityToken}
         />
       </Provider>

app/javascript/components/SiteSettings/General/GeneralSiteSettingsP.tsx

@@ -12,18 +12,23 @@ import {
   TENANT_SETTING_BRAND_DISPLAY_LOGO_ONLY,
   TENANT_SETTING_BRAND_DISPLAY_NONE,
 } from '../../../interfaces/ITenantSetting';
-import { DangerText } from '../../common/CustomTexts';
+import { DangerText, SmallMutedText } from '../../common/CustomTexts';
 import { getLabel, getValidationMessage } from '../../../helpers/formUtils';
+import IBoardJSON from '../../../interfaces/json/IBoard';
 
 export interface ISiteSettingsGeneralForm {
   siteName: string;
   siteLogo: string;
   brandDisplaySetting: string;
   locale: string;
+  showVoteCount: boolean;
+  showVoteButtonInBoard: boolean;
+  rootBoardId?: string;
 }
 
 interface Props {
   originForm: ISiteSettingsGeneralForm;
+  boards: IBoardJSON[];
   authenticityToken: string;
 
   areUpdating: boolean;
@@ -34,12 +39,16 @@ interface Props {
     siteLogo: string,
     brandDisplaySetting: string,
     locale: string,
+    rootBoardId: number,
+    showVoteCount: boolean,
+    showVoteButtonInBoard: boolean,
     authenticityToken: string
   ): Promise<any>;
 }
 
 const GeneralSiteSettingsP = ({
   originForm,
+  boards,
   authenticityToken,
 
   areUpdating,
@@ -56,6 +65,9 @@ const GeneralSiteSettingsP = ({
       siteLogo: originForm.siteLogo,
       brandDisplaySetting: originForm.brandDisplaySetting,
       locale: originForm.locale,
+      showVoteCount: originForm.showVoteCount,
+      showVoteButtonInBoard: originForm.showVoteButtonInBoard,
+      rootBoardId: originForm.rootBoardId,
     },
   });
   
@@ -65,6 +77,9 @@ const GeneralSiteSettingsP = ({
       data.siteLogo,
       data.brandDisplaySetting,
       data.locale,
+      Number(data.rootBoardId),
+      data.showVoteCount,
+      data.showVoteButtonInBoard,
       authenticityToken,
     ).then(res => {
       if (res?.status !== HttpStatus.OK) return;
@@ -99,7 +114,7 @@ const GeneralSiteSettingsP = ({
             </div>
 
             <div className="formGroup col-4">
-              <label htmlFor="brandSetting">{ getLabel('tenant', 'brand_setting') }</label>
+              <label htmlFor="brandSetting">{ getLabel('tenant_setting', 'brand_display') }</label>
               <select
                 {...register('brandDisplaySetting')}
                 id="brandSetting"
@@ -136,6 +151,48 @@ const GeneralSiteSettingsP = ({
             </select>
           </div>
 
+          <div className="formGroup">
+            <label htmlFor="rootBoardId">{ getLabel('tenant_setting', 'root_board_id') }</label>
+            <select
+              {...register('rootBoardId')}
+              id="rootBoardId"
+              className="selectPicker"
+            >
+              <option value="0">
+                {I18n.t('roadmap.title')}
+              </option>
+              <optgroup label={getLabel('board')}>
+                {boards.map((board, i) => (
+                  <option value={board.id} key={i}>{board.name}</option>
+                ))}
+              </optgroup>
+            </select>
+          </div>
+
+          <br />
+
+          <div className="formGroup">
+            <div className="checkboxSwitch">
+              <input {...register('showVoteCount')} type="checkbox" id="show_vote_count_checkbox" />
+              <label htmlFor="show_vote_count_checkbox">{ getLabel('tenant_setting', 'show_vote_count') }</label>
+              <SmallMutedText>
+                { I18n.t('site_settings.general.show_vote_count_help') }
+              </SmallMutedText>
+            </div>
+          </div>
+
+          <br />
+
+          <div className="formGroup">
+            <div className="checkboxSwitch">
+              <input {...register('showVoteButtonInBoard')} type="checkbox" id="show_vote_button_in_board_checkbox" />
+              <label htmlFor="show_vote_button_in_board_checkbox">{ getLabel('tenant_setting', 'show_vote_button_in_board') }</label>
+              <SmallMutedText>
+                { I18n.t('site_settings.general.show_vote_button_in_board_help') }
+              </SmallMutedText>
+            </div>
+          </div>
+
           <br />
 
           <Button onClick={() => null} disabled={!isDirty}>

app/javascript/components/SiteSettings/General/index.tsx

@@ -4,11 +4,13 @@ import { Store } from 'redux';
 
 import GeneralSiteSettings from '../../../containers/GeneralSiteSettings';
 import createStoreHelper from '../../../helpers/createStore';
+import IBoardJSON from '../../../interfaces/json/IBoard';
 import { State } from '../../../reducers/rootReducer';
 import { ISiteSettingsGeneralForm } from './GeneralSiteSettingsP';
 
 interface Props {
   originForm: ISiteSettingsGeneralForm;
+  boards: IBoardJSON[];
   authenticityToken: string;
 }
 
@@ -26,6 +28,7 @@ class GeneralSiteSettingsRoot extends React.Component<Props> {
       <Provider store={this.store}>
         <GeneralSiteSettings
           originForm={this.props.originForm}
+          boards={this.props.boards}
           authenticityToken={this.props.authenticityToken}
         />
       </Provider>

app/javascript/components/SiteSettings/Users/UserForm.tsx

@@ -4,6 +4,7 @@ import I18n from 'i18n-js';
 
 import Button from '../../common/Button';
 import IUser, { UserRoles, USER_ROLE_ADMIN, USER_ROLE_MODERATOR, USER_ROLE_USER } from '../../../interfaces/IUser';
+import { getLabel } from '../../../helpers/formUtils';
 
 interface Props {
   user: IUser;
@@ -57,7 +58,7 @@ class UserForm extends React.Component<Props, State> {
             id="selectPickerUserRole"
             className="selectPicker"
           >
-            <optgroup label="Roles">
+            <optgroup label={getLabel('user', 'role')}>
               <option value={USER_ROLE_USER}>
                 { I18n.t(`site_settings.users.role_${USER_ROLE_USER}`) }
               </option>

app/javascript/containers/GeneralSiteSettings.tsx

@@ -16,12 +16,20 @@ const mapDispatchToProps = (dispatch: any) => ({
     siteLogo: string,
     brandDisplaySetting: TenantSettingBrandDisplay,
     locale: string,
+    rootBoardId: number,
+    showVoteCount: boolean,
+    showVoteButtonInBoard: boolean,
     authenticityToken: string
   ): Promise<any> {
     return dispatch(updateTenant({
       siteName,
       siteLogo,
-      tenantSetting: { brand_display: brandDisplaySetting },
+      tenantSetting: {
+        brand_display: brandDisplaySetting,
+        show_vote_count: showVoteCount,
+        show_vote_button_in_board: showVoteButtonInBoard,
+        root_board_id: rootBoardId,
+      },
       locale,
       authenticityToken,
     }));

app/javascript/helpers/formUtils.ts

@@ -3,9 +3,12 @@ import I18n from 'i18n-js';
 
 export const getLabel = (
   entity: string,
-  attribute: string,
+  attribute: string = undefined,
 ) => (
-  I18n.t(`activerecord.attributes.${entity}.${attribute}`)
+  attribute ?
+    I18n.t(`activerecord.attributes.${entity}.${attribute}`)
+  :
+    I18n.t(`activerecord.models.${entity}.one`)
 );
 
 export const getValidationMessage = (

app/javascript/interfaces/IPost.ts

@@ -4,7 +4,7 @@ interface IPost {
   description?: string;
   boardId: number;
   postStatusId?: number;
-  likesCount: number;
+  likeCount: number;
   liked: number;
   commentsCount: number;
   hotness: number;

app/javascript/interfaces/ITenantSetting.ts

@@ -12,6 +12,9 @@ export type TenantSettingBrandDisplay =
 
 interface ITenantSetting {
   brand_display?: TenantSettingBrandDisplay;
+  root_board_id?: number;
+  show_vote_count?: boolean;
+  show_vote_button_in_board?: boolean;
 }
 
 export default ITenantSetting;

app/javascript/reducers/postReducer.ts

@@ -16,7 +16,7 @@ const initialState: IPost = {
   description: null,
   boardId: 0,
   postStatusId: null,
-  likesCount: 0,
+  likeCount: 0,
   liked: 0,
   commentsCount: 0,
   hotness: 0,
@@ -40,7 +40,7 @@ const postReducer = (
         description: action.post.description,
         boardId: action.post.board_id,
         postStatusId: action.post.post_status_id,
-        likesCount: action.post.likes_count,
+        likeCount: action.post.likes_count,
         liked: action.post.liked,
         commentsCount: action.post.comments_count,
         hotness: action.post.hotness,

app/javascript/reducers/postsReducer.ts

@@ -104,9 +104,9 @@ const postsReducer = (
         items: state.items.map(post => {
           if (action.postId === post.id) {
             return action.isLike ?
-              { ...post, likesCount: post.likesCount + 1, liked: 1 }
+              { ...post, likeCount: post.likeCount + 1, liked: 1 }
               :
-              { ...post, likesCount: post.likesCount - 1, liked: 0 }
+              { ...post, likeCount: post.likeCount - 1, liked: 0 }
           } else return post;
         }),
       };

app/javascript/stylesheets/components/LikeButton.scss

@@ -23,7 +23,7 @@
     border-bottom-color: $primary-color;
   }
 
-  .likesCountLabel {
+  .likeCountLabel {
     text-align: center;
     font-size: 17px;
   }

app/policies/tenant_setting_policy.rb

@@ -1,7 +1,7 @@
 class TenantSettingPolicy < ApplicationPolicy
   def permitted_attributes_for_update
     if user.admin?
-      [:brand_display]
+      [:brand_display, :root_board_id, :show_vote_count, :show_vote_button_in_board]
     else
       []
     end

app/views/boards/show.html.erb

@@ -4,7 +4,9 @@
     {
       board: @board,
       isLoggedIn: user_signed_in?,
-      authenticityToken: form_authenticity_token,
+      isPowerUser: user_signed_in? ? current_user.moderator? : false,
+      tenantSetting: @tenant_setting,
+      authenticityToken: form_authenticity_token
     }
   )
 %>

app/views/posts/show.html.erb

@@ -9,6 +9,7 @@
       isPowerUser: user_signed_in? ? current_user.moderator? : false,
       currentUserFullName: user_signed_in? ? current_user.full_name : nil,
       currentUserEmail: user_signed_in? ? current_user.email : nil,
+      tenantSetting: @tenant_setting,
       authenticityToken: form_authenticity_token,
     }
   )

app/views/site_settings/general.html.erb

@@ -9,8 +9,12 @@
             siteName: @tenant.site_name,
             siteLogo: @tenant.site_logo,
             brandDisplaySetting: @tenant_setting.brand_display,
+            showVoteCount: @tenant_setting.show_vote_count,
+            showVoteButtonInBoard: @tenant_setting.show_vote_button_in_board,
+            rootBoardId: @tenant_setting.root_board_id.to_s,
             locale: @tenant.locale
           },
+          boards: @tenant.boards.order(order: :asc),
           authenticityToken: form_authenticity_token
         }
       )

config/locales/backend/backend.en.yml

@@ -47,6 +47,28 @@ en:
         subject: '[%{app_name}] Status change on post %{post}'
         body: "The post you're following %{post} has a new status"
   activerecord:
+    models:
+      board:
+        one: 'Board'
+        other: 'Boards'
+      comment:
+        one: 'Comment'
+        other: 'Comments'
+      like:
+        one: 'Vote'
+        other: 'Votes'
+      o_auth:
+        one: 'OAuth'
+        other: 'OAuths'
+      post_status:
+        one: 'Status'
+        other: 'Statuses'
+      post:
+        one: 'Post'
+        other: 'Posts'
+      user:
+        one: 'User'
+        other: 'Users'
     attributes:
       board:
         name: 'Name'
@@ -92,7 +114,11 @@ en:
         site_logo: 'Site logo'
         subdomain: 'Subdomain'
         locale: 'Language'
-        brand_setting: 'Display'
+      tenant_setting:
+        brand_display: 'Display'
+        show_vote_count: 'Show vote count to users'
+        show_vote_button_in_board: 'Show vote buttons in board page'
+        root_board_id: 'Root page'
       user:
         email: 'Email'
         full_name: 'Full name'

config/locales/en.yml

@@ -153,6 +153,8 @@ en:
       brand_setting_name: 'Name only'
       brand_setting_logo: 'Logo only'
       brand_setting_none: 'None'
+      show_vote_count_help: 'If you enable this setting, users will be able to see the vote count of posts. This may incentivize users to vote on already popular posts, leading to a snowball effect.'
+      show_vote_button_in_board_help: 'If you enable this setting, users will be able to vote posts from the board page. This may incentivize users to vote on more posts, leading to a higher number of votes but of lower significance.'
     boards:
       title: 'Boards'
       empty: 'There are no boards. Create one below!'

config/routes.rb

@@ -13,7 +13,7 @@ Rails.application.routes.draw do
   end
 
   constraints subdomain: /.*/ do
-    root to: 'static_pages#roadmap'
+    root to: 'static_pages#root'
     
     get '/roadmap', to: 'static_pages#roadmap'
     get '/pending-tenant', to: 'static_pages#pending_tenant'

db/migrate/20230204145211_add_show_vote_and_button_vote_to_tenant_setting.rb

@@ -0,0 +1,6 @@
+class AddShowVoteAndButtonVoteToTenantSetting < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tenant_settings, :show_vote_count, :boolean, null: false, default: false
+    add_column :tenant_settings, :show_vote_button_in_board, :boolean, null: false, default: false
+  end
+end

db/migrate/20230204171748_add_root_board_id_to_tenant_setting.rb

@@ -0,0 +1,5 @@
+class AddRootBoardIdToTenantSetting < ActiveRecord::Migration[6.0]
+  def change
+    add_column :tenant_settings, :root_board_id, :integer, null: false, default: 0
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_01_31_194858) do
+ActiveRecord::Schema.define(version: 2023_02_04_171748) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -129,6 +129,9 @@ ActiveRecord::Schema.define(version: 2023_01_31_194858) do
     t.bigint "tenant_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.boolean "show_vote_count", default: false, null: false
+    t.boolean "show_vote_button_in_board", default: false, null: false
+    t.integer "root_board_id", default: 0, null: false
     t.index ["tenant_id"], name: "index_tenant_settings_on_tenant_id"
   end
 

spec/factories/tenant_settings.rb

@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory :tenant_setting do
-    brand_display { 0 }
     tenant
   end
 end

spec/models/tenant_setting_spec.rb

@@ -19,4 +19,16 @@ RSpec.describe TenantSetting, type: :model do
     tenant_setting.brand_display = 'no_name_no_logo'
     expect(tenant_setting).to be_valid
   end
+
+  it 'has a setting to show vote count' do
+    expect(tenant_setting.show_vote_count).to be_falsy
+  end
+
+  it 'has a setting to show vote button in board view' do
+    expect(tenant_setting.show_vote_button_in_board).to be_falsy
+  end
+
+  it 'has a setting that contains the board id of the root page' do
+    expect(tenant_setting.root_board_id).to eq(0)
+  end
 end

spec/routing/static_pages_routing_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'static pages routing', :aggregate_failures, type: :routing do
   it 'routes roadmap' do
     expect(get: '/').to route_to(
-      controller: 'static_pages', action: 'roadmap'
+      controller: 'static_pages', action: 'root'
     )
     
     expect(get: '/roadmap').to route_to(

spec/system/likes_spec.rb

@@ -10,7 +10,7 @@ feature 'likes', type: :system, js: true do
   let(:post_header_selector) { '.postHeader' }
   let(:like_button_container_selector) { '.likeButtonContainer' }
   let(:like_button_selector) { '.likeButton' }
-  let(:likes_count_label_selector) { '.likesCountLabel' }
+  let(:likes_count_label_selector) { '.likeCountLabel' }
   let(:like_list_container_selector) { '.likeListContainer' }
 
   before(:each) do