Skip to content

Commit

Permalink
elon av yangilikda link ozgardi
Browse files Browse the repository at this point in the history
  • Loading branch information
@bekzodjonganiyev
bekzodjonganiyev committed Jan 28, 2023
1 parent 837cb2b commit d2de0c7
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 90 deletions.
7 changes: 3 additions & 4 deletions src/components/header/header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ const Header = () => {
<i className="fa-solid fa-xmark"></i>
</div>
<div className="header__top__main">
<a style={{background:"darkblue", color:"white"}} className="header__nav header_border" href="https://tkti-2023.edupage.org/timetable/view.php">
{HeaderLang[lang].talim[1]}
</a>
<a className="header__nav header_border" href="/qabul">
{HeaderLang[lang].qabul}
</a>
Expand All @@ -75,10 +78,6 @@ const Header = () => {
<a className="header__nav header_border" href="/faoliyatlar">
{HeaderLang[lang].activity[0]}
</a>

<a className="header__nav header_border" href="https://tkti-2023.edupage.org/timetable/view.php">
{HeaderLang[lang].talim[1]}
</a>
<a className="header__nav header_border" href="/biz-bilan-aloqa">
{HeaderLang[lang].contact}
</a>
Expand Down
20 changes: 18 additions & 2 deletions src/components/news/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ function YangiliklarComp({ home, myKey }) {
(data) =>
data.success &&
setNews({
data: home ? data.data.sort((a, b) => new Date(b.date) - new Date(a.date)).slice(0, 3)
data: home
? data.data
.sort((a, b) => new Date(b.date) - new Date(a.date))
.slice(0, 3)
: data.data.sort((a, b) => new Date(b.date) - new Date(a.date)),
isFetched: true,
})
Expand All @@ -38,7 +41,20 @@ function YangiliklarComp({ home, myKey }) {
{news.isFetched && news.data && news.data.length > 0 ? (
news.data.map((e, index) => (
<>
<Link className="news__card" key={index} to={`/${myKey}/${e._id}`}>
<Link
className="news__card"
key={index}
to={`/${myKey}/${e.title_uz
.toLowerCase()
.split(" ")
.map((str) =>
str
.split("")
.filter((char) => /[a-zA-Z]/.test(char))
.join("")
)
.join("-")}-${e._id}`}
>
<img
className="news_photo"
src={`${globalUrl}/${e.photo}`}
Expand Down
6 changes: 3 additions & 3 deletions src/components/searchsillabus/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ function Filter({yili}) {
const [syllabus, setSyllabus] = useState({});

const [about] = useState({
uz:[`Darajani tanlang`,`Yilni tanlang`,`Ta'lim turini tanlang`,`Ta'lim darajasini tanlang`,`Fakultetni tanlang`,`Kafedrani tanlang`,`Yo'nalishni tanlang`,`Qidirish`],
ru:[`Выберите уровень`,`Выберите год`,`Выберите тип образования`,`Выберите уровень образования`,`Выберите факультет`,`Выберите отдел`,`Выберите направление`,`Поиск`],
en:[`Select a level`,`Select a year`,`Select the type of education`,`Select the level of education`,`Choose a faculty`,`Select a department`,`Choose a direction`,`Search`]
uz:[`Syllabusni toping`,`Yilni tanlang`,`Ta'lim turini tanlang`,`Ta'lim darajasini tanlang`,`Fakultetni tanlang`,`Kafedrani tanlang`,`Yo'nalishni tanlang`,`Qidirish`],
ru:[`Найдите программу`,`Выберите год`,`Выберите тип образования`,`Выберите уровень образования`,`Выберите факультет`,`Выберите отдел`,`Выберите направление`,`Поиск`],
en:[`SFind the syllabus`,`Select a year`,`Select the type of education`,`Select the level of education`,`Choose a faculty`,`Select a department`,`Choose a direction`,`Search`]
})

const [types, setTypes] = useState([]);
Expand Down
5 changes: 5 additions & 0 deletions src/pages/admin/bolim/Bolim.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.table-edit-input{
margin-bottom: 10px;
display: flex;
width: 250px;
}
167 changes: 86 additions & 81 deletions src/pages/news/yengiItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Link, useNavigate, useParams } from "react-router-dom";

import { Context } from "../../context";

const YengiItem = ({myKey}) => {
const { lang, time, globalUrl, textSytles } = useContext(Context);
const YengiItem = ({ myKey }) => {
const { lang, time, globalUrl, textSytles, DataGetter } = useContext(Context);
const { id } = useParams();
const navigate = useNavigate();

Expand All @@ -25,26 +25,6 @@ const YengiItem = ({myKey}) => {
link: "",
});

useEffect(()=>{
if (!id.match(/^[0-9a-fA-F]{24}$/)) {
navigate(-1)
}
},[])

useEffect(() => {
fetch(`${globalUrl}/${myKey}/${id}`, {
headers: {
"Content-Type": "application/json",
},
})
.then((res) => res.json())
.then(
(data) =>
data.success && setNewOne({ data: data.data, isFetched: true })
)
.catch(() => setNewOne({ error: true }));
}, [id]);

useEffect(() => {
if (newOne.isFetched && newOne.data) {
fetch(`${globalUrl}/${myKey}/all`, {
Expand All @@ -57,7 +37,10 @@ const YengiItem = ({myKey}) => {
(data) =>
data.success &&
setData({
data: data.data.sort((a, b) => new Date(a.date) - new Date(b.date)).slice(0, 7).filter((a) => a._id !== id),
data: data.data
.sort((a, b) => new Date(a.date) - new Date(b.date))
.slice(0, 7)
.filter((a) => a._id !== id),
isFetched: true,
})
);
Expand All @@ -72,68 +55,90 @@ const YengiItem = ({myKey}) => {
setToggle({ display: false });
};

const refId = id.substring(id.lastIndexOf("-") + Number(1));
useEffect(() => {
if (!refId.match(/^[0-9a-fA-F]{24}$/)) {
navigate(-1);
}
DataGetter(setNewOne, `${myKey}/${refId}`);
}, [id]);

return (
<>
<div className="wrapped">
<div className="elonDesc">
<div className="news__item__card">
{newOne.isFetched && newOne.data ? (
<>
<div className="news__item__body">
<h2>{newOne.data[`title_${lang}`]} </h2>
<div className="card__html__content" dangerouslySetInnerHTML={{__html: newOne.data[`body_${lang}`]}}></div>
</div>
<div className="news__item__body">
<div className="card__control">
<i className="fa-solid fa-calendar-days">
<span>{time(newOne.data.date)}</span>
</i>

<i
onClick={() =>
setToggle({
display: true,
link: window.location.href,
})
}
className="fas fa-share"
>
<span>Ulashish</span>
</i>
</div>
</div>
</>
) : (
<></>
)}
</div>

<div className="mt-5 news__nav">
{data.isFetched && data.data && data.data.length > 0 ? (
data.data.map((e, index) => (
<Link
className="news__nav__card"
key={index}
to={`/${myKey}/${e._id}`}
<div className="elonDesc">
<div className="news__item__card">
{newOne.isFetched && newOne.data ? (
<>
<div className="news__item__body">
<h2>{newOne.data[`title_${lang}`]} </h2>
<div
className="card__html__content"
dangerouslySetInnerHTML={{
__html: newOne.data[`body_${lang}`],
}}
></div>
</div>
<div className="news__item__body">
<div className="card__control">
<i className="fa-solid fa-calendar-days">
<span>{time(newOne.data.date)}</span>
</i>

<i
onClick={() =>
setToggle({
display: true,
link: window.location.href,
})
}
className="fas fa-share"
>
<i
style={textSytles(14, 500)}
className="fa-solid fa-calendar-days"
>
<span style={textSytles(13, 500)} className="ms-3">
{time(e.date)}
</span>
</i>
<h4 style={textSytles(16, 600)}> {e[`title_${lang}`]}</h4>
</Link>
))
) : data.error ? (
<h2>Error</h2>
) : (
<h2>Loading ...</h2>
)}
</div>
</div>
<span>Ulashish</span>
</i>
</div>
</div>
</>
) : (
<></>
)}
</div>

<div className="mt-5 news__nav">
{data.isFetched && data.data && data.data.length > 0 ? (
data.data.map((e, index) => (
<Link
className="news__nav__card"
key={index}
to={`/${myKey}/${e.title_uz
.toLowerCase()
.split(" ")
.map((str) =>
str
.split("")
.filter((char) => /[a-zA-Z]/.test(char))
.join("")
)
.join("-")}-${e._id}`}
>
<i
style={textSytles(14, 500)}
className="fa-solid fa-calendar-days"
>
<span style={textSytles(13, 500)} className="ms-3">
{time(e.date)}
</span>
</i>
<h4 style={textSytles(16, 600)}> {e[`title_${lang}`]}</h4>
</Link>
))
) : data.error ? (
<h2>Error</h2>
) : (
<h2>Loading ...</h2>
)}
</div>
</div>
</div>

{toggle.display ? (
Expand Down

0 comments on commit d2de0c7

Please sign in to comment.