diff --git a/package.json b/package.json index 54468f2..173b01d 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,10 @@ "version": "0.0.0", "type": "module", "scripts": { - "start": "npm-run-all --parallel backend vite", + "start": "npm-run-all --parallel vite", "vite": "vite", "build": "vite build", - "serve": "http-server -p 3000 ./dist/", - "backend": "json-server database/data.json -p 5174", - "prod": "npm-run-all build --parallel backend serve", + "prod": "npm-run-all build --parallel", "lint": "eslint ." }, "dependencies": { diff --git a/src/App.css b/src/App.css index 0bb34c4..4c05377 100644 --- a/src/App.css +++ b/src/App.css @@ -39,7 +39,7 @@ color: #000000; } -.pteg { +.ptag { color: #ff0000; } diff --git a/src/components/Api/client.js b/src/components/Api/client.js index dcc998f..8394e51 100644 --- a/src/components/Api/client.js +++ b/src/components/Api/client.js @@ -1,4 +1,4 @@ -const URL = "http://localhost:5174/"; +const URL = "http://localhost:8080/api/1.0/"; const makeRequest = async (path, params, vars, method = "GET", data = null) => { try { diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx index b63a990..a40864b 100644 --- a/src/components/Layout/Header.jsx +++ b/src/components/Layout/Header.jsx @@ -3,12 +3,12 @@ import "./Header.modul.css" export default function Header() { return ( -
-
- - +
+
+ Логотип УлЧУ +
-
+
Главная Об университете Образование diff --git a/src/components/News/Hooks/NewsHook.jsx b/src/components/News/Hooks/NewsHook.jsx index af2aabb..5942acb 100644 --- a/src/components/News/Hooks/NewsHook.jsx +++ b/src/components/News/Hooks/NewsHook.jsx @@ -21,8 +21,7 @@ export const useNews = (id) => { } else { await updateItem(PATH, newsId, news); } - const result = await getNews(newsId); - setNews(result); + getNews(newsId).then((value) => setNews(value)) }; const updateNews = (key, value) => { diff --git a/src/components/News/Hooks/NewsTagHook.jsx b/src/components/News/Hooks/NewsTagHook.jsx new file mode 100644 index 0000000..f7eac4f --- /dev/null +++ b/src/components/News/Hooks/NewsTagHook.jsx @@ -0,0 +1,12 @@ +import { useEffect, useState } from "react"; +import { getAllItems } from "../../Api/client"; + +export default function NewsTagHook() { + const [tags, setTags] = useState(null); + + useEffect(() => { + getAllItems("tags").then((value) => setTags(value)) + }, []) + + return tags; +}; \ No newline at end of file diff --git a/src/components/News/Hooks/NewsTegHook.jsx b/src/components/News/Hooks/NewsTegHook.jsx deleted file mode 100644 index 3d8cd63..0000000 --- a/src/components/News/Hooks/NewsTegHook.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useEffect, useState } from "react"; -import { getAllItems } from "../../Api/client"; - -export default function NewsTegHook() { - const [tegs, setTegs] = useState(null); - - useEffect(() => { - getAllItems("tegs").then((value) => setTegs(value)) - }, []) - - return tegs; -}; \ No newline at end of file diff --git a/src/components/News/Hooks/NewssHook.jsx b/src/components/News/Hooks/NewssHook.jsx index 0f6af34..b49bf11 100644 --- a/src/components/News/Hooks/NewssHook.jsx +++ b/src/components/News/Hooks/NewssHook.jsx @@ -19,8 +19,7 @@ export default function useNewss() { throw new Error("News id is not defined"); } await deleteItem(PATH, id) - const newNewss = getNews() - setNews(newNewss) + getNews().then((value) => setNews(value)) } return { news, deleteNews } diff --git a/src/components/News/News.jsx b/src/components/News/News.jsx index 8c5ca6c..a05b0d6 100644 --- a/src/components/News/News.jsx +++ b/src/components/News/News.jsx @@ -1,12 +1,12 @@ import { Link, useNavigate } from "react-router-dom" import NewsBoard from "./NewsBoard/NewsBoard" -import useNewsTeg from "./Hooks/NewsTegHook" +import useNewsTag from "./Hooks/NewsTagHook" import useNewss from "./Hooks/NewssHook" export default function News() { const navigate = useNavigate() const { news, deleteNews } = useNewss() - const tegs = useNewsTeg() + const tags = useNewsTag() function handleUpdate(id) { navigate(`/news/edit/${id}`) } function handleDelete(id) { deleteNews(id) } @@ -14,7 +14,7 @@ export default function News() { return (
- +
) } \ No newline at end of file diff --git a/src/components/News/NewsBoard/NewsBoard.jsx b/src/components/News/NewsBoard/NewsBoard.jsx index aa2414d..65c1362 100644 --- a/src/components/News/NewsBoard/NewsBoard.jsx +++ b/src/components/News/NewsBoard/NewsBoard.jsx @@ -1,9 +1,9 @@ -export default function NewsBoard({ data, tegs, onUpdate, onDelete}) { +export default function NewsBoard({ data, tags, onUpdate, onDelete}) { const body = data?.map((news) => { return ( -
+

{news.name}

-

{tegs?.find((teg) => teg.id === news.tegId).name}

+

{tags?.find((tag) => tag.id === news.tagId).name}

{news.bdate}

{news.description}

diff --git a/src/components/News/NewsForm/NewsForm.jsx b/src/components/News/NewsForm/NewsForm.jsx index 0e23951..1801107 100644 --- a/src/components/News/NewsForm/NewsForm.jsx +++ b/src/components/News/NewsForm/NewsForm.jsx @@ -1,17 +1,17 @@ import { useParams } from "react-router-dom" -import useNewsTeg from "../Hooks/NewsTegHook" +import useNewsTag from "../Hooks/NewsTagHook" import { useNews } from "../Hooks/NewsHook" const newsModel = { name: ["Название", "text"], - tegId: ["Тег", "text"], + tagId: ["Тег", "text"], bdate: ["Дата", "date"], description: ["Описание", "text"] } export default function NewsForm() { const params = useParams() - const tegs = useNewsTeg() + const tags = useNewsTag() const { news, updateNews, saveNews, clearNews } = useNews(params.newsId) async function handleSave(event) { @@ -19,20 +19,18 @@ export default function NewsForm() { event.stopPropagation() try { await saveNews() - setError(false) } catch (err) { - setError(err) + console.log(err) } } function handleChange(event) { - console.log(event.target.name, event.target.value) updateNews(event.target.name, event.target.value) } const inputs = Object.keys(newsModel).map((field) => { - if (field === "tegId") return + if (field === "tagId") return return (
@@ -48,10 +46,10 @@ export default function NewsForm() { ); }); - const tegOptions = tegs?.map((teg) => { + const tagOptions = tags?.map((tag) => { return ( - ); }); @@ -60,15 +58,15 @@ export default function NewsForm() {
{inputs}
- +
diff --git a/src/components/Pages/ContactsPage.jsx b/src/components/Pages/ContactsPage.jsx index dafa7ad..131f228 100644 --- a/src/components/Pages/ContactsPage.jsx +++ b/src/components/Pages/ContactsPage.jsx @@ -3,7 +3,7 @@ export default function ContactsPage() { <>

Список контактов:

    -
  • Телефон: 8-800-476-92-84
    • +
  • Телефон: 8-800-476-92-84
  • E-mail: info@ulchu.ru
  • Адрес: 432027, г. Ульяновск, ул. Северный Венец, д. 32
  • Официальный телеграмм канал: https://t.me/UlCHU
    • diff --git a/src/components/Pages/EducationPage.jsx b/src/components/Pages/EducationPage.jsx index 497dbd3..7769489 100644 --- a/src/components/Pages/EducationPage.jsx +++ b/src/components/Pages/EducationPage.jsx @@ -2,7 +2,7 @@ export default function EducationPage() { return ( <>

    Доступные направления обучения:

    -
    +

    Экономика и управление:

    • Управление предприятиями
      • @@ -11,7 +11,7 @@ export default function EducationPage() {
    • Предпринемательская деятельность
    -
    +

    Информационные технологии:

    • Программная инженерия
      • @@ -21,7 +21,7 @@ export default function EducationPage() {
    • Веб-дизайнер
    -
    +

    Гуманитарные науки:

    • Психология
      • @@ -31,7 +31,7 @@ export default function EducationPage() {
    • Журналист
    -
    +

    Международные отношения и право:

    • Правоведение
      • @@ -39,7 +39,7 @@ export default function EducationPage() {
    • Международный бизнес
    -
    +

    Экология и устойчивое развитие:

    • Специалист по охране окружающей среды