Skip to content

Commit eb36013

Browse files
Abulfayz05Abulfayz05
committed
small bug fixed
1 parent 26a5b36 commit eb36013

20 files changed

+169
-204
lines changed

‎component/InitiativePartners.js

+49-51
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,19 @@
11
import React from "react";
22
import styles from "../styles/InitiativePartners.module.css";
3-
var $ = require("jquery");
4-
if (typeof window !== "undefined") {
5-
// Client-side-only code
6-
window.$ = window.jQuery = require("jquery");
7-
}
8-
import "owl.carousel/dist/assets/owl.carousel.css";
9-
import "owl.carousel/dist/assets/owl.theme.default.css";
10-
import dynamic from "next/dynamic";
113
import { useRouter } from "next/router";
12-
import Link from "next/link";
4+
import { Swiper, SwiperSlide } from "swiper/react";
5+
import { Navigation, Scrollbar, Pagination, A11y, Autoplay , Controller} from "swiper";
6+
import "swiper/css";
7+
import "swiper/css/navigation";
8+
import "swiper/css/autoplay";
139

14-
const OwlCarousel = dynamic(() => import("react-owl-carousel"), {
15-
ssr: false,
16-
});
1710
export default function InitiativePartners(props) {
1811
const { locale, pathname } = useRouter();
1912

2013
const { HomeContent, partners, status } = props;
2114

22-
const Responsive = {
23-
0: {
24-
items: 2,
25-
margin: 5,
26-
},
27-
28-
580: {
29-
items: 2,
30-
margin: 10,
31-
},
32-
33-
900: {
34-
items: 3,
35-
margin: 20,
36-
},
37-
38-
1200: {
39-
items: 4,
40-
margin: 20,
41-
},
4215

43-
1400: {
44-
items: 4,
45-
margin: 10,
46-
},
47-
};
16+
4817
return (
4918
<div className={styles.initpartners}>
5019
{HomeContent.partner
@@ -66,22 +35,47 @@ export default function InitiativePartners(props) {
6635
);
6736
})}
6837

69-
<div className={styles.sliders + " sliders"}>
70-
<OwlCarousel
71-
className={styles.slider}
72-
loop
73-
margin={10}
74-
dots={false}
75-
// nav={true}
76-
responsive={Responsive}
77-
autoplay
78-
autoplayTimeout={1500000}
79-
>
38+
<div className={styles.sliders}>
39+
<Swiper
40+
modules={[Navigation, Scrollbar, Autoplay, A11y, Pagination, Controller]}
41+
spaceBetween={10}
42+
slidesPerView={3}
43+
loop={true}
44+
navigation
45+
autoplay={true}
46+
speed={300}
47+
breakpoints={{
48+
0: {
49+
slidesPerView: 1,
50+
spaceBetween: 5,
51+
},
52+
580: {
53+
slidesPerView: 2,
54+
spaceBetween: 10,
55+
},
56+
900: {
57+
slidesPerView: 3,
58+
spaceBetween: 10,
59+
},
60+
1200: {
61+
slidesPerView: 4,
62+
spaceBetween: 20,
63+
},
64+
1400: {
65+
slidesPerView: 4,
66+
spaceBetween: 10,
67+
},
68+
}}
69+
scrollbar={{ draggable: true }}
70+
>
71+
8072
{partners.map(
8173
({ id, partner_link, partner_image, partner_title }) => (
82-
<a
74+
<SwiperSlide key={id}>
75+
<div className={styles.item}>
76+
<a
8377
href={partner_link}
84-
key={id}
78+
8579
target="_blank"
8680
className={styles.item}
8781
>
@@ -90,9 +84,13 @@ export default function InitiativePartners(props) {
9084
/>
9185
<span>{partner_title}</span>
9286
</a>
87+
</div>
88+
89+
</SwiperSlide>
9390
)
9491
)}
95-
</OwlCarousel>
92+
93+
</Swiper>
9694
</div>
9795
</div>
9896
);

‎component/Modal.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import {FiXCircle} from 'react-icons/fi'
44
export default function Modal() {
55
const [showModal, setShowModal] = React.useState(false);
66
return (
7-
<>
7+
<div>
88
<button type="button" onClick={() => setShowModal(true)}>
99
Barchasini ko'rish
1010
</button>
1111

1212
{showModal ? (
13-
<>
13+
<div>
1414
<div className={styles.modal_bg} >
1515
<div className={styles.modal_content}>
1616
<div className={styles.modal_heading}>
@@ -43,8 +43,8 @@ export default function Modal() {
4343
</div>
4444
</div>
4545

46-
</>
46+
</div>
4747
) : null}
48-
</>
48+
</div>
4949
);
5050
}

‎component/OurTeam.js

+36-39
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ import { FaTelegramPlane } from "react-icons/fa";
55
import { FaLinkedin } from "react-icons/fa";
66
import { useRouter } from "next/router";
77

8-
export default function OurTeam({ data, HomeContent }) {
8+
export default function OurTeam({ data }) {
99
const { locale } = useRouter();
10+
1011

1112
return (
1213
<div className={styles.ourteam}>
13-
{HomeContent.team
14-
.filter((p) => p.languages_code === locale)
15-
.map((HomeContent, i) => {
16-
const { title } = HomeContent;
17-
return (
18-
<div key={i}>
19-
<h3>{title}</h3>
20-
</div>
21-
);
22-
})}
14+
15+
{locale === "uz-UZ" ? (
16+
<h3>Uzbekvoice Jamoasi</h3>
17+
) : locale === "ru-RU" ? (
18+
<h3>Команда Узбеквоисе</h3>
19+
) : (
20+
<h3>Uzbekvoice Team</h3>
21+
)}
2322

2423
<div className={styles.firstblock}>
2524
{data
@@ -33,35 +32,33 @@ export default function OurTeam({ data, HomeContent }) {
3332
profile_tg,
3433
profile_role,
3534
}) => (
36-
<>
37-
{team_members_id !== null && (
38-
<div className={styles.item} key={team_members_id}>
39-
<div className={styles.avatarimg}>
40-
<img
41-
src={`https://admin.uzbekvoice.ai/assets/${profile_image}`}
42-
alt="partners1"
43-
/>
44-
</div>
45-
46-
<h4>{profile_name}</h4>
47-
<p>{profile_role}</p>
48-
<div>
49-
<Link href={profile_linkedin}>
50-
<a className={styles.FaLinkedin}>
51-
<FaLinkedin size={20} />
52-
</a>
53-
</Link>
54-
<Link href={profile_tg}>
55-
<a>
56-
<FaTelegramPlane size={20} />
57-
</a>
58-
</Link>
59-
</div>
60-
</div>
35+
<div key={team_members_id}>
36+
{team_members_id !== null && (
37+
<div className={styles.item} >
38+
<div className={styles.avatarimg}>
39+
<img
40+
src={`https://admin.uzbekvoice.ai/assets/${profile_image}`}
41+
alt="partners1"
42+
/>
43+
</div>
6144

62-
)}
63-
64-
</>
45+
<h4>{profile_name}</h4>
46+
<p>{profile_role}</p>
47+
<div>
48+
<Link href={profile_linkedin}>
49+
<a className={styles.FaLinkedin}>
50+
<FaLinkedin size={20} />
51+
</a>
52+
</Link>
53+
<Link href={profile_tg}>
54+
<a>
55+
<FaTelegramPlane size={20} />
56+
</a>
57+
</Link>
58+
</div>
59+
</div>
60+
)}
61+
</div>
6562
)
6663
)}
6764
</div>

‎component/TopUser.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default function TopUser({ users, userslist, HomeContent }) {
7373
{/* More voice top user */}
7474
<div className={styles.voice_user}>
7575
{showModal ? (
76-
<>
76+
7777
<div
7878
onClick={() => setShowModal(false)}
7979
className={styles.modal_bg}
@@ -112,15 +112,15 @@ export default function TopUser({ users, userslist, HomeContent }) {
112112
</div>
113113
</div>
114114
</div>
115-
</>
115+
116116
) : null}
117117
</div>
118118
{/* //More voice top user */}
119119

120120
{/* More listening top user */}
121121
<div className={styles.voice_user}>
122122
{showModal2 ? (
123-
<>
123+
124124
<div
125125
onClick={() => setShowModal2(false)}
126126
className={styles.modal_bg}
@@ -161,7 +161,7 @@ export default function TopUser({ users, userslist, HomeContent }) {
161161
</div>
162162
</div>
163163
</div>
164-
</>
164+
165165
) : null}
166166
</div>
167167
{/* //More listening top user */}

‎component/Winners.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export default function Winners({ users, userslist, bosqich }) {
9696
{/* More voice top user */}
9797
<div className={styles.voice_user}>
9898
{showModal ? (
99-
<>
99+
100100
<div onClick={() => setShowModal(false)} className={styles.modal_bg}>
101101
<div onClick={e => e.stopPropagation()} className={styles.modal_content}>
102102
<div className={styles.modal_heading}>
@@ -136,15 +136,15 @@ export default function Winners({ users, userslist, bosqich }) {
136136
</div>
137137
</div>
138138
</div>
139-
</>
139+
140140
) : null}
141141
</div>
142142
{/* //More voice top user */}
143143

144144
{/* More listening top user */}
145145
<div className={styles.voice_user}>
146146
{showModal2 ? (
147-
<>
147+
148148
<div onClick={() => setShowModal2(false)} className={styles.modal_bg}>
149149
<div onClick={e => e.stopPropagation()} className={styles.modal_content}>
150150
<div className={styles.modal_heading}>
@@ -183,7 +183,7 @@ export default function Winners({ users, userslist, bosqich }) {
183183
</div>
184184
</div>
185185
</div>
186-
</>
186+
187187
) : null}
188188
</div>
189189
{/* //More listening top user */}

‎component/YangilikByIdHero.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const YangilikByIdHero = ({ data }) => {
1717

1818
// console.log(router);
1919
return (
20-
<>
20+
<div>
2121
<NextSeo title={dataFilter.news_title } description={dataFilter.news_content.split(" ", 20).join(' ')} titleTemplate={dataFilter.news_title} />
2222
<div className={styles.yangilikByIdHero}>
2323
<div className={styles.heroImg}>
@@ -61,7 +61,7 @@ const YangilikByIdHero = ({ data }) => {
6161
</div>
6262
</div>
6363
</div>
64-
</>
64+
</div>
6565
)
6666
}
6767

‎next.config.js

+12-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@ module.exports = {
88
localeDetection: false
99
},
1010

11-
publicRuntimeConfig: {
12-
url: process.env.DIRECTUS_URL,
13-
},
14-
serverRuntimeConfig: {
15-
email: process.env.DIRECTUS_EMAIL,
16-
password: process.env.DIRECTUS_PASSWORD,
17-
// token: process.env.DIRECTUS_STATIC_TOKEN,
18-
},
19-
11+
reactStrictMode: true,
12+
swcMinify: true,
2013

2114

2215
async redirects() {
@@ -47,6 +40,16 @@ module.exports = {
4740

4841
}
4942

43+
// publicRuntimeConfig: {
44+
// url: process.env.DIRECTUS_URL,
45+
// },
46+
// serverRuntimeConfig: {
47+
// email: process.env.DIRECTUS_EMAIL,
48+
// password: process.env.DIRECTUS_PASSWORD,
49+
// // token: process.env.DIRECTUS_STATIC_TOKEN,
50+
// },
51+
52+
5053

5154

5255

‎pages/_app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function MyApp({ Component, pageProps }) {
1010
const { locale } = useRouter();
1111

1212
return (
13-
<>
13+
<div>
1414
<NextNProgress color="blueviolet" />
1515
<Layout>
1616
<Head>
@@ -31,7 +31,7 @@ function MyApp({ Component, pageProps }) {
3131

3232
<Component {...pageProps} />
3333
</Layout>
34-
</>
34+
</div>
3535
);
3636
}
3737

0 commit comments

Comments
 (0)