From 642a8a9641bfcbb7676253e91ffa0938fe971700 Mon Sep 17 00:00:00 2001 From: Z1chi Date: Wed, 18 Jan 2023 17:37:52 +0300 Subject: [PATCH 01/14] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 7 +- src/components/AuthBox/AuthBox.js | 32 +- src/components/Candidate/Candidate.js | 173 ++++----- src/components/Candidate/candidate.scss | 20 -- src/components/Description/Description.js | 371 ++++++++++---------- src/components/Header/Header.js | 15 + src/components/Header/header.scss | 26 ++ src/components/Loader/Loader.js | 9 +- src/components/Outstaffing/Outstaffing.js | 10 +- src/components/Outstaffing/outstaffing.scss | 27 -- src/hoc/ErrorBoundary.js | 22 ++ src/pages/CandidatePage.js | 7 - src/{components => pages}/Home/Home.js | 26 +- 13 files changed, 387 insertions(+), 358 deletions(-) create mode 100644 src/components/Header/Header.js create mode 100644 src/components/Header/header.scss create mode 100644 src/hoc/ErrorBoundary.js delete mode 100644 src/pages/CandidatePage.js rename src/{components => pages}/Home/Home.js (64%) diff --git a/src/App.js b/src/App.js index 318c49ef..b70c438c 100644 --- a/src/App.js +++ b/src/App.js @@ -4,8 +4,8 @@ import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom import AuthForPartners from "./pages/AuthForPartners/AuthForPartners"; import AuthForDevelopers from "./pages/AuthForDevelopers/AuthForDevelopers"; -import Home from "./components/Home/Home"; -import CandidatePage from './pages/CandidatePage' +import Home from "./pages/Home/Home"; +import Candidate from "./components/Candidate/Candidate"; import Calendar from "./components/Calendar/Calendar"; import ReportForm from "./components/ReportForm/ReportForm"; import {ProfileCalendar} from "./components/ProfileCalendar/ProfileCalendar"; @@ -24,6 +24,7 @@ import 'bootstrap/dist/css/bootstrap.min.css' + const App = () => { return ( <> @@ -36,7 +37,7 @@ const App = () => { }/> }/> - }/> + }/> }/> }/> diff --git a/src/components/AuthBox/AuthBox.js b/src/components/AuthBox/AuthBox.js index 388f5ce7..280dda58 100644 --- a/src/components/AuthBox/AuthBox.js +++ b/src/components/AuthBox/AuthBox.js @@ -1,21 +1,23 @@ import React, {useState} from 'react' -import {Link} from 'react-router-dom' +import {Link, useNavigate} from 'react-router-dom' import {useDispatch, useSelector} from 'react-redux' import {withSwalInstance} from 'sweetalert2-react' import swal from 'sweetalert2' import {Loader} from '../Loader/Loader' +import ErrorBoundary from "../../hoc/ErrorBoundary"; -import {auth, setUserInfo} from '../../redux/outstaffingSlice' +import {auth, selectAuth, setUserInfo} from '../../redux/outstaffingSlice' import {loading} from '../../redux/loaderSlice' import {setRole} from '../../redux/roleSlice' import {selectIsLoading} from '../../redux/loaderSlice' +import {useRequest} from "../../hooks/useRequest"; + import ellipse from '../../images/ellipse.png' import './authBox.scss' -import {useRequest} from "../../hooks/useRequest"; const SweetAlert = withSwalInstance(swal); @@ -23,14 +25,21 @@ const SweetAlert = withSwalInstance(swal); export const AuthBox = ({title, altTitle, roleChangeLink}) => { const dispatch = useDispatch(); - const {apiRequest} = useRequest(); + const navigate = useNavigate(); + const isAuth = useSelector(selectAuth); const isLoading = useSelector(selectIsLoading); + const {apiRequest} = useRequest(); + const [username, setUsername] = useState(''); const [password, setPassword] = useState(''); const [error, setError] = useState(null); + if (isAuth) { + navigate('/') + } + const submitHandler = () => { if (!isLoading) { @@ -97,12 +106,14 @@ export const AuthBox = ({title, altTitle, roleChangeLink}) => { {error && (
- setError(null)} - /> + + setError(null)} + /> +
)} @@ -124,6 +135,7 @@ export const AuthBox = ({title, altTitle, roleChangeLink}) => { + ) }; diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js index c0f01974..b890ddc7 100644 --- a/src/components/Candidate/Candidate.js +++ b/src/components/Candidate/Candidate.js @@ -18,13 +18,19 @@ import back from '../../images/back_end.png' import design from '../../images/design.png' import './candidate.scss' +import {LogoutButton} from "../LogoutButton/LogoutButton"; +import {Header} from "../Header/Header"; const Candidate = () => { const {id: candidateId} = useParams(); + const navigate = useNavigate(); + const dispatch = useDispatch(); + const currentCandidateObj = useSelector(selectCurrentCandidate); + const [activeSnippet, setActiveSnippet] = useState(true); const {apiRequest} = useRequest(); @@ -39,8 +45,6 @@ const Candidate = () => { }).then((el) => dispatch(currentCandidate(el))) }, [dispatch, candidateId]); - const currentCandidateObj = useSelector(selectCurrentCandidate); - const {position_id, skillValues, vc_text: text} = currentCandidateObj; const setStyles = () => { @@ -80,108 +84,105 @@ const Candidate = () => { const {header, img, classes} = setStyles(); return ( -
-
-
-
-

- Аутстаффинг it-персонала -

-
-
-
+ <> +
+
-
-
- -
navigate('/')}> -
- -
-
- Вернуться к списку -
-
- -
-

{header}

- -
- -
-
-
-
- +
+ +
navigate('/')}> +
+ +
+
+ Вернуться к списку +
+
+ +
+

{header}

+ +
+
- { - activeSnippet ? - ( -
-
- -

# Описание опыта

- {text ? ( -
- ) : ( -

- {currentCandidateObj.vc_text - ? currentCandidateObj.vc_text - : 'Описание отсутствует...'} -

- )} +
+
+
+
+ +
+ { + activeSnippet ? + ( +
+
+ +

# Описание опыта

+ {text ? ( +
+ ) : ( +

+ {currentCandidateObj.vc_text + ? currentCandidateObj.vc_text + : 'Описание отсутствует...'} +

+ )} - + +
-
- ) : - ( -
-
-
-
-
- Vuetifyis.com -
Forked from peluprvi/vuetifyjs.com
Vuetifyjs.com - documentation + ) : + ( +
+
+
+
+
+ Vuetifyis.com +
Forked from + peluprvi/vuetifyjs.com
Vuetifyjs.com + documentation +
+
Angular
-
Angular
-
-
-
- Vuetifyis.com -
Forked from peluprvi/vuetifyjs.com
Vuetifyjs.com - documentation +
+
+ Vuetifyis.com +
Forked from + peluprvi/vuetifyjs.com
Vuetifyjs.com + documentation +
+
Angular
-
Angular
-
-
-
- Vuetifyis.com -
Forked from peluprvi/vuetifyjs.com
Vuetifyjs.com - documentation +
+
+ Vuetifyis.com +
Forked from + peluprvi/vuetifyjs.com
Vuetifyjs.com + documentation +
+
Laravel
-
Laravel
-
- ) - } + ) + } +
+
-
-
+ ) }; diff --git a/src/components/Candidate/candidate.scss b/src/components/Candidate/candidate.scss index 42a102e9..fb96f566 100644 --- a/src/components/Candidate/candidate.scss +++ b/src/components/Candidate/candidate.scss @@ -1,26 +1,6 @@ @use 'sass:math'; .candidate { - &__title { - margin-top: 60px; - h2 { - text-align: center; - color: #52b709; - font-family: 'GT Eesti Pro Display', sans-serif; - font-size: 5em; - font-weight: 700; - font-style: normal; - letter-spacing: normal; - line-height: 77.81px; - - span { - color: #282828; - font-style: normal; - letter-spacing: 0.56px; - line-height: normal; - } - } - } &__header { display: flex; diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js index 05a543ed..0ff2d67e 100644 --- a/src/components/Description/Description.js +++ b/src/components/Description/Description.js @@ -3,6 +3,7 @@ import {useSelector} from 'react-redux' import {Link} from 'react-router-dom' import {Loader} from '../Loader/Loader' +import ErrorBoundary from "../../hoc/ErrorBoundary"; import {LEVELS, SKILLS} from '../../constants/constants' import {selectProfiles, selectFilteredCandidates,} from '../../redux/outstaffingSlice' @@ -12,211 +13,217 @@ import rectangle from '../../images/rectangle_secondPage.png' import './description.scss' -const Description = ({ onLoadMore, isLoadingMore }) => { + +const Description = ({onLoadMore, isLoadingMore}) => { const candidatesListArr = useSelector(selectProfiles); const filteredListArr = useSelector(selectFilteredCandidates); + if (!filteredListArr) { return ( +
+
+
+ + {candidatesListArr && Array.isArray(candidatesListArr) && candidatesListArr.length > 0 ? ( + candidatesListArr.map((el) => ( +
+
+ +
+
+

+ + {el.specification} {SKILLS[el.position_id]},{' '} + {LEVELS[el.level]}{' '} + +

+ + {el.vc_text_short ? ( +
+ {el.vc_text_short} +
+ ) : ( +

+ Описание отсутствует... +

+ )} +
+
+ + + +
+
+
+
    + {Array.isArray(el?.skillValues) && el.skillValues.map((e) => ( +
  • + {e.skill.name} +
    • + ))} +
+ +
+
+
+ )) + ) : ( +
+ {isLoadingMore + ? 'В данный момент в категории нет свободных специалистов' + : 'Загрузка...'} +
+ )} + +
+ +
+
+
+
+ +
+
+
+
+
+
+ ) + } + + return (
- {candidatesListArr && Array.isArray(candidatesListArr) && candidatesListArr.length > 0 ? ( - candidatesListArr.map((el) => ( -
-
- -
-
-

- - {el.specification} {SKILLS[el.position_id]},{' '} - {LEVELS[el.level]}{' '} - -

+ + {filteredListArr && Array.isArray(filteredListArr) && filteredListArr.length > 0 + ? filteredListArr.map((el) => ( +
+
+ +
+
+

+ + {' '} + {el.specification} {SKILLS[el.position_id]},{' '} + {LEVELS[el.level]}{' '} + +

- {el.vc_text_short ? ( -
- {el.vc_text_short} + {el.vc_text_short ? ( +
+ {el.vc_text_short} +
+ ) : ( +

+ Описание отсутствует... +

+ )} +
+
+ + + +
+
+
+
    + {Array.isArray(el?.skillValues) && el.skillValues?.map((e) => ( +
  • + {e.skill.name} +
    • + ))} +
+ +
+
- ) : ( -

- Описание отсутствует... -

- )} -
-
- - - -
-
-
-
    - {Array.isArray(el?.skillValues) && el.skillValues.map((e) => ( -
  • - {e.skill.name} -
    • - ))} -
- -
-
-
- )) - ) : ( -
- {isLoadingMore - ? 'В данный момент в категории нет свободных специалистов' - : 'Загрузка...'} -
- )} + )) + : /* :
В данный момент в категории нет свободных специалистов
} */ + candidatesListArr && Array.isArray(candidatesListArr) && + candidatesListArr.map((el) => ( +
+
+ +
+
+

+ {SKILLS[el.position_id]}, {LEVELS[el.level]} +

+ + {el.vc_text_short ? ( +
+ {el.vc_text_short} +
+ ) : ( +

+ Описание отсутствует... +

+ )} +
+
+ + + +
+
+
+
    + {Array.isArray(el?.skillValues) && el.skillValues?.map((e) => ( +
  • + {e.skill.name} +
    • + ))} +
+ +
+
+
+ ))} +
- + {candidatesListArr && + filteredListArr.length === 0 ? ( + + ) : null}
- ) - } - - return ( -
-
-
- {filteredListArr && Array.isArray(filteredListArr) && filteredListArr.length > 0 - ? filteredListArr.map((el) => ( -
-
- -
-
-

- - {' '} - {el.specification} {SKILLS[el.position_id]},{' '} - {LEVELS[el.level]}{' '} - -

- - {el.vc_text_short ? ( -
- {el.vc_text_short} -
- ) : ( -

- Описание отсутствует... -

- )} -
-
- - - -
-
-
-
    - {Array.isArray(el?.skillValues) && el.skillValues?.map((e) => ( -
  • - {e.skill.name} -
    • - ))} -
- -
-
-
- )) - : /* :
В данный момент в категории нет свободных специалистов
} */ - candidatesListArr && Array.isArray(candidatesListArr) && - candidatesListArr.map((el) => ( -
-
- -
-
-

- {SKILLS[el.position_id]}, {LEVELS[el.level]} -

- - {el.vc_text_short ? ( -
- {el.vc_text_short} -
- ) : ( -

- Описание отсутствует... -

- )} -
-
- - - -
-
-
-
    - {Array.isArray(el?.skillValues) && el.skillValues?.map((e) => ( -
  • - {e.skill.name} -
    • - ))} -
- -
-
-
- ))} -
- -
-
-
-
- {candidatesListArr && - filteredListArr.length === 0 ? ( - - ) : null} -
-
-
-
-
-
) }; diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js new file mode 100644 index 00000000..4616bf17 --- /dev/null +++ b/src/components/Header/Header.js @@ -0,0 +1,15 @@ +import React from "react"; +import {LogoutButton} from "../LogoutButton/LogoutButton"; + +import './header.scss' + +export const Header = () => { + return ( +
+

+ Аутстаффинг it-персонала +

+ +
+ ) +}; \ No newline at end of file diff --git a/src/components/Header/header.scss b/src/components/Header/header.scss new file mode 100644 index 00000000..423ca653 --- /dev/null +++ b/src/components/Header/header.scss @@ -0,0 +1,26 @@ +.header { + margin-top: 60px; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + + h2 { + flex: 1; + text-align: center; + color: #52b709; + font-family: 'GT Eesti Pro Display', sans-serif; + font-size: 5em; + font-weight: 700; + font-style: normal; + letter-spacing: normal; + line-height: 77.81px; + + span { + color: #282828; + font-style: normal; + letter-spacing: 0.56px; + line-height: normal; + } + } +} \ No newline at end of file diff --git a/src/components/Loader/Loader.js b/src/components/Loader/Loader.js index e76d8e79..c0e56f31 100644 --- a/src/components/Loader/Loader.js +++ b/src/components/Loader/Loader.js @@ -2,10 +2,11 @@ import SVGLoader from 'react-loader-spinner' import './loader.scss' import React from "react"; -export const Loader = ({ width = 50, height = 50 }) => { + +export const Loader = ({width = 50, height = 50}) => { return ( -
- -
+
+ +
) }; diff --git a/src/components/Outstaffing/Outstaffing.js b/src/components/Outstaffing/Outstaffing.js index 075ef57f..556aa58c 100644 --- a/src/components/Outstaffing/Outstaffing.js +++ b/src/components/Outstaffing/Outstaffing.js @@ -3,6 +3,7 @@ import {useSelector, useDispatch} from 'react-redux' import OutstaffingBlock from '../OutstaffingBlock/OutstaffingBlock' import TagSelect from '../Select/TagSelect' +import {Header} from "../Header/Header"; import {selectTags, getPositionId, setPositionId} from '../../redux/outstaffingSlice' @@ -11,7 +12,8 @@ import back from '../../images/back_end.png' import design from '../../images/design.png' import './outstaffing.scss' -import {LogoutButton} from "../LogoutButton/LogoutButton"; + + const createSelectPositionHandler = ({positionId, setPositionId, dispatch}) => @@ -36,12 +38,6 @@ const Outstaffing = () => { return ( <>
-
-

- Аутстаффинг it-персонала -

- -
h2 { diff --git a/src/hoc/ErrorBoundary.js b/src/hoc/ErrorBoundary.js new file mode 100644 index 00000000..6edbe298 --- /dev/null +++ b/src/hoc/ErrorBoundary.js @@ -0,0 +1,22 @@ +import React, {Component} from "react"; + +class ErrorBoundary extends Component { + state = { + error: null, + }; + + static getDerivedStateFromError(error) { + return {error}; + } + + render() { + const { error } = this.state; + + if (error) { + return
Что-то пошло не так =( {error}
; + } + return this.props.children; + } +} + +export default ErrorBoundary \ No newline at end of file diff --git a/src/pages/CandidatePage.js b/src/pages/CandidatePage.js deleted file mode 100644 index 30e8c15b..00000000 --- a/src/pages/CandidatePage.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from 'react'; -import { WithLogout } from '../hoc/withLogout'; -import Candidate from '../components/Candidate/Candidate'; - -const CandidatePage = () => ; - -export default CandidatePage; diff --git a/src/components/Home/Home.js b/src/pages/Home/Home.js similarity index 64% rename from src/components/Home/Home.js rename to src/pages/Home/Home.js index 748f74a9..6142b4ff 100644 --- a/src/components/Home/Home.js +++ b/src/pages/Home/Home.js @@ -1,14 +1,15 @@ import React, {useState, useEffect} from 'react' import {useDispatch} from 'react-redux' -import Outstaffing from '../Outstaffing/Outstaffing' -import Description from '../Description/Description' -import {Footer} from '../Footer/Footer' +import Outstaffing from '../../components/Outstaffing/Outstaffing' +import Description from '../../components/Description/Description' +import {Footer} from '../../components/Footer/Footer' import {profiles, tags} from '../../redux/outstaffingSlice' import {useRequest} from "../../hooks/useRequest"; -import {LogoutButton} from "../LogoutButton/LogoutButton"; +import {LogoutButton} from "../../components/LogoutButton/LogoutButton"; +import {Header} from "../../components/Header/Header"; const Home = () => { @@ -30,8 +31,7 @@ const Home = () => { setIsLoadingMore(false) }); - apiRequest('/skills/skills-on-main-page', { - }).then((skills) => { + apiRequest('/skills/skills-on-main-page', {}).then((skills) => { if (!skills) { return [] } @@ -54,12 +54,14 @@ const Home = () => { }; return ( -
- - - -
-
+ <> +
+
+ + +
+
+ ) }; From 56f63dbed2d7efdbc845be37db3a238c6bd13583 Mon Sep 17 00:00:00 2001 From: Z1chi Date: Fri, 20 Jan 2023 16:20:06 +0300 Subject: [PATCH 02/14] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D1=8B=D0=B2=D0=B0=D1=8E=20=D1=81=D0=BF=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0,=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2=20=D0=B2=20map=20=D0=B2=20?= =?UTF-8?q?Description.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .browserslistrc | 3 + config/env.js | 106 - config/getHttpsConfig.js | 66 - config/jest/babelTransform.js | 29 - config/jest/cssTransform.js | 14 - config/jest/fileTransform.js | 40 - config/modules.js | 134 - config/paths.js | 76 +- config/pnpTs.js | 35 - config/webpack.config.js | 757 - config/webpack/analyze.js | 10 + config/webpack/common.js | 129 + config/webpack/dev.js | 23 + config/webpack/prod.js | 62 + config/webpackDevServer.config.js | 130 - package-lock.json | 41121 +++++++++++++--- package.json | 142 +- postcss.config.js | 6 + scripts/build.js | 212 - scripts/start.js | 166 - scripts/test.js | 53 - src/{hoc => HOC}/ErrorBoundary.js | 0 src/{hoc => HOC}/withLogout.js | 0 src/{hooks => HOOks}/useLogout.js | 0 src/HOOks/useRequest.js | 13 + src/api/request.js | 102 +- src/components/AuthBox/AuthBox.js | 13 +- src/components/Candidate/Candidate.js | 4 +- src/components/Description/Description.js | 9 +- src/components/Form/Form.js | 3 +- .../OutstaffingBlock/OutstaffingBlock.js | 3 +- .../ProfileCalendar/ProfileCalendar.js | 12 +- src/components/ProfileHeader/ProfileHeader.js | 12 +- src/components/ReportForm/ReportForm.js | 3 +- src/components/Select/TagSelect.js | 3 +- .../bookkeeping/ActContent/ActContent.js | 3 +- .../ContractContent/ContractContent.js | 2 - src/components/features/quiz/HeaderQuiz.js | 3 +- src/components/features/quiz/Instructions.js | 4 +- src/components/features/quiz/Results.js | 4 +- src/components/features/quiz/Task.js | 4 +- src/helper.js | 3 + src/hooks/useRequest.js | 61 - .../AuthForDevelopers/AuthForDevelopers.js | 3 +- src/pages/CalendarPage.js | 2 +- src/pages/FormPage/FormPage.js | 6 +- src/pages/Home/Home.js | 5 +- src/pages/Profile/Profile.js | 5 +- .../SingleReportPage/SingleReportPage.js | 2 +- src/pages/Summary/Summary.js | 8 +- 50 files changed, 34327 insertions(+), 9279 deletions(-) create mode 100644 .browserslistrc delete mode 100644 config/env.js delete mode 100644 config/getHttpsConfig.js delete mode 100644 config/jest/babelTransform.js delete mode 100644 config/jest/cssTransform.js delete mode 100644 config/jest/fileTransform.js delete mode 100644 config/modules.js delete mode 100644 config/pnpTs.js delete mode 100644 config/webpack.config.js create mode 100644 config/webpack/analyze.js create mode 100644 config/webpack/common.js create mode 100644 config/webpack/dev.js create mode 100644 config/webpack/prod.js delete mode 100644 config/webpackDevServer.config.js create mode 100644 postcss.config.js delete mode 100644 scripts/build.js delete mode 100644 scripts/start.js delete mode 100644 scripts/test.js rename src/{hoc => HOC}/ErrorBoundary.js (100%) rename src/{hoc => HOC}/withLogout.js (100%) rename src/{hooks => HOOks}/useLogout.js (100%) create mode 100644 src/HOOks/useRequest.js delete mode 100644 src/hooks/useRequest.js diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 00000000..37d2a02b --- /dev/null +++ b/.browserslistrc @@ -0,0 +1,3 @@ +> 0.5% +not dead +IE 10 \ No newline at end of file diff --git a/config/env.js b/config/env.js deleted file mode 100644 index 3d1411bd..00000000 --- a/config/env.js +++ /dev/null @@ -1,106 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')]; - -const NODE_ENV = process.env.NODE_ENV; -if (!NODE_ENV) { - throw new Error( - 'The NODE_ENV environment variable is required but was not specified.' - ); -} - -// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use -const dotenvFiles = [ - `${paths.dotenv}.${NODE_ENV}.local`, - // Don't include `.env.local` for `test` environment - // since normally you expect tests to produce the same - // results for everyone - NODE_ENV !== 'test' && `${paths.dotenv}.local`, - `${paths.dotenv}.${NODE_ENV}`, - paths.dotenv, -].filter(Boolean); - -// Load environment variables from .env* files. Suppress warnings using silent -// if this file is missing. dotenv will never modify any environment variables -// that have already been set. Variable expansion is supported in .env files. -// https://github.com/motdotla/dotenv -// https://github.com/motdotla/dotenv-expand -dotenvFiles.forEach(dotenvFile => { - if (fs.existsSync(dotenvFile)) { - require('dotenv-expand')( - require('dotenv').config({ - path: dotenvFile, - }) - ); - } -}); - -// We support resolving modules according to `NODE_PATH`. -// This lets you use absolute paths in imports inside large monorepos: -// https://github.com/facebook/create-react-app/issues/253. -// It works similar to `NODE_PATH` in Node itself: -// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders -// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. -// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims. -// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 -// We also resolve them to make sure all tools using them work consistently. -const appDirectory = fs.realpathSync(process.cwd()); -process.env.NODE_PATH = (process.env.NODE_PATH || '') - .split(path.delimiter) - .filter(folder => folder && !path.isAbsolute(folder)) - .map(folder => path.resolve(appDirectory, folder)) - .join(path.delimiter); - -// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be -// injected into the application via DefinePlugin in webpack configuration. -const REACT_APP = /^REACT_APP_/i; - -function getClientEnvironment(publicUrl) { - const raw = Object.keys(process.env) - .filter(key => REACT_APP.test(key)) - .reduce( - (env, key) => { - env[key] = process.env[key]; - return env; - }, - { - // Useful for determining whether we’re running in production mode. - // Most importantly, it switches React into the correct mode. - NODE_ENV: process.env.NODE_ENV || 'development', - // Useful for resolving the correct path to static assets in `public`. - // For example, . - // This should only be used as an escape hatch. Normally you would put - // images into the `src` and `import` them in code to get their paths. - PUBLIC_URL: publicUrl, - // We support configuring the sockjs pathname during development. - // These settings let a developer run multiple simultaneous projects. - // They are used as the connection `hostname`, `pathname` and `port` - // in webpackHotDevClient. They are used as the `sockHost`, `sockPath` - // and `sockPort` options in webpack-dev-server. - WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, - WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, - WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, - // Whether or not react-refresh is enabled. - // react-refresh is not 100% stable at this time, - // which is why it's disabled by default. - // It is defined here so it is available in the webpackHotDevClient. - FAST_REFRESH: process.env.FAST_REFRESH !== 'false', - } - ); - // Stringify all values so we can feed into webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]); - return env; - }, {}), - }; - - return { raw, stringified }; -} - -module.exports = getClientEnvironment; diff --git a/config/getHttpsConfig.js b/config/getHttpsConfig.js deleted file mode 100644 index 013d493c..00000000 --- a/config/getHttpsConfig.js +++ /dev/null @@ -1,66 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const crypto = require('crypto'); -const chalk = require('react-dev-utils/chalk'); -const paths = require('./paths'); - -// Ensure the certificate and key provided are valid and if not -// throw an easy to debug error -function validateKeyAndCerts({ cert, key, keyFile, crtFile }) { - let encrypted; - try { - // publicEncrypt will throw an error with an invalid cert - encrypted = crypto.publicEncrypt(cert, Buffer.from('test')); - } catch (err) { - throw new Error( - `The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}` - ); - } - - try { - // privateDecrypt will throw an error with an invalid key - crypto.privateDecrypt(key, encrypted); - } catch (err) { - throw new Error( - `The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${ - err.message - }` - ); - } -} - -// Read file and throw an error if it doesn't exist -function readEnvFile(file, type) { - if (!fs.existsSync(file)) { - throw new Error( - `You specified ${chalk.cyan( - type - )} in your env, but the file "${chalk.yellow(file)}" can't be found.` - ); - } - return fs.readFileSync(file); -} - -// Get the https config -// Return cert files if provided in env, otherwise just true or false -function getHttpsConfig() { - const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env; - const isHttps = HTTPS === 'true'; - - if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) { - const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE); - const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE); - const config = { - cert: readEnvFile(crtFile, 'SSL_CRT_FILE'), - key: readEnvFile(keyFile, 'SSL_KEY_FILE'), - }; - - validateKeyAndCerts({ ...config, keyFile, crtFile }); - return config; - } - return isHttps; -} - -module.exports = getHttpsConfig; diff --git a/config/jest/babelTransform.js b/config/jest/babelTransform.js deleted file mode 100644 index dabf5a8c..00000000 --- a/config/jest/babelTransform.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -const babelJest = require('babel-jest'); - -const hasJsxRuntime = (() => { - if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') { - return false; - } - - try { - require.resolve('react/jsx-runtime'); - return true; - } catch (e) { - return false; - } -})(); - -module.exports = babelJest.createTransformer({ - presets: [ - [ - require.resolve('babel-preset-react-app'), - { - runtime: hasJsxRuntime ? 'automatic' : 'classic', - }, - ], - ], - babelrc: false, - configFile: false, -}); diff --git a/config/jest/cssTransform.js b/config/jest/cssTransform.js deleted file mode 100644 index 8f651148..00000000 --- a/config/jest/cssTransform.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -// This is a custom Jest transformer turning style imports into empty objects. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process() { - return 'module.exports = {};'; - }, - getCacheKey() { - // The output is always the same. - return 'cssTransform'; - }, -}; diff --git a/config/jest/fileTransform.js b/config/jest/fileTransform.js deleted file mode 100644 index aab67618..00000000 --- a/config/jest/fileTransform.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -const path = require('path'); -const camelcase = require('camelcase'); - -// This is a custom Jest transformer turning file imports into filenames. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process(src, filename) { - const assetFilename = JSON.stringify(path.basename(filename)); - - if (filename.match(/\.svg$/)) { - // Based on how SVGR generates a component name: - // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6 - const pascalCaseFilename = camelcase(path.parse(filename).name, { - pascalCase: true, - }); - const componentName = `Svg${pascalCaseFilename}`; - return `const React = require('react'); - module.exports = { - __esModule: true, - default: ${assetFilename}, - ReactComponent: React.forwardRef(function ${componentName}(props, ref) { - return { - $$typeof: Symbol.for('react.element'), - type: 'svg', - ref: ref, - key: null, - props: Object.assign({}, props, { - children: ${assetFilename} - }) - }; - }), - };`; - } - - return `module.exports = ${assetFilename};`; - }, -}; diff --git a/config/modules.js b/config/modules.js deleted file mode 100644 index d63e41d7..00000000 --- a/config/modules.js +++ /dev/null @@ -1,134 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); -const chalk = require('react-dev-utils/chalk'); -const resolve = require('resolve'); - -/** - * Get additional module paths based on the baseUrl of a compilerOptions object. - * - * @param {Object} options - */ -function getAdditionalModulePaths(options = {}) { - const baseUrl = options.baseUrl; - - if (!baseUrl) { - return ''; - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - // We don't need to do anything if `baseUrl` is set to `node_modules`. This is - // the default behavior. - if (path.relative(paths.appNodeModules, baseUrlResolved) === '') { - return null; - } - - // Allow the user set the `baseUrl` to `appSrc`. - if (path.relative(paths.appSrc, baseUrlResolved) === '') { - return [paths.appSrc]; - } - - // If the path is equal to the root directory we ignore it here. - // We don't want to allow importing from the root directly as source files are - // not transpiled outside of `src`. We do allow importing them with the - // absolute path (e.g. `src/Components/Button.js`) but we set that up with - // an alias. - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return null; - } - - // Otherwise, throw an error. - throw new Error( - chalk.red.bold( - "Your project's `baseUrl` can only be set to `src` or `node_modules`." + - ' Create React App does not support other values at this time.' - ) - ); -} - -/** - * Get webpack aliases based on the baseUrl of a compilerOptions object. - * - * @param {*} options - */ -function getWebpackAliases(options = {}) { - const baseUrl = options.baseUrl; - - if (!baseUrl) { - return {}; - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return { - src: paths.appSrc, - }; - } -} - -/** - * Get jest aliases based on the baseUrl of a compilerOptions object. - * - * @param {*} options - */ -function getJestAliases(options = {}) { - const baseUrl = options.baseUrl; - - if (!baseUrl) { - return {}; - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return { - '^src/(.*)$': '/src/$1', - }; - } -} - -function getModules() { - // Check if TypeScript is setup - const hasTsConfig = fs.existsSync(paths.appTsConfig); - const hasJsConfig = fs.existsSync(paths.appJsConfig); - - if (hasTsConfig && hasJsConfig) { - throw new Error( - 'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.' - ); - } - - let config; - - // If there's a tsconfig.json we assume it's a - // TypeScript project and set up the config - // based on tsconfig.json - if (hasTsConfig) { - const ts = require(resolve.sync('typescript', { - basedir: paths.appNodeModules, - })); - config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config; - // Otherwise we'll check if there is jsconfig.json - // for non TS projects. - } else if (hasJsConfig) { - config = require(paths.appJsConfig); - } - - config = config || {}; - const options = config.compilerOptions || {}; - - const additionalModulePaths = getAdditionalModulePaths(options); - - return { - additionalModulePaths: additionalModulePaths, - webpackAliases: getWebpackAliases(options), - jestAliases: getJestAliases(options), - hasTsConfig, - }; -} - -module.exports = getModules(); diff --git a/config/paths.js b/config/paths.js index 4e3d30e2..a11d1e69 100644 --- a/config/paths.js +++ b/config/paths.js @@ -1,75 +1,7 @@ -'use strict'; - const path = require('path'); -const fs = require('fs'); -const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath'); - -// Make sure any symlinks in the project folder are resolved: -// https://github.com/facebook/create-react-app/issues/637 -const appDirectory = fs.realpathSync(process.cwd()); -const resolveApp = relativePath => path.resolve(appDirectory, relativePath); - -// We use `PUBLIC_URL` environment variable or "homepage" field to infer -// "public path" at which the app is served. -// webpack needs to know it to put the right