saeloun · akhilgkrishnan · Jun 14, 2022 · Jun 13, 2022 · Jun 14, 2022 · Jun 14, 2022
diff --git a/app/javascript/src/apis/companies.ts b/app/javascript/src/apis/companies.ts
@@ -1,8 +1,8 @@
 import axios from "axios";
 
-const path = "/internal_api/v1/companies";
+const path = "/companies";
 
-const index = () => axios.get(path);
+const index = async () => axios.get(`${path}`);
 
 const create = payload => axios.post(path, payload);
 

diff --git a/app/javascript/src/apis/companyProfile.ts b/app/javascript/src/apis/companyProfile.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 
-const path = "/internal_api/v1/timezones";
+const path = "/timezones";
 
 const get = async () => axios.get(`${path}`);
 

diff --git a/app/javascript/src/apis/profile.ts b/app/javascript/src/apis/profile.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 
-const path = "/internal_api/v1/profile";
+const path = "/profile";
 
 const index = () => axios.get(path);
 

diff --git a/app/javascript/src/common/ChartBar/index.tsx b/app/javascript/src/common/ChartBar/index.tsx
@@ -1,7 +1,8 @@
 import React, { Fragment } from "react";
 import ReactTooltip from "react-tooltip";
+
+import { minutesToHHMM } from "helpers/hhmm-parser";
 import { IChartBarGraph, ISingleClient } from "./interface";
-import { minutesToHHMM } from "../../helpers/hhmm-parser";
 
 const Client = ({ element, totalMinutes, index }:ISingleClient) => {
   const chartColor = ["miru-chart-green", "miru-chart-blue", "miru-chart-pink", "miru-chart-orange"];

diff --git a/app/javascript/src/components/Clients/Details/index.tsx b/app/javascript/src/components/Clients/Details/index.tsx
@@ -7,14 +7,14 @@ import clients from "apis/clients";
 import AmountBoxContainer from "common/AmountBox";
 import ChartBar from "common/ChartBar";
 import Table from "common/Table";
+import AddEditProject from "components/Projects/Modals/AddEditProject";
+import DeleteProject from "components/Projects/Modals/DeleteProject";
 import { cashFormatter } from "helpers/cashFormater";
 import { currencySymbol } from "helpers/currencySymbol";
 
+import { TOASTER_DURATION } from "constants/index";
 import Header from "./Header";
-import { TOASTER_DURATION } from "../../../constants/index";
 import { unmapClientDetails } from "../../../mapper/client.mapper";
-import AddEditProject from "../../Projects/Modals/AddEditProject";
-import DeleteProject from "../../Projects/Modals/DeleteProject";
 
 const getTableData = (clients) => {
   if (clients) {

diff --git a/app/javascript/src/components/Clients/List/Header.tsx b/app/javascript/src/components/Clients/List/Header.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import clients from "apis/clients";
 import { MagnifyingGlass, Plus } from "phosphor-react";
+
 import AutoComplete from "./AutoComplete";
 import { unmapClientListForDropdown } from "../../../mapper/client.mapper";
 

diff --git a/app/javascript/src/components/Clients/List/index.tsx b/app/javascript/src/components/Clients/List/index.tsx
@@ -10,8 +10,8 @@ import Table from "common/Table";
 import { cashFormatter } from "helpers/cashFormater";
 import { currencySymbol } from "helpers/currencySymbol";
 
+import { TOASTER_DURATION } from "constants/index";
 import Header from "./Header";
-import { TOASTER_DURATION } from "../../../constants/index";
 import { unmapClientList } from "../../../mapper/client.mapper";
 import DeleteClient from "../Modals/DeleteClient";
 import EditClient from "../Modals/EditClient";

diff --git a/app/javascript/src/components/InvoiceEmail/PayOnlineMenu.tsx b/app/javascript/src/components/InvoiceEmail/PayOnlineMenu.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+
 const stripe = require('../../../../assets/images/StripeDropdown.svg'); // eslint-disable-line
 
 const Discountmenu = ( { stripeUrl } ) => (

diff --git a/app/javascript/src/components/InvoiceEmail/index.tsx b/app/javascript/src/components/InvoiceEmail/index.tsx
@@ -1,6 +1,8 @@
 import React from "react";
+
 import Header from "./Header";
 import InvoiceDetails from "./InvoiceDetails";
+
 const Instagram = require("../../../../assets/images/Instagram.svg"); // eslint-disable-line
 const Twitter = require("../../../../assets/images/Twitter.svg"); // eslint-disable-line
 const MiruLogowithText = require("../../../../assets/images/MiruWhiteLogowithText.svg"); // eslint-disable-line

diff --git a/app/javascript/src/components/Invoices/Edit/InvoiceTable.tsx b/app/javascript/src/components/Invoices/Edit/InvoiceTable.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef } from "react";
 
+import useOutsideClick from "helpers/outsideClick";
 import NewLineItemTable from "./NewLineItemTable";
-import useOutsideClick from "../../../helpers/outsideClick";
 import TableHeader from "../common/LineItemTableHeader";
 import NewLineItemRow from "../common/NewLineItemRow";
 import ManualEntry from "../Generate/ManualEntry";

diff --git a/app/javascript/src/components/Invoices/Edit/index.tsx b/app/javascript/src/components/Invoices/Edit/index.tsx
@@ -5,6 +5,7 @@ import { setAuthHeaders, registerIntercepts } from "apis/axios";
 import clientsApi from "apis/clients";
 import invoicesApi from "apis/invoices";
 import dayjs from "dayjs";
+
 import Header from "./Header";
 import InvoiceTable from "./InvoiceTable";
 import InvoiceTotal from "./InvoiceTotal";

diff --git a/app/javascript/src/components/Invoices/Generate/ClientSelection.tsx b/app/javascript/src/components/Invoices/Generate/ClientSelection.tsx
@@ -1,10 +1,10 @@
 import React, { useState, useRef } from "react";
 import Select from "react-select";
+import useOutsideClick from "helpers/outsideClick";
 import { PencilSimple } from "phosphor-react";
 
 import { DropdownIndicator } from "./CustomComponents";
 import { reactSelectStyles } from "./Styles";
-import useOutsideClick from "../../../helpers/outsideClick";
 
 const ClientSelection = ({ clientList, selectedClient, setSelectedClient, optionSelected, clientVisible }) => {
   const [isOptionSelected, setOptionSelection] = useState<boolean>(optionSelected);

diff --git a/app/javascript/src/components/Invoices/Generate/Header.tsx b/app/javascript/src/components/Invoices/Generate/Header.tsx
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
 import { ToastContainer } from "react-toastify";
 import { X, FloppyDisk, PaperPlaneTilt, Gear } from "phosphor-react";
 
-import { TOASTER_DURATION } from "../../../constants/index";
+import { TOASTER_DURATION } from "constants/index";
 
 const Header = ({
   handleSendInvoice,

diff --git a/app/javascript/src/components/Invoices/Generate/InvoiceSettings.tsx b/app/javascript/src/components/Invoices/Generate/InvoiceSettings.tsx
@@ -1,11 +1,12 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import React, { useState, useEffect } from "react";
+
 import paymentSettings from "apis/payment-settings";
 import PaymentsProviders from "apis/payments/providers";
 import CustomCheckbox from "common/CustomCheckbox";
 import CustomToggle from "common/CustomToggle";
 import { X } from "phosphor-react";
-import { ApiStatus as PaymentSettingsStatus } from "../../../constants";
+import { ApiStatus as PaymentSettingsStatus } from "constants/index";
 
 const amex = require("../../../../../assets/images/amex.svg");
 const applePay = require("../../../../../assets/images/applePay.svg");
@@ -58,7 +59,7 @@ const InvoiceSettings = ({ setShowInvoiceSetting }) => {
   };
 
   const updatePaymentsProvidersSettings = async (id, provider) => {
-    await PaymentsProviders.update(id, provider); 
+    await PaymentsProviders.update(id, provider);
   };
 
   const toggleStripe = async () => {

diff --git a/app/javascript/src/components/Invoices/Generate/InvoiceTable.tsx b/app/javascript/src/components/Invoices/Generate/InvoiceTable.tsx
@@ -1,11 +1,11 @@
 import React, { useEffect, useState, useRef } from "react";
 import generateInvoice from "apis/generateInvoice";
-
 import dayjs from "dayjs";
+
+import useOutsideClick from "helpers/outsideClick";
+
 import ManualEntry from "./ManualEntry";
 import NewLineItemTable from "./NewLineItemTable";
-
-import useOutsideClick from "../../../helpers/outsideClick";
 import TableHeader from "../common/LineItemTableHeader";
 import NewLineItemRows from "../common/NewLineItemRow";
 import MultipleEntriesModal from "../MultipleEntriesModal";

diff --git a/app/javascript/src/components/Invoices/Invoice/InvoiceStatus.tsx b/app/javascript/src/components/Invoices/Invoice/InvoiceStatus.tsx
@@ -1,5 +1,6 @@
 import React from "react";
-import getStatusCssClass from "../../../utils/getStatusTag";
+
+import getStatusCssClass from "utils/getStatusTag";
 
 const InvoiceStatus = ({ invoice }) => (
   <div className="flex flex-row">

diff --git a/app/javascript/src/components/Invoices/Invoice/index.tsx b/app/javascript/src/components/Invoices/Invoice/index.tsx
@@ -1,10 +1,12 @@
 import React, { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
+
 import { setAuthHeaders, registerIntercepts } from "apis/axios";
 import invoicesApi from "apis/invoices";
+import { ApiStatus as InvoiceStatus } from "constants/index";
+
 import Header from "./Header";
 import InvoiceDetails from "./InvoiceDetails";
-import { ApiStatus as InvoiceStatus } from "../../../constants";
 import DeleteInvoice from "../popups/DeleteInvoice";
 import SendInvoice from "../popups/SendInvoice";
 

diff --git a/app/javascript/src/components/Invoices/List/FilterSideBar/index.tsx b/app/javascript/src/components/Invoices/List/FilterSideBar/index.tsx
@@ -1,8 +1,8 @@
 import * as React from "react";
 import Select from "react-select";
-
 import { X } from "phosphor-react";
-import getStatusCssClass from "../../../../utils/getStatusTag";
+
+import getStatusCssClass from "utils/getStatusTag";
 
 //Json Should be removed once we start integrating the api.
 const FilterSideBar = ({ setFilterVisibilty }) => {

diff --git a/app/javascript/src/components/Invoices/List/SendInvoice/index.tsx b/app/javascript/src/components/Invoices/List/SendInvoice/index.tsx
@@ -12,6 +12,7 @@ import Toastr from "common/Toastr";
 import useOutsideClick from "helpers/outsideClick";
 import { X } from "phosphor-react";
 
+import { ApiStatus as InvoiceStatus } from "constants/index";
 import {
   isEmailValid,
   emailSubject,
@@ -20,8 +21,6 @@ import {
   buttonText
 } from "./utils";
 
-import { ApiStatus as InvoiceStatus } from "../../../../constants";
-
 interface InvoiceEmail {
   subject: string;
   message: string;

diff --git a/app/javascript/src/components/Invoices/List/SendInvoice/utils.ts b/app/javascript/src/components/Invoices/List/SendInvoice/utils.ts
@@ -1,7 +1,8 @@
 import dayjs from "dayjs";
 import { currencyFormat } from "helpers/currency";
 import * as Yup from "yup";
-import { ApiStatus as InvoiceStatus } from "../../../../constants";
+
+import { ApiStatus as InvoiceStatus } from "constants/index";
 
 export const isEmailValid = (email: string): boolean => {
   const schema = Yup.string().email();

diff --git a/app/javascript/src/components/Invoices/List/Table/TableRow.tsx b/app/javascript/src/components/Invoices/List/Table/TableRow.tsx
@@ -5,7 +5,8 @@ import dayjs from "dayjs";
 import { currencyFormat } from "helpers/currency";
 import { PaperPlaneTilt, Pen, Trash } from "phosphor-react";
 
-import getStatusCssClass from "../../../../utils/getStatusTag";
+import getStatusCssClass from "utils/getStatusTag";
+
 import SendInvoice from "../SendInvoice";
 
 const TableRow = ({

diff --git a/app/javascript/src/components/Invoices/List/index.tsx b/app/javascript/src/components/Invoices/List/index.tsx
@@ -3,12 +3,12 @@ import { useSearchParams } from "react-router-dom";
 
 import invoicesApi from "apis/invoices";
 import Pagination from "common/Pagination";
+import { ApiStatus as InvoicesStatus } from "constants/index";
 
 import Container from "./container";
 import FilterSideBar from "./FilterSideBar";
 import Header from "./Header";
 
-import { ApiStatus as InvoicesStatus } from "../../../constants";
 import BulkDeleteInvoices from "../popups/BulkDeleteInvoices";
 import DeleteInvoice from "../popups/DeleteInvoice";
 

diff --git a/app/javascript/src/components/Invoices/popups/SendInvoice/index.tsx b/app/javascript/src/components/Invoices/popups/SendInvoice/index.tsx
@@ -5,14 +5,15 @@ import React, {
   useRef,
   useState
 } from "react";
-
 import { useNavigate } from "react-router-dom";
+
 import invoicesApi from "apis/invoices";
 import cn from "classnames";
 import Toastr from "common/Toastr";
 import useOutsideClick from "helpers/outsideClick";
 import { X } from "phosphor-react";
 
+import { ApiStatus as InvoiceStatus } from "constants/index";
 import {
   isEmailValid,
   emailSubject,
@@ -21,8 +22,6 @@ import {
   buttonText
 } from "./utils";
 
-import { ApiStatus as InvoiceStatus } from "../../../../constants";
-
 interface InvoiceEmail {
   subject: string;
   message: string;

diff --git a/app/javascript/src/components/Invoices/popups/SendInvoice/utils.tsx b/app/javascript/src/components/Invoices/popups/SendInvoice/utils.tsx
@@ -1,7 +1,8 @@
 import dayjs from "dayjs";
 import { currencyFormat } from "helpers/currency";
 import * as Yup from "yup";
-import { ApiStatus as InvoiceStatus } from "../../../../constants";
+
+import { ApiStatus as InvoiceStatus } from "constants/index";
 
 export const isEmailValid = (email: string): boolean => {
   const schema = Yup.string().email();

diff --git a/app/javascript/src/components/Profile/Organization/Billing/index.tsx b/app/javascript/src/components/Profile/Organization/Billing/index.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 
 import Header from "../../Header";
+
 const OrgBilling = () => (
   <div className="flex flex-col w-4/5">
     <Header

diff --git a/app/javascript/src/components/Profile/Organization/Edit/index.tsx b/app/javascript/src/components/Profile/Organization/Edit/index.tsx
@@ -1,17 +1,20 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import React, { useCallback, useEffect, useState } from "react";
-
 import Select from "react-select";
 import { ToastContainer } from "react-toastify";
+
+import { setAuthHeaders, registerIntercepts } from "apis/axios";
 import companiesApi from "apis/companies";
 import companyProfileApi from "apis/companyProfile";
+import { Divider } from "common/Divider";
 import Toastr from "common/Toastr";
 import * as Yup from "yup";
-import { Divider } from "../../../../common/Divider";
-import { CountryList } from "../../../../constants/countryList";
-import { currencyList } from "../../../../constants/currencyList";
-import { TOASTER_DURATION } from "../../../../constants/index";
+import { CountryList } from "constants/countryList";
+import { currencyList } from "constants/currencyList";
+import { TOASTER_DURATION } from "constants/index";
+
 import Header from "../../Header";
+
 const editButton = require("../../../../../../assets/images/edit_image_button.svg");
 const img = require("../../../../../../assets/images/plus_icon.svg");
 
@@ -130,6 +133,8 @@ const OrgEdit = () => {
   };
 
   useEffect(() => {
+    setAuthHeaders();
+    registerIntercepts();
     getCountries();
     getCurrencies();
     getData();
@@ -235,8 +240,7 @@ const OrgEdit = () => {
             "company[logo]", orgDetails.logo
           );
         }
-        const updateOrgDetails = await companiesApi.update(orgDetails.id, formD);
-        Toastr.success(updateOrgDetails.data.notice);
+        await companiesApi.update(orgDetails.id, formD);
         setIsDetailUpdated(false);
       } catch (err){
         Toastr.error("Error in Updating Org. Details");

diff --git a/app/javascript/src/components/Profile/Organization/Payment/index.tsx b/app/javascript/src/components/Profile/Organization/Payment/index.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 
 import Header from "../../Header";
+
 const OrgPayment = () => (
   <div className="flex flex-col w-4/5">
     <Header