Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodlenet
MoodleNet Frontend
Commits
7e692516
Commit
7e692516
authored
Jun 01, 2020
by
aleclofabbro
Browse files
Merge branch 'fix/udate_profile_accidentally_logsout_user' into develop
parents
a68edda1
f8da288f
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/fe/session/useMe.ts
View file @
7e692516
...
...
@@ -31,7 +31,7 @@ export const useMe = () => {
const
[
updateProfileMutation
,
updateProfileMutationStatus
]
=
GQL
.
useMe
Logout
Mutation
();
]
=
GQL
.
useMe
UpdateMyProfile
Mutation
();
const
{
push
}
=
useHistory
();
const
me
=
meQ
.
data
?.
me
;
...
...
src/ui/modules/DropzoneModal/index.tsx
View file @
7e692516
...
...
@@ -48,9 +48,9 @@ const DropzoneArea: React.FC<Props> = ({
const
{
getRootProps
,
getInputProps
,
isDragActive
,
rejectedFiles
,
acceptedFiles
isDragActive
//
rejectedFiles,
//
acceptedFiles
}
=
useDropzone
({
accept
:
filePattern
,
// maxSize: uploadMaxBytes,
...
...
@@ -66,7 +66,7 @@ const DropzoneArea: React.FC<Props> = ({
}
});
// const rejectedFile = rejectedFiles[0];
console
.
log
({
rejectedFiles
,
acceptedFiles
});
//
console.log({ rejectedFiles, acceptedFiles });
return
(
<>
<
Box
sx
=
{
{
height
:
'
100%
'
}
}
{
...
getRootProps
({
className
:
'
dropzone
'
})
}
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment