Merge pull request #1518 from hngx-org/bug-fixes

added fallback value for base api url
hngx-org · Dec 11, 2023 · 123394e · 123394e · vercel · Dec 11, 2023
2 parents cb1559c + 2b4c2b2
commit 123394e
Show file tree

Hide file tree

Showing 26 changed files with 82 additions and 57 deletions.
diff --git a/components/Modals/interest-modal.tsx b/components/Modals/interest-modal.tsx
@@ -10,8 +10,9 @@ import { notify } from '@ui/Toast';
 import { checkObjectProperties } from '@modules/portfolio/functions/checkObjectProperties';
 import Loader from '@ui/Loader';
 import { AiOutlineClose, AiOutlineCloseCircle, AiOutlinePlus } from 'react-icons/ai';
+import { API_BASE_URL } from '../../http/checkout';
 
-const endpoint = `${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`;
+const endpoint = `${API_BASE_URL}/portfolio`;
 
 type interestModalProps = {
   onCloseModal: () => void;

diff --git a/components/Modals/language-modal.tsx b/components/Modals/language-modal.tsx
@@ -10,6 +10,7 @@ import { notify } from '@ui/Toast';
 import { checkObjectProperties } from '@modules/portfolio/functions/checkObjectProperties';
 import Loader from '@ui/Loader';
 import { AiOutlineClose, AiOutlineCloseCircle } from 'react-icons/ai';
+import { API_BASE_URL } from '../../http/checkout';
 
 type languageModalProps = {
   onCloseModal: () => void;
@@ -18,7 +19,7 @@ type languageModalProps = {
   userId: string;
 };
 
-const endpoint = (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string;
+const endpoint = (`${API_BASE_URL}/portfolio`) as string;
 const programmingLanguages = [
   'JavaScript',
   'TypeScript',
@@ -101,7 +102,7 @@ const LanguageModal = ({ isOpen, onCloseModal, onSaveModal, userId }: languageMo
   };
 
   const handleDelete = async (params: any) => {
-    const data = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/languages`, {
+    const data = await fetch(`${API_BASE_URL}/portfolio/languages`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

diff --git a/context/PortfolioLandingContext.tsx b/context/PortfolioLandingContext.tsx
@@ -18,6 +18,7 @@ import { useQueries, useQueryClient, UseQueryResult } from '@tanstack/react-quer
 import $http from '../http/axios';
 import { AddShopModal } from '@modules/portfolio/component/addShopErrorModal';
 import { useRouter } from 'next/router';
+import { API_BASE_URL } from '../http/checkout';
 
 type PortfolioContext = {
   portfolioUrl: string;
@@ -116,7 +117,7 @@ const Portfolio = createContext<PortfolioContext>({
 export function PortfolioCtxProvider(props: { children: any }) {
   const queryClient = useQueryClient();
   const router = useRouter();
-  const portfolioUrl = `${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/portfolio`;
+  const portfolioUrl = `${API_BASE_URL}/portfolio/portfolio`;
   const { auth } = useAuth();
   const [userId, setUserId] = useState('');
   const [slug, setSlug] = useState('');
@@ -272,7 +273,7 @@ export function PortfolioCtxProvider(props: { children: any }) {
       formData.append('images', coverImage as string | Blob);
       formData.append('userId', userId);
 
-      const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/profile/cover/upload`, {
+      const response = await fetch(`${API_BASE_URL}/portfolio/profile/cover/upload`, {
         method: 'POST',
         body: formData,
       });

diff --git a/http/checkout.ts b/http/checkout.ts
@@ -6,10 +6,12 @@ import axios from 'axios';
 
 
 // export const CART_ENDPOINT = "https://zuri-cart-checkout.onrender.com/api/v1/checkout_cart"
-export const CART_ENDPOINT = process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL + "/checkout";
+
 export const STAGING_URL = process.env.NEXT_PUBLIC_APP_STAGING_URL || 'https://staging.zuri.team';
+export const API_BASE_URL =  process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL || 'https://zuriportfolio-backend.onrender.com/api/v1'
 export const RECENTLY_VIEWED_ENDPOINT = 'https://staging.zuri.team/api/marketplace/v1/recently-viewed';
 export const AUTH_API_ENDPOINT = "https://zuri-auth.up.railway.app/api/auth/api"
+export const CART_ENDPOINT = API_BASE_URL + "/checkout";
 
 
 export const addToCart = async (cartItems: string[], token: string) => {

diff --git a/modules/portfolio/component/about/about.tsx b/modules/portfolio/component/about/about.tsx
@@ -5,6 +5,7 @@ import Modal from '@ui/Modal';
 import Loader from '@ui/Loader';
 import { toast } from 'react-toastify';
 import axios from 'axios';
+import { API_BASE_URL } from '../../../../http/checkout';
 
 type aboutModalProps = {
   onCloseModal: () => void;
@@ -26,12 +27,12 @@ const PortfolioAbout: React.FC<aboutModalProps> = ({ onCloseModal, onSaveModal,
   const [create, setCreate] = useState(false);
 
   // POST ABOUT VALUE TO DATABASE
-  const API_BASE_URL = (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string;
+  const API_URL = (`${API_BASE_URL}/portfolio`) as string;
   const createResponse = async () => {
     try {
       const axiosConfig = {
         method: 'post',
-        url: `${API_BASE_URL}/about/${userId}`,
+        url: `${API_URL}/about/${userId}`,
         data: bio,
       };
 
@@ -79,7 +80,7 @@ const PortfolioAbout: React.FC<aboutModalProps> = ({ onCloseModal, onSaveModal,
     try {
       const axiosConfig = {
         method: 'get',
-        url: `${API_BASE_URL}/about/${userId}`,
+        url: `${API_URL}/about/${userId}`,
       };
 
       const response = await axios(axiosConfig);
@@ -115,7 +116,7 @@ const PortfolioAbout: React.FC<aboutModalProps> = ({ onCloseModal, onSaveModal,
     try {
       const axiosConfig = {
         method: 'put',
-        url: `${API_BASE_URL}/about/${id}`,
+        url: `${API_URL}/about/${id}`,
         data: bio,
       };
 
@@ -179,7 +180,7 @@ const PortfolioAbout: React.FC<aboutModalProps> = ({ onCloseModal, onSaveModal,
         try {
           const axiosConfig = {
             method: 'delete',
-            url: `${API_BASE_URL}/about/${id}`,
+            url: `${API_URL}/about/${id}`,
           };
 
           const response = await axios(axiosConfig);

diff --git a/modules/portfolio/component/awards-modal.tsx b/modules/portfolio/component/awards-modal.tsx
@@ -10,6 +10,7 @@ import Loader from '@ui/Loader';
 import Portfolio from '../../../context/PortfolioLandingContext';
 import { Edit2, Trash } from 'iconsax-react';
 import { notify } from '@ui/Toast';
+import { API_BASE_URL } from '../../../http/checkout';
 
 // Defining a context to share state across components
 interface Context {
@@ -39,7 +40,7 @@ const initialContextValue: Context = {
   error: '',
   setIsLoading: () => {},
   isLoading: false,
-  baseURL: (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string, // Add baseURL with a default value
+  baseURL: (`${API_BASE_URL}/portfolio`) as string, // Add baseURL with a default value
   setBaseURL: () => {}, // Add setter for baseURL
 };
 
@@ -62,7 +63,7 @@ const Awards = ({ isOpen, onCloseModal }: awardsModalProps) => {
     url: '',
     description: '',
   });
-  const [baseURL, setBaseURL] = useState(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`);
+  const [baseURL, setBaseURL] = useState(`${API_BASE_URL}/portfolio`);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [urlError, setUrlError] = useState('');
   const [error, setError] = useState('');

diff --git a/modules/portfolio/component/certification-modal.tsx b/modules/portfolio/component/certification-modal.tsx
@@ -10,6 +10,7 @@ import { Certification, CertificationListProps, CertificationItemProps } from '.
 import Loader from '@ui/Loader';
 import { notify } from '@ui/Toast';
 import { Edit2, Trash } from 'iconsax-react';
+import { API_BASE_URL } from '../../../http/checkout';
 
 // Defining a context to share state across components
 interface Context {
@@ -39,7 +40,7 @@ const initialContextValue: Context = {
   error: '',
   setIsLoading: () => {},
   isLoading: false,
-  baseURL: (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string, // Add baseURL with a default value
+  baseURL: (`${API_BASE_URL}/portfolio`) as string, // Add baseURL with a default value
   setBaseURL: () => {}, // Add setter for baseURL
 };
 
@@ -62,7 +63,7 @@ const Certifications = ({ isOpen, onCloseModal }: certificationModalProps) => {
     url: '',
     description: '',
   });
-  const [baseURL, setBaseURL] = useState(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`);
+  const [baseURL, setBaseURL] = useState(`${API_BASE_URL}/portfolio`);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [urlError, setUrlError] = useState('');
   const [error, setError] = useState('');

diff --git a/modules/portfolio/component/contact-modal.tsx b/modules/portfolio/component/contact-modal.tsx
@@ -10,6 +10,7 @@ import { sendArrayOfObjects } from '../functions/sendArrayOfObjects';
 import { notify } from '@ui/Toast';
 import { Trash } from 'iconsax-react';
 import Loader from '@ui/Loader';
+import { API_BASE_URL } from '../../../http/checkout';
 
 const generateUniqueId = () => {
   const timestamp = new Date().getTime();
@@ -92,7 +93,7 @@ function ContactModal({ isOpen, onCloseModal, onSaveModal, userId }: contactModa
       user_id: userId, // Ensure you have the userId available
     }));
 
-    sendArrayOfObjects(data, `${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/contacts`)
+    sendArrayOfObjects(data, `${API_BASE_URL}/portfolio/contacts`)
       .then((response: any) => {
         setLoading(false);
         notify({
@@ -128,7 +129,7 @@ function ContactModal({ isOpen, onCloseModal, onSaveModal, userId }: contactModa
     console.log('delete clicked');
     const id = 5;
     try {
-      const res = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/contacts/${id}`, {
+      const res = await fetch(`${API_BASE_URL}/portfolio/contacts/${id}`, {
         method: 'DELETE',
         headers: {
           'Content-Type': 'application/json',
@@ -145,7 +146,7 @@ function ContactModal({ isOpen, onCloseModal, onSaveModal, userId }: contactModa
 
   const getSocialsAvailable = async () => {
     try {
-      const response = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/socials`);
+      const response = await axios.get(`${API_BASE_URL}/portfolio/socials`);
       const data = await response.data;
       console.log('getSocialsAvailable', data);
       setAvailableSocials(data?.data);
@@ -164,7 +165,7 @@ function ContactModal({ isOpen, onCloseModal, onSaveModal, userId }: contactModa
 
   const getAllSocials = async () => {
     try {
-      const response = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/contacts/${userId}`);
+      const response = await axios.get(`${API_BASE_URL}/portfolio/contacts/${userId}`);
       const data = await response.data;
       console.log('responseData', data);
     } catch (error) {

diff --git a/modules/portfolio/component/modals/apiService.js b/modules/portfolio/component/modals/apiService.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const BASE_URL = `${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/`;
+const BASE_URL = `${API_BASE_URL}/portfolio/`;
 
 export const updateProfileDetails = async (userId, newProfileDetails) => {
   try {

diff --git a/modules/portfolio/component/modals/edit-profile.tsx b/modules/portfolio/component/modals/edit-profile.tsx
@@ -11,6 +11,7 @@ import CountryCityDropdown from './CountryCityDropdown';
 
 import { useAuth } from '../../../../context/AuthContext';
 import { AuthResponse } from '../../../../@types/index';
+import { API_BASE_URL } from '../../../../http/checkout';
 
 const inputStyle = `placeholder-gray-300 placeholder-opacity-40 font-semibold text-gray-500 h-[50px] border-2 border-[#bcbcbc] rounded-[10px] px-4  ring-0 outline-brand-green-primary transition-all duration-300 ease-in-out select-none focus-within:border-brand-green-primary`;
 
@@ -39,7 +40,7 @@ const EditProfile = () => {
       try {
         setIsLoading(true);
         console.log('Logging this one');
-        const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/users/${userId}`);
+        const response = await fetch(`${API_BASE_URL}/portfolio/users/${userId}`);
         console.log('after logging');
 
         const userData = await response.json();
@@ -64,7 +65,7 @@ const EditProfile = () => {
 
   const getTracks = async () => {
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/tracks`);
+      const response = await fetch(`${API_BASE_URL}/portfolio/tracks`);
       const data = await response.json();
       return data.data;
     } catch (error: any) {
@@ -100,7 +101,7 @@ const EditProfile = () => {
         if (matchingTrack) {
           setIsLoading(true);
           console.log("Logging second one");
-          const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/users/${userId}`,
+          const response = await fetch(`${API_BASE_URL}/portfolio/users/${userId}`,
            {
             method: 'PUT',
             headers: {
@@ -136,7 +137,7 @@ const EditProfile = () => {
       const formData = new FormData();
       formData.append('images', coverImage as string | Blob);
       formData.append('userId', userId);
-      const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/profile/image/upload`, {
+      const response = await fetch(`${API_BASE_URL}/portfolio/profile/image/upload`, {
         method: 'POST',
         body: formData,
       });

diff --git a/modules/portfolio/component/modals/project-modal/all-projects-modal.tsx b/modules/portfolio/component/modals/project-modal/all-projects-modal.tsx
@@ -7,8 +7,9 @@ import axios from 'axios';
 import { notify } from '@ui/Toast';
 import { Edit2, Trash } from 'iconsax-react';
 import { Data, allRouteOptions } from './project-section-modal';
+import { API_BASE_URL } from '../../../../../http/checkout';
 
-const endpoint = (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string;
+const endpoint = (`${API_BASE_URL}/portfolio`) as string;
 const AllProjectsModal = ({
   onEdit,
   projects,

diff --git a/modules/portfolio/component/modals/project-modal/project-section-modal.tsx b/modules/portfolio/component/modals/project-modal/project-section-modal.tsx
@@ -5,6 +5,7 @@ import axios from 'axios';
 import Loader from '@ui/Loader';
 import AllProjectsModal from './all-projects-modal';
 import SingleProject from './single-project';
+import { API_BASE_URL } from '../../../../../http/checkout';
 
 export type allRouteOptions = 'add-project' | 'view-projects' | 'single-project';
 
@@ -51,7 +52,7 @@ const ProjectSectionModal = ({ isOpen, onCloseModal, onSaveModal, userId }: Proj
     setLoading(data);
   };
 
-  const endpoint = (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string;
+  const endpoint = (`${API_BASE_URL}/portfolio`) as string;
   const getAllProjects = () => {
     setLoading(true);
     axios

diff --git a/modules/portfolio/component/modals/project-modal/projects.tsx b/modules/portfolio/component/modals/project-modal/projects.tsx
@@ -10,6 +10,7 @@ import { notify } from '@ui/Toast';
 import { checkObjectProperties } from '@modules/portfolio/functions/checkObjectProperties';
 import { Data, allRouteOptions } from './project-section-modal';
 import Loader from '@ui/Loader';
+import { API_BASE_URL } from '../../../../../http/checkout';
 
 type ProjectSectionProps = {
   onCloseModal: () => void;
@@ -20,7 +21,7 @@ type ProjectSectionProps = {
   handleSetRoute: (data: allRouteOptions) => void;
 };
 
-const endpoint = (`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio`) as string;
+const endpoint = (`${API_BASE_URL}/portfolio`) as string;
 const ProjectSection: React.FC<ProjectSectionProps> = ({
   dataToEdit,
   onCloseModal,

diff --git a/modules/portfolio/component/modals/track-dropdown.tsx b/modules/portfolio/component/modals/track-dropdown.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react';
+import { API_BASE_URL } from '../../../../http/checkout';
 
 interface Track {
   id: number;
@@ -12,7 +13,7 @@ const TrackDropdown = ({ onSelectTrack }: { onSelectTrack: (selectedTrack: strin
   useEffect(() => {
     const fetchTracks = async () => {
       try {
-        const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/tracks`, {
+        const response = await fetch(`${API_BASE_URL}/portfolio/tracks`, {
           headers: {
             Accept: 'application/json',
           },

diff --git a/modules/portfolio/component/new-custom-section-modal.tsx b/modules/portfolio/component/new-custom-section-modal.tsx
@@ -128,7 +128,7 @@ function CreateCustomSectionContainer({ onClose, userId }: { onClose: () => void
   };
 
   const createNewCustomSectionOption = useMutation(async () => {
-    const response = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/custom/`, {
+    const response = await axios.post(`${API_BASE_URL}/portfolio/custom/`, {
       sectionId: 55,
       title: form?.values?.addList[0]?.title,
       userId: userId,
@@ -174,7 +174,7 @@ function CreateCustomSectionContainer({ onClose, userId }: { onClose: () => void
     );
 
     if (fields.length < 1) {
-      const response = await axios.post(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/custom/field`, {
+      const response = await axios.post(`${API_BASE_URL}/portfolio/custom/field`, {
         customUserSectionId: sectionForm?.values?.section[0]?.id,
         fields: fields,
       });

diff --git a/modules/portfolio/component/portfolioSettingsComponents/DeleteAccount.tsx b/modules/portfolio/component/portfolioSettingsComponents/DeleteAccount.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/router';
 import { useAuth } from '../../../../context/AuthContext';
 import { notify } from '@ui/Toast';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { API_BASE_URL } from '../../../../http/checkout';
 
 function DeleteAccount() {
   const [openModal, setOpenModal] = useState<boolean>(false);
@@ -16,7 +17,7 @@ function DeleteAccount() {
   };
   const userId: string | undefined = auth?.user.id;
   const deleteAccountMutation = useMutation(
-    () => axios.delete(`${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/delete-user-account/${userId}`),
+    () => axios.delete(`${API_BASE_URL}/portfolio/delete-user-account/${userId}`),
     {
       onSuccess: () => {
         // If the delete operation is successful, you can perform any necessary actions here.

diff --git a/modules/portfolio/component/portfolioSettingsComponents/UpdatingProfilePic.tsx b/modules/portfolio/component/portfolioSettingsComponents/UpdatingProfilePic.tsx
@@ -10,14 +10,15 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import axios from 'axios';
 import addPics from '../../../../public/assets/inviteAssets/add-circle.svg';
 import { notify } from '@ui/Toast';
+import { API_BASE_URL } from '../../../../http/checkout';
 
 const UpdatingProfilePic = ({userId}:{userId: string}) => {
   const queryClient = useQueryClient();
 
   const [selectedPics, setSelectedPics] = React.useState<string | StaticImport>('');
   const [reload, setReload] = React.useState<boolean>(false);
 
-  const baseUrl = `${process.env.NEXT_PUBLIC_BACKEND_ENDPOINT_URL}/portfolio/` as string;
+  const baseUrl = `${API_BASE_URL}/portfolio/` as string;
 
   const {
     data: userData,