Skip to content

Commit fd25b7f

Browse files
anr2601anr2601
committed
Resolved conflicting merges
2 parents 4920a58 + 45d0bd7 commit fd25b7f

File tree

9 files changed

+154
-1
lines changed

9 files changed

+154
-1
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@
2323
"@typescript-eslint/eslint-plugin": "^5.60.1",
2424
"@vitejs/plugin-react": "^4.2.1",
2525
"file-saver": "^2.0.5",
26+
<<<<<<< HEAD
2627
"i18next-browser-languagedetector": "^8.0.0",
2728
"i18next-http-backend": "^2.6.1",
29+
=======
30+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
2831
"jszip": "^3.10.1",
2932
"lucide-react": "^0.376.0",
3033
"prop-types": "^15.8.1",
3134
"react": "^18.2.0",
3235
"react-chatbotify": "^2.0.0-beta.3",
3336
"react-dom": "^18.2.0",
37+
<<<<<<< HEAD
3438
"react-i18next": "^15.0.1",
39+
=======
40+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
3541
"react-loading-skeleton": "^3.4.0",
3642
"react-router-dom": "^6.2.2",
3743
"uuid": "^9.0.1",

‎src/components/SearchBar/SearchBar.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import React, { useState } from 'react';
22
import { useSearchParams } from 'react-router-dom';
3+
<<<<<<< HEAD
34
import { useTranslation } from 'react-i18next';
5+
=======
6+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
47

58
type Props = {
69
onSearch: (query: string) => void;
@@ -31,6 +34,7 @@ const SearchBar: React.FC<Props> = ({ onSearch }) => {
3134
}
3235
}
3336

37+
<<<<<<< HEAD
3438
const { t } = useTranslation();
3539

3640
return (
@@ -39,6 +43,14 @@ const SearchBar: React.FC<Props> = ({ onSearch }) => {
3943
<input
4044
type="text"
4145
placeholder={t('themes.schbar')}
46+
=======
47+
return (
48+
<div className="mb-8">
49+
<h2 className="text-lg font-semibold mb-4">Search</h2>
50+
<input
51+
type="text"
52+
placeholder="Search themes..."
53+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
4254
value={query}
4355
onChange={handleChange}
4456
onKeyDown={handleKeyDown}

‎src/components/Themes/ThemeCard.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ import ThemeModal from './ThemeModal';
66
import { Theme } from '../../interfaces/Theme';
77
import FavIcon from '../../assets/images/icon_favorite.svg';
88
import GitHubIcon from '../../assets/images/icon_github_white.svg';
9+
<<<<<<< HEAD
910
import { useTranslation } from 'react-i18next';
11+
=======
12+
13+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
1014
import '../../styles/theme_card.css'
1115

1216
type Props = {
@@ -30,8 +34,11 @@ const ThemeCard: React.FC<Props> = ({ theme, isPreviewed, onPreview }) => {
3034
onPreview(theme.name)
3135
}
3236

37+
<<<<<<< HEAD
3338
const {t} = useTranslation();
3439

40+
=======
41+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
3542
return (
3643
<>
3744
<div className="text-black w-[300px] h-[545px]">
@@ -46,12 +53,20 @@ const ThemeCard: React.FC<Props> = ({ theme, isPreviewed, onPreview }) => {
4653
group-hover:-translate-y-6 transition ease-in-out duration"
4754
alt={theme.name}
4855
/>
56+
<<<<<<< HEAD
4957
<div className="theme-card-details">{t('themes.thlist.vd')}</div>
58+
=======
59+
<div className="theme-card-details">View Details</div>
60+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
5061
</button>
5162
<div className="theme-card-info">
5263
<div>
5364
<div className="flex justify-between">
65+
<<<<<<< HEAD
5466
<p className="theme-card-title">{t(theme.name)}</p>
67+
=======
68+
<p className="theme-card-title">{theme.name}</p>
69+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
5570
<button
5671
type="button"
5772
aria-label="Favorite Button"
@@ -61,7 +76,11 @@ const ThemeCard: React.FC<Props> = ({ theme, isPreviewed, onPreview }) => {
6176
<img src={FavIcon} alt="fav-icon" />
6277
</button>
6378
</div>
79+
<<<<<<< HEAD
6480
<p className="text-[15px] opacity-80">{t(theme.description)}</p>
81+
=======
82+
<p className="text-[15px] opacity-80">{theme.description}</p>
83+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
6584
</div>
6685
<Link to={`/profile/${theme.github}`} className="theme-card-github">
6786
<img src={GitHubIcon} alt="github-icon" />

‎src/components/Themes/ThemeModal.tsx

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import React, { useEffect, useRef } from 'react';
22

33
import ReactDOM from 'react-dom';
4+
<<<<<<< HEAD
45
import { useTranslation } from 'react-i18next';
6+
=======
7+
8+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
59
import { downloadThemeContent } from '../../utils';
610
import { Theme } from '../../interfaces/Theme';
711

@@ -17,8 +21,11 @@ type ThemeModalProps = {
1721
const ThemeModal: React.FC<ThemeModalProps> = ({ isOpen, onClose, theme }) => {
1822
const modalRef = useRef<HTMLDivElement>(null)
1923

24+
<<<<<<< HEAD
2025
const {t} = useTranslation();
2126

27+
=======
28+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
2229
useEffect(() => {
2330
const handleClickOutside = (event: MouseEvent) => {
2431
if (
@@ -77,6 +84,7 @@ const ThemeModal: React.FC<ThemeModalProps> = ({ isOpen, onClose, theme }) => {
7784
<div className="space-y-4">
7885
<div className="space-y-2">
7986
<div className="grid grid-cols-1 md:grid-cols-2 gap-5">
87+
<<<<<<< HEAD
8088
<div className="font-semibold">{t('themes.carddetails.name')}:</div>
8189
<div>{theme.name}</div>
8290
<div className="font-semibold">{t('themes.carddetails.details')}:</div>
@@ -86,6 +94,17 @@ const ThemeModal: React.FC<ThemeModalProps> = ({ isOpen, onClose, theme }) => {
8694
<div className="font-semibold">{t('themes.carddetails.ver')}:</div>
8795
<div>{theme.version}</div>
8896
<div className="font-semibold">{t('themes.carddetails.auth')}:</div>
97+
=======
98+
<div className="font-semibold">Name:</div>
99+
<div>{theme.name}</div>
100+
<div className="font-semibold">Description:</div>
101+
<div>{theme.description}</div>
102+
<div className="font-semibold">ID:</div>
103+
<div>{theme.id}</div>
104+
<div className="font-semibold">Version:</div>
105+
<div>{theme.version}</div>
106+
<div className="font-semibold">Author:</div>
107+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
89108
<div className="flex items-center space-x-2">
90109
{theme.authorImg && (
91110
<img
@@ -103,7 +122,11 @@ const ThemeModal: React.FC<ThemeModalProps> = ({ isOpen, onClose, theme }) => {
103122
</a>
104123
</div>
105124
</div>
125+
<<<<<<< HEAD
106126
<div className="font-semibold">T{t('themes.carddetails.tags')}:</div>
127+
=======
128+
<div className="font-semibold">Tags:</div>
129+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
107130
<div className="flex flex-wrap gap-2">
108131
{theme.tags.map((tag, index) => (
109132
<span
@@ -114,13 +137,21 @@ const ThemeModal: React.FC<ThemeModalProps> = ({ isOpen, onClose, theme }) => {
114137
</span>
115138
))}
116139
</div>
140+
<<<<<<< HEAD
117141
<div className="font-semibold">{t('themes.carddetails.cont')}:</div>
142+
=======
143+
<div className="font-semibold">Contents:</div>
144+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
118145
<button
119146
type="button"
120147
onClick={() => onDownload()}
121148
className="theme-card-download"
122149
>
150+
<<<<<<< HEAD
123151
{t('themes.carddetails.down')}
152+
=======
153+
Download
154+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8
124155
</button>
125156
</div>
126157
</div>

‎src/declaration.d.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
<<<<<<< HEAD
12
declare module "*.png"
23
declare module '*.json' {
34
const value: any;
45
export default value;
5-
}
6+
}
7+
=======
8+
declare module "*.png"
9+
>>>>>>> 45d0bd74b629ed311466970d2ae9c435d1df47a8

0 commit comments

Comments
 (0)