Skip to content

Commit

Permalink
feat: redesign scroll for themes, change small cards skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
TomatoVan committed Apr 26, 2024
1 parent 431ccef commit 8ace007
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 199 deletions.
56 changes: 28 additions & 28 deletions extractedTranslations/en/profile.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"": "",
"Age": "",
"Avatar": "",
"City": "",
"Edit": "",
"Error": "",
"Error with getting profile data": "",
"Error with profile ": "",
"Incorrect age": "",
"Incorrect country": "",
"Incorrect user data": "",
"Lastname": "",
"Name": "",
"No data": "",
"Profile": "",
"Server error": "",
"Try to reload page": "",
"Username": "",
"Username>": "",
"Your age": "",
"Your avatar": "",
"Your city": "",
"Your lastname": "",
"Your name": "",
"Your surname": "",
"Your username": "",
"Попробуйте обновить страницу": "",
"Произошла ошибка при загрузке профиля": ""
"": "",
"Age": "",
"Avatar": "",
"City": "",
"Edit": "",
"Error": "",
"Error with getting profile data": "",
"Error with profile ": "",
"Incorrect age": "",
"Incorrect country": "",
"Incorrect user data": "",
"Lastname": "",
"Name": "",
"No data": "",
"Profile": "",
"Server error": "",
"Try to reload page": "",
"Username": "",
"Username>": "",
"Your age": "",
"Your avatar": "",
"Your city": "",
"Your lastname": "",
"Your name": "",
"Your surname": "",
"Your username": "",
"Попробуйте обновить страницу": "",
"Произошла ошибка при загрузке профиля": ""
}
244 changes: 122 additions & 122 deletions extractedTranslations/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
{
"": "",
"123": "123",
"About site": "",
"Admin panel": "",
"All": "",
"Article ratings coming soon!": "",
"Articles": "",
"Articles app": "",
"Articles not found": "",
"Ascending": "",
"Back to list": "",
"Cancel": "",
"Choose ": "",
"Choose country": "",
"Choose currency": "",
"Close": "",
"Comments": "",
"Comments is loading": "",
"Create new article": "",
"Creation date": "",
"Descending": "",
"Design options": "",
"Economics": "",
"Edit": "",
"Enter ": "",
"Enter comment text": "",
"Enter cooment text": "",
"Error while loading articles": "",
"Error with getting article data": "",
"Error with getting profile data": "",
"Exit": "",
"Here you can search and view articles on various topics": "",
"IT": "",
"Incorrect age": "",
"Incorrect country": "",
"Incorrect user data": "",
"Leave your feedback on the article, it will help improve the quality": "",
"Main page": "",
"Main_page": "",
"Name": "",
"New": "",
"No data": "",
"Old": "",
"PROFILE PAGE": "",
"Profile": "",
"Rate the article": "",
"Read more": {
"": {
"": {
"": ""
}
}
},
"Recommend": "",
"Save": "",
"Science": "",
"Search": "",
"Send": "",
"Server error": "",
"Sort by": "",
"Sorting by": "",
"Thanks for review!": "",
"Try to reload page": "",
"User settings": "",
"Views": "",
"Welcome to the articles page!": "",
"You don`t have access to this page!": "",
"Your name": "",
"Your review": "",
"article_not_found": "",
"articles": "",
"articles page": "",
"articles_details": "",
"articles_details page": "",
"articles_detals": "",
"ascending": "",
"auth_form": "",
"auth_password": "",
"auth_username": "",
"by": "",
"comments": "",
"creation date": "",
"decrement": "",
"descending": "",
"exit": "",
"increment": "",
"login": "",
"login_error": "",
"name": "",
"no articles found": "",
"no comments": "",
"no profile found": "",
"read more": "",
"throw error": "throw error",
"views": "",
"{{count}} views": "",
"{{count}} views_plural": "",
"{{count}} просмотров": "",
"{{count}} просмотров_plural": "",
"Айти": "",
"Ваш отзыв": "",
"Все статьи": "",
"Главная страница": "",
"Закрыть": "",
"Наука": "",
"Обновить страницу": "",
"Отправить": "",
"Оценка статей скоро появится!": "",
"Поиск": "",
"Попробуйте обновить страницу": "",
"Произошла непредвиденная ошибка": "",
"Произошла ошибка при загрузке профиля": "",
"Редактировать": "",
"Сортировать ПО": "",
"Статьи не найдены": "",
"Экономика": "",
"возрастанию": "",
"дате создания": "",
"названию": "",
"по": "",
"просмотрам": "",
"убыванию": ""
"": "",
"123": "123",
"About site": "",
"Admin panel": "",
"All": "",
"Article ratings coming soon!": "",
"Articles": "",
"Articles app": "",
"Articles not found": "",
"Ascending": "",
"Back to list": "",
"Cancel": "",
"Choose ": "",
"Choose country": "",
"Choose currency": "",
"Close": "",
"Comments": "",
"Comments is loading": "",
"Create new article": "",
"Creation date": "",
"Descending": "",
"Design options": "",
"Economics": "",
"Edit": "",
"Enter ": "",
"Enter comment text": "",
"Enter cooment text": "",
"Error while loading articles": "",
"Error with getting article data": "",
"Error with getting profile data": "",
"Exit": "",
"Here you can search and view articles on various topics": "",
"IT": "",
"Incorrect age": "",
"Incorrect country": "",
"Incorrect user data": "",
"Leave your feedback on the article, it will help improve the quality": "",
"Main page": "",
"Main_page": "",
"Name": "",
"New": "",
"No data": "",
"Old": "",
"PROFILE PAGE": "",
"Profile": "",
"Rate the article": "",
"Read more": {
"": {
"": {
"": ""
}
}
},
"Recommend": "",
"Save": "",
"Science": "",
"Search": "",
"Send": "",
"Server error": "",
"Sort by": "",
"Sorting by": "",
"Thanks for review!": "",
"Try to reload page": "",
"User settings": "",
"Views": "",
"Welcome to the articles page!": "",
"You don`t have access to this page!": "",
"Your name": "",
"Your review": "",
"article_not_found": "",
"articles": "",
"articles page": "",
"articles_details": "",
"articles_details page": "",
"articles_detals": "",
"ascending": "",
"auth_form": "",
"auth_password": "",
"auth_username": "",
"by": "",
"comments": "",
"creation date": "",
"decrement": "",
"descending": "",
"exit": "",
"increment": "",
"login": "",
"login_error": "",
"name": "",
"no articles found": "",
"no comments": "",
"no profile found": "",
"read more": "",
"throw error": "throw error",
"views": "",
"{{count}} views": "",
"{{count}} views_plural": "",
"{{count}} просмотров": "",
"{{count}} просмотров_plural": "",
"Айти": "",
"Ваш отзыв": "",
"Все статьи": "",
"Главная страница": "",
"Закрыть": "",
"Наука": "",
"Обновить страницу": "",
"Отправить": "",
"Оценка статей скоро появится!": "",
"Поиск": "",
"Попробуйте обновить страницу": "",
"Произошла непредвиденная ошибка": "",
"Произошла ошибка при загрузке профиля": "",
"Редактировать": "",
"Сортировать ПО": "",
"Статьи не найдены": "",
"Экономика": "",
"возрастанию": "",
"дате создания": "",
"названию": "",
"по": "",
"просмотрам": "",
"убыванию": ""
}
6 changes: 3 additions & 3 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"login_error": "An incorrect username or password",
"exit": "Exit",
"main_page": "Main page",
"{{count}} views_zero": "{{count}} views",
"{{count}} views_one": "{{count}} view",
"{{count}} views_other": "{{count}} views"
"{{count}} views_zero": "{{count}} views",
"{{count}} views_one": "{{count}} view",
"{{count}} views_other": "{{count}} views"
}
8 changes: 4 additions & 4 deletions public/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"About site": "О сайте",
"Profile": "Профиль",
"Articles": "Статьи",
"{{count}} views_zero": "{{count}} просмотров",
"{{count}} views_one": "{{count}} просмотр",
"{{count}} views_few": "{{count}} просмотров",
"{{count}} views_many": "{{count}} просмотров"
"{{count}} views_zero": "{{count}} просмотров",
"{{count}} views_one": "{{count}} просмотр",
"{{count}} views_few": "{{count}} просмотров",
"{{count}} views_many": "{{count}} просмотров"
}
5 changes: 5 additions & 0 deletions src/app/providers/ThemeProvider/ui/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ const ThemeProvider = (props: ThemeProviderProps) => {
}
}, [defaultTheme, isThemeInited]);

// for scroll theme changes
useEffect(() => {
document.body.className = theme;
}, [theme]);

const defaultProps = useMemo(
() => ({
theme,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,11 @@
&.BIG {
width: 100%;
}

&.SMALL {
.card {
height: 350px;
width: 240px;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@

.title {
margin-top: 8px;
height: 26px;
overflow: hidden;
text-overflow: ellipsis;
}

.title p {
Expand All @@ -109,4 +106,11 @@
&.BIG {
width: 100%;
}

&.SMALL {
.card {
height: 350px;
width: 240px;
}
}
}
Loading

0 comments on commit 8ace007

Please sign in to comment.