From cc0b7b3e6f0ad56baec7e5c20b72969e23996ac6 Mon Sep 17 00:00:00 2001 From: Dimas Atmodjo Date: Wed, 20 Nov 2024 10:16:51 +0700 Subject: [PATCH] fixing media URL --- src/components/layout/admin/AdminNavbar.jsx | 4 ++-- src/components/layout/teacher/TeacherSideNav.jsx | 4 ++-- src/components/layout/user/UserSideNav.jsx | 4 ++-- src/roles/admin/manage_exercises/hooks/useUpdateExercises.jsx | 2 +- src/roles/admin/manage_materials/hooks/useEditorMaterial.jsx | 2 +- src/roles/admin/manage_materials/hooks/useUpdateMaterials.jsx | 2 +- src/roles/admin/manage_section/hooks/useSections.jsx | 2 +- src/roles/admin/setting/hooks/useSettings.jsx | 2 +- src/roles/teacher/setting/hooks/useSettings.jsx | 2 +- src/roles/user/dashboard/hooks/useDashboards.jsx | 2 +- src/roles/user/exercise/views/components/ExerciseMedia.jsx | 2 +- .../user/exercise/views/components/MatchingPairsQuestion.jsx | 2 +- .../user/exercise/views/components/MultipleChoiceQuestion.jsx | 2 +- .../user/exercise/views/components/TrueFalseQuestion.jsx | 2 +- src/roles/user/learning/hooks/useSections.jsx | 2 +- src/roles/user/material/views/Material.jsx | 4 ++-- src/roles/user/setting/hooks/useSettings.jsx | 2 +- src/roles/user/topic/hooks/useTopics.jsx | 2 +- src/utils/Constant.jsx | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/components/layout/admin/AdminNavbar.jsx b/src/components/layout/admin/AdminNavbar.jsx index a90fd26..d606eea 100644 --- a/src/components/layout/admin/AdminNavbar.jsx +++ b/src/components/layout/admin/AdminNavbar.jsx @@ -4,7 +4,7 @@ import logo from '../../../assets/images/logo-w.png'; import logoutIllustration from '../../../assets/images/illustration/logout.png'; import { Link } from 'react-router-dom'; import useAuth from '../../../roles/guest/auth/hooks/useAuth'; -import { API_URL } from '../../../utils/Constant'; +import { MEDIA_URL } from '../../../utils/Constant'; import avatar from '../../../assets/images/default-avatar.jpg'; function validName(fullName) { @@ -54,7 +54,7 @@ const AdminNavbar = () => {
- {
- { const [topicName, setTopicName] = useState('topic'); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); - const mediaPath = `${MEDIA_URL}/uploads/exercise`; + const mediaPath = `${MEDIA_URL}/exercise`; const [formData, setFormData] = useState({ ID_ADMIN_EXERCISE: "", diff --git a/src/roles/admin/manage_materials/hooks/useEditorMaterial.jsx b/src/roles/admin/manage_materials/hooks/useEditorMaterial.jsx index 9099ea3..dee62cd 100644 --- a/src/roles/admin/manage_materials/hooks/useEditorMaterial.jsx +++ b/src/roles/admin/manage_materials/hooks/useEditorMaterial.jsx @@ -13,7 +13,7 @@ const useTest = (materialId) => { const editorContainerRef = useRef(null); const editorRef = useRef(null); const [isLayoutReady, setIsLayoutReady] = useState(false); - const mediaPath = `${MEDIA_URL}/uploads/level/`; + const mediaPath = `${MEDIA_URL}/level/`; const [show, setShow] = useState(false); diff --git a/src/roles/admin/manage_materials/hooks/useUpdateMaterials.jsx b/src/roles/admin/manage_materials/hooks/useUpdateMaterials.jsx index 7cb6cf9..ae3c298 100644 --- a/src/roles/admin/manage_materials/hooks/useUpdateMaterials.jsx +++ b/src/roles/admin/manage_materials/hooks/useUpdateMaterials.jsx @@ -9,7 +9,7 @@ const useUpdateMaterials = (materialId) => { const [topicName, setTopicName] = useState('topic'); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); - const mediaPath = `${MEDIA_URL}/uploads/level`; + const mediaPath = `${MEDIA_URL}/level`; const [formData, setFormData] = useState({ content: '', diff --git a/src/roles/admin/manage_section/hooks/useSections.jsx b/src/roles/admin/manage_section/hooks/useSections.jsx index 6222e0f..9b02608 100644 --- a/src/roles/admin/manage_section/hooks/useSections.jsx +++ b/src/roles/admin/manage_section/hooks/useSections.jsx @@ -3,7 +3,7 @@ import sectionService from '../services/serviceSections'; import { MEDIA_URL } from '../../../../utils/Constant'; const useSections = () => { - const thumbPath = `${MEDIA_URL}/uploads/section/`; + const thumbPath = `${MEDIA_URL}/section/`; const [sections, setSections] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); diff --git a/src/roles/admin/setting/hooks/useSettings.jsx b/src/roles/admin/setting/hooks/useSettings.jsx index 17aeb70..97e6ebb 100644 --- a/src/roles/admin/setting/hooks/useSettings.jsx +++ b/src/roles/admin/setting/hooks/useSettings.jsx @@ -10,7 +10,7 @@ const useSettings = () => { const [loadingUpdate, setLoadingUpdate] = useState(false); const [error, setError] = useState(null); const [success, setSuccess] = useState(false); - const thumbPath = `${MEDIA_URL}/uploads/avatar/`; + const thumbPath = `${MEDIA_URL}/avatar/`; useEffect(() => { const fetchData = async () => { diff --git a/src/roles/teacher/setting/hooks/useSettings.jsx b/src/roles/teacher/setting/hooks/useSettings.jsx index 2caa0ac..0a7fff1 100644 --- a/src/roles/teacher/setting/hooks/useSettings.jsx +++ b/src/roles/teacher/setting/hooks/useSettings.jsx @@ -10,7 +10,7 @@ const useSettings = () => { const [loadingUpdate, setLoadingUpdate] = useState(false); const [error, setError] = useState(null); const [success, setSuccess] = useState(false); - const thumbPath = `${MEDIA_URL}/uploads/avatar/`; + const thumbPath = `${MEDIA_URL}/avatar/`; useEffect(() => { const fetchData = async () => { diff --git a/src/roles/user/dashboard/hooks/useDashboards.jsx b/src/roles/user/dashboard/hooks/useDashboards.jsx index fe5fb91..4a68490 100644 --- a/src/roles/user/dashboard/hooks/useDashboards.jsx +++ b/src/roles/user/dashboard/hooks/useDashboards.jsx @@ -6,7 +6,7 @@ const useDashboards = () => { const [journey, setJourney] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); - const thumbPath = `${MEDIA_URL}/uploads/section/`; + const thumbPath = `${MEDIA_URL}/section/`; useEffect(() => { const fetchData = async () => { diff --git a/src/roles/user/exercise/views/components/ExerciseMedia.jsx b/src/roles/user/exercise/views/components/ExerciseMedia.jsx index a085a0a..36d7399 100644 --- a/src/roles/user/exercise/views/components/ExerciseMedia.jsx +++ b/src/roles/user/exercise/views/components/ExerciseMedia.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { MEDIA_URL } from '../../../../../utils/Constant'; const ExerciseMedia = ({ image, audio, video }) => { - const mediaPath = `${MEDIA_URL}/uploads/exercise`; + const mediaPath = `${MEDIA_URL}/exercise`; return (
diff --git a/src/roles/user/exercise/views/components/MatchingPairsQuestion.jsx b/src/roles/user/exercise/views/components/MatchingPairsQuestion.jsx index 1a472c0..d1767b5 100644 --- a/src/roles/user/exercise/views/components/MatchingPairsQuestion.jsx +++ b/src/roles/user/exercise/views/components/MatchingPairsQuestion.jsx @@ -111,7 +111,7 @@ const MatchingPairsQuestion = ({ question, onAnswer, studentAnswer, index }) => }; const mediaUrls = []; - const mediaPath = `${MEDIA_URL}/uploads/exercise`; + const mediaPath = `${MEDIA_URL}/exercise`; if (question.IMAGE) mediaUrls.push(`${mediaPath}/image/${question.IMAGE}`); if (question.AUDIO) mediaUrls.push(`${mediaPath}/audio/${question.AUDIO}`); diff --git a/src/roles/user/exercise/views/components/MultipleChoiceQuestion.jsx b/src/roles/user/exercise/views/components/MultipleChoiceQuestion.jsx index c8aed4c..21cb6da 100644 --- a/src/roles/user/exercise/views/components/MultipleChoiceQuestion.jsx +++ b/src/roles/user/exercise/views/components/MultipleChoiceQuestion.jsx @@ -7,7 +7,7 @@ const MultipleChoiceQuestion = ({ question, onAnswer, studentAnswer, index }) => const options = question.multipleChoices[0]; const mediaUrls = []; - const mediaPath = `${MEDIA_URL}/uploads/exercise`; + const mediaPath = `${MEDIA_URL}/exercise`; if (question.IMAGE) mediaUrls.push(`${mediaPath}/image/${question.IMAGE}`); if (question.AUDIO) mediaUrls.push(`${mediaPath}/audio/${question.AUDIO}`); diff --git a/src/roles/user/exercise/views/components/TrueFalseQuestion.jsx b/src/roles/user/exercise/views/components/TrueFalseQuestion.jsx index 47c7469..b495d1f 100644 --- a/src/roles/user/exercise/views/components/TrueFalseQuestion.jsx +++ b/src/roles/user/exercise/views/components/TrueFalseQuestion.jsx @@ -5,7 +5,7 @@ import { MEDIA_URL } from '../../../../../utils/Constant'; const TrueFalseQuestion = ({ question, onAnswer, studentAnswer, index }) => { const savedAnswer = studentAnswer !== null ? studentAnswer.ANSWER_STUDENT : null; const mediaUrls = []; - const mediaPath = `${MEDIA_URL}/uploads/exercise`; + const mediaPath = `${MEDIA_URL}/exercise`; if (question.IMAGE) mediaUrls.push(`${mediaPath}/image/${question.IMAGE}`); if (question.AUDIO) mediaUrls.push(`${mediaPath}/audio/${question.AUDIO}`); diff --git a/src/roles/user/learning/hooks/useSections.jsx b/src/roles/user/learning/hooks/useSections.jsx index a49037d..3513b31 100644 --- a/src/roles/user/learning/hooks/useSections.jsx +++ b/src/roles/user/learning/hooks/useSections.jsx @@ -6,7 +6,7 @@ const useSections = () => { const [sections, setSections] = useState([]); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); - const thumbPath = `${MEDIA_URL}/uploads/section/`; + const thumbPath = `${MEDIA_URL}/section/`; useEffect(() => { const fetchData = async () => { diff --git a/src/roles/user/material/views/Material.jsx b/src/roles/user/material/views/Material.jsx index 27a44fb..7701e52 100644 --- a/src/roles/user/material/views/Material.jsx +++ b/src/roles/user/material/views/Material.jsx @@ -6,7 +6,7 @@ import useMaterial from '../hooks/useMaterials'; import MediaViewer from './components/MediaViewer'; -import { API_URL } from '../../../../utils/Constant'; +import { MEDIA_URL } from '../../../../utils/Constant'; import { unSlugify } from '../../../../utils/Constant'; import Skeleton from 'react-loading-skeleton'; @@ -19,7 +19,7 @@ const Material = () => { const [localLoader, setLoader]= useState(true); const [mediaUrls, setMedia] = useState([]); - const mediaPath = `${API_URL}/uploads/level`; + const mediaPath = `${MEDIA_URL}/level`; useEffect(() => { if (!loading) { diff --git a/src/roles/user/setting/hooks/useSettings.jsx b/src/roles/user/setting/hooks/useSettings.jsx index 2caa0ac..0a7fff1 100644 --- a/src/roles/user/setting/hooks/useSettings.jsx +++ b/src/roles/user/setting/hooks/useSettings.jsx @@ -10,7 +10,7 @@ const useSettings = () => { const [loadingUpdate, setLoadingUpdate] = useState(false); const [error, setError] = useState(null); const [success, setSuccess] = useState(false); - const thumbPath = `${MEDIA_URL}/uploads/avatar/`; + const thumbPath = `${MEDIA_URL}/avatar/`; useEffect(() => { const fetchData = async () => { diff --git a/src/roles/user/topic/hooks/useTopics.jsx b/src/roles/user/topic/hooks/useTopics.jsx index d514bee..51734bd 100644 --- a/src/roles/user/topic/hooks/useTopics.jsx +++ b/src/roles/user/topic/hooks/useTopics.jsx @@ -8,7 +8,7 @@ const useTopics = (sectionId) => { const [loading, setLoading] = useState(true); const [error, setError] = useState(null); const [sections, setSection] = useState(null); - const thumbPath = `${MEDIA_URL}/uploads/section/`; + const thumbPath = `${MEDIA_URL}/section/`; const { sectionSlugMap } = useSlugContext(); useEffect(() => { diff --git a/src/utils/Constant.jsx b/src/utils/Constant.jsx index 6c201d9..b1c2193 100644 --- a/src/utils/Constant.jsx +++ b/src/utils/Constant.jsx @@ -1,5 +1,5 @@ export const API_URL = 'http://54.173.167.62/api'; -export const MEDIA_URL = 'http://54.173.167.62/media'; +export const MEDIA_URL = 'http://54.173.167.62/public'; export const slugify = (text) => { if (!text) {