Przeglądaj źródła

not work login check commit

mfdok43 2 lat temu
rodzic
commit
c640969f89

+ 3 - 4
src/actions/login-reg-actions.js

@@ -20,7 +20,7 @@ export const actionLogin = (login, password) => {
 export const actionFullLogin = (login, password) =>
     ({type:'FULL_LOGIN', login, password})
 
-export function* loginWorker (action) {
+export function* fullLoginWorker (action) {
     const {login, password} = action
 
     let token = yield call(promiseWorker, actionLogin(login, password)) //dispatch(actionLogin(login, password));
@@ -34,9 +34,8 @@ export function* loginWorker (action) {
 
 }
 
-
-export function* loginWatcher() {
-    yield takeEvery ('FULL_LOGIN',loginWorker)
+export function* fullLoginWatcher() {
+    yield takeEvery ('FULL_LOGIN',fullLoginWorker)
 }
 
 

+ 1 - 2
src/actions/my-playlist-tracks-actions.js

@@ -3,14 +3,13 @@ import {actionPromise, promiseWorker} from "../reducers/promiseReducer";
 import {backURL, gql} from "./index";
 import {actionAboutMe} from "./index";
 import {actionPlaylistFindByOwner} from "./index";
-import {connect} from "react-redux";
+
 
 export const actionCreatePlaylist = (name) =>
     ({type:'CREATE_PLAYLIST', name})
 
 export function* createPlaylistWorker (action) {
     let {name} = action
-    let {auth} = yield select()
     yield call(promiseWorker,actionPromise('createPlaylist', gql(`mutation p($playlist:PlaylistInput) {
          PlaylistUpsert(playlist:$playlist) {
          _id 

+ 3 - 3
src/pages/header/avatar.js

@@ -4,7 +4,7 @@ import {actionSetAvatar, actionUploadImage, backURL} from "../../actions";
 import {useDropzone} from "react-dropzone";
 import {connect} from "react-redux";
 import avadef from "../../ava-def.jpg";
-import {all, takeEvery, put, call} from 'redux-saga/effects';
+
 
 
 function AvatarDropzone({onLoad}) {
@@ -12,7 +12,7 @@ function AvatarDropzone({onLoad}) {
         // Do something with the files
         onLoad(acceptedFiles[0]);
         store.dispatch(actionSetAvatar(acceptedFiles[0]))
-    }, []);
+    }, [onLoad]);
     const { getRootProps, getInputProps, isDragActive } = useDropzone({ onDrop });
 
     return (
@@ -36,7 +36,7 @@ const Avatar = ({ avatarURL = {} }) => {
     // console.log(avatarURL);
     return (
         <div className='Avatar'>
-            {avatarURL !== null ? <img src={backURL + "/" + avatarURL.avatar?.url}></img> : <img src={avadef}/>}
+            {avatarURL !== null ? <img alt='avatar' src={backURL + "/" + avatarURL.avatar?.url}></img> : <img alt='def-ava' src={avadef}/>}
         </div>
     )
 };

+ 4 - 5
src/pages/header/header-build.js

@@ -1,18 +1,17 @@
-import {Link, Route, Switch} from "react-router-dom";
+import {Link, Switch} from "react-router-dom";
 import {connect} from "react-redux";
-import {actionAuthLogin, actionAuthLogout, actionPromise} from "../../reducers";
+import {actionAuthLogout, actionPromise} from "../../reducers";
 import {CLoginForm} from "./login";
 import {CRegForm} from "./registration";
 import {useState} from "react";
 import {CAvatar,CAvatarDropZone} from "./avatar";
 import {Logo} from "./logo";
 import {history} from "../../App";
-import {actionFullLogin, gql} from "../../actions";
-import {takeEvery, select, call,put} from "redux-saga/effects";
+import {gql} from "../../actions";
+import {takeEvery, select, call} from "redux-saga/effects";
 import {promiseWorker} from "../../reducers/promiseReducer";
 import {CTrackSearch} from "../tools/search";
 import {CProtectedRoute} from "../../reducers/routeReducer";
-import {Aside} from "../main";
 
 
 export const actionSetUserPassword = (password) =>

+ 0 - 2
src/pages/header/login.js

@@ -1,6 +1,4 @@
-import {Link} from "react-router-dom";
 import {connect} from "react-redux";
-import {actionAuthLogout} from "../../reducers";
 import {useState} from "react";
 import {actionFullLogin} from "../../actions";
 

+ 1 - 2
src/pages/tools/trackdropzone.js

@@ -1,8 +1,7 @@
 import {useCallback} from "react";
-import {actionFullUploadPlaylists} from "../../actions";
 import {useDropzone} from "react-dropzone";
 import {connect} from "react-redux";
-import {actionFullUploadTrack,actionUploadTrack} from "../../actions/no-playlist-track-actions";
+import {actionFullUploadTrack} from "../../actions/no-playlist-track-actions";
 
 
 function TrackDropZone({ onLoad, children }) {

+ 1 - 1
src/reducers/promiseReducer.js

@@ -1,4 +1,4 @@
-import {all, takeEvery, put, call} from 'redux-saga/effects';
+import {takeEvery, put} from 'redux-saga/effects';
 
 export function promiseReducer(state = {}, { type, status, payload, error, name }) {
     if (type === 'PROMISE') {

+ 2 - 2
src/reducers/store.js

@@ -3,7 +3,7 @@ import {authReducer} from "./authReducer";
 import {promiseReducer,promiseWatcher} from "./promiseReducer";
 import {routeReducer, routeWatcher} from "./routeReducer";
 import {playerReducer} from "./playerReducer";
-import {loginWatcher,regWatcher} from "../actions/login-reg-actions";
+import {fullLoginWatcher,regWatcher} from "../actions/login-reg-actions";
 import {findMyTracksWatcher,playlistFindByOwnerWatcher} from "../actions/find-actions";
 import {setAvatarWatcher} from "../actions/set-avatar-actions";
 import {fullUploadPlaylistsWatcher,setTrackToPlaylistWatcher} from "../actions/my-playlist-tracks-actions";
@@ -33,7 +33,7 @@ export const store = createStore(combineReducers({promise: localStoredReducer(pr
 function* rootSaga(){
     yield all([
         promiseWatcher(),
-         loginWatcher(),
+         fullLoginWatcher(),
          regWatcher(),
          setAvatarWatcher(),
          aboutMeWatcher(),