Skip to content

Commit

Permalink
oxirgisi
Browse files Browse the repository at this point in the history
  • Loading branch information
Doston1002 committed Jan 28, 2023
1 parent 296ac86 commit 84c3c1c
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 15 deletions.
6 changes: 2 additions & 4 deletions src/components/aboutus/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ color: #02307D;
.list-info{

margin:0 auto;
display: flex;
/* display: flex; */
justify-content: space-around;
align-items: center;
flex-wrap: wrap;
Expand Down Expand Up @@ -43,9 +43,7 @@ color: #02307D;
transition: all 0.5s ease;
}

.list-info img:hover {
box-shadow: 0px 0px 13px 0px rgba(163, 155, 155, 0.9);
}



.list-item >p{
Expand Down
3 changes: 2 additions & 1 deletion src/components/admin/table/Table.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.generic-table tr {
text-align: center;
border: 1px solid red;
border: .5px solid #02307d;
}


Expand All @@ -27,6 +27,7 @@
}
.generic-table th{
text-transform: capitalize;
font-weight: 600;
padding: 15px 10px;
font-size: 1rem!important;
}
9 changes: 7 additions & 2 deletions src/components/header/MyComponent.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
border-bottom: 0.3rem solid #02307d;
padding-bottom: 0.5rem;
}
.hovered_logo{
width: 15%;
}
.list-info{
width:340px ;
font-style: normal;
Expand All @@ -42,13 +45,15 @@
background: white;
border-radius: 10px;
box-shadow: 2px 2px 10px 2px #cddcf6;
padding: 10px 20px;
padding: 20px;
transition: 0.3s linear;
height: 335px;

/* height: 335px; */
margin-top: -1px;
}
.hovered-list .list-info span{
display: flex;
margin-bottom: 20px;
}
.hovered-list h3{
font-style: normal;
Expand Down
5 changes: 4 additions & 1 deletion src/components/header/MyComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useState, useContext, useEffect } from "react";
import { useLocation } from "react-router-dom";
import { Link } from "react-router-dom";
import { Institut } from "../../icons/Icons";
import Logo from '../../files/logo.png'
import "./MyComponent.css";
import HeaderLang from "./lang";
import { Context } from "../../context";
Expand Down Expand Up @@ -205,7 +206,9 @@ const MyComponent = () => {
<ul className="hovered-list">
<div className="list-info">
<span>
<Institut />
<img className="hovered_logo" src={Logo} alt="" />
{/* <Institut /> */}

<h3>{hoveredButton.name}</h3>
</span>
<p>{hoveredButton.fakultetInfo}</p>
Expand Down
1 change: 1 addition & 0 deletions src/components/header/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

/* main header styles */
header {
min-width: 425px;
position: sticky;
top: 0;
z-index: 999;
Expand Down
4 changes: 2 additions & 2 deletions src/components/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ const Header = () => {
<a className="header__nav header_border" href="/bitiruvchilar">
{HeaderLang[lang].graduates}
</a>
<a className="header__nav" href="/faoliyatlar">
<a className="header__nav header_border" href="/faoliyatlar">
{HeaderLang[lang].activity[0]}
</a>
<a className="header__nav" href="/biz-bilan-aloqa">
<a className="header__nav header_border" href="/biz-bilan-aloqa">
{HeaderLang[lang].contact}
</a>
<div className="qawws">
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/lang.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ a{
height: 300px;
max-width: 1200px;
}
.cardTitleComp{
display: flex;
justify-content: center;
color:#02307D;
font-weight: 600;
margin: 20px 0;
}

@media only screen and (min-width: 1440px) {
.my__container {
Expand Down
18 changes: 16 additions & 2 deletions src/pages/nashriyot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ import Table from '../../components/admin/table/Table'

const NashriyotComponent = () =>{
const {DataGetter, lang,time} = useContext(Context);
const [hero] = useState({
uz: {
title: "Nashriyot",

},
ru: {
title: "Издатель",

},
en: {
title: "Publisher",

},
});
const [about]= useState({
uz:[`№`,`Sana`,`Ismi`,`Yuklash`],
ru:[`№`, `Дата`, `Имя`, `Скачать`],
Expand All @@ -30,15 +44,15 @@ const NashriyotComponent = () =>{
<th>{index+1}</th>
<th>{item[`name_${lang}`]}</th>
<th>{time(item.date)}</th>
<th><a download href={item.link}><i className="fa-solid fa-file-pdf"></i></a></th>
<th><a download href={item.link}><i className="fa-2x fa-solid fa-file-pdf"></i></a></th>
</tr>

)
}
console.log(nashriyot);
return(
<div className="container mb-5">

<h2 className="cardTitleComp">{hero[lang].title}</h2>
{
nashriyot.isFetched && nashriyot.data ? (
<Table headData={TableHead} renderHead={TableContent} renderBody={TableRender} bodyData={TableBody} />
Expand Down
18 changes: 16 additions & 2 deletions src/pages/sertifikat.js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ import Table from '../../components/admin/table/Table'

const SertifikatComponent = () =>{
const {DataGetter, lang, textSytles} = useContext(Context);
const [hero] = useState({
uz: {
title: "Sertifikat",

},
ru: {
title: "Cертификат",

},
en: {
title: "Certificate",

},
});
const [about]= useState({
uz:[`№`,`Kod`,`Ismi`,`Yuklash`],
ru:[`№`, `Код`, `Имя`, `Скачать`],
Expand All @@ -30,14 +44,14 @@ const SertifikatComponent = () =>{
<th>{index+1}</th>
<th>{item.kod}</th>
<th>{item[`name_${lang}`]}</th>
<th><a download href={item.link}><i className="fa-solid fa-file-pdf"></i></a></th>
<th><a download href={item.link}><i className="fa-2x fa-solid fa-file-pdf"></i></a></th>
</tr>

)
}
return(
<div className="container mb-5">

<h2 className="cardTitleComp">{hero[lang].title}</h2>
{
sertifikat.isFetched && sertifikat.data ? (
<Table headData={TableHead} renderHead={TableContent} renderBody={TableRender} bodyData={TableBody} />
Expand Down

0 comments on commit 84c3c1c

Please sign in to comment.