This commit is contained in:
SrGooglo 2023-03-14 19:50:41 +00:00
parent 8e9f2623b8
commit d12c2e03ae
10 changed files with 50 additions and 26 deletions

View File

@ -21,7 +21,6 @@ export default class UserPosts extends React.Component {
return <div className="userPosts"> return <div className="userPosts">
<PostsList <PostsList
emptyListRender={emptyListRender} emptyListRender={emptyListRender}
onLoadMore={PostModel.getUserPosts}
loadFromModel={PostModel.getUserPosts} loadFromModel={PostModel.getUserPosts}
loadFromModelProps={{ loadFromModelProps={{
user_id: this.props.state.user._id, user_id: this.props.state.user._id,

View File

@ -58,6 +58,7 @@ export default class Dashboard extends React.Component {
tabs={Tabs} tabs={Tabs}
navMenuHeader={navMenuHeader} navMenuHeader={navMenuHeader}
extraPanel={extraPanel} extraPanel={extraPanel}
primaryPanelClassName="full"
useSetQueryType useSetQueryType
transition transition
/> />

View File

@ -32,6 +32,7 @@
background-image: radial-gradient(rgba(var(--layout-background-contrast), 0.5) 1px, transparent 0), background-image: radial-gradient(rgba(var(--layout-background-contrast), 0.5) 1px, transparent 0),
radial-gradient(rgba(var(--layout-background-contrast), 0.3) 1px, transparent 0); radial-gradient(rgba(var(--layout-background-contrast), 0.3) 1px, transparent 0);
background-position: 0 0, background-position: 0 0,
25px 25px; 25px 25px;
background-size: 50px 50px; background-size: 50px 50px;

View File

@ -1,6 +1,6 @@
import React from "react" import React from "react"
import * as antd from "antd" import * as antd from "antd"
import { ImageViewer } from "components" import { ImageViewer, UserPreview } from "components"
import { Icons } from "components/Icons" import { Icons } from "components/Icons"
import { Translation } from "react-i18next" import { Translation } from "react-i18next"
@ -38,11 +38,9 @@ const PlaylistItem = (props) => {
</div> </div>
<div className="playlistItem_info"> <div className="playlistItem_info">
<div className="playlistItem_info_title"> <div className="playlistItem_info_title">
{playlist.title} <h1>{playlist.title}</h1>
</div>
<div className="playlistItem_info_author">
{playlist.user.username}
</div> </div>
<UserPreview username={playlist.user.username} />
</div> </div>
<div className="playlistItem_actions"> <div className="playlistItem_actions">
<antd.Button <antd.Button

View File

@ -6,7 +6,7 @@
max-width: 70vw; max-width: 70vw;
overflow: hidden; overflow: visible;
.playlistExplorer_section { .playlistExplorer_section {
display: flex; display: flex;
@ -25,8 +25,9 @@
//flex-direction: row; //flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center;
align-items: center; align-items: center;
gap: 20px;
} }
} }
} }
@ -38,19 +39,19 @@
cursor: pointer; cursor: pointer;
width: 45%; width: 15vw;
height: 10vh; height: 10vh;
min-width: 450px;
max-width: 850px;
border-radius: 12px; border-radius: 12px;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
margin-right: 20px;
background-color: var(--background-color-accent); background-color: var(--background-color-accent);
border-radius: 8px; border-radius: 8px;
margin-bottom: 20px;
&:hover { &:hover {
.playlistItem_cover { .playlistItem_cover {
transform: scale(1.1); transform: scale(1.1);
@ -92,31 +93,53 @@
} }
.playlistItem_info { .playlistItem_info {
display: flex;
flex-direction: column;
width: 100%; width: 100%;
max-width: 265px;
padding: 10px; padding: 10px;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
.playlistItem_info_title { .playlistItem_info_title {
font-size: 1.2rem; font-size: 1rem;
font-weight: 600; font-weight: 600;
color: var(--background-color-contrast); color: var(--background-color-contrast);
font-family: "Space Grotesk", sans-serif; font-family: "Space Grotesk", sans-serif;
text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap;
h1,
h4 {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin: 0;
}
} }
.playlistItem_info_author { // set userPreview to the bottom of the playlistItem_info
font-size: 1rem; .userPreview {
font-weight: 400; margin-top: auto;
color: var(--text-color); font-size: 0.8rem;
text-overflow: ellipsis; h1 {
overflow: hidden; font-size: 0.8rem;
white-space: nowrap; }
.avatar {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
}
} }
} }
@ -124,10 +147,14 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-self: flex-end;
justify-self: flex-end;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100%; height: 100%;
padding: 10px; padding: 10px;
.ant-btn { .ant-btn {

View File

@ -43,7 +43,6 @@ export default class ExplorePosts extends React.Component {
</div> </div>
{ {
this.state.focusedSearcher || this.state.filledSearcher ? null : <PostsList this.state.focusedSearcher || this.state.filledSearcher ? null : <PostsList
onLoadMore={Post.getExplorePosts}
loadFromModel={Post.getExplorePosts} loadFromModel={Post.getExplorePosts}
watchTimeline={[ watchTimeline={[
"post.new", "post.new",

View File

@ -23,7 +23,6 @@ export class Feed extends React.Component {
return <PostsList return <PostsList
emptyListRender={emptyListRender} emptyListRender={emptyListRender}
loadFromModel={FeedModel.getPostsFeed} loadFromModel={FeedModel.getPostsFeed}
onLoadMore={FeedModel.getPostsFeed}
watchTimeline={[ watchTimeline={[
"feed.new", "feed.new",
"post.delete", "post.delete",

View File

@ -18,7 +18,6 @@ export class SavedPosts extends React.Component {
return <PostsList return <PostsList
emptyListRender={emptyListRender} emptyListRender={emptyListRender}
loadFromModel={PostModel.getSavedPosts} loadFromModel={PostModel.getSavedPosts}
onLoadMore={PostModel.getSavedPosts}
/> />
} }
} }

View File

@ -1,6 +1,5 @@
.fade-transverse-active { .fade-transverse-active {
transition: all var(--page-transition-duration); transition: all var(--page-transition-duration);
height: fit-content;
width: 100%; width: 100%;
} }

View File

@ -107,6 +107,8 @@ html {
position: fixed; position: fixed;
overflow: hidden; overflow: hidden;
overflow-y: auto;
width: 100%; width: 100%;
height: 100%; height: 100%;