diff --git a/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/blog-metadata.json b/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/blog-metadata.json deleted file mode 100644 index f3f1037..0000000 --- a/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/blog-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "id": "72e4d550-a19b-4b62-bf5a-13f98813d31a", - "name": "Blog 1", - "description": "A subtitle for Blog 1", - "coverImage": "blogs/72e4d550-a19b-4b62-bf5a-13f98813d31a/media/blog1.png", - "tagLine": "Read more", - "parentCategory": "520b7982-069e-4a48-9ef3-64507d86a579" - }, - { - "id": "b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e", - "name": "Blog 2", - "description": "A subtitle for Blog 2", - "coverImage": "blogs/b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e/media/blog2.png", - "tagLine": "Read more", - "parentCategory": "520b7982-069e-4a48-9ef3-64507d86a579" - } -] \ No newline at end of file diff --git a/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/category-data.json b/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/category-data.json index 476aad9..9fce824 100644 --- a/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/category-data.json +++ b/frontend/public/data/category/520b7982-069e-4a48-9ef3-64507d86a579/category-data.json @@ -4,5 +4,21 @@ "coverImage": "category/520b7982-069e-4a48-9ef3-64507d86a579/media/technology.png", "tagLine": "Read articles about tech", "description": "I have been working in tech for long, and here are my thoughts of random stuff", - "featuredBlog": "b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e" + "featuredBlog": "b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e", + "blogMetadata": [{ + "id": "72e4d550-a19b-4b62-bf5a-13f98813d31a", + "name": "Blog 1", + "description": "A subtitle for Blog 1", + "coverImage": "blogs/72e4d550-a19b-4b62-bf5a-13f98813d31a/media/blog1.png", + "tagLine": "Read more", + "parentCategory": "520b7982-069e-4a48-9ef3-64507d86a579" + }, + { + "id": "b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e", + "name": "Blog 2", + "description": "A subtitle for Blog 2", + "coverImage": "blogs/b4d9e1a0-4a77-48eb-a04b-06ec23e2b73e/media/blog2.png", + "tagLine": "Read more", + "parentCategory": "520b7982-069e-4a48-9ef3-64507d86a579" + }] } \ No newline at end of file diff --git a/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/blog-metadata.json b/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/blog-metadata.json deleted file mode 100644 index 367e8fa..0000000 --- a/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/blog-metadata.json +++ /dev/null @@ -1,3 +0,0 @@ -[{ - -}] \ No newline at end of file diff --git a/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/category-data.json b/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/category-data.json index 8f1143e..848ba83 100644 --- a/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/category-data.json +++ b/frontend/public/data/category/b9e0d686-351d-49af-8e3d-b62023f44dbe/category-data.json @@ -3,5 +3,7 @@ "name": "Gaming", "coverImage": "category/b9e0d686-351d-49af-8e3d-b62023f44dbe/media/game.png", "tagLine": "Read articles about games", - "description": "I like to game, and here are my thoughts on games" + "description": "I like to game, and here are my thoughts on games", + "blogMetadata": [{ + }] } diff --git a/frontend/src/App.css b/frontend/src/App.css index e69de29..de837b8 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -0,0 +1,8 @@ +a{ + padding: 1em; +} + +.blogContent{ + margin-left:25% !important; + margin-right:25% !important; +} \ No newline at end of file diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 0bf03c3..16a2e1f 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -4,15 +4,16 @@ import {useEffect, useState} from 'react'; import 'bootstrap/dist/css/bootstrap.min.css'; //Import Views -import Home from './components/views/home'; -import CategoryList from './components/views/category-list'; -import BlogList from './components/views/blog-list'; -import Blog from './components/views/blog'; +import Home from './components/home'; +import CategoryList from './components/category-list'; +import BlogList from './components/blog-list'; +import Blog from './components/blog'; //Import Shared Views -import Header from './components/views/shared/navbar'; -import Footer from './components/views/shared/footer'; +import Header from './components/shared/navbar'; +import Footer from './components/shared/footer'; +import Notification from './components/shared/notification'; //Import Services import DataService from './services/data-service' @@ -21,6 +22,16 @@ function App() { const [userData, setUserData] = useState(null); const [themeConfig, setThemeConfig] = useState(null); const [globalTheme, setGlobalTheme] = useState("lightTheme"); + const [isOpen, setIsOpen] = useState(false); + const [notificationMessage, setNotificationMessage] = useState("") + + const notificationToggler = (message) => { + setIsOpen(true) + setNotificationMessage(message) + setTimeout(() => { + setIsOpen(false) + }, 3500) + } useEffect(() => { DataService.getData('shared/user-data').then( response => @@ -39,11 +50,12 @@ function App() {
{blogData.contentBody}
diff --git a/frontend/src/components/views/category-list.jsx b/frontend/src/components/category-list.jsx
similarity index 94%
rename from frontend/src/components/views/category-list.jsx
rename to frontend/src/components/category-list.jsx
index aa20f42..ff138e9 100644
--- a/frontend/src/components/views/category-list.jsx
+++ b/frontend/src/components/category-list.jsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
//import services
-import DataService from '../../services/data-service';
+import DataService from '../services/data-service';
//import views
import CardListViewer from './shared/card-list-viewer';
diff --git a/frontend/src/components/views/home.jsx b/frontend/src/components/home.jsx
similarity index 90%
rename from frontend/src/components/views/home.jsx
rename to frontend/src/components/home.jsx
index 7d54f28..2579be4 100644
--- a/frontend/src/components/views/home.jsx
+++ b/frontend/src/components/home.jsx
@@ -1,5 +1,5 @@
import { Container, Spinner } from 'reactstrap';
-import MediaService from '../../services/media-service'
+import MediaService from '../services/media-service'
function HomePage(props) {
const UserData = props.UserData ? props.UserData :