Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
8a0c601c
Commit
8a0c601c
authored
Sep 14, 2018
by
Florent Chehab
Browse files
Reorganized js files and bug corrected in Generic Module
parent
9ea9cf99
Pipeline
#27327
passed with stages
in 2 minutes and 48 seconds
Changes
33
Pipelines
1
Show whitespace changes
Inline
Side-by-side
frontend/src/components/university/
modules/
editors/UniversitySemestersDatesEditor.js
→
frontend/src/components/university/editors/UniversitySemestersDatesEditor.js
View file @
8a0c601c
...
...
@@ -4,18 +4,18 @@ import withStyles from '@material-ui/core/styles/withStyles';
import
compose
from
'
recompose/compose
'
;
import
{
connect
}
from
"
react-redux
"
;
import
Editor
from
'
./Editor
'
;
import
editorStyle
from
'
./editorStyle
'
;
import
DateField
from
'
./fields/DateField
'
;
import
UsefulLinksField
from
'
./fields/UsefulLinksField
'
;
import
MarkdownField
from
'
./fields/MarkdownField
'
;
import
Editor
from
'
.
./shared
/Editor
'
;
import
editorStyle
from
'
.
./shared
/editorStyle
'
;
import
DateField
from
'
.
./shared
/fields/DateField
'
;
import
UsefulLinksField
from
'
.
./shared
/fields/UsefulLinksField
'
;
import
MarkdownField
from
'
.
./shared
/fields/MarkdownField
'
;
import
dateStrToDate
from
'
../../../
../
utils/dateStrToDate
'
;
import
dateStrToDate
from
'
../../../utils/dateStrToDate
'
;
import
{
universitiesSemestersDatesElSaveData
,
universitiesSemestersDatesElSavingHasError
}
from
'
../../../
../
generated/actions
'
;
}
from
'
../../../generated/actions
'
;
const
styles
=
theme
=>
({
...
editorStyle
(
theme
)
...
...
frontend/src/components/university/modules/Scholarship.js
View file @
8a0c601c
...
...
@@ -18,7 +18,7 @@ import PersonIcon from '@material-ui/icons/Person';
import
MyComponent
from
'
../../MyComponent
'
;
import
TextLink
from
'
../../other/TextLink
'
;
import
GenericModule
from
'
./GenericModule
'
;
import
GenericModule
from
'
.
./shared
/GenericModule
'
;
import
Grid
from
'
@material-ui/core/Grid
'
;
import
Divider
from
'
@material-ui/core/Divider
'
;
...
...
frontend/src/components/university/modules/UniversityDri.js
View file @
8a0c601c
...
...
@@ -2,9 +2,9 @@ import React from 'react';
import
PropTypes
from
'
prop-types
'
;
import
withStyles
from
'
@material-ui/core/styles/withStyles
'
;
import
Paper
from
'
@material-ui/core/Paper
'
;
import
GenericModule
from
'
./GenericModule
'
;
import
GenericModule
from
'
.
./shared
/GenericModule
'
;
import
GenericGroupModule
from
'
./GenericGroupModule
'
;
import
GenericGroupModule
from
'
.
./shared
/GenericGroupModule
'
;
const
styles
=
theme
=>
({
...
...
frontend/src/components/university/modules/UniversityGeneral.js
View file @
8a0c601c
...
...
@@ -6,7 +6,7 @@ import PhotoIcon from '@material-ui/icons/Photo';
import
MyComponent
from
'
../../MyComponent
'
;
import
TextLink
from
'
../../other/TextLink
'
;
import
GenericModule
from
'
./GenericModule
'
;
import
GenericModule
from
'
.
./shared
/GenericModule
'
;
import
Grid
from
'
@material-ui/core/Grid
'
;
import
Divider
from
'
@material-ui/core/Divider
'
;
...
...
frontend/src/components/university/modules/UniversitySemestersDates.js
View file @
8a0c601c
...
...
@@ -15,13 +15,13 @@ import Markdown from '../../shared/Markdown';
import
CloudQueueIcon
from
'
@material-ui/icons/CloudQueue
'
;
import
LocalFloristIcon
from
'
@material-ui/icons/LocalFlorist
'
;
import
GenericModule
from
'
./GenericModule
'
;
import
GenericModule
from
'
.
./shared
/GenericModule
'
;
import
MyComponent
from
'
../../MyComponent
'
;
import
dateStrToStr
from
'
../../../utils/dateStrToStr
'
;
import
UniversitySemestersDatesEditor
from
'
./editors/UniversitySemestersDatesEditor
'
;
import
UniversitySemestersDatesEditor
from
'
.
.
/editors/UniversitySemestersDatesEditor
'
;
import
{
universitiesSemestersDatesElFetchData
,
...
...
frontend/src/components/university/
modules/editors
/Alert.js
→
frontend/src/components/university/
shared
/Alert.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/Editor.js
→
frontend/src/components/university/
shared
/Editor.js
View file @
8a0c601c
...
...
@@ -10,10 +10,10 @@ import Typography from '@material-ui/core/Typography';
import
CloseIcon
from
'
@material-ui/icons/Close
'
;
import
Slide
from
'
@material-ui/core/Slide
'
;
import
MyComponent
from
'
../../
../
MyComponent
'
;
import
MyComponent
from
'
../../MyComponent
'
;
import
Alert
from
'
./Alert
'
;
import
Notification
from
'
./Notification
'
;
import
getObjModerationLevel
from
'
../../../
../
utils/getObjModerationLevels
'
;
import
getObjModerationLevel
from
'
../../../utils/getObjModerationLevels
'
;
import
SelectField
from
'
./fields/SelectField
'
;
function
Transition
(
props
)
{
...
...
frontend/src/components/university/
modules
/GenericGroupModule.js
→
frontend/src/components/university/
shared
/GenericGroupModule.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules
/GenericModule.js
→
frontend/src/components/university/
shared
/GenericModule.js
View file @
8a0c601c
...
...
@@ -12,7 +12,7 @@ import green from '@material-ui/core/colors/green';
import
MyComponent
from
'
../../MyComponent
'
;
import
isModerationRequired
from
'
../../../utils/isModerationRequired
'
;
import
Alert
from
'
./
editors/
Alert
'
;
import
Alert
from
'
./Alert
'
;
import
{
serverModerationStatusFetchData
,
...
...
@@ -144,7 +144,7 @@ class GenericModule extends MyComponent {
forceSave
:
true
,
})
this
.
handleClosePendingModeration
();
this
.
handleOpenEditor
();
this
.
handleOpenEditor
(
true
);
}
handleEditCurrent
=
()
=>
{
...
...
frontend/src/components/university/
modules
/History.js
→
frontend/src/components/university/
shared
/History.js
View file @
8a0c601c
...
...
@@ -22,7 +22,7 @@ import { versionsFetchData, versionsInvalidated } from '../../../generated/actio
import
Loading
from
'
../../other/Loading
'
;
import
dateTimeStrToStr
from
'
../../../utils/dateTimeStrToStr
'
;
import
editorStyle
from
'
./
editors/
editorStyle
'
;
import
editorStyle
from
'
./editorStyle
'
;
import
_
from
'
lodash
'
;
const
styles
=
theme
=>
({
...
...
frontend/src/components/university/
modules/editors
/Notification.js
→
frontend/src/components/university/
shared
/Notification.js
View file @
8a0c601c
...
...
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import
{
withStyles
}
from
'
@material-ui/core/styles
'
;
import
Snackbar
from
'
@material-ui/core/Snackbar
'
;
import
DoneIcon
from
'
@material-ui/icons/Done
'
;
import
Loading
from
'
../../
../../components/
other/Loading
'
import
Loading
from
'
../../other/Loading
'
import
IconButton
from
'
@material-ui/core/IconButton
'
;
import
CloseIcon
from
'
@material-ui/icons/Close
'
;
...
...
frontend/src/components/university/
modules
/PendingModeration.js
→
frontend/src/components/university/
shared
/PendingModeration.js
View file @
8a0c601c
...
...
@@ -13,7 +13,7 @@ import CloseIcon from '@material-ui/icons/Close';
import
Slide
from
'
@material-ui/core/Slide
'
;
import
Divider
from
'
@material-ui/core/Divider
'
;
import
editorStyle
from
'
./
editors/
editorStyle
'
;
import
editorStyle
from
'
./editorStyle
'
;
import
_
from
'
lodash
'
;
const
styles
=
theme
=>
({
...
...
frontend/src/components/university/
modules/editors
/editorStyle.js
→
frontend/src/components/university/
shared
/editorStyle.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/fields/DateField.js
→
frontend/src/components/university/
shared
/fields/DateField.js
View file @
8a0c601c
...
...
@@ -12,7 +12,7 @@ import format from 'date-fns/format';
import
KeyboardArrowLeftIcon
from
'
@material-ui/icons/KeyboardArrowLeft
'
;
import
KeyboardArrowRightIcon
from
'
@material-ui/icons/KeyboardArrowRight
'
;
import
FieldWrapper
from
'
./FieldWrapper
'
;
import
dateToDateStr
from
'
../../../../
../
utils/dateToDateStr
'
;
import
dateToDateStr
from
'
../../../../utils/dateToDateStr
'
;
import
Field
from
'
./Field
'
;
...
...
frontend/src/components/university/
modules/editors
/fields/Field.js
→
frontend/src/components/university/
shared
/fields/Field.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/fields/FieldWrapper.js
→
frontend/src/components/university/
shared
/fields/FieldWrapper.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/fields/MarkdownField.js
→
frontend/src/components/university/
shared
/fields/MarkdownField.js
View file @
8a0c601c
...
...
@@ -10,8 +10,8 @@ import FieldWrapper from './FieldWrapper';
import
TextField
from
'
@material-ui/core/TextField
'
;
import
Typography
from
'
@material-ui/core/Typography
'
;
import
Markdown
from
'
../../../
../
shared/Markdown
'
;
import
LinkText
from
'
../../../
../
other/TextLink
'
;
import
Markdown
from
'
../../../shared/Markdown
'
;
import
LinkText
from
'
../../../other/TextLink
'
;
import
Field
from
'
./Field
'
;
const
styles
=
theme
=>
({
...
...
frontend/src/components/university/
modules/editors
/fields/SelectField.js
→
frontend/src/components/university/
shared
/fields/SelectField.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/fields/TextField.js
→
frontend/src/components/university/
shared
/fields/TextField.js
View file @
8a0c601c
File moved
frontend/src/components/university/
modules/editors
/fields/UsefulLinksField.js
→
frontend/src/components/university/
shared
/fields/UsefulLinksField.js
View file @
8a0c601c
...
...
@@ -17,7 +17,7 @@ import KeyboardArrowUpIcon from '@material-ui/icons/KeyboardArrowUp';
import
Field
from
'
./Field
'
;
import
Typography
from
'
@material-ui/core/Typography
'
;
import
isUrl
from
'
../../../../
../
utils/isUrl
'
;
import
isUrl
from
'
../../../../utils/isUrl
'
;
const
styles
=
theme
=>
({
container
:
{
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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