Skip to content

Commit e76bc76

Browse files
Youil412Youil412
committed
container fix
1 parent 354f37a commit e76bc76

File tree

17 files changed

+370
-523
lines changed

17 files changed

+370
-523
lines changed

‎public/assets/css/bootstrap.min.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/assets/css/sb-admin-2.min.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,10 +581,10 @@ pre code {
581581
.container-sm,
582582
.container-xl {
583583
width: 100%;
584-
padding-right: .75rem;
585-
padding-left: .75rem;
586-
margin-right: auto;
587-
margin-left: auto
584+
/* padding-right: .75rem; */
585+
/* padding-left: .75rem; */
586+
/* margin-right: auto; */
587+
/* margin-left: auto */
588588
}
589589

590590
@media (min-width:576px) {
@@ -2128,7 +2128,8 @@ pre code {
21282128
font-size: 1rem;
21292129
font-weight: 400;
21302130
line-height: 1.5;
2131-
color: #6e707e;
2131+
/* color: #6e707e; */
2132+
color: black;
21322133
background-color: #fff;
21332134
background-clip: padding-box;
21342135
border: 1px solid #d1d3e2;

‎public/assets/css/style.css

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ hr {
244244
}
245245

246246
label {
247-
color: var(--tg-body-font-color);
247+
/* color: var(--tg-body-font-color); */
248+
color: white;
248249
cursor: pointer;
249250
font-size: 16px;
250251
font-weight: 400;
@@ -300,10 +301,10 @@ label {
300301
}
301302

302303
/* Bootstrap 5 */
303-
.container {
304+
/* .container {
304305
padding-left: 15px;
305306
padding-right: 15px;
306-
}
307+
} */
307308

308309
.content-container {
309310
margin: unset;
@@ -5882,7 +5883,7 @@ label {
58825883
.form-check label {
58835884
text-align: left;
58845885
font-size: 14px;
5885-
color: #7488a1;
5886+
color: white;
58865887
user-select: none;
58875888
}
58885889

@@ -8286,7 +8287,7 @@ label {
82868287
background: var(--tg-white);
82878288
position: fixed;
82888289
z-index: 2;
8289-
padding: 10px;
8290+
padding: 10px 0 0 10px;
82908291
width: 280px;
82918292
}
82928293

@@ -8791,7 +8792,7 @@ label {
87918792
}
87928793

87938794
.login-card {
8794-
height: 500px;
8795+
height: 400px;
87958796
width: 100%;
87968797
margin-top: auto;
87978798
margin-bottom: auto;
@@ -8809,10 +8810,17 @@ label {
88098810
}
88108811

88118812
.brand_logo_container {
8812-
position: absolute;
8813-
top: -42px;
8813+
/* position: absolute; */
8814+
/* top: -42px; */
88148815
border-radius: 50%;
88158816
background: white;
88168817
padding: 10px;
88178818
text-align: center;
8819+
}
8820+
.account-profile{
8821+
display: flex;
8822+
align-items: center;
8823+
justify-content: center;
8824+
margin-top: 25px;
8825+
margin-bottom: 10px;
88188826
}

‎public/assets/css/style1.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ label {
270270
}
271271

272272
/* Bootstrap 5 */
273-
.container {
273+
/* .container {
274274
padding-left: 15px;
275275
padding-right: 15px;
276-
}
276+
} */
277277
.row {
278278
--bs-gutter-x: 30px;
279279
}

‎src/assets/css/bootstrap.min.css

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/css/mystyle.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
z-index: 1000; /* Ensure it's on top of other content */
6666
}
6767

68-
.account-profile {
68+
/* .account-profile {
6969
display: flex;
7070
align-items: center;
7171
margin-bottom: 1rem;
72-
}
72+
} */
7373

7474
.ap-img.pro_img_wrapper {
7575
position: relative;

‎src/assets/css/style.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ label {
270270
}
271271

272272
/* Bootstrap 5 */
273-
.container {
273+
/* .container {
274274
padding-left: 15px;
275275
padding-right: 15px;
276-
}
276+
} */
277277
.row {
278278
--bs-gutter-x: 30px;
279279
}

‎src/components/HomeBlog.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const HomeBlog = ({ title }) => {
1212
const [loading, setLoading] = useState(true);
1313
const [posts, setPosts] = useState([]);
1414
const { setting } = useSelector((state) => state.setting);
15+
const [clickedBlogArticleIconId, setClickedBlogArticleIconId] = useState([]);
1516

1617
useEffect(() => {
1718
const fetch = async () => {
@@ -27,6 +28,16 @@ const HomeBlog = ({ title }) => {
2728
dispatch(fetchSelectCategory(name));
2829
};
2930

31+
const handleBlogArticleHeartClick = (linkId) => {
32+
if(clickedBlogArticleIconId.includes(linkId)){
33+
setClickedBlogArticleIconId(clickedBlogArticleIconId.filter(id => id !== linkId));
34+
}
35+
else{
36+
setClickedBlogArticleIconId([...clickedBlogArticleIconId, linkId]);
37+
}
38+
39+
};
40+
3041
return (
3142
<>
3243
{posts.length ? (
@@ -73,11 +84,12 @@ const HomeBlog = ({ title }) => {
7384
<Link to={`/${post.category_type === 'news' ? 'news_detail' : 'article_detail'}/${post.seo_slug}`}>{post.title}</Link>
7485
</h2>
7586
<div className='blog-post-meta my-3'>
76-
<ul className='list-wrap'>
77-
<li>
78-
<FontAwesomeIcon icon='fa-regular fa-calendar' /> {new Date(post.created_at).toLocaleDateString()}
87+
<ul className='list-wrap mb-3'>
88+
<li className='col-2'>
89+
<FontAwesomeIcon icon='fa-regular fa-calendar' />
90+
{new Date(post.created_at).toLocaleDateString()}
7991
</li>
80-
<li>
92+
<li className='col-3'>
8193
<span className='homeblog-link-icon-phone'>
8294
<Link to={setting.social_whatsapp}>
8395
<FontAwesomeIcon icon='fa-solid fa-phone' />
@@ -94,7 +106,7 @@ const HomeBlog = ({ title }) => {
94106
</Link>
95107
</span>
96108
</li>
97-
<li>
109+
<li className='col-6'>
98110
<div className='view-all-btn'>
99111
<Link
100112
to={`/${post.category_type === 'news' ? 'news_detail' : 'article_detail'}/${post.seo_slug}`}
@@ -110,9 +122,10 @@ const HomeBlog = ({ title }) => {
110122
</Link>
111123
</div>
112124
</li>
113-
<li>
114-
<Link to={''} >
115-
<FontAwesomeIcon icon="fa-regular fa-heart" className='blog-article--icon-heart' />
125+
<li className='col-1'>
126+
<Link to={''} onClick={() => handleBlogArticleHeartClick(post.id)}
127+
className={clickedBlogArticleIconId.includes(post.id) ? 'blog-article-icon-heart-clicked' : ''}>
128+
<FontAwesomeIcon icon="fa-solid fa-heart" className='blog-article-icon-heart' />
116129
</Link>
117130
</li>
118131
</ul>

‎src/components/home/SpotLight.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const SpotLightSection = () => {
117117
<div className='blog-post-meta'>
118118
<ul className='list-wrap mb-3'>
119119
<li className='col-2'>
120-
<i className='flaticon-calendar'></i>
120+
<FontAwesomeIcon icon='fa-regular fa-calendar' />
121121
{new Date(spotlight[spotIndex * 5 + index].created_at).toLocaleDateString()}
122122
</li>
123123
<li className='col-3'>

‎src/config/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import axios from 'axios';
22

3-
// const IMAGE_BASE_URL = process.env.IMAGE_BASE_URL || 'https://tnreaders.in/images/';
4-
const IMAGE_BASE_URL = 'http://localhost:8000/images/';
3+
const IMAGE_BASE_URL = process.env.IMAGE_BASE_URL || 'https://tnreaders.in/images/';
4+
// const IMAGE_BASE_URL = 'http://localhost:8000/images/';
55
// const IMAGE_BASE_URL = 'https://tnreaders.in/images/';
66

77
const axiosInstance = axios.create({
8-
// baseURL: process.env.REACT_APP_API_BASE_URL || 'https://www.Tnreaders.in/', // Default URL
9-
baseURL: 'http://localhost:8000', // Default URL
8+
baseURL: process.env.REACT_APP_API_BASE_URL || 'https://www.Tnreaders.in/', // Default URL
9+
// baseURL: 'http://localhost:8000', // Default URL
1010
});
1111

1212
export default axiosInstance;

0 commit comments

Comments
 (0)