Commit ebe42bc4 authored by Florent Chehab's avatar Florent Chehab
Browse files

Finish reorganizing frontend and imports are finally linted ! youpiiiii

parent 81f10fe3
Pipeline #35760 passed with stages
......@@ -7,11 +7,11 @@ import Toolbar from "@material-ui/core/Toolbar";
import IconButton from "@material-ui/core/IconButton";
import Typography from "@material-ui/core/Typography";
import CloseIcon from "@material-ui/icons/Close";
import Alert from "../../shared/Alert";
import Alert from "../../../common/Alert";
// Form is imported only for type hints
// eslint-disable-next-line no-unused-vars
import Form from "../../shared/Form";
import Form from "../../../form/Form";
/**
......
import React from "react";
import PropTypes from "prop-types";
import Form from "./Form";
import CustomError from "../../../../utils/CustomError";
import Form from "../../../form/Form";
import CustomError from "../../../common/CustomError";
const frequencyOptions = [
{ value: "w", label: "Il s'agit du montant hebdomadaire" },
......
import getActions from "../../../../api/getActions";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../actions/fullScreenDialog";
import getActions from "../../../../redux/api/getActions";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../redux/actions/fullScreenDialog";
/**
* Function to create the mapDispatchToProps function for editor in a "generic way"
......
import { getLatestRead } from "../../../../api/utils";
import { getLatestRead } from "../../../../redux/api/utils";
/**
......
......@@ -3,17 +3,16 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Markdown from "../../shared/Markdown";
import Markdown from "../../common/Markdown";
import Module from "../shared/Module";
import Module from "./common/Module";
import ModuleWrapper from "../shared/ModuleWrapper";
import ModuleGroupWrapper from "../shared/ModuleGroupWrapper";
import ModuleWrapper from "./common/ModuleWrapper";
import ModuleGroupWrapper from "./common/ModuleGroupWrapper";
import CountryDriEditor from "../editors/CountryDriEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
// eslint-disable-next-line no-unused-vars
......
......@@ -3,17 +3,18 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Module from "../shared/Module";
import ModuleWrapper from "../shared/ModuleWrapper";
import ModuleGroupWrapper from "../shared/ModuleGroupWrapper";
import Scholarship from "../shared/Scholarship";
import Module from "./common/Module";
import ModuleWrapper from "./common/ModuleWrapper";
import ModuleGroupWrapper from "./common/ModuleGroupWrapper";
import Scholarship from "./common/Scholarship";
import CountryScholarshipEditor from "../editors/CountryScholarshipEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
// eslint-disable-next-line no-unused-vars
......
......@@ -3,18 +3,17 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Markdown from "../../shared/Markdown";
import Markdown from "../../common/Markdown";
import Module from "../shared/Module";
import Module from "./common/Module";
import ModuleWrapper from "../shared/ModuleWrapper";
import ModuleGroupWrapper from "../shared/ModuleGroupWrapper";
import ModuleWrapper from "./common/ModuleWrapper";
import ModuleGroupWrapper from "./common/ModuleGroupWrapper";
import UniversityDriEditor from "../editors/UniversityDriEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
// eslint-disable-next-line no-unused-vars
const styles = theme => ({
......
......@@ -3,21 +3,20 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Typography from "@material-ui/core/Typography";
import ModuleWrapper from "../shared/ModuleWrapper";
import TextLink from "../../other/TextLink";
import ModuleWrapper from "./common/ModuleWrapper";
import TextLink from "../../common/TextLink";
import Grid from "@material-ui/core/Grid";
import Divider from "@material-ui/core/Divider";
import PhotoSizeSelectActualIcon from "@material-ui/icons/PhotoSizeSelectActual";
import Module from "../shared/Module";
import Module from "./common/Module";
import UniversityGeneralEditor from "../editors/UniversityGeneralEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
// eslint-disable-next-line no-unused-vars
const styles = theme => ({
......
......@@ -3,16 +3,15 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Module from "../shared/Module";
import Module from "./common/Module";
import ModuleWrapper from "../shared/ModuleWrapper";
import ModuleGroupWrapper from "../shared/ModuleGroupWrapper";
import Scholarship from "../shared/Scholarship";
import ModuleWrapper from "./common/ModuleWrapper";
import ModuleGroupWrapper from "./common/ModuleGroupWrapper";
import Scholarship from "./common/Scholarship";
import UniversityScholarshipEditor from "../editors/UniversityScholarshipEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
// eslint-disable-next-line no-unused-vars
const styles = theme => ({
......
......@@ -3,27 +3,26 @@ import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import compose from "recompose/compose";
import { connect } from "react-redux";
import __pick from "lodash/pick";
import Table from "@material-ui/core/Table";
import TableBody from "@material-ui/core/TableBody";
import TableCell from "@material-ui/core/TableCell";
import TableHead from "@material-ui/core/TableHead";
import TableRow from "@material-ui/core/TableRow";
import Markdown from "../../shared/Markdown";
import Markdown from "../../common/Markdown";
import CloudQueueIcon from "@material-ui/icons/CloudQueue";
import LocalFloristIcon from "@material-ui/icons/LocalFlorist";
import ModuleWrapper from "../shared/ModuleWrapper";
import ModuleWrapper from "./common/ModuleWrapper";
import Module from "../shared/Module";
import Module from "./common/Module";
import dateStrToStr from "../../../utils/dateStrToStr";
import UniversitySemestersDatesEditor from "../editors/UniversitySemestersDatesEditor";
import getActions from "../../../api/getActions";
import getActions from "../../../redux/api/getActions";
const styles = theme => ({
root: {
......
import React, { Component } from "react";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../actions/fullScreenDialog";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../redux/actions/fullScreenDialog";
import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
......@@ -18,12 +18,12 @@ import MobileStepper from "@material-ui/core/MobileStepper";
import KeyboardArrowLeft from "@material-ui/icons/KeyboardArrowLeft";
import KeyboardArrowRight from "@material-ui/icons/KeyboardArrowRight";
import Loading from "../../../other/Loading";
import Loading from "../../../common/Loading";
import dateTimeStrToStr from "../../../../utils/dateTimeStrToStr";
import editorStyle from "../../editors/utils/editorStyle";
import editorStyle from "../../editors/common/editorStyle";
import getActions from "../../../../api/getActions";
import getActions from "../../../../redux/api/getActions";
......
......@@ -14,10 +14,10 @@ import Divider from "@material-ui/core/Divider";
import AddIcon from "@material-ui/icons/Add";
import getActions from "../../../../api/getActions";
import getActions from "../../../../redux/api/getActions";
import green from "@material-ui/core/colors/green";
import CustomComponentForAPI from "../../../CustomComponentForAPI";
import CustomComponentForAPI from "../../../common/CustomComponentForAPI";
const styles = theme => ({
root: {
......
......@@ -12,9 +12,9 @@ import green from "@material-ui/core/colors/green";
import CustomComponentForAPI from "../../../common/CustomComponentForAPI";
import isModerationRequired from "../../../../utils/isModerationRequired";
import Alert from "../../utils/Alert";
import Alert from "../../../common/Alert";
import getActions from "../../../../api/getActions";
import getActions from "../../../../redux/api/getActions";
import renderUsefulLinks from "./moduleWrapperFunctions/renderUsefulLinks";
......@@ -124,7 +124,7 @@ class ModuleWrapper extends CustomComponentForAPI {
handleApproveModeration = (modelDataInModeration) => {
this.setState({ dataToSave: modelDataInModeration });
this.handleClosePendingModeration();
this.closePendingModerationPanel();
}
renderTitle = (rawModelData) => (
......
import React, { Component } from "react";
import { connect } from "react-redux";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../actions/fullScreenDialog";
import { openFullScreenDialog, closeFullScreenDialog } from "../../../../redux/actions/fullScreenDialog";
import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
......@@ -14,7 +14,7 @@ import Typography from "@material-ui/core/Typography";
import CloseIcon from "@material-ui/icons/Close";
import Divider from "@material-ui/core/Divider";
import editorStyle from "../../editors/utils/editorStyle";
import editorStyle from "../../editors/common/editorStyle";
const styles = theme => ({
...editorStyle(theme),
......
......@@ -2,7 +2,7 @@ import React from "react";
import PropTypes from "prop-types";
import withStyles from "@material-ui/core/styles/withStyles";
import Markdown from "../../../shared/Markdown";
import Markdown from "../../../common/Markdown";
import moneyConversion from "../../../../utils/convertAmountToEur";
import Typography from "@material-ui/core/Typography";
......
......@@ -6,7 +6,7 @@ import getVersionTooltipAndClass from "./getVersionTooltipAndClass";
import getModerationTooltipAndClass from "./getModerationTooltipAndClass";
import Grid from "@material-ui/core/Grid";
import MyBadge from "../../../shared/MyBadge";
import MyBadge from "../../../../common/MyBadge";
import IconButton from "@material-ui/core/IconButton";
import VerifiedUserIcon from "@material-ui/icons/VerifiedUser";
......
import React from "react";
import Typography from "@material-ui/core/Typography";
import dateTimeStrToStr from "../../../../utils/dateTimeStrToStr";
import dateTimeStrToStr from "../../../../../utils/dateTimeStrToStr";
export default function renderUpdateInfo() {
const { rawModelData } = this.props;
......@@ -23,5 +23,5 @@ export default function renderUpdateInfo() {
);
}
}
}
\ No newline at end of file
}
@import "../../../node_modules/react-awesome-slider/src/core/styles.scss";
@import "../../../../node_modules/react-awesome-slider/src/core/styles.scss";
// Direct scss customization
.#{$root-element} {
......
import React, { Component } from "react";
import ModuleGroupWrappers from "../shared/ModuleGroupWrapper";
import ModuleGroupWrappers from "../modules/common/ModuleGroupWrapper";
/**
* Tab on the university page related to Campuses and cities
......
......@@ -10,7 +10,7 @@ import UniversitySemestersDates from "../modules/UniversitySemestersDates";
import UniversityDri from "../modules/UniversityDri";
import CountryDri from "../modules/CountryDri";
import withWidth, { isWidthUp } from "@material-ui/core/withWidth";
import UnivInfoConsumer from "../shared/UnivInfoConsumer";
import UnivInfoConsumer from "../common/UnivInfoConsumer";
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment