-
toggleToolArea()}
- />
-
- {!toolAreaOpen && unread > 0 && (
- = 10 })}>
- {unread}
-
- )}
-
- );
- }
-}
-
-ToolAreaButton.propTypes =
-{
- toolAreaOpen : PropTypes.bool.isRequired,
- toggleToolArea : PropTypes.func.isRequired,
- unread : PropTypes.number.isRequired,
- visible : PropTypes.bool.isRequired
-};
-
-const mapStateToProps = (state) =>
-{
- return {
- toolAreaOpen : state.toolarea.toolAreaOpen,
- visible : state.room.toolbarsVisible,
- unread : state.toolarea.unreadMessages + state.toolarea.unreadFiles
- };
-};
-
-const mapDispatchToProps = (dispatch) =>
-{
- return {
- toggleToolArea : () =>
- {
- dispatch(stateActions.toggleToolArea());
- }
- };
-};
-
-const ToolAreaButtonContainer = connect(
- mapStateToProps,
- mapDispatchToProps
-)(ToolAreaButton);
-
-export default ToolAreaButtonContainer;
diff --git a/app/lib/components/appPropTypes.js b/app/lib/components/appPropTypes.js
index 392e854..74b52e3 100644
--- a/app/lib/components/appPropTypes.js
+++ b/app/lib/components/appPropTypes.js
@@ -76,3 +76,16 @@ export const Message = PropTypes.shape(
text : PropTypes.string,
sender : PropTypes.string
});
+
+export const FileEntryProps = PropTypes.shape(
+ {
+ data : PropTypes.shape({
+ name : PropTypes.string.isRequired,
+ picture : PropTypes.string,
+ file : PropTypes.shape({
+ magnet : PropTypes.string.isRequired
+ }).isRequired,
+ me : PropTypes.bool
+ }).isRequired,
+ notify : PropTypes.func.isRequired
+ });
\ No newline at end of file
diff --git a/app/lib/redux/reducers/files.js b/app/lib/redux/reducers/files.js
new file mode 100644
index 0000000..19d5369
--- /dev/null
+++ b/app/lib/redux/reducers/files.js
@@ -0,0 +1,99 @@
+const files = (state = {}, action) =>
+{
+ switch (action.type)
+ {
+ case 'ADD_FILE':
+ {
+ const { file } = action.payload;
+
+ const newFile = {
+ active : false,
+ progress : 0,
+ files : null,
+ me : false,
+ ...file
+ };
+
+ return { ...state, [file.magnetUri]: newFile };
+ }
+
+ case 'ADD_FILE_HISTORY':
+ {
+ const { fileHistory } = action.payload;
+ const newFileHistory = {};
+
+ fileHistory.map((file) =>
+ {
+ const newFile = {
+ active : false,
+ progress : 0,
+ files : null,
+ me : false,
+ ...file
+ };
+
+ newFileHistory[file.magnetUri] = newFile;
+ });
+
+ return { ...state, ...newFileHistory };
+ }
+
+ case 'SET_FILE_ACTIVE':
+ {
+ const { magnetUri } = action.payload;
+ const file = state[magnetUri];
+
+ const newFile = { ...file, active: true };
+
+ return { ...state, [magnetUri]: newFile };
+ }
+
+ case 'SET_FILE_INACTIVE':
+ {
+ const { magnetUri } = action.payload;
+ const file = state[magnetUri];
+
+ const newFile = { ...file, active: false };
+
+ return { ...state, [magnetUri]: newFile };
+ }
+
+ case 'SET_FILE_PROGRESS':
+ {
+ const { magnetUri, progress } = action.payload;
+ const file = state[magnetUri];
+
+ const newFile = { ...file, progress: progress };
+
+ return { ...state, [magnetUri]: newFile };
+ }
+
+ case 'SET_FILE_DONE':
+ {
+ const { magnetUri, sharedFiles } = action.payload;
+ const file = state[magnetUri];
+
+ const newFile = {
+ ...file,
+ files : sharedFiles,
+ progress : 1,
+ active : false,
+ timeout : false
+ };
+
+ return { ...state, [magnetUri]: newFile };
+ }
+
+ case 'REMOVE_FILE':
+ {
+ const { magnetUri } = action.payload;
+
+ return state.filter((file) => file.magnetUri !== magnetUri);
+ }
+
+ default:
+ return state;
+ }
+};
+
+export default files;
diff --git a/app/lib/redux/reducers/index.js b/app/lib/redux/reducers/index.js
index 1f59ace..fcafba6 100644
--- a/app/lib/redux/reducers/index.js
+++ b/app/lib/redux/reducers/index.js
@@ -8,7 +8,7 @@ import notifications from './notifications';
import chatmessages from './chatmessages';
import chatbehavior from './chatbehavior';
import toolarea from './toolarea';
-import sharing from './sharing';
+import files from './files';
const reducers = combineReducers(
{
@@ -21,7 +21,7 @@ const reducers = combineReducers(
chatmessages,
chatbehavior,
toolarea,
- sharing
+ files
});
export default reducers;
diff --git a/app/lib/redux/reducers/notifications.js b/app/lib/redux/reducers/notifications.js
index bf3e6c0..142308e 100644
--- a/app/lib/redux/reducers/notifications.js
+++ b/app/lib/redux/reducers/notifications.js
@@ -1,6 +1,4 @@
-const initialState = [];
-
-const notifications = (state = initialState, action) =>
+const notifications = (state = [], action) =>
{
switch (action.type)
{
diff --git a/app/lib/redux/reducers/room.js b/app/lib/redux/reducers/room.js
index 89d2b21..eed2e8a 100644
--- a/app/lib/redux/reducers/room.js
+++ b/app/lib/redux/reducers/room.js
@@ -3,6 +3,7 @@ const initialState =
url : null,
state : 'new', // new/connecting/connected/disconnected/closed,
activeSpeakerName : null,
+ torrentSupport : false,
showSettings : false,
advancedMode : false,
fullScreenConsumer : null, // ConsumerID
@@ -41,6 +42,13 @@ const room = (state = initialState, action) =>
return { ...state, activeSpeakerName: peerName };
}
+ case 'FILE_SHARING_SUPPORTED':
+ {
+ const { supported } = action.payload;
+
+ return { ...state, torrentSupport: supported };
+ }
+
case 'TOGGLE_SETTINGS':
{
const showSettings = !state.showSettings;
diff --git a/app/lib/redux/stateActions.js b/app/lib/redux/stateActions.js
index 3ced6b6..a837631 100644
--- a/app/lib/redux/stateActions.js
+++ b/app/lib/redux/stateActions.js
@@ -70,6 +70,14 @@ export const setWebcamDevices = (devices) =>
};
};
+export const setFileSharingSupported = (supported) =>
+{
+ return {
+ type : 'FILE_SHARING_SUPPORTED',
+ payload : { supported }
+ };
+};
+
export const setDisplayName = (displayName) =>
{
return {
@@ -455,11 +463,11 @@ export const dropMessages = () =>
};
};
-export const addFile = (payload) =>
+export const addFile = (file) =>
{
return {
- type : 'ADD_FILE',
- payload
+ type : 'ADD_FILE',
+ payload : { file }
};
};
@@ -471,6 +479,38 @@ export const addFileHistory = (fileHistory) =>
};
};
+export const setFileActive = (magnetUri) =>
+{
+ return {
+ type : 'SET_FILE_ACTIVE',
+ payload : { magnetUri }
+ };
+};
+
+export const setFileInActive = (magnetUri) =>
+{
+ return {
+ type : 'SET_FILE_INACTIVE',
+ payload : { magnetUri }
+ };
+};
+
+export const setFileProgress = (magnetUri, progress) =>
+{
+ return {
+ type : 'SET_FILE_PROGRESS',
+ payload : { magnetUri, progress }
+ };
+};
+
+export const setFileDone = (magnetUri, sharedFiles) =>
+{
+ return {
+ type : 'SET_FILE_DONE',
+ payload : { magnetUri, sharedFiles }
+ };
+};
+
export const setPicture = (picture) =>
({
type : 'SET_PICTURE',
diff --git a/app/stylus/components/ToolArea.styl b/app/stylus/components/ToolArea.styl
index 9283d42..038ca8d 100644
--- a/app/stylus/components/ToolArea.styl
+++ b/app/stylus/components/ToolArea.styl
@@ -19,12 +19,6 @@
}
}
-[data-component='ToolAreaButton'] {
- &.on {
- right: 80%;
- }
-}
-
[data-component='ToolArea'] {
&.open {
width: 80%;
@@ -153,12 +147,6 @@
}
@media (min-width: 600px) {
- [data-component='ToolAreaButton'] {
- &.on {
- right: 60%;
- }
- }
-
[data-component='ToolArea'] {
&.open {
width: 60%;
@@ -167,12 +155,6 @@
}
@media (min-width: 900px) {
- [data-component='ToolAreaButton'] {
- &.on {
- right: 40%;
- }
- }
-
[data-component='ToolArea'] {
&.open {
width: 40%;
@@ -181,12 +163,6 @@
}
@media (min-width: 1500px) {
- [data-component='ToolAreaButton'] {
- &.on {
- right: 25%;
- }
- }
-
[data-component='ToolArea'] {
&.open {
width: 25%;
@@ -194,79 +170,6 @@
}
}
-[data-component='ToolAreaButton'] {
- position: absolute;
- z-index: 1020;
- right: 0;
- height: 36px;
- width: 36px;
- margin: 2rem;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- transition: right 0.3s;
-
- > .button {
- flex: 0 0 auto;
- margin: 4px 0;
- background-position: center;
- background-size: 75%;
- background-repeat: no-repeat;
- background-color: rgba(#fff, 0.3);
- cursor: pointer;
- transition-property: opacity, background-color;
- transition-duration: 0.15s;
- border-radius: 100%;
-
- +desktop() {
- height: 36px;
- width: 36px;
- }
-
- +mobile() {
- height: 32px;
- width: 32px;
- }
-
- &.on {
- background-color: rgba(#fff, 0.7);
- }
-
- &.disabled {
- pointer-events: none;
- opacity: 0.5;
- }
-
- &.toolarea-button {
- background-image: url('/resources/images/icon_tool_area_white.svg');
-
- &.on {
- background-image: url('/resources/images/icon_tool_area_black.svg');
- }
- }
- }
-
- > .badge {
- border-radius: 50%;
- font-size: 1rem;
- background: #b12525;
- color: #fff;
- text-align: center;
- margin-top: -8px;
- line-height: 1rem;
- margin-right: -8px;
- position: absolute;
- padding: 0.2rem 0.4rem;
- top: 0;
- right: 0;
-
- &.long {
- border-radius: 25% / 50%;
- }
- }
-}
-
[data-component='ToolArea'] {
width: 100%;
height: 100%;
+
+ 
+
+
+