Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull from dev #1315

Merged
merged 111 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
d9bf01a
Added Deck 2.0 grid layout
dkildar Mar 20, 2023
1e8daa6
Added Deck 2.0 add column layout
dkildar Mar 21, 2023
3aa26ab
Added Deck 2.0 add user column layout
dkildar Mar 21, 2023
b5cdac9
Added Deck 2.0 user posts layout and data fetching
dkildar Mar 21, 2023
930ae4e
Added Deck 2.0 user posts skeleton loader
dkildar Mar 22, 2023
043fdf2
Added Deck 2.0 user column creation from add column
dkildar Mar 22, 2023
7669ade
Updated deck 2.0 virtual scrolling with dynamic height calculation
dkildar Mar 22, 2023
f358574
Added Deck 2.0 new column button
dkildar Mar 22, 2023
4a4df7c
Added Deck 2.0 interval updating
dkildar Mar 22, 2023
73d87a3
Added Deck 2.0 re-ordering
dkildar Mar 22, 2023
11d2900
Updated deck 2.0 user widget adding flow
dkildar Mar 23, 2023
7ed2028
Added deck 2.0 community column
dkildar Mar 23, 2023
fc9c0a1
Added deck 2.0 wallet column
dkildar Mar 23, 2023
48309a6
Added deck 2.0 wallet list item skeleton
dkildar Mar 24, 2023
8cd6225
WIP
MTSaeed Mar 24, 2023
d8ba0e8
Added deck 2.0 notifications column
dkildar Mar 24, 2023
f1543c1
Added deck 2.0 notifications column skeleton items
dkildar Mar 24, 2023
340dc96
Added deck 2.0 trending column
dkildar Mar 24, 2023
e475426
Added deck 2.0 topics column
dkildar Mar 24, 2023
e92d3ac
Added deck 2.0 search column
dkildar Mar 24, 2023
b89c5e9
Added deck 2.0 user dropdown menu and notifications trigger
dkildar Mar 24, 2023
cfbd103
Added deck 2.0 user nav items
dkildar Mar 25, 2023
e324098
Added deck 2.0 theme switcher
dkildar Mar 25, 2023
527a4c1
Added deck 2.0 create post button
dkildar Mar 25, 2023
462d885
Added deck 2.0 menu dropdown list
dkildar Mar 25, 2023
1b42b8c
Added deck 2.0 fast access manager
dkildar Mar 26, 2023
622c5da
Added deck 2.0 scroll to new added column
dkildar Mar 26, 2023
f1ab19d
Updated deck 2.0 all icons
dkildar Mar 26, 2023
5f197dc
Updated deck 2.0 updated cols titles, showing cols icons in the float…
dkildar Mar 26, 2023
89ef669
Notification drawer improvements
MTSaeed Mar 27, 2023
ec12a7d
Test Update
MTSaeed Mar 27, 2023
8289740
Resolve conflicts with development
MTSaeed Mar 27, 2023
3355207
Add padding in buttons
MTSaeed Mar 27, 2023
27dca6b
Updated deck 2.0 hiding add column button while dragging
dkildar Mar 27, 2023
0f2b83c
Fixed backward compatibility
dkildar Mar 28, 2023
f4c8f73
Added deck creation dialog window
dkildar Mar 29, 2023
3c7407b
Added deck create/update API
dkildar Mar 29, 2023
eab3f8b
Added deck default columns on start
dkildar Mar 29, 2023
3ba8985
Added deck 2.0 deck edition
dkildar Mar 29, 2023
cdca60b
Added deck 2.0 deck local badge
dkildar Mar 29, 2023
40ea8d9
Updated deck 2.0 decks list emoji alignment
dkildar Mar 29, 2023
1a9c921
Added deck 2.0 decks deletion ability
dkildar Mar 30, 2023
c488d76
Added deck 2.0 decks columns deletion ability
dkildar Mar 30, 2023
c6c6cb4
Added deck 2.0 global loader spinner
dkildar Mar 30, 2023
781feb7
Added deck 2.0 night theme
dkildar Mar 30, 2023
0e61292
Added deck 2.0 fixed night theme
dkildar Mar 30, 2023
3a545bb
Added deck 2.0 smooth scroller
dkildar Mar 31, 2023
471c444
Added deck 2.0 mobile layout support
dkildar Mar 31, 2023
cd1f6b0
Resolve conflict with development
MTSaeed Apr 1, 2023
f2b82f2
Test Updated
MTSaeed Apr 1, 2023
c81595c
Added deck 2.0 smooth scroller on mobile
dkildar Apr 2, 2023
9de1cc5
Added deck 2.0 smooth scroller update
dkildar Apr 2, 2023
9018ca7
Deck 2.0 minimal rows overscan due to performance issues
dkildar Apr 2, 2023
cd8703b
Deck 2.0 migration from old one
dkildar Apr 2, 2023
10f480b
Fixed tests
dkildar Apr 2, 2023
c0aef64
Merge branch 'development' into feature/deck-2-0
dkildar Apr 2, 2023
c2cc860
Removed old deck, fixed Deck 2.0 column reloading
dkildar Apr 5, 2023
79d56d1
Fixed Deck 2.0 tiny bugs
dkildar Apr 5, 2023
28fca9d
Fixed Deck 2.0 tiny bugs
dkildar Apr 8, 2023
ddcf8ad
Fixed Deck 2.0 tests
dkildar Apr 8, 2023
73b37e1
Comments resolved
MTSaeed Apr 10, 2023
49e0ef3
Show top curator name under the word count in the entry
MTSaeed Apr 11, 2023
17f6ddd
Snapshot update
MTSaeed Apr 11, 2023
f0a7303
Fixed Deck 2.0 community content fetching
dkildar Apr 12, 2023
49ac338
Show avatar instead of username
MTSaeed Apr 13, 2023
0f56c06
Added Deck 2.0 post viewer
dkildar Apr 13, 2023
3ffa21c
Added Deck 2.0 post viewer for user, search and trending posts
dkildar Apr 13, 2023
95cea5e
Added Deck 2.0 post viewer comment box
dkildar Apr 14, 2023
8429233
Added Deck 2.0 minor bug-fixes
dkildar Apr 16, 2023
b54cf80
Updated Deck 2.0 deck settings
dkildar Apr 16, 2023
ecc5e8e
Updated Deck 2.0 deck floating manager styles
dkildar Apr 16, 2023
ee477bf
Updated Deck 2.0 to column scrolling
dkildar Apr 17, 2023
349ef85
Updated Deck 2.0 additional menu items
dkildar Apr 17, 2023
2abd83f
Added Deck 2.0 notifications content viewer
dkildar Apr 17, 2023
8593b67
Resolve conflicts with developmebt
MTSaeed Apr 17, 2023
a20b45c
change config
MTSaeed Apr 17, 2023
c47318a
Added Deck 2.0 translations
dkildar Apr 17, 2023
9cc6c7b
Use select icon instead of button
MTSaeed Apr 17, 2023
0d985a9
pull from developmet
MTSaeed Apr 17, 2023
277fe1c
Feedbacks resolved
MTSaeed Apr 18, 2023
212bf12
move declarations to top
MTSaeed Apr 18, 2023
4b5e6be
Snapshot updated
MTSaeed Apr 18, 2023
2ceb04a
Used Mark as read svg instead of dropdown
MTSaeed Apr 18, 2023
3c3c0ce
show mark svg before select svg
MTSaeed Apr 18, 2023
74da013
get curator name from the entry object
MTSaeed Apr 18, 2023
6bc104f
Hotfix
MTSaeed Apr 18, 2023
014fa44
Merge pull request #1309 from ecency/recovery-hotfix
feruzm Apr 18, 2023
af3ba2f
Merge pull request #1305 from ecency/top-curator
feruzm Apr 18, 2023
56fe549
Added Deck 2.0 new post available button
dkildar Apr 18, 2023
3946192
Add Notification type in enum file
MTSaeed Apr 19, 2023
bcac45c
Added Deck 2.0 anonymous mode
dkildar Apr 19, 2023
3a33a25
Fixed Deck 2.0 entry comments count
dkildar Apr 19, 2023
8005163
fix usage of enum
feruzm Apr 20, 2023
5ec02d6
Merge pull request #1294 from ecency/notification-improvements
feruzm Apr 20, 2023
66ad304
Merge branch 'development' into feature/deck-2-0
dkildar Apr 20, 2023
6e76796
Fixed merge conflicts
dkildar Apr 20, 2023
f4fc9fd
Fixed merge conflicts
dkildar Apr 20, 2023
37df658
Fixed merge conflicts
dkildar Apr 21, 2023
598613d
Added Deck 2.0 content viewer view full post link
dkildar Apr 21, 2023
b75e426
Fixed Deck 2.0 entry vote tooltip styles
dkildar Apr 21, 2023
b7f8391
Merge pull request #1295 from ecency/feature/deck-2-0
feruzm Apr 21, 2023
450955c
lock update
feruzm Apr 21, 2023
d39bdf1
Fixed CI tests
dkildar Apr 22, 2023
2867fbd
Fixed CI tests
dkildar Apr 22, 2023
438c49e
Merge pull request #1314 from ecency/fix-ci
feruzm Apr 22, 2023
942be36
test updates
feruzm Apr 24, 2023
af1e9cd
remove entry-menu test
feruzm Apr 24, 2023
e3a8850
Revert "remove entry-menu test"
feruzm Apr 24, 2023
a97db2d
remove entry-payout test
feruzm Apr 24, 2023
bce58e7
Revert "remove entry-payout test"
feruzm Apr 24, 2023
0f4d8c8
update some tests
feruzm Apr 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/common/api/hive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,9 @@ export const getAllTrendingTags = (
afterTag: string = "",
limit: number = 250
): Promise<TrendingTag[] | any> =>
client.database
.call("get_trending_tags", [afterTag, limit])
.then((tags: TrendingTag[]) => {
return tags.filter((x) => x.name !== "").filter((x) => !isCommunity(x.name));
})
.catch((reason) => {
debugger;
});
client.database.call("get_trending_tags", [afterTag, limit]).then((tags: TrendingTag[]) => {
return tags.filter((x) => x.name !== "").filter((x) => !isCommunity(x.name));
});

export const lookupAccounts = (q: string, limit = 50): Promise<string[]> =>
client.database.call("lookup_accounts", [q, limit]);
Expand Down
3 changes: 3 additions & 0 deletions src/common/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ const EntryPage = (props: any) => {
const PurchaseContainer = loadable(() => import("./pages/purchase"));
const PurchasePage = (props: any) => <PurchaseContainer {...props} />;

const DecksPage = loadable(() => import("./pages/decks"));

const App = (props: any) => {
useEffect(() => {
let pathname = window.location.pathname;
Expand Down Expand Up @@ -141,6 +143,7 @@ const App = (props: any) => {
<Route exact={true} strict={true} path={routes.TOS} component={TosPage} />
<Route exact={true} strict={true} path={routes.FAQ} component={FaqPage} />
<Route exact={true} strict={true} path={routes.CONTRIBUTORS} component={ContributorsPage} />
<Route exact={true} strict={true} path={routes.DECKS} component={DecksPage} />
<Route component={NotFound} />
</Switch>

Expand Down
3 changes: 1 addition & 2 deletions src/common/components/community-activities/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ it("(1) Default render - With data.", async () => {
history: createBrowserHistory(),
global: globalInstance,
community: { ...communityInstance1 },
addAccount: () => {},
onHide: () => {}
addAccount: () => {}
};

const component = await renderer.create(<Activities {...props} />);
Expand Down
4 changes: 2 additions & 2 deletions src/common/components/community-activities/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ interface ListItemProps {
addAccount: (data: Account) => void;
}

class ListItem extends Component<ListItemProps> {
class NListItem extends Component<ListItemProps> {
shouldComponentUpdate(): boolean {
return false;
}
Expand Down Expand Up @@ -179,7 +179,7 @@ export class Activities extends BaseComponent<Props, State> {
<div className="activity-list">
<div className="activity-list-body">
{items.length > 0 &&
items.map((item, i) => <ListItem key={i} {...this.props} notification={item} />)}
items.map((item, i) => <NListItem key={i} {...this.props} notification={item} />)}
</div>
</div>
{hasMore && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`(1) Default render 1`] = `
>
<span
className="user-avatar xLarge"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/large)",
Expand Down Expand Up @@ -156,6 +157,7 @@ exports[`(2) Should show edit buttons with nsfw label 1`] = `
>
<span
className="user-avatar xLarge"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/large)",
Expand Down Expand Up @@ -345,6 +347,7 @@ exports[`(3) usePrivate = false 1`] = `
>
<span
className="user-avatar xLarge"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/large)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ exports[`(1) Default render 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/medium)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ exports[`(1) Default render 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/medium)",
Expand Down Expand Up @@ -80,6 +81,7 @@ exports[`(1) Default render 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bluemist/avatar/medium)",
Expand Down Expand Up @@ -154,6 +156,7 @@ exports[`(2) Should not show add user button 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/medium)",
Expand Down Expand Up @@ -187,6 +190,7 @@ exports[`(2) Should not show add user button 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bluemist/avatar/medium)",
Expand Down Expand Up @@ -261,6 +265,7 @@ exports[`(3) Should show add user button 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-148441/avatar/medium)",
Expand Down Expand Up @@ -294,6 +299,7 @@ exports[`(3) Should show add user button 1`] = `
>
<span
className="user-avatar medium"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bluemist/avatar/medium)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ exports[`(2) Tags with no community 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -62,6 +63,7 @@ exports[`(3) Tags with community. but in the end 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -93,6 +95,7 @@ exports[`(4) Tags with community. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-125125/avatar/small)",
Expand Down Expand Up @@ -124,6 +127,7 @@ exports[`(5) Tags with community. But not valid 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -180,6 +184,7 @@ exports[`(6) Browser 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -207,6 +212,7 @@ exports[`(6) Browser 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-125125/avatar/small)",
Expand Down Expand Up @@ -234,6 +240,7 @@ exports[`(6) Browser 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-131131/avatar/small)",
Expand Down Expand Up @@ -261,6 +268,7 @@ exports[`(6) Browser 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/hive-145145/avatar/small)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bluemist/avatar/small)",
Expand Down Expand Up @@ -62,6 +63,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -102,6 +104,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bar/avatar/small)",
Expand Down Expand Up @@ -142,6 +145,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/baz/avatar/small)",
Expand Down Expand Up @@ -182,6 +186,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/lorem/avatar/small)",
Expand Down Expand Up @@ -222,6 +227,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/ipsum/avatar/small)",
Expand Down Expand Up @@ -262,6 +268,7 @@ exports[`(1) Default render. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/dolor/avatar/small)",
Expand Down Expand Up @@ -317,6 +324,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bluemist/avatar/small)",
Expand Down Expand Up @@ -362,6 +370,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/foo/avatar/small)",
Expand Down Expand Up @@ -421,6 +430,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/bar/avatar/small)",
Expand Down Expand Up @@ -480,6 +490,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/baz/avatar/small)",
Expand Down Expand Up @@ -539,6 +550,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/lorem/avatar/small)",
Expand Down Expand Up @@ -598,6 +610,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/ipsum/avatar/small)",
Expand Down Expand Up @@ -657,6 +670,7 @@ exports[`(2) Active user. 1`] = `
>
<span
className="user-avatar small"
onClick={[Function]}
style={
Object {
"backgroundImage": "url(https://images.ecency.com/u/dolor/avatar/small)",
Expand Down
6 changes: 5 additions & 1 deletion src/common/components/curation/index.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ jest.mock("../../api/private-api", () => ({
{ account: "baz", votes: 26, vests: "44.707" },
{ account: "zoo", votes: 22, vests: "55.040" }
]);
}),
getAccounts: (accounts: string[]) =>
new Promise((resolve) => {
resolve([]);
})
}));

Expand All @@ -29,6 +33,6 @@ it("(1) Render with data.", async () => {
// render the component
const root = await create(<Curation {...props} />);
// make assertions on root
await allOver();
expect(root.toJSON()).toMatchSnapshot();
root.unmount();
});