Skip to content

Commit

Permalink
Merge alpha into Spaces (#540)
Browse files Browse the repository at this point in the history
* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.20

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.21

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.22

* Spaces backend examples (#522)

* fix: spaces documentation

* Update README.md

* fix: formatting issues

* fix: uncommented code

* test: added autoleave tcs (#525)

* Spaces SDK alpha publish (#520)

* refactor: added initial SpacesUI class architecture

* Update packages/uiweb/src/lib/components/space/SpacesUI.tsx

Co-authored-by: Arnab Chatterjee <[email protected]>

* Update packages/uiweb/src/lib/components/space/SpacesUI.tsx

Co-authored-by: Arnab Chatterjee <[email protected]>

* fix: refine code structure

* refactor: change structure and added a test sample

* feat: added themeprovider for spaces ui components (#436)

* feat: feat: add themeprovider for spaces

* fix: resolved conflicts

* refactor: cleaned up provider

* refactor: resolved comments

* feat: added colors and themeing in demoreactapp

* refactor: cleaned code

* refactor: resolved comments

* refactor: added a basic style structure for ease of use (#453)

* feat: SpaceBanner Component (#438)

* feat: SpaceBanner

* refactor: removed-optionals

* feat: space-banner functionality

* fix: reverted app.tsx

* fix: reverted app.tsx

* fix: removed test svg file

* refactor: change structure and added a test sample

* feat: space-banner functionality

* refactor: api-implementation

* fix: removed-svg

* refactor: mobile version

* Revert "fix: removed test svg file"

This reverts commit 7af756b.

* Revert "refactor: change structure and added a test sample"

This reverts commit b1e8745.

* fix: revert

* refactor: lastest-pull

* feat: added-spaceBanner-test

* refactor: cache-to-context

* refactor: custom hook added for data

* refactor: spaceDTO

* fix: SpaceDTO implementation

* refactor: participant-container

* refactor: cleanups

* fix: ui-fixes

* fix: EOF newlines

* fix: overflow-fixed

* refactor: tweaked context structure a bit

---------

Co-authored-by: Samarendra Gouda <[email protected]>
Co-authored-by: Nilesh Gupta <[email protected]>

* refactor: updated theme object along with light and dark theme

* feat: Create Space Component (#454)

* refactor: resolved merge conflicts

* feat: added modals and modal behaviour logic

* feat: modal inputs

* feat: change modal logic + integr8 API

* feat: added CSS for modals and inputs

* fix: resolved PR comments

* refactor: improve css

* refactor: rft create modal

* feat: added search input component

* Refactor/space widget component (#458)

* refactor: added basic design

* refactor: added full widget with style

* refactor: reduced fixed height of scheduled widget content

* refactor: changes requested

* refactor: resolved review comments

* feat: add spaces info component (#474)

* Feat/added members modal (#477)

* refactor: added modal

* refactor: added members modal

* refactor: review comments

* refactor: resolve review comments

* fix: review comments

* 424 spaces functions webrtc logic (#482)

* fix: add spaces for functions

* fix: Separate page for space in the demo react APP

* fix: start/stop spaces functions

* fix: fix image and description types

* fix: added functions to add and remove members from group

* fix: spaces functions

* fix: spaces functions refactoring

* fix: few more changes

* fix: spaces function testing

* fix: spaces functions

* fix: SDK bug fixes

* fix: SDK bug fixes

* fix: minor fixes

* fix: minor fix

* fix: minor fix

* feat(video): add create mesh connection logic in Video class

* feat(spaces): make video mesh compatible & add spaces class

* feat(spaces): add backend methods in Space class

---------

Co-authored-by: Shoaib Mohammed <[email protected]>
Co-authored-by: Madhur Gupta <[email protected]>

* refactor: spaces UI Components refactor (#478)

> replaced hardcoded styles with context theme >added smoother animations on collapsoble components
>added profile cards to invite modal

* refactor: added spaceUI class variables into context as well (#488)

* refactor: added spaceUI class variables into context as well

* refactor: resolve review comments

* refactor: added a clickHandler in spaceBanner component for extra flexibility (#489)

* fix(spaces): fix console errs and refactor create, update methods (#492)

* fix: add spaces for functions

* fix: Separate page for space in the demo react APP

* fix: start/stop spaces functions

* fix: fix image and description types

* fix: added functions to add and remove members from group

* fix: spaces functions

* fix: spaces functions refactoring

* fix: few more changes

* fix: spaces function testing

* fix: spaces functions

* fix: SDK bug fixes

* fix: SDK bug fixes

* fix: minor fixes

* fix: minor fix

* fix: minor fix

* feat(video): add create mesh connection logic in Video class

* feat(spaces): make video mesh compatible & add spaces class

* feat(spaces): add backend methods in Space class

* fix: Merge branch 'alpha' into 424-spaces-functions-webrtc-logic

* fix(spaces): fix console errors and move out create, update functions from Space class

---------

Co-authored-by: Shoaib Mohammed <[email protected]>

* refactor: modified init class method

* refactor/added-space-feed-component(#481)

* feat: space-feed

* refactor: space-feed

* Deployment (#440)

* ci(restapi): 🎉 cut release to restapi-v1.0.0

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.0

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.1

* ci(restapi): 🎉 cut release to restapi-v1.0.1

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.2

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.2

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.3

* fix: success progressHook

* ci(restapi): 🎉 cut release to restapi-v1.0.4

* ci(restapi): 🎉 cut release to restapi-v1.1.0

* ci(restapi): 🎉 cut release to restapi-v1.2.0

* ci(restapi): 🎉 cut release to restapi-v1.2.0

* ci(restapi): 🎉 cut release to restapi-v1.0.0

* fix(component): dummy

* fix(component): dummy

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.2

* fix(component): dummy

* ci(restapi): 🎉 cut release to restapi-v1.0.3

* ci(restapi): 🎉 cut release to restapi-v1.0.4

* ci(restapi): 🎉 cut release to restapi-v1.2.1

* fix: local for local development (#295)

Co-Authored-By: aman035 <[email protected]>

* fix: version update

* ci(restapi): 🎉 cut release to restapi-v1.2.2

* ci(restapi): 🎉 cut release to restapi-v1.2.3

* ci(restapi): 🎉 cut release to restapi-v1.2.4

* ci(restapi): 🎉 cut release to restapi-v1.2.5

* ci(restapi): 🎉 cut release to restapi-v1.2.6

* ci(restapi): 🎉 cut release to restapi-v1.2.7

* ci(socket): 🎉 cut release to socket-v0.5.0

* fix: test commit

* ci(restapi): 🎉 cut release to restapi-v1.2.8

* ci(uiweb): 🎉 cut release to uiweb-v1.0.0

* ci(uiweb): 🎉 cut release to uiweb-v1.0.0

* ci(uiweb): 🎉 cut release to uiweb-v1.0.1

* fix: added ci-version-beta

* fix: added ci-version-beta

* ci(restapi): 🎉 cut beta release to restapi-v1.2.9

* fix: added releaseType

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.0

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.0

* ci(restapi): 🎉 cut release to restapi-v1.2.10

* ci(restapi): 🎉 cut release to restapi-v1.2.10

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.1

* ci(restapi): 🎉 cut release to restapi-v1.2.11

* fix: linkedListHash test cases removed & CI version corrected

* fix: update name to beta

* ci(restapi): 🎉 cut release to restapi-v1.2.12

* ci(restapi): 🎉 cut release to restapi-v1.2.12

* ci(restapi): 🎉 cut release to restapi-v1.2.13

* ci(restapi): 🎉 cut release to restapi-v1.2.14

* ci(restapi): 🎉 cut release to restapi-v1.2.15

* fix: update package json

* fix: updated socket version

* ci(uiweb): 🎉 cut release to uiweb-v1.0.2

* fix: socket lib update

* ci(uiweb): 🎉 cut release to uiweb-v1.0.2

* ci(restapi): 🎉 cut release to restapi-v1.2.16

* ci(restapi): 🎉 cut release to restapi-v1.3.0

* ci(restapi): 🎉 cut release to restapi-v1.3.1

* ci(socket): 🎉 cut release to socket-v0.5.1

* ci(restapi): 🎉 cut release to restapi-v1.3.2

* ci(restapi): 🎉 cut release to restapi-v1.3.3

* ci(restapi): 🎉 cut release to restapi-v1.3.4

---------

Co-authored-by: aman035 <[email protected]>

* feat: space-feed

* refactor: space-feed

* fix: api-call-custom-hooks

* fix: api-call

* refactor: enums/changes

* fix: scrollable

* fix: scrolling-issue

* feat: filter-changes

* fix: added types

* fix: loader-issue

* fix: tab-button-color

* feat: new-filter and prop

* fix: ended-logic && participant-number logic

* refactor: add onBannerClick

* fix: conflicts

* revert: messed-up spaceBanner

* fix: onClick issue

* fix: onClick and cleanups

* refactor: new pagination interface

* fix: scroll-logic

* fix: scroll-final

* fix: ..

* fix: removed any

* fix: onClick-issue

* fix: loading-context-to-state

* refactor: add-NoSpaceIcons

* refactor: new-ui-layout

* refactor: new-ui-layout

---------

Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: aman035 <[email protected]>
Co-authored-by: Nilesh Gupta <[email protected]>

* refactor: added structure for spaces invites modal component

* refactor: invite-component

* fix: minor-bug

* feat: Create Space API Integration (#494)

* feat: create spaces integration

* feat: added datetime picker

* feat: completed create space API integration

* feat: changed flow and time component

* feat(spaces): initiate livepeer playback in start method (#499)

* fix: add spaces for functions

* fix: Separate page for space in the demo react APP

* fix: start/stop spaces functions

* fix: fix image and description types

* fix: added functions to add and remove members from group

* fix: spaces functions

* fix: spaces functions refactoring

* fix: few more changes

* fix: spaces function testing

* fix: spaces functions

* fix: SDK bug fixes

* fix: SDK bug fixes

* fix: minor fixes

* fix: minor fix

* fix: minor fix

* feat(video): add create mesh connection logic in Video class

* feat(spaces): make video mesh compatible & add spaces class

* feat(spaces): add backend methods in Space class

* fix: Merge branch 'alpha' into 424-spaces-functions-webrtc-logic

* fix(spaces): fix console errors and move out create, update functions from Space class

* feat(spaces): initiate livepeer playback in start method

* feat(spaces): store livepeer playback id in space description

---------

Co-authored-by: Shoaib Mohammed <[email protected]>

* Add initialize method (#505)

* fix: add spaces for functions

* fix: Separate page for space in the demo react APP

* fix: start/stop spaces functions

* fix: fix image and description types

* fix: added functions to add and remove members from group

* fix: spaces functions

* fix: spaces functions refactoring

* fix: few more changes

* fix: spaces function testing

* fix: spaces functions

* fix: SDK bug fixes

* fix: SDK bug fixes

* fix: minor fixes

* fix: minor fix

* fix: minor fix

* feat(video): add create mesh connection logic in Video class

* feat(spaces): make video mesh compatible & add spaces class

* feat(spaces): add backend methods in Space class

* fix: Merge branch 'alpha' into 424-spaces-functions-webrtc-logic

* fix(spaces): fix console errors and move out create, update functions from Space class

* feat(spaces): initiate livepeer playback in start method

* feat(spaces): store livepeer playback id in space description

* feat(spaces): add intitialize method

---------

Co-authored-by: Shoaib Mohammed <[email protected]>

* refactor: resolved css in space banner

* refactor: added a skeleton loading effect on space Banner component

* feat: add invite functionality to create space (#506)

* feat: added invite functionality

* fix: add logic for time selector

* fix: css fixes

* refactor: info-on-widget (#504)

* refactor: info-on-widget

* refactor: add Space class to context

* fix: padding, added new mic icons

* fix: added-ref to context

* feat: start added

* fix: remove optional spaceId

* fix: inf-bug

* fix: effectAdded

* fix(spaces): add is supported check in start

* refactor: added-join-functionalities (#507)

* refactor: added-join-functionalities

* fix: screens

* fix(spaces): fix livepeer stream creation in start

---------

Co-authored-by: Madhur Gupta <[email protected]>

* Fix join and pgpPrivateKey in demoreact (#508)

* refactor: info-on-widget

* refactor: add Space class to context

* fix: padding, added new mic icons

* fix: added-ref to context

* feat: start added

* fix: remove optional spaceId

* fix: inf-bug

* fix: effectAdded

* fix(spaces): add is supported check in start

* refactor: added-join-functionalities

* fix: screens

* refactor: added-join-functionalities (#507)

* refactor: added-join-functionalities

* fix: screens

* fix(spaces): fix livepeer stream creation in start

* fix: join function

---------

Co-authored-by: samarendra-push <[email protected]>
Co-authored-by: Samarendra Gouda <[email protected]>

* refactor: added feature of triggering widget from sdk

* fix(spaces): fix join as speaker and listner

* fix: resolved updating env and other class variables

* Spaces/UI migration (#510)

* fix: ui-migration

* fix: migration fixes

* refactor: added notification socket for space in uiweb

* feat: add remove and admin func to invite modal (#509)

* feat: add remove and admin func to invite modal

* fix: fix null

* fix(spaces): fix start

* feat: add join functionality to invited spaces (#512)

* feat: add join functionality to invited spaces

* fix: open space widget after joining

* refactor: add audio playback from space speakers (#511)

* refactor: added a hidden Video container

* fix: migrated initSpaceObject to parent component

* feat(spaces): add user feeds socket handler logic

* fix: fix create invite UI edge cases (#515)

* fix: fix create invite UI edge cases

* fix: fix env

* fix: fix state behaviour

* fix: add wallet as name if name string empty

add wallet as name if name string empty

* refactor: added join function and socket code (#517)

* refactor: added join function and socket code

* refactor(spaces): fix mesh creation logic

* refactor(spaces): remove unused imports from context

* refactor(spaces): remove unused code and improve positioning of code blocks

---------

Co-authored-by: Madhur Gupta <[email protected]>

* Fix isJoined, add hidden video tag (#514)

* refactor: added a hidden Video container

* fix: migrated initSpaceObject to parent component

* fix: WIP isJoined

* fix: join as a listener

---------

Co-authored-by: Madhur Gupta <[email protected]>

* fix(spaces): add create audio call before join for speakers (#518)

* Widget/videoplayer (#519)

* refactor: added a hidden Video container

* fix: migrated initSpaceObject to parent component

* fix: WIP isJoined

* fix: revert husky

* fix: nx.json revert

* fix: join as a listener

* fix: start ui-logic refactor

* fix: merge-conflicts

* fix: isListener

* fix(spaces): fix isSpeaker and isListner logic

* feat: added blockies (#523)

---------

Co-authored-by: Nilesh Gupta <[email protected]>
Co-authored-by: Arnab Chatterjee <[email protected]>
Co-authored-by: Samarendra Gouda <[email protected]>
Co-authored-by: Samarendra Gouda <[email protected]>
Co-authored-by: Shoaib Mohammed <[email protected]>
Co-authored-by: aman035 <[email protected]>
Co-authored-by: samarendra-push <[email protected]>

* fix: fix unable to decrypt case (#527)

* ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.23

* Update README.md

* Feat/notification theme (#524)

* fix: adding theme

* fix: added theming to notification Item

* fix: fixed review issues

* fix: rename chats to spaces

---------

Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: Mohammed S <[email protected]>
Co-authored-by: Aman Gupta <[email protected]>
Co-authored-by: Nilesh Gupta <[email protected]>
Co-authored-by: Arnab Chatterjee <[email protected]>
Co-authored-by: Samarendra Gouda <[email protected]>
Co-authored-by: Samarendra Gouda <[email protected]>
Co-authored-by: samarendra-push <[email protected]>
Co-authored-by: Monalisha Mishra <[email protected]>
  • Loading branch information
10 people authored Jul 14, 2023
1 parent 9c62c36 commit f570c69
Show file tree
Hide file tree
Showing 18 changed files with 2,870 additions and 167 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"private": true,
"dependencies": {
"@ledgerhq/iframe-provider": "^0.4.2",
"@livepeer/webrtmp-sdk": "^0.2.3",
"@react-native-masked-view/masked-view": "^0.2.7",
"@web3-react/abstract-connector": "^6.0.7",
"axios": "^0.27.2",
Expand Down Expand Up @@ -49,7 +50,8 @@
"ts-mocha": "^10.0.0",
"tslib": "^2.3.0",
"unique-names-generator": "^4.7.1",
"uuid": "^9.0.0"
"uuid": "^9.0.0",
"video-stream-merger": "^4.0.1"
},
"devDependencies": {
"@commitlint/cli": "^17.0.0",
Expand Down
33 changes: 30 additions & 3 deletions packages/demoreact/src/app/NotificationsTest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Loader from './components/Loader';
import { DarkIcon, LightIcon } from './components/Icons';
import { Web3Context, EnvContext } from './context';
import * as PushAPI from '@pushprotocol/restapi';
import { NotificationItem, chainNameType, SubscribedModal } from '@pushprotocol/uiweb';
import { NotificationItem, chainNameType, SubscribedModal, INotificationItemTheme, notificationBaseTheme, notificationLightTheme } from '@pushprotocol/uiweb';
import { getCAIPAddress } from './helpers';

import sampleNotifications from './data';
Expand Down Expand Up @@ -52,8 +52,34 @@ const NotificationsTest = () => {
const [theme, setTheme] = useState('dark');
const [viewType, setViewType] = useState('notif');
const [showSubscribe, setShowSubscribe] = useState(false);


const customTheme: INotificationItemTheme = {...notificationLightTheme,...{
borderRadius:{
...notificationLightTheme.borderRadius,
modal:'12px',
},
color:{
...notificationLightTheme.color,
channelNameText:'#62626A',
notificationTitleText:'#000',
notificationContentText:'#62626A',
timestamp:'#62626A',
},
fontWeight:{
...notificationLightTheme.fontWeight,
channelNameText:700,
notificationTitleText:700,
notificationContentText:800,
timestamp:400
},
fontSize:{
...notificationLightTheme.fontSize,
channelNameText:'16px',
notificationTitleText:'16px',
notificationContentText:'16px',
timestamp:'12px'
},
modalDivider:'none'
}};
const loadNotifications = useCallback(async () => {
try {
setLoading(true);
Expand Down Expand Up @@ -171,6 +197,7 @@ const NotificationsTest = () => {
image={image}
url={url}
theme={theme}
customTheme={customTheme}
// chainName="ETH_TEST_GOERLI"
chainName={blockchain as chainNameType}
/>
Expand Down
3 changes: 3 additions & 0 deletions packages/examples/sdk-backend-node/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { runNotificaitonsUseCases } from './notification';
import { runChatUseCases, runNFTChatUseCases } from './chat';
import { runVideoUseCases } from './video';
import { runSpacesUseCases } from './spaces';

import { config } from './config';
import { ENV } from './types';

Expand All @@ -16,6 +18,7 @@ const start = async (): Promise<void> => {
await runChatUseCases();
await runNFTChatUseCases();
await runVideoUseCases();
await runSpacesUseCases();
};

start();
Expand Down
Loading

0 comments on commit f570c69

Please sign in to comment.