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

Master -> dev #5350

Merged
merged 116 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
e9b6f03
Release v3.3.4
attemka Jun 7, 2023
bc02d79
Merge branch 'dev'
Jun 9, 2023
88071d8
Changelog and version bump
Jun 9, 2023
2f22d45
Release v3.3.5
attemka Jun 9, 2023
a6fe14d
Merge remote-tracking branch 'Joystream/dev'
Jun 23, 2023
3cd9d05
Changelog and version bump
Jun 23, 2023
3e755a0
Release v3.3.6
attemka Jun 23, 2023
0ae8ccf
Merge branch 'dev'
Jul 3, 2023
500bbb8
Changelog and version bump
Jul 3, 2023
7aebefb
Release v3.4.0
attemka Jul 3, 2023
ec4005e
Fixed metaserver build issue (#4386)
attemka Jul 4, 2023
6d52af0
Version bump
Jul 4, 2023
17c6d33
Atlas meta-server build fix (#4388)
attemka Jul 5, 2023
947a8f6
Merge remote-tracking branch 'Joystream/dev'
Jul 20, 2023
0d33d2e
changelog, env defaults, version bump
Jul 20, 2023
545c5df
Release v4.0.0
attemka Jul 20, 2023
b9fe702
Merge branch 'dev'
Jul 20, 2023
a059ff3
Merge branch 'dev'
Jul 20, 2023
abc5b02
changelog and version bump
Jul 20, 2023
6219e48
Release v4.0.1
attemka Jul 20, 2023
1c82a25
Merge remote-tracking branch 'Joystream/dev'
Jul 21, 2023
9bd0650
Changelog and version bump
Jul 21, 2023
9a93eb8
Release v4.0.2
attemka Jul 21, 2023
d7d8d13
🚒 YPP auth fixes (#4486)
WRadoslaw Jul 24, 2023
ac9cb9d
Changelog and version bump
Jul 24, 2023
1ac99f2
Release v4.0.3
attemka Jul 24, 2023
4c24059
Merge remote-tracking branch 'Joystream/dev'
Jul 26, 2023
348b030
Changelog and version bump
Jul 26, 2023
7136eac
Release v4.1.0
attemka Jul 26, 2023
1fbe590
Merge remote-tracking branch 'Joystream/dev'
Jul 28, 2023
24a9a3d
Changelog and version bump
Jul 28, 2023
583b22d
Release v4.2.0
attemka Jul 28, 2023
34fa3fb
Merge remote-tracking branch 'Joystream/dev'
Aug 2, 2023
bb9c8e7
changelog and version bump
Aug 2, 2023
ec8cd4e
Release v4.3.0
attemka Aug 2, 2023
0d22058
Merge remote-tracking branch 'Joystream/dev'
Aug 3, 2023
32185fd
changelog and version bump
Aug 3, 2023
70803bb
Release v4.3.1
attemka Aug 3, 2023
904126b
🔁 Retry file upload after blacklisting a bucket (#4592)
thesan Aug 8, 2023
bf7bad6
Merge remote-tracking branch 'Joystream/dev'
Aug 8, 2023
dd36fb5
Changelog and version bump
Aug 8, 2023
96e22db
Release v4.4.0
attemka Aug 8, 2023
0fc2631
Merge branch 'dev'
Aug 9, 2023
eb9ed74
changelog and version bump
Aug 9, 2023
58cb701
Release v4.4.1
attemka Aug 9, 2023
c3607b4
Merge remote-tracking branch 'Joystream/dev'
Aug 9, 2023
a090625
changelog and version bump
Aug 9, 2023
59b307c
Release v4.4.2
attemka Aug 9, 2023
bbd01d8
Merge remote-tracking branch 'Joystream/dev'
Aug 10, 2023
f2bdcd4
changelog and version bump
Aug 10, 2023
8fb3040
Release v4.5.0
attemka Aug 10, 2023
c3e43ab
Merge remote-tracking branch 'Joystream/dev'
Aug 14, 2023
ba5bf07
changelog and version bump
Aug 14, 2023
d62e874
Release v4.5.1
attemka Aug 14, 2023
cd396b2
Merge remote-tracking branch 'Joystream/dev'
Aug 17, 2023
d0b3630
changelog and version bump
Aug 17, 2023
4330b2f
Release v4.6.0
attemka Aug 17, 2023
526d625
Merge remote-tracking branch 'Joystream/dev'
Aug 21, 2023
97f6e86
changelog and version bump
Aug 21, 2023
8cbef77
Release v4.6.1
attemka Aug 21, 2023
2eba4d6
Merge remote-tracking branch 'Joystream/dev'
Aug 24, 2023
cc6b492
changelog and version bump
Aug 24, 2023
9c44dc7
Release v4.7.0
attemka Aug 24, 2023
45c853f
Merge remote-tracking branch 'Joystream/dev'
Sep 1, 2023
9135d1d
changelog and version bump, restored method for asset test
Sep 1, 2023
d5c2fc0
Release v4.8.0
attemka Sep 1, 2023
e9e7f9b
Merge remote-tracking branch 'Joystream/dev'
Sep 6, 2023
2150084
Changelog and version bump
Sep 6, 2023
57fda2f
Release v4.8.1
attemka Sep 6, 2023
7c3f0aa
Merge remote-tracking branch 'Joystream/dev'
Sep 8, 2023
dcec54c
changelog and version bump
Sep 8, 2023
25ceb9c
Release v4.9.0
attemka Sep 8, 2023
5aef88a
Raised the heap size for atlas build (#4841)
attemka Sep 8, 2023
470c768
Merge remote-tracking branch 'Joystream/dev'
Sep 14, 2023
5923eec
changelog and version bump
Sep 14, 2023
2cacb9c
Release v4.9.1
attemka Sep 14, 2023
2eaa66e
Raised docker build heap size (#4907)
attemka Sep 22, 2023
bbdfe37
Merge remote-tracking branch 'Joystream/dev'
Sep 22, 2023
dc85c97
changelog and version bump
Sep 22, 2023
b3584e7
Release v4.9.2
attemka Sep 22, 2023
6c20379
Merge remote-tracking branch 'Joystream/dev'
Oct 6, 2023
a2eaaae
changelog and version bump
attemka Oct 6, 2023
1ebbb2c
Merge remote-tracking branch 'Joystream/dev'
Oct 6, 2023
f94a31f
Release v4.10.0
attemka Oct 6, 2023
ce31835
Merge remote-tracking branch 'Joystream/dev'
Oct 11, 2023
34f912f
changelog and version bump
Oct 11, 2023
7abba35
version fix
Oct 11, 2023
e049aee
Release v4.10.1
attemka Oct 11, 2023
c90ad2d
Merge remote-tracking branch 'Joystream/dev'
Oct 12, 2023
9793ed6
changelog and version bump
Oct 12, 2023
287d8e6
Release v4.10.2
attemka Oct 12, 2023
e17272c
Merge remote-tracking branch 'Joystream/dev'
Oct 20, 2023
41c79d1
Changelog and version bump
Oct 20, 2023
905e0c2
Merge remote-tracking branch 'Joystream/dev'
Oct 20, 2023
11fe416
Release v4.11.0
attemka Oct 20, 2023
711e508
Merge remote-tracking branch 'Joystream/dev'
Nov 1, 2023
dd1f11d
changelog and version bump
Nov 1, 2023
2d433f0
Release v4.12.0
attemka Nov 1, 2023
1c1a3fb
Merge remote-tracking branch 'Joystream/dev'
Nov 8, 2023
9ef3948
changelog and version bump
Nov 8, 2023
ab2c138
Release v4.13.0
attemka Nov 8, 2023
1676f22
Updated changelog
attemka Nov 8, 2023
27092ae
Merge remote-tracking branch 'Joystream/dev'
Nov 8, 2023
9a474ec
Release v4.13.0
attemka Nov 8, 2023
a9a7dfd
Merge remote-tracking branch 'Joystream/dev'
Nov 9, 2023
460e9d4
changelog and version bump
Nov 9, 2023
7b6caec
Release v4.13.1
attemka Nov 9, 2023
f37668c
Fix `general.appName`
thesan Nov 10, 2023
afcb731
Fix video player on mobile (#5325)
WRadoslaw Nov 13, 2023
ba8c009
Updated referrals list asset (#5337)
attemka Nov 14, 2023
2b73dca
🦖 Improved swiper performance (#5321)
WRadoslaw Nov 14, 2023
9d51f32
Download seed checkbox (#5342)
Nov 14, 2023
6769d17
YPP dashboard fixes (#5347)
attemka Nov 14, 2023
45aae03
changelog and version bump
Nov 14, 2023
92f8766
import fix
Nov 14, 2023
30a6fac
Release v4.13.2
attemka Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
atlas:
runs-on: ubuntu-latest
env:
NODE_OPTIONS: "--max_old_space_size=4096"
NODE_OPTIONS: "--max_old_space_size=6144"
steps:
- name: Login to DockerHub
uses: docker/login-action@v1
Expand Down
119 changes: 118 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,123 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.13.2] - 2023-11-14

### Changed

- YPP payout date is moved to Tuesday
- Account seed is now downloaded by default
- Changed referrals list on referrals page

### Fixed

- Fixed performance issues on mobile devices
- Fixed player styling on mobile devices
- Fixed incorrect rewards on YPP dashboard tab

## [4.13.1] - 2023-11-09

### Fixed

- Minor markup fixes on referrals page
- Fixed issue with YPP landing page carousel
- Fixed user logs

## [4.13.0] - 2023-11-08

### Added

- new Referrals page

### Changed

- YPP channel carousel is now showing most paid channels
- Removed YPP signup quota check

### Fixed

- Fixed password suggestion being shown in the wrong places
- Fixed issue with channel asset upload
- Fixed NFT button being available for unauthorized users
- Fixed incorrect block number in payments table
- Fixed avatars on NFT carousel

## [4.12.0] - 2023-11-01

### Changed

- YPP requirements are now fetched from yt-synch
- Changed rewards for higher tiers
- Moved YPP daily quota to config

## [4.11.0] - 2023-10-20

### Added

- Added banner for second channel opt-in
- Added signup tutorial video on YPP landing page
- Added permanent referral link btn on YPP referrals tab

### Changed

- Password fields autocomplete was removed
- Adjusted YPP referral link
- Changed sort algorithm for YPP channels carousel

### Fixed

- Fixed redirect to YPP dashboard after sign in
- Fixed asset provider incorrect behaviour
- Fixed issue with GAuth code persistence

## [4.10.2] - 2023-10-12

### Fixed

- Fixed issues with channel funds withdrawal

## [4.10.1] - 2023-10-11

### Changed

- Removed YPP channel requirements

### Fixed

- Fixed issue with failing funds withdrawal
- Fixed crashes on ypp dashboard and referrals page
- Fixed channel assets modification
- Fixed referral link generation

## [4.10.0] - 2023-10-06

### Added

- Introduced new categories
- YPP was updated to v2.0: updated landing page, new tiers system; rewards, referrals and dashboard changes

### Changed

- Changed channel tokens withdrawal from membership account to any Joystream account

### Fixed

- Fixed bug with slow loading of a homepage
- Fixed bug with bid withdrawal from an auction
- Minor markup fixes

## [4.9.2] - 2023-09-22

### Changed

- Captcha was moved to the last signup step

### Fixed

- Fixed bug with checking the encoding for non-video assets
- Fixed bug with missing upload button for mobile devices
- Fixed bug with infinite modal on signup

## [4.9.1] - 2023-09-14

### Changed
Expand Down Expand Up @@ -124,7 +241,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fixed bug with infinite loop in studio
- Fixed error with WASM
- Fixed error with WASM

## [4.4.2] - 2023-08-09

Expand Down
2 changes: 1 addition & 1 deletion packages/atlas/atlas.config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
general:
appName: Atlas # Application name - used in the copy throughout the app, in index.html, open graph meta tags, etc. Don't use env variables here
appName: Gleev # Application name - used in the copy throughout the app, in index.html, open graph meta tags, etc. Don't use env variables here
appDescription: 'The streaming platform empowering viewers, creators, and builders. Built on and operated by the Joystream blockchain and DAO.' # Application description - used in index.html meta tags
appTagline: 'The streaming platform empowering viewers, creators, and builders. Built on and operated by the Joystream blockchain and DAO.'
appId: '$VITE_APP_ID' # App ID for Apps as first-class citizens
Expand Down
4 changes: 2 additions & 2 deletions packages/atlas/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@joystream/atlas",
"description": "UI for consuming Joystream - a user governed video platform",
"version": "4.9.1",
"version": "4.13.2",
"license": "GPL-3.0",
"scripts": {
"start": "vite",
Expand Down Expand Up @@ -96,7 +96,7 @@
"retry-axios": "^3.0.0",
"scroll-lock": "^2.1.5",
"subscriptions-transport-ws": "^0.11.0",
"swiper": "^9.1.1",
"swiper": "11.0.4",
"twemoji": "^14.0.2",
"use-draggable-scroll": "^0.1.0",
"use-resize-observer": "^9.1.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/atlas/src/api/hooks/nfts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ export const useFeaturedNftsVideos = () => {
variables: {
limit: 10,
orderBy: [OwnedNftOrderByInput.VideoViewsNumDesc],
where: {
isFeatured_eq: true,
},
},
})

Expand Down
Binary file not shown.
13 changes: 13 additions & 0 deletions packages/atlas/src/components/Avatar/Avatar.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import styled from '@emotion/styled'
import { SvgActionAddImage, SvgActionEdit, SvgIllustrativeFileFailed } from '@/assets/icons'
import { SvgAvatarSilhouette } from '@/assets/illustrations'
import { AssetImage } from '@/components/AssetImage'
import { smallBadgeStyles } from '@/components/Badge'
import { SkeletonLoader } from '@/components/_loaders/SkeletonLoader'
import { cVar, square, zIndex } from '@/styles'

Expand Down Expand Up @@ -171,3 +172,15 @@ export const StyledSvgIllustrativeFileFailed = styled(SvgIllustrativeFileFailed)
fill: ${cVar('colorCoreNeutral100')};
}
`

export const BadgeContainer = styled.div<{ 'data-badge': string | number | boolean | undefined }>`
display: ${(props) => (props['data-badge'] ? 'block' : 'contents')};
position: relative;
${smallBadgeStyles}

&[data-badge]::after {
position: absolute;
right: -6px;
top: -6px;
}
`
2 changes: 1 addition & 1 deletion packages/atlas/src/components/Carousel/Carousel.styles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled'
import { SwiperOptions } from 'swiper'
import { Swiper } from 'swiper/react'
import { SwiperOptions } from 'swiper/types'

import { Button } from '@/components/_buttons/Button'
import { cVar, media, sizes, transitions, zIndex } from '@/styles'
Expand Down
4 changes: 2 additions & 2 deletions packages/atlas/src/components/Carousel/Carousel.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ReactNode } from 'react'
import { Pagination } from 'swiper'
import 'swiper/css'
import { Navigation, Pagination } from 'swiper/modules'
import { SwiperProps, SwiperSlide } from 'swiper/react'
import { Swiper as SwiperType } from 'swiper/types'

Expand All @@ -15,7 +15,7 @@ export type CarouselProps = {
} & SwiperProps

const dotsProps = {
modules: [Pagination],
modules: [Pagination, Navigation],
pagination: {
clickable: true,
bulletClass: 'bullet',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const InformationContainer = styled.div<{ isPaused: boolean }>`
}
`

export const Container = styled.div<{ isActive: boolean }>`
export const Container = styled.div`
display: flex;
flex-direction: column;
position: relative;
Expand Down
Loading
Loading