diff --git a/src/pages/Account/AccountRoot.jsx b/src/pages/Account/AccountRoot.jsx
index 75c469d..4dcfea9 100644
--- a/src/pages/Account/AccountRoot.jsx
+++ b/src/pages/Account/AccountRoot.jsx
@@ -25,7 +25,7 @@ class Account extends React.Component {
Authenticate with Put.io
diff --git a/src/pages/Files/Files.jsx b/src/pages/Files/Files.jsx
index 0609b6d..2039aa8 100644
--- a/src/pages/Files/Files.jsx
+++ b/src/pages/Files/Files.jsx
@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
-import { Route, match } from "react-router-dom";
+import { Route, Redirect, match } from "react-router-dom";
import styles from "styles.module.css";
import { NavLink } from "react-router-dom";
import { connect } from "react-redux";
@@ -9,44 +9,71 @@ import PropTypes from "prop-types";
import { getDirectoryList } from "services/filebrowser/selectors";
import { fetchDirectoryList } from "services/filebrowser/actions";
-function Files({ directoryList, fetchDirectoryList, dirId, match }) {
- useEffect(
- dirId => {
- fetchDirectoryList(match.params.dirId);
- },
- [match]
- );
- return (
-
-
-
-
-
-
Kars
-
124.21 FDT
+function Files({ directoryList, fetchDirectoryList, match }) {
+ const dirId = match.params.dirId;
+ useEffect(() => {
+ fetchDirectoryList(dirId);
+ }, [dirId]);
+ console.log(directoryList);
+ let files = directoryList.files;
+ let meta = directoryList.meta;
+ console.log(files);
+ console.log(meta);
+ if (files) {
+ return (
+
+
+
+
+
+
+
{meta.name}
+
{meta.size}kb
-
-
-
FairDrive /
-
~122GB {dirId}
+
+
+ {files.map(item => (
+
+
+
+
+
+ ))}
-
- {directoryList.map(item => (
-
-
-
+ );
+ } else {
+ return (
+
-
- );
+ );
+ }
}
Files.propTypes = {
- directoryList: PropTypes.array.isRequired
+ files: PropTypes.array.isRequired
};
const mapStateToProps = (_, ownProps) => {
diff --git a/src/services/filebrowser/fetchFunctions/getDirectoryList.js b/src/services/filebrowser/fetchFunctions/getDirectoryList.js
index e1ed121..9938faa 100644
--- a/src/services/filebrowser/fetchFunctions/getDirectoryList.js
+++ b/src/services/filebrowser/fetchFunctions/getDirectoryList.js
@@ -15,9 +15,18 @@ export default async function getDirectoryList({ dirId }) {
// .Info()
// .then(res => console.log('Res: ', res.data.info)
// .catch(err => console.log('Error occured while fetching user info: ', err))
- const directoryList = await Api.Files.Query(dirId, {});
+ const res = await Api.Files.Query(dirId, {});
+ //const directoryList = res.body.files;
- // treat data HERE!!
+ console.log(res);
+ const directoryMeta = res.body.parent;
- return directoryList.data.files;
+ const directoryList = {
+ files: res.body.files,
+ meta: directoryMeta
+ };
+
+ console.log(directoryList);
+
+ return directoryList;
}
diff --git a/src/services/filebrowser/sagas.js b/src/services/filebrowser/sagas.js
index 5c8739e..3adf26d 100644
--- a/src/services/filebrowser/sagas.js
+++ b/src/services/filebrowser/sagas.js
@@ -4,17 +4,13 @@ import * as t from "./actionTypes";
import getDirectoryList from "./fetchFunctions/getDirectoryList";
-console.log("sagas");
-
function* fetchDirectoryList({ dirId }) {
try {
- const directoryList = yield call(getDirectoryList, { dirId });
-
- console.log("sagas dirlist:", directoryList);
- console.log("fetchung dir", dirId);
+ const directoryList = yield call(getDirectoryList, {
+ dirId
+ });
yield put(a.updateDirectoryList(directoryList));
- console.log("Saga starging DirectoryList", directoryList);
return directoryList;
} catch (e) {
console.error(`Error on fetchGetDirSaga: ${e.stack}`);