Commit 48b0e8ab authored by Zhou Fang's avatar Zhou Fang Committed by Martin Lowe
Browse files

Only reorganized the structure, no code changes

parent fc9a4e56
...@@ -69,3 +69,6 @@ nb-configuration.xml ...@@ -69,3 +69,6 @@ nb-configuration.xml
# Ignore built resources to display in package # Ignore built resources to display in package
src/main/resources/META-INF/resources/* src/main/resources/META-INF/resources/*
secret.properties secret.properties
#environment variables
.env
version: "3"
services:
drupal:
container_name: drupal
image: drupal:7
ports:
- 8085:80
- 8086:443
postgres:
container_name: postgres
image: postgres:12.4
volumes:
- ${HOME}/localdocker/keycloak/postgres:/var/lib/postgresql/data
# - ./volumes/postgres:/var/lib/postgresql/data
environment:
- POSTGRES_DB=keycloak
- POSTGRES_USER=keycloak
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
# - PGDATA=/tmp
ports:
- 5432:5432
keycloak:
container_name: keycloak
image: jboss/keycloak:11.0.1
environment:
- DB_VENDOR=POSTGRES
- DB_DATABASE=keycloak
- DB_SCHEMA=public
- DB_ADDR=postgres
- DB_PORT=5432
- DB_USER=keycloak
- DB_PASSWORD=${POSTGRES_PASSWORD}
- KEYCLOAK_USER=admin
- KEYCLOAK_PASSWORD=${KEYCLOAK_PASSWORD}
ports:
- 8080:8080
depends_on:
- postgres
- ldap
ldap:
container_name: ldap
image: osixia/openldap
ports:
- "389:389"
- "636:636"
environment:
- LDAP_ADMIN_PASSWORD=my-secret-pw
volumes:
- ${HOME}/localdocker/keycloak/ldap/var:/var/lib/ldap
- ${HOME}/localdocker/lkeycloak/dap/etc:/etc/ldap/slapd.d
# - ./volumes/ldap/var:/var/lib/ldap
# - ./volumes/ldap/etc:/etc/ldap/slapd.d
ldap-admin:
container_name: ldap-admin
image: osixia/phpldapadmin
ports:
- 8083:443
environment:
- PHPLDAPADMIN_LDAP_HOSTS=ldap
\ No newline at end of file
import React, { useState } from 'react'; import React, { useState } from 'react';
import './App.css'; import './App.css';
import AppFooter from './components/layout/AppFooter'; import AppFooter from './components/UIComponents/layout/AppFooter';
import AppHeader from './components/layout/AppHeader'; import AppHeader from './components/UIComponents/layout/AppHeader';
import FormWrapper from './components/FormPreprocess/FormWrapper'; import FormWrapper from './components/UIComponents/FormPreprocess/FormWrapper';
import MembershipContext from './Context/MembershipContext'; import MembershipContext from './Context/MembershipContext';
const App = () => { const App = () => {
......
...@@ -4,9 +4,9 @@ import { ...@@ -4,9 +4,9 @@ import {
matchCompanyFields, matchCompanyFields,
matchContactFields, matchContactFields,
} from '../../../Utils/formFunctionHelpers'; } from '../../../Utils/formFunctionHelpers';
import Company from './Company'; import Company from './CompanyInformationCompany';
import Contacts from './Contacts'; import Contacts from './CompanyInformationContacts';
import Loading from '../../Loading/Loading'; import Loading from '../../UIComponents/Loading/Loading';
import { import {
end_point, end_point,
api_prefix_form, api_prefix_form,
......
import React from 'react'; import React from 'react';
import CustomSelectWrapper from '../Inputs/CustomSelect/CustomSelectWrapper'; import CustomSelectWrapper from '../../UIComponents/Inputs/CustomSelect/CustomSelectWrapper';
import DefaultSelect from '../Inputs/CustomSelect/DefaultSelect'; import DefaultSelect from '../../UIComponents/Inputs/CustomSelect/DefaultSelect';
import CustomAsyncSelect from '../Inputs/CustomSelect/CustomAsyncSelect'; import CustomAsyncSelect from '../../UIComponents/Inputs/CustomSelect/CustomAsyncSelect';
import Input from '../Inputs/Input'; import Input from '../../UIComponents/Inputs/Input';
import { formField } from '../formModels/formFieldModel'; import { formField } from '../../UIComponents/FormComponents/formModels/formFieldModel';
import { companies } from '../../../Constants/Constants'; import { companies } from '../../../Constants/Constants';
/** /**
......
import React from 'react'; import React from 'react';
import Input from '../Inputs/Input'; import Input from '../../UIComponents/Inputs/Input';
import CustomCheckbox from '../Inputs/CustomCheckbox'; import CustomCheckbox from '../../UIComponents/Inputs/CustomCheckbox';
/** /**
* - * -
......
import React, { useContext, useEffect, useState } from 'react'; import React, { useContext, useEffect, useState } from 'react';
import DefaultSelect from '../Inputs/CustomSelect/DefaultSelect'; import DefaultSelect from '../../UIComponents/Inputs/CustomSelect/DefaultSelect';
import CustomSelectWrapper from '../Inputs/CustomSelect/CustomSelectWrapper'; import CustomSelectWrapper from '../../UIComponents/Inputs/CustomSelect/CustomSelectWrapper';
import MembershipFeeTable from './MembershipFeeTable'; import MembershipLevelFeeTable from './MembershipLevelFeeTable';
import MembershipContext from '../../../Context/MembershipContext'; import MembershipContext from '../../../Context/MembershipContext';
import Loading from '../../Loading/Loading'; import Loading from '../../UIComponents/Loading/Loading';
import { mapMembershipLevel } from '../../../Utils/formFunctionHelpers'; import { mapMembershipLevel } from '../../../Utils/formFunctionHelpers';
import { import {
api_prefix_form, api_prefix_form,
...@@ -94,7 +94,7 @@ const MembershipLevel = ({ formField, ...otherProps }) => { ...@@ -94,7 +94,7 @@ const MembershipLevel = ({ formField, ...otherProps }) => {
/> />
</div> </div>
</div> </div>
<MembershipFeeTable /> <MembershipLevelFeeTable />
</div> </div>
</> </>
); );
......
...@@ -4,7 +4,7 @@ import React from 'react'; ...@@ -4,7 +4,7 @@ import React from 'react';
* This is a pure static html table copied from membership site: * This is a pure static html table copied from membership site:
* https://www.eclipse.org/membership/#tab-fees * https://www.eclipse.org/membership/#tab-fees
*/ */
const MembershipFeeTable = () => { const MembershipLevelFeeTable = () => {
return ( return (
<> <>
<div className="vertical-align margin-top-50"> <div className="vertical-align margin-top-50">
...@@ -96,4 +96,4 @@ const MembershipFeeTable = () => { ...@@ -96,4 +96,4 @@ const MembershipFeeTable = () => {
); );
}; };
export default MembershipFeeTable; export default MembershipLevelFeeTable;
import React from 'react'; import React from 'react';
import MembershipContext from '../../Context/MembershipContext'; import MembershipContext from '../../../Context/MembershipContext';
import FormChooser from '../FormPreprocess/FormChooser'; import FormChooser from '../../UIComponents/FormPreprocess/FormChooser';
import SignInIntroduction from './SignInIntroduction'; import SignInIntroduction from './SignInIntroduction';
import StepperComponent from '../Steppers/StepperComponent'; import StepperComponent from '../../UIComponents/Steppers/StepperComponent';
import { import {
FETCH_HEADER, FETCH_HEADER,
api_prefix, api_prefix,
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
getCurrentMode, getCurrentMode,
MODE_REACT_ONLY, MODE_REACT_ONLY,
MODE_REACT_API, MODE_REACT_API,
} from '../../Constants/Constants'; } from '../../../Constants/Constants';
/** /**
* - When it is only running React App without server, uses fake user in public/fake_user.json * - When it is only running React App without server, uses fake user in public/fake_user.json
......
import React from 'react'; import React from 'react';
import Input from '../Inputs/Input'; import Input from '../../UIComponents/Inputs/Input';
/** /**
* Have not added any API calls here, * Have not added any API calls here,
......
import React, { useContext } from 'react'; import React, { useContext } from 'react';
import { useFormikContext } from 'formik'; import { useFormikContext } from 'formik';
import MembershipContext from '../../../Context/MembershipContext'; import MembershipContext from '../../../Context/MembershipContext';
import CustomSelectWrapper from '../Inputs/CustomSelect/CustomSelectWrapper'; import CustomSelectWrapper from '../../UIComponents/Inputs/CustomSelect/CustomSelectWrapper';
import ParticipationLevel from './ParticipationLevel'; import ParticipationLevel from './WorkingGroupParticipationLevel';
import EffectiveDate from './EffectiveDate'; import EffectiveDate from './WorkingGroupEffectiveDate';
import WorkingGroupsRepresentative from './WorkingGroupRepresentative'; import WorkingGroupsRepresentative from './WorkingGroupRepresentative';
import { deleteData } from '../../../Utils/formFunctionHelpers'; import { deleteData } from '../../../Utils/formFunctionHelpers';
import { import {
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
WORKING_GROUPS, WORKING_GROUPS,
workingGroups, workingGroups,
} from '../../../Constants/Constants'; } from '../../../Constants/Constants';
import DefaultSelect from '../Inputs/CustomSelect/DefaultSelect'; import DefaultSelect from '../../UIComponents/Inputs/CustomSelect/DefaultSelect';
/** /**
* Wrapper for Working Group Selector, * Wrapper for Working Group Selector,
......
import React from 'react'; import React from 'react';
import DateInput from '../Inputs/DateInput'; import DateInput from '../../UIComponents/Inputs/DateInput';
/** /**
* Render Effective Date input component (react-datepicker) * Render Effective Date input component (react-datepicker)
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import DefaultSelect from '../Inputs/CustomSelect/DefaultSelect'; import DefaultSelect from '../../UIComponents/Inputs/CustomSelect/DefaultSelect';
import CustomSelectWrapper from '../Inputs/CustomSelect/CustomSelectWrapper'; import CustomSelectWrapper from '../../UIComponents/Inputs/CustomSelect/CustomSelectWrapper';
/** /**
* Render Participation level selector component (React-Select) * Render Participation level selector component (React-Select)
......
import React from 'react'; import React from 'react';
import Input from '../Inputs/Input'; import Input from '../../UIComponents/Inputs/Input';
/** /**
* Render Working Group Representative input component * Render Working Group Representative input component
......
...@@ -3,7 +3,7 @@ import MembershipContext from '../../../Context/MembershipContext'; ...@@ -3,7 +3,7 @@ import MembershipContext from '../../../Context/MembershipContext';
import { FieldArray } from 'formik'; import { FieldArray } from 'formik';
import WorkingGroup from './WorkingGroup'; import WorkingGroup from './WorkingGroup';
import { matchWorkingGroupFields } from '../../../Utils/formFunctionHelpers'; import { matchWorkingGroupFields } from '../../../Utils/formFunctionHelpers';
import Loading from '../../Loading/Loading'; import Loading from '../../UIComponents/Loading/Loading';
import { import {
end_point, end_point,
api_prefix_form, api_prefix_form,
......
...@@ -2,15 +2,15 @@ import React, { useState, useRef, useContext } from 'react'; ...@@ -2,15 +2,15 @@ import React, { useState, useRef, useContext } from 'react';
import { Form, Formik } from 'formik'; import { Form, Formik } from 'formik';
import { validationSchema } from '../formModels/ValidationSchema'; import { validationSchema } from '../formModels/ValidationSchema';
import StepperComponent from '../../Steppers/StepperComponent'; import StepperComponent from '../../Steppers/StepperComponent';
import CustomStepButton from '../CustomStepButton'; import CustomStepButton from '../../Button/CustomStepButton';
import { import {
executeSendDataByStep, executeSendDataByStep,
assignContactData, assignContactData,
handleNewForm, handleNewForm,
} from '../../../Utils/formFunctionHelpers'; } from '../../../../Utils/formFunctionHelpers';
import MembershipContext from '../../../Context/MembershipContext'; import MembershipContext from '../../../../Context/MembershipContext';
import SubmitSuccess from '../SubmitSuccess'; import SubmitSuccess from '../SubmitSuccess';
import { newForm_tempId } from '../../../Constants/Constants'; import { newForm_tempId } from '../../../../Constants/Constants';
/** /**
* A wrapper for each step of form. * A wrapper for each step of form.
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import FormikStepper from './FormikStepper/FormikStepper'; import FormikStepper from './FormikStepper/FormikStepper';
import CompanyInformation from './CompanyInformation/CompanyInformation'; import CompanyInformation from '../../Pages/CompanyInformation/CompanyInformation';
import MembershipLevel from './MembershipLevel/MembershipLevel'; import MembershipLevel from '../../Pages/MembershipLevel/MembershipLevel';
import WorkingGroupsWrapper from './WorkingGroups/WorkingGroupsWrapper'; import WorkingGroupsWrapper from '../../Pages/WorkingGroups/WorkingGroupsWrapper';
import SigningAuthority from './SigningAuthority/SigningAuthority'; import SigningAuthority from '../../Pages/SigningAuthority/SigningAuthority';
import Preview from './Preview/Preview'; import Preview from '../../Pages/Review/Review';
import { formField, initialValues } from './formModels/formFieldModel'; import { formField, initialValues } from './formModels/formFieldModel';
import { import {
COMPANY_INFORMATION, COMPANY_INFORMATION,
...@@ -13,7 +13,7 @@ import { ...@@ -13,7 +13,7 @@ import {
SIGNING_AUTHORITY, SIGNING_AUTHORITY,
REVIEW, REVIEW,
FETCH_HEADER, FETCH_HEADER,
} from '../../Constants/Constants'; } from '../../../Constants/Constants';
/** /**
* Wrapper for the FormikStepper and FormikStepper's children steps * Wrapper for the FormikStepper and FormikStepper's children steps
......
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