Siddhesh.More/rubix-admin-panel
1
0
Fork 0
mirror of https://github.com/WDI-Ideas/rubix-admin-panel.git synced 2026-04-27 17:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Swapnil Bendal
2024-06-10 16:38:33 +05:30
parent 4c1af2062c c90f340b6d
commit 58f49913f5
29 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Components/Banner/BannerTable.jsx
View File

@@ -30,6 +30,7 @@ import {
WarningIcon,
} from "@chakra-ui/icons";
import ToastBox from "../ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const BannerCommunity = ({
dataArray,

5
src/Components/Banner/BannerView.jsx
View File

@@ -16,6 +16,7 @@ import {
VStack,
} from "@chakra-ui/react";
import BannerMainCard from "./BannerMainCard";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const BannerView = ({data, isLoading, editLink, center}) => {
const banner = data?.data;
@@ -64,12 +65,12 @@ const BannerView = ({data, isLoading, editLink, center}) => {
rounded={8}
w={500}
h={240}
src={`https://rubix.betadelivery.com/${banner?.banner_image}`}
src={`${API_URL}/${banner?.banner_image}`}
alt="Selected Image"
/> */}
<BannerMainCard
imgLink={`https://rubix.betadelivery.com/${banner?.banner_image}`}
imgLink={`${API_URL}/${banner?.banner_image}`}
heading={banner?.Heading}
subHeading={banner?.sub_heading}
buttonTitle={banner?.CTO_button_title}

3
src/Pages/BlogsAndArticles/BlogsAndArticles.jsx
View File

@@ -54,6 +54,7 @@ import Header from "../../Components/Header";
import ToastBox from "../../Components/ToastBox";
import TabularView from "../../Components/TabularView/TabularView";
import { TABLE_PAGINATION } from "../../Constants/Paginations";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const BlogsAndArticles = () => {
// ====================================================[Hooks]===================================================================
@@ -158,7 +159,7 @@ const BlogsAndArticles = () => {
<Avatar
size="sm"
name="KC Reddy"
src={`https://rubix.betadelivery.com/${item.profile_image}`}
src={`${API_URL}/${item.profile_image}`}
/>
<span className="d-flex flex-column">
<Text

5
src/Pages/BlogsAndArticles/EditBlogsAndArticles.jsx
View File

@@ -32,6 +32,7 @@ import { motion } from "framer-motion";
import Loader01 from "../../Components/Loaders/Loader01";
import Header from "../../Components/Header";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditBlogsAndArticles = () => {
const { id } = useParams();
@@ -75,9 +76,9 @@ const EditBlogsAndArticles = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(`https://rubix.betadelivery.com/${blog?.profile_image}`);
setSelectedImage(`${API_URL}/${blog?.profile_image}`);
setSelectedImageLarge(
`https://rubix.betadelivery.com/${blog?.content_image_large}`
`${API_URL}/${blog?.content_image_large}`
);
setValue("author_name", blog?.author_name);
setValue("author_designation", blog?.author_designation);

5
src/Pages/BlogsAndArticles/ViewBlogsAndArticles.jsx
View File

@@ -14,6 +14,7 @@ import { useGetBlogByIdQuery } from "../../Services/api.service";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import { OPACITY_ON_LOAD } from "../../Layout/animations";
import Header from "../../Components/Header";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewBlogsAndArticles = () => {
const { id } = useParams();
@@ -66,7 +67,7 @@ const ViewBlogsAndArticles = () => {
rounded={8}
w={500}
h={240}
src={`https://rubix.betadelivery.com/${blog?.content_image_large}`}
src={`${API_URL}/${blog?.content_image_large}`}
alt="Selected Image"
/>
{/* <Button
@@ -191,7 +192,7 @@ const ViewBlogsAndArticles = () => {
rounded={8}
w={214}
h={240}
src={`https://rubix.betadelivery.com/${blog?.profile_image}`}
src={`${API_URL}/${blog?.profile_image}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Community/CommCard.jsx
View File

@@ -4,6 +4,7 @@ import { Text, SimpleGrid, Card, Image, Box, Flex } from "@chakra-ui/react";
// import map from "../../assets/images/map-pin.png";
import linkedin from "../../assets/linkedin.png";
import { Link } from "react-router-dom";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const CommCard = ({ id, imageUrl, name, jobTitle, description, linkdin }) => {
return (
@@ -32,7 +33,7 @@ const CommCard = ({ id, imageUrl, name, jobTitle, description, linkdin }) => {
},
}}
>
<Image src={`https://rubix.betadelivery.com/${imageUrl}`} />
<Image src={`${API_URL}/${imageUrl}`} />
</Text>
<Text
position={"relative"}

2
src/Pages/Community/Community.jsx
View File

@@ -176,7 +176,7 @@ const Community = () => {
<Avatar
size="sm"
name="KC Reddy"
src={`https://rubix.betadelivery.com/${item.profile_image}`}
src={`${API_URL}/${item.profile_image}`}
/>
<span className="d-flex flex-column">
<Text

5
src/Pages/Community/CommunityBannerCard.jsx
View File

@@ -13,6 +13,7 @@ import {
import React from "react";
import WebButton from "../../Components/WebButton";
import { formatDate } from "../../Components/Functions/UTCConvertor";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const CommunityBannerCard = ({
bgImage,
@@ -46,7 +47,7 @@ const CommunityBannerCard = ({
// border={"1px solid #9B4651"}
borderRadius={'sm'}
overflow={"hidden"}
bgImage={`https://rubix.betadelivery.com/${bgImage}`}
bgImage={`${API_URL}/${bgImage}`}
bgSize="cover"
bgPosition="center"
// backgroundColor={status ? "#ffe5ea": '#ffffff'}
@@ -164,7 +165,7 @@ const CommunityBannerCard = ({
rounded={"md"}
w={130}
h={"75px"}
src={`https://rubix.betadelivery.com/${bgImage}`}
src={`${API_URL}/${bgImage}`}
/>
</Box> */}
</Box>

3
src/Pages/Community/ComunityEditPage.jsx
View File

@@ -32,6 +32,7 @@ import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import fallbackImage from "../../assets/fallBackImage.png";
import Header from "../../Components/Header";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ComunityEditPage = () => {
const { id } = useParams();
@@ -63,7 +64,7 @@ const ComunityEditPage = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.profile_image}`
`${API_URL}/${data?.data?.profile_image}`
);
setValue("member_name", data?.data?.member_name);
setValue("designation", data?.data?.designation);

3
src/Pages/Community/ComunityViewPage.jsx
View File

@@ -9,6 +9,7 @@ import { Box, Divider, Image, Tag } from "@chakra-ui/react";
import Header from "../../Components/Header";
import { OPACITY_ON_LOAD } from "../../Layout/animations";
import { formatDate } from "../../Components/Functions/UTCConvertor";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ComunityViewPage = () => {
const { id } = useParams();
@@ -59,7 +60,7 @@ const ComunityViewPage = () => {
rounded={8}
w={214}
h={240}
src={`https://rubix.betadelivery.com/${data?.data?.profile_image}`}
src={`${API_URL}/${data?.data?.profile_image}`}
alt="Selected Image"
/>
{/* <Button

2
src/Pages/Events/EditEvents.jsx
View File

@@ -80,7 +80,7 @@ const EditEvents = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.banner_image}`
`${API_URL}/${data?.data?.banner_image}`
);
setValue("title", data?.data?.title);
setValue("content", data?.data?.content);

3
src/Pages/Events/ViewEvents.jsx
View File

@@ -6,6 +6,7 @@ import FullscreenLoaders from '../../Components/Loaders/FullscreenLoaders';
import { OPACITY_ON_LOAD } from '../../Layout/animations';
import Header from '../../Components/Header';
import { formatDate } from '../../Components/Functions/UTCConvertor';
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewEvents = () => {
const { id } = useParams();
@@ -61,7 +62,7 @@ const ViewEvents = () => {
objectFit='cover'
w={500}
h={240}
src={`https://rubix.betadelivery.com/${events?.banner_image}`}
src={`${API_URL}/${events?.banner_image}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Faq/ViewFaq.jsx
View File

@@ -11,6 +11,7 @@ import { AttachmentIcon } from "@chakra-ui/icons";
import extractFilename from "../../Components/Functions/FileNameAlter";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import pdf from "../../assets/pdfscreen.png";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewFaq = () => {
const { id } = useParams();
@@ -49,7 +50,7 @@ const ViewFaq = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${viewPolicy?.banner_image}`}
src={`${API_URL}/${viewPolicy?.banner_image}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/News/EditNews.jsx
View File

@@ -31,6 +31,7 @@ import { formatDate } from "../../Components/Functions/UTCConvertor";
import { TiWarning } from "react-icons/ti";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditNews = () => {
const { id } = useParams();
@@ -67,7 +68,7 @@ const EditNews = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.banner_image}`
`${API_URL}/${data?.data?.banner_image}`
);
setValue("title", data?.data?.title);
setValue("meta_description", data?.data?.meta_description);

3
src/Pages/News/ViewNews.jsx
View File

@@ -9,6 +9,7 @@ import {
import { useNavigate, useParams } from "react-router-dom";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import { formatDate } from "../../Components/Functions/UTCConvertor";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewNews = () => {
const { id } = useParams();
@@ -60,7 +61,7 @@ const ViewNews = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${news?.banner_image}`}
src={`${API_URL}/${news?.banner_image}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Partners/EditPartners.jsx
View File

@@ -35,6 +35,7 @@ import Loader01 from "../../Components/Loaders/Loader01";
import { motion } from "framer-motion";
import ToastBox from "../../Components/ToastBox";
import ReactQuill from "react-quill";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditPartner = () => {
const { id } = useParams();
@@ -69,7 +70,7 @@ const EditPartner = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.company_logo}`
`${API_URL}/${data?.data?.company_logo}`
);
setValue("website_link", data?.data?.website_link);
setValue("description", data?.data?.description);

3
src/Pages/Partners/ViewPartner.jsx
View File

@@ -11,6 +11,7 @@ import { AttachmentIcon } from "@chakra-ui/icons";
import extractFilename from "../../Components/Functions/FileNameAlter";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import pdf from "../../assets/pdfscreen.png";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewPartner = () => {
const { id } = useParams();
@@ -53,7 +54,7 @@ const ViewPartner = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${viewPolicy?.company_logo}`}
src={`${API_URL}/${viewPolicy?.company_logo}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Policy/EditPolicy.jsx
View File

@@ -32,6 +32,7 @@ import Loader01 from "../../Components/Loaders/Loader01";
import { motion } from "framer-motion";
import ToastBox from "../../Components/ToastBox";
import ReactQuill from "react-quill";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditPolicy = () => {
const { id } = useParams();
@@ -67,7 +68,7 @@ const EditPolicy = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.banner_image}`
`${API_URL}/${data?.data?.banner_image}`
);
setValue("title", data?.data?.title);
setValue("content", data?.data?.content);

3
src/Pages/Policy/ViewPolicy.jsx
View File

@@ -8,6 +8,7 @@ import { AttachmentIcon } from "@chakra-ui/icons";
import extractFilename from "../../Components/Functions/FileNameAlter";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import pdf from "../../assets/pdfscreen.png";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewPolicy = () => {
const { id } = useParams();
@@ -50,7 +51,7 @@ const ViewPolicy = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${viewPolicy?.banner_image}`}
src={`${API_URL}/${viewPolicy?.banner_image}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Terms/EditTerms.jsx
View File

@@ -35,6 +35,7 @@ import Loader01 from "../../Components/Loaders/Loader01";
import { motion } from "framer-motion";
import ToastBox from "../../Components/ToastBox";
import ReactQuill from "react-quill";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditTerms = () => {
const { id } = useParams();
@@ -71,7 +72,7 @@ const EditTerms = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.banner_image}`
`${API_URL}/${data?.data?.banner_image}`
);
setValue("title", data?.data?.title);
setValue("content", data?.data?.content);

3
src/Pages/Terms/ViewTerms.jsx
View File

@@ -8,6 +8,7 @@ import { AttachmentIcon } from "@chakra-ui/icons";
import extractFilename from "../../Components/Functions/FileNameAlter";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import pdf from "../../assets/pdfscreen.png";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewTerms = () => {
const { id } = useParams();
@@ -50,7 +51,7 @@ const ViewTerms = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${viewTerms?.banner_image}`}
src={`${API_URL}/${viewTerms?.banner_image}`}
alt="Selected Image"
/>
</Box>

5
src/Pages/Usecase/EditUseCase.jsx
View File

@@ -33,6 +33,7 @@ import { motion } from "framer-motion";
import Loader01 from "../../Components/Loaders/Loader01";
import Header from "../../Components/Header";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditUseCase = () => {
const { id } = useParams();
@@ -77,9 +78,9 @@ const EditUseCase = () => {
useEffect(() => {
if (data?.data) {
setSelectedImage(`https://rubix.betadelivery.com/${blog?.icon}`);
setSelectedImage(`${API_URL}/${blog?.icon}`);
setSelectedImageLarge(
`https://rubix.betadelivery.com/${blog?.bannerImage}`
`${API_URL}/${blog?.bannerImage}`
);
setValue("meta_description", blog?.meta_description);
setValue("title", blog?.title);

3
src/Pages/Usecase/Usecase.jsx
View File

@@ -36,6 +36,7 @@ import Header from "../../Components/Header";
import { TABLE_PAGINATION } from "../../Constants/Paginations";
import TabularView from "../../Components/TabularView/TabularView";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const Usecase = () => {
// ====================================================[Hooks]===================================================================
@@ -143,7 +144,7 @@ const Usecase = () => {
w={"35px"}
h={"35px"}
rounded={"full"}
src={`https://rubix.betadelivery.com/${item?.icon}`}
src={`${API_URL}/${item?.icon}`}
/>
<Text as={"span"}>{item?.title}</Text>
</Box>

5
src/Pages/Usecase/ViewUseCase.jsx
View File

@@ -8,6 +8,7 @@ import {
import { useNavigate, useParams } from "react-router-dom";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import { formatDate } from "../../Components/Functions/UTCConvertor";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewUseCase = () => {
const { id } = useParams();
@@ -59,7 +60,7 @@ const ViewUseCase = () => {
objectFit='cover'
w={"100px"}
h={"100px"}
src={`https://rubix.betadelivery.com/${usecase?.icon}`}
src={`${API_URL}/${usecase?.icon}`}
alt="Selected Image"
/>
</Box>
@@ -81,7 +82,7 @@ const ViewUseCase = () => {
objectFit='cover'
w={500}
h={240}
src={`https://rubix.betadelivery.com/${usecase?.bannerImage}`}
src={`${API_URL}/${usecase?.bannerImage}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Videos/EditVideos.jsx
View File

@@ -30,6 +30,7 @@ import Loader01 from "../../Components/Loaders/Loader01";
import { motion } from "framer-motion";
import { TiWarning } from "react-icons/ti";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditVideos = () => {
const { id } = useParams();
@@ -64,7 +65,7 @@ const EditVideos = () => {
useEffect(() => {
if (data?.data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.data?.thumbnail}`
`${API_URL}/${data?.data?.data?.thumbnail}`
);
setValue("title", data?.data?.data?.title);
setValue("description", data?.data?.data?.description);

3
src/Pages/Videos/ViewVideos.jsx
View File

@@ -5,6 +5,7 @@ import { useGetVideosByIdQuery } from "../../Services/api.service";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import Header from "../../Components/Header";
import { OPACITY_ON_LOAD } from "../../Layout/animations";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewVideos = () => {
const { id } = useParams();
@@ -60,7 +61,7 @@ const ViewVideos = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${videos?.thumbnail}`}
src={`${API_URL}/${videos?.thumbnail}`}
alt="Selected Image"
/>
</Box>

3
src/Pages/Whitepapers/EditWhitepaper.jsx
View File

@@ -32,6 +32,7 @@ import extractFilename from "../../Components/Functions/FileNameAlter";
import Loader01 from "../../Components/Loaders/Loader01";
import { motion } from "framer-motion";
import ToastBox from "../../Components/ToastBox";
const API_URL = import.meta.env.VITE_API_BASE_URL;
const EditWhitepaper = () => {
const { id } = useParams();
@@ -61,7 +62,7 @@ const EditWhitepaper = () => {
useEffect(() => {
if (data?.data?.data) {
setSelectedImage(
`https://rubix.betadelivery.com/${data?.data?.data?.bannerImage}`
`${API_URL}/${data?.data?.data?.bannerImage}`
);
setValue("title", data?.data?.data?.title);
setValue("image", data?.data?.data?.image);

3
src/Pages/Whitepapers/ViewWhitePaper.jsx
View File

@@ -8,6 +8,7 @@ import { AttachmentIcon } from "@chakra-ui/icons";
import extractFilename from "../../Components/Functions/FileNameAlter";
import FullscreenLoaders from "../../Components/Loaders/FullscreenLoaders";
import pdf from "../../assets/pdfscreen.png"
const API_URL = import.meta.env.VITE_API_BASE_URL;
const ViewWhitePaper = () => {
const { id } = useParams();
@@ -60,7 +61,7 @@ const ViewWhitePaper = () => {
objectFit="cover"
w={500}
h={240}
src={`https://rubix.betadelivery.com/${whitepaper?.bannerImage}`}
src={`${API_URL}/${whitepaper?.bannerImage}`}
alt="Selected Image"
/>
</Box>

5
src/Services/api.service.js
View File

@@ -1,9 +1,6 @@
// Need to use the React-specific entry point to import createApi
import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
const baseUrl = import.meta.env.VITE_API_BASE_URL
const baseUrl = import.meta.env.VITE_API_BASE_URL + "/api"
// Define a service using a base URL and expected endpoints
export const rubixApi = createApi({