From 6ce367b68e09cda63bdb4327e745e62df9e5b9b9 Mon Sep 17 00:00:00 2001 From: navaneeth Date: Wed, 19 May 2021 12:10:46 +0530 Subject: [PATCH] Sidebar for dashboard, minor bug fix --- app/controllers/apps_controller.rb | 1 - frontend/src/HomePage/HomePage.jsx | 27 ++++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb index 442022e072..7337731abc 100644 --- a/app/controllers/apps_controller.rb +++ b/app/controllers/apps_controller.rb @@ -2,7 +2,6 @@ class AppsController < ApplicationController skip_before_action :authenticate_request, only: [:show] def index - sleep(4) authorize App @apps = App.where(organization: @current_user.organization) .order('created_at desc') diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx index 92d1ecd277..b5bb1e6f58 100644 --- a/frontend/src/HomePage/HomePage.jsx +++ b/frontend/src/HomePage/HomePage.jsx @@ -158,7 +158,32 @@ class HomePage extends React.Component {

- +
+ + {isLoading && ( +
+
+
+
+
+ )} + + {!isLoading && ( + + )} +
+