-
- );
-}
-
-export default BlogsHeader;
-
-BlogsHeader.propTypes = {
- pageType: PropTypes.oneOf(["CreatePost", "ManagePosts"]),
-};
-
-BlogsHeader.defaultProps = {
- pageType: "CreatePost",
-};
diff --git a/src/ADMIN/index.js b/src/ADMIN/index.js
index e4f99b0a..d3724d52 100644
--- a/src/ADMIN/index.js
+++ b/src/ADMIN/index.js
@@ -5,8 +5,6 @@ import AddEventPage from "./pages/events/AddEventPage";
import AllEventsPage from "./pages/events/AllEventsPage";
import UpdateEventPage from "./pages/events/UpdateEventPage";
import AdminLayout from "./components/AdminLayout";
-import CreatePost from "./pages/blogs/CreatePost";
-import ManagePosts from "./pages/blogs/ManagePosts";
export {
AddChapterPage,
@@ -16,6 +14,4 @@ export {
AllEventsPage,
UpdateEventPage,
AdminLayout,
- CreatePost,
- ManagePosts,
};
diff --git a/src/ADMIN/pages/blogs/CreatePost.jsx b/src/ADMIN/pages/blogs/CreatePost.jsx
deleted file mode 100644
index 707e1f67..00000000
--- a/src/ADMIN/pages/blogs/CreatePost.jsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import React, { useState, useEffect } from "react";
-import axios from "axios";
-import { Listbox, Transition } from "@headlessui/react";
-import { Navigate, useNavigate } from "react-router-dom";
-import ReactQuill from "react-quill";
-import BlogsHeader from "../../components/blogs/BlogsHeader";
-import useAuth from "../../../hooks/useAuth";
-import "react-quill/dist/quill.snow.css";
-
-function CreatePost() {
- const { auth } = useAuth();
- const [categories, setCategories] = useState([]);
- const [title, setTitle] = useState("");
- const [description, setDescription] = useState("");
- const [body, setBody] = useState("");
- const [selectedCategory, setSelectedCategory] = useState();
- const [isError, setError] = useState();
- const navigate = useNavigate();
-
- const getAllCategories = async () => {
- try {
- const response = await axios.get(
- `${process.env.REACT_APP_API_BASE_URL}/blog/category`
- );
-
- return response.data;
- } catch (error) {
- return error.message;
- }
- };
-
- useEffect(() => {
- getAllCategories().then(setCategories).catch(setError);
- }, []);
-
- const handleSubmit = async (e) => {
- e.preventDefault();
- try {
- const response = await axios.post(
- `${process.env.REACT_APP_API_BASE_URL}/blog/create`,
- {
- title,
- description,
- body,
- category: Number(selectedCategory),
- },
- { headers: { "Content-Type": "application/json" } }
- );
-
- console.log("Created blog successful ", response);
- navigate("/admin/blogs/manage-posts");
- } catch (error) {
- setError(error.message);
- }
- };
-
- if (auth?.access) {
- return - {pageType === "CreatePost" ? "Create Post" : "Manage Posts"} -
-
-
-
-
-
-
-
- );
-}
-
-export default CreatePost;
diff --git a/src/ADMIN/pages/blogs/ManagePosts.jsx b/src/ADMIN/pages/blogs/ManagePosts.jsx
deleted file mode 100644
index 906a7f80..00000000
--- a/src/ADMIN/pages/blogs/ManagePosts.jsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { useState, useEffect } from "react";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faTrashCan, faPenToSquare } from "@fortawesome/free-solid-svg-icons";
-import axios from "axios";
-import { Navigate } from "react-router-dom";
-import useAuth from "../../../hooks/useAuth";
-import BlogsHeader from "../../components/blogs/BlogsHeader";
-
-function ManagePosts() {
- const { auth } = useAuth();
- const [isError, setError] = useState(null);
- const [Posts, setPosts] = useState([]);
-
- const getAllPosts = async () => {
- try {
- const response = await axios.get(
- `${process.env.REACT_APP_API_BASE_URL}/blog/`
- );
-
- setPosts(response.data.results);
- } catch (error) {
- setError(error.message);
- }
- };
-
- useEffect(() => {
- getAllPosts();
- }, []);
-
- if (auth?.access) {
- return {isError.message}
} - - -
-
- );
-}
-
-export default ManagePosts;
diff --git a/src/ADMIN/pages/chapters/AddChapterPage.jsx b/src/ADMIN/pages/chapters/AddChapterPage.jsx
index 8018e018..97f92909 100644
--- a/src/ADMIN/pages/chapters/AddChapterPage.jsx
+++ b/src/ADMIN/pages/chapters/AddChapterPage.jsx
@@ -1,7 +1,7 @@
import * as React from "react";
import { useNavigate } from "react-router-dom";
-import StepIndicator from "../../components/chapters/StepIndicator";
-import AddChapterForm from "../../components/chapters/AddChapterForm";
+import StepIndicator from "../../components/StepIndicator";
+import AddChapterForm from "../../components/AddChapterForm";
function AddChapterPage() {
const [steps, setSteps] = React.useState([
diff --git a/src/APP/pages/aboutUs/sections/HeroSection.jsx b/src/APP/pages/aboutUs/sections/HeroSection.jsx
index e7ee1fcd..b5b49569 100644
--- a/src/APP/pages/aboutUs/sections/HeroSection.jsx
+++ b/src/APP/pages/aboutUs/sections/HeroSection.jsx
@@ -3,7 +3,7 @@ import AboutImg2 from "../../../../assets/images/aboutPage/about-img-2.png";
function HeroSection() {
return (
-
-
-
- {Posts?.map(({ id, title }, idx) => (
-
- {isError &&
- | - {(idx + 1).toString().length === 1 ? `0${idx + 1}` : idx + 1}.{" "} - {title} - | -- - | -- - | -
{isError}
} -
+
diff --git a/src/APP/pages/community/CommunityPage.jsx b/src/APP/pages/community/CommunityPage.jsx
index 1c41a3ea..8dc934d7 100644
--- a/src/APP/pages/community/CommunityPage.jsx
+++ b/src/APP/pages/community/CommunityPage.jsx
@@ -15,7 +15,7 @@ function CommunityPage() {
return (
diff --git a/src/APP/pages/community/CommunityPage.jsx b/src/APP/pages/community/CommunityPage.jsx
index 1c41a3ea..8dc934d7 100644
--- a/src/APP/pages/community/CommunityPage.jsx
+++ b/src/APP/pages/community/CommunityPage.jsx
@@ -15,7 +15,7 @@ function CommunityPage() {
return (
- Events in
-
+
+ { topEventsCities && Array.isArray(topEventsCities.cities) ? (
+ <>
+ Events in
{topEventsCities.cities.map((city, index) => (
-
))}
- {cityFilter.city && (
- updateCityFilter("")}
- >
- Clear City
-
- )}
-
- ) : (
- ""
- )}
+ { cityFilter.city &&
+ updateCityFilter('')}>Clear City
+ }
+
+ ) : ''}
{showAllEventsLink && (
-// <<<<<<< feat/blog-admin-forms
-
- ALL EVENTS
-
-
+
)}
+
-
-
+
+
-
-
- Dashboard
-
+ Dashboard
-
-
- Settings
-
+ Settings
-
-
- Earnings
-
+ Earnings
- );
+
+ )
}
EventsUpdateSection.defaultProps = {
showAllEventsLink: false,
-};
+}
-export default EventsUpdateSection;
+export default EventsUpdateSection
diff --git a/src/APP/pages/landingPage/sections/HeroSection3.jsx b/src/APP/pages/landingPage/sections/HeroSection3.jsx
index 3a6d364d..791680db 100644
--- a/src/APP/pages/landingPage/sections/HeroSection3.jsx
+++ b/src/APP/pages/landingPage/sections/HeroSection3.jsx
@@ -68,7 +68,7 @@ const partners = [
const HeroSection3 = () => {
return (
-
+
{/* Hero Header */}
{/* hero desc */}
diff --git a/src/AUTH/pages/LogIn.jsx b/src/AUTH/pages/LogIn.jsx
index a238a046..e14d1da8 100644
--- a/src/AUTH/pages/LogIn.jsx
+++ b/src/AUTH/pages/LogIn.jsx
@@ -16,7 +16,7 @@ function LogIn() {
try {
const response = await axios.post(
- `${process.env.REACT_APP_API_BASE_URL}/token/`,
+ `${process.env.REACT_APP_API_BASE_URL}/api/token/`,
{
username,
password,
diff --git a/src/index.css b/src/index.css
index 61798aae..af5040f2 100644
--- a/src/index.css
+++ b/src/index.css
@@ -130,32 +130,6 @@
.bg-blog-image {
background-image: url("../src/assets/images/blogs-page/blogBg.png");
}
-
- /* React-quill custom styles */
- .quill .ql-toolbar {
- @apply bg-white;
- border-top-left-radius: 8px;
- border-top-right-radius: 8px;
- }
- .ql-custom :focus {
- outline: #9c529d;
- }
- .ql-container {
- @apply bg-white placeholder:text-neutral-gray;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- max-height: 300px;
- overflow-y: hidden;
- }
- .quill.ql-error .ql-toolbar {
- border-bottom: 1px solid red;
- }
-
- .quill.ql-error .ql-container {
- border-left: 1px solid red;
- border-right: 1px solid red;
- border-bottom: 1px solid red;
- }
}
/* =======
@import url("https://fonts.googleapis.com/css2?family=Sora&display=swap");
diff --git a/src/router/index.jsx b/src/router/index.jsx
index ec5dd904..ad25eb6f 100644
--- a/src/router/index.jsx
+++ b/src/router/index.jsx
@@ -28,8 +28,6 @@ import {
AddChapterPage,
AddEventPage,
UpdateEventPage,
- ManagePosts,
- CreatePost,
} from "../ADMIN";
import {
ForgotPassword,
@@ -150,14 +148,6 @@ const router = createBrowserRouter([
path: "/admin/events/update-event",
element:
-
-
-
-
-
- {selectedRecentButton && (
-
- );
+ )
}
export default EventsTab;
diff --git a/src/APP/pages/events/sections/eventsSection/EventsUpdateSection.jsx b/src/APP/pages/events/sections/eventsSection/EventsUpdateSection.jsx
index 73f139c0..3af17171 100644
--- a/src/APP/pages/events/sections/eventsSection/EventsUpdateSection.jsx
+++ b/src/APP/pages/events/sections/eventsSection/EventsUpdateSection.jsx
@@ -1,133 +1,66 @@
-import React, { useState } from "react";
+import React, { useState } from 'react';
import { Link } from "react-router-dom";
-function EventsUpdateSection({
- cityFilter,
- topEventsCities,
- updateCityFilter,
- showAllEventsLink,
-}) {
+function EventsUpdateSection({ cityFilter, topEventsCities, updateCityFilter, showAllEventsLink }) {
return (
- {topEventsCities && Array.isArray(topEventsCities.cities) ? (
- <>
-
- Events in -
+ + { topEventsCities && Array.isArray(topEventsCities.cities) ? ( + <> +Events in
{topEventsCities.cities.map((city, index) => ( - ))} - {cityFilter.city && ( - updateCityFilter("")} - > - Clear City - - )} - - ) : ( - "" - )} + { cityFilter.city && + updateCityFilter('')}>Clear City + } + + ) : ''}
{showAllEventsLink && (
-
-// <<<<<<< feat/blog-admin-forms
-
+
)}
+
- ALL EVENTS -
-
-
- );
+
+ )
}
EventsUpdateSection.defaultProps = {
showAllEventsLink: false,
-};
+}
-export default EventsUpdateSection;
+export default EventsUpdateSection
diff --git a/src/APP/pages/landingPage/sections/HeroSection3.jsx b/src/APP/pages/landingPage/sections/HeroSection3.jsx
index 3a6d364d..791680db 100644
--- a/src/APP/pages/landingPage/sections/HeroSection3.jsx
+++ b/src/APP/pages/landingPage/sections/HeroSection3.jsx
@@ -68,7 +68,7 @@ const partners = [
const HeroSection3 = () => {
return (
- -
+
- - - Dashboard - + Dashboard
- - - Settings - + Settings
- - - Earnings - + Earnings
+
{/* hero desc */}
diff --git a/src/AUTH/pages/LogIn.jsx b/src/AUTH/pages/LogIn.jsx
index a238a046..e14d1da8 100644
--- a/src/AUTH/pages/LogIn.jsx
+++ b/src/AUTH/pages/LogIn.jsx
@@ -16,7 +16,7 @@ function LogIn() {
try {
const response = await axios.post(
- `${process.env.REACT_APP_API_BASE_URL}/token/`,
+ `${process.env.REACT_APP_API_BASE_URL}/api/token/`,
{
username,
password,
diff --git a/src/index.css b/src/index.css
index 61798aae..af5040f2 100644
--- a/src/index.css
+++ b/src/index.css
@@ -130,32 +130,6 @@
.bg-blog-image {
background-image: url("../src/assets/images/blogs-page/blogBg.png");
}
-
- /* React-quill custom styles */
- .quill .ql-toolbar {
- @apply bg-white;
- border-top-left-radius: 8px;
- border-top-right-radius: 8px;
- }
- .ql-custom :focus {
- outline: #9c529d;
- }
- .ql-container {
- @apply bg-white placeholder:text-neutral-gray;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
- max-height: 300px;
- overflow-y: hidden;
- }
- .quill.ql-error .ql-toolbar {
- border-bottom: 1px solid red;
- }
-
- .quill.ql-error .ql-container {
- border-left: 1px solid red;
- border-right: 1px solid red;
- border-bottom: 1px solid red;
- }
}
/* =======
@import url("https://fonts.googleapis.com/css2?family=Sora&display=swap");
diff --git a/src/router/index.jsx b/src/router/index.jsx
index ec5dd904..ad25eb6f 100644
--- a/src/router/index.jsx
+++ b/src/router/index.jsx
@@ -28,8 +28,6 @@ import {
AddChapterPage,
AddEventPage,
UpdateEventPage,
- ManagePosts,
- CreatePost,
} from "../ADMIN";
import {
ForgotPassword,
@@ -150,14 +148,6 @@ const router = createBrowserRouter([
path: "/admin/events/update-event",
element: