+
+
-
- {this.renderButton("Submit")}
+ {this.renderButton('Submit')}
- );
+ )
}
}
-export default Profile;
+export default Profile
diff --git a/src/components/Profile/index.js b/src/components/Profile/index.js
new file mode 100644
index 0000000000..a22de090ff
--- /dev/null
+++ b/src/components/Profile/index.js
@@ -0,0 +1 @@
+export { default } from "./Profile";
\ No newline at end of file
diff --git a/src/components/ProfileLinks.jsx b/src/components/ProfileLinks.jsx
deleted file mode 100644
index 20d0712130..0000000000
--- a/src/components/ProfileLinks.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import NewProfileLink from './NewProfileLink'
-
-const ProfileLinksCard = ({data:links,canEdit, label, handleProfileLinks, collection }) => {
- return (
-
-
-
{label} Links
-
{links.length === 0 ? `No ${label} link defined`: ""}
-
-
-{links.map((link, index) =>
-
-
-
-
-
- {canEdit &&
handleProfileLinks(collection,link,"delete", index)} > }
-
-
-
-)}
-{canEdit &&
}
-
-
-
- );
-}
-
-export default ProfileLinksCard;
\ No newline at end of file
diff --git a/src/components/ProfileLinks/ProfileLinks.jsx b/src/components/ProfileLinks/ProfileLinks.jsx
new file mode 100644
index 0000000000..29641634a3
--- /dev/null
+++ b/src/components/ProfileLinks/ProfileLinks.jsx
@@ -0,0 +1,63 @@
+import React from 'react'
+import NewProfileLink from '../NewProfileLink'
+
+const ProfileLinksCard = ({
+ data: links,
+ canEdit,
+ label,
+ handleProfileLinks,
+ collection
+}) => {
+ return (
+
+
+
{label} Links
+
+ {links.length === 0 ? `No ${label} link defined` : ''}
+
+
+ {links.map((link, index) => (
+
+
+
+
+
+ {canEdit && (
+
+ handleProfileLinks(collection, link, 'delete', index)
+ }>
+ )}
+
+ ))}
+ {canEdit && (
+
+ )}
+
+
+
+ )
+}
+
+export default ProfileLinksCard
diff --git a/src/components/ProfileLinks/index.js b/src/components/ProfileLinks/index.js
new file mode 100644
index 0000000000..c89745ee38
--- /dev/null
+++ b/src/components/ProfileLinks/index.js
@@ -0,0 +1 @@
+export { default } from "./ProfileLinks";
\ No newline at end of file
diff --git a/src/components/Projects/AddProject/AddProject.jsx b/src/components/Projects/AddProject/AddProject.jsx
new file mode 100644
index 0000000000..e80b8750b2
--- /dev/null
+++ b/src/components/Projects/AddProject/AddProject.jsx
@@ -0,0 +1,41 @@
+/*********************************************************************************
+ * Component: ADDPROJECT
+ * Author: Henry Ng - 01/17/20
+ * This component is used to add more project into the database
+ ********************************************************************************/
+import React, { useState } from 'react'
+
+const AddProject = (props) => {
+ const [showAddButton, setShowAddButton] = useState(false);
+ const [newName, setNewName] = useState('');
+
+ const changeNewName = (newName) =>{
+ if(newName.length!==0){
+ setShowAddButton(true);
+ }else{
+ setShowAddButton(false);
+ }
+ setNewName(newName);
+ }
+
+ return (
+
+
+ Add new project
+
+
+
changeNewName(e.target.value)}/>
+
+ { showAddButton ?
+
+ : null
+ }
+
+
+ )
+}
+
+export default AddProject;
+
diff --git a/src/components/Projects/AddProject/index.js b/src/components/Projects/AddProject/index.js
new file mode 100644
index 0000000000..6bdee1c516
--- /dev/null
+++ b/src/components/Projects/AddProject/index.js
@@ -0,0 +1 @@
+export { default } from "./AddProject";
\ No newline at end of file
diff --git a/src/components/Projects/Members/Member/Member.jsx b/src/components/Projects/Members/Member/Member.jsx
new file mode 100644
index 0000000000..ae4c6db1f9
--- /dev/null
+++ b/src/components/Projects/Members/Member/Member.jsx
@@ -0,0 +1,26 @@
+/*********************************************************************************
+ * Component: MEMBER
+ * Author: Henry Ng - 02/03/20
+ * Display member of the members list
+ ********************************************************************************/
+import React from 'react'
+
+const Member = (props) => {
+ return (
+
+
+
+ {props.index + 1} |
+
+ {props.fullName}
+ |
+
+
+ |
+
+
+ )
+}
+
+export default Member
+
diff --git a/src/components/Projects/Members/Member/index.js b/src/components/Projects/Members/Member/index.js
new file mode 100644
index 0000000000..7cdf57154a
--- /dev/null
+++ b/src/components/Projects/Members/Member/index.js
@@ -0,0 +1 @@
+export { default } from "./Member";
\ No newline at end of file
diff --git a/src/components/Projects/Members/Members.jsx b/src/components/Projects/Members/Members.jsx
new file mode 100644
index 0000000000..7bc0896dda
--- /dev/null
+++ b/src/components/Projects/Members/Members.jsx
@@ -0,0 +1,65 @@
+/*********************************************************************************
+ * Component: MEMBERS
+ * Author: Henry Ng - 01/25/20
+ * Display members of the project
+ ********************************************************************************/
+import React, { useState, useEffect } from 'react'
+import { Link } from 'react-router-dom'
+import { NavItem } from 'reactstrap'
+import { connect } from 'react-redux'
+import { fetchAllMembers } from './../../../actions/projectMembers'
+import Member from './Member'
+import './members.css'
+
+const Members = (props) => {
+ const [init, setInit] = useState(false);
+ const projectId = props.match.params.projectId;
+
+ if (!init) {
+ props.fetchAllMembers(projectId);
+ setInit(true);
+ }
+
+
+ return (
+
+
+
+
+
+
+
+ | # |
+ |
+ |
+
+
+
+
+ {props.state.projectMembers.members.map((member, i) =>
+ )}
+
+
+
+ )
+}
+
+
+const mapStateToProps = state => { return { state } }
+export default connect(mapStateToProps, { fetchAllMembers })(Members)
+
diff --git a/src/components/Projects/Members/index.js b/src/components/Projects/Members/index.js
new file mode 100644
index 0000000000..132a61b949
--- /dev/null
+++ b/src/components/Projects/Members/index.js
@@ -0,0 +1 @@
+export { default } from "./Members";
\ No newline at end of file
diff --git a/src/components/Projects/Members/members.css b/src/components/Projects/Members/members.css
new file mode 100644
index 0000000000..8bad461fd6
--- /dev/null
+++ b/src/components/Projects/Members/members.css
@@ -0,0 +1,11 @@
+#member_project__name{
+ padding:5px
+}
+
+#members__order{
+ width: 10px;
+}
+
+.members__name{
+ text-align: left;
+}
\ No newline at end of file
diff --git a/src/components/Projects/Overview/Overview.jsx b/src/components/Projects/Overview/Overview.jsx
new file mode 100644
index 0000000000..e6a858afcf
--- /dev/null
+++ b/src/components/Projects/Overview/Overview.jsx
@@ -0,0 +1,38 @@
+/*********************************************************************************
+ * Component: OVERVIEW
+ * Author: Henry Ng - 01/17/20
+ * This component display the number of projects and active projects
+ ********************************************************************************/
+import React from 'react'
+import {PROJECTS, ACTIVE_PROJECTS} from './../../../languages/en/ui'
+
+
+const Overview = (props) => {
+ return (
+
+
+
+
{props.numberOfProjects}
+
+ {PROJECTS}
+
+
+
+
+
+
+
{props.numberOfActive}
+
+
+ {ACTIVE_PROJECTS}
+
+
+
+
+
+
+ )
+}
+
+export default Overview;
+
diff --git a/src/components/Projects/Overview/index.js b/src/components/Projects/Overview/index.js
new file mode 100644
index 0000000000..bebeeb2c93
--- /dev/null
+++ b/src/components/Projects/Overview/index.js
@@ -0,0 +1 @@
+export { default } from "./Overview";
\ No newline at end of file
diff --git a/src/components/Projects/Project/Project.jsx b/src/components/Projects/Project/Project.jsx
new file mode 100644
index 0000000000..a40cd87d36
--- /dev/null
+++ b/src/components/Projects/Project/Project.jsx
@@ -0,0 +1,73 @@
+import React, { useState } from 'react'
+import { DELETE } from './../../../languages/en/ui'
+import './../projects.css'
+import { Link } from 'react-router-dom'
+import { NavItem } from 'reactstrap'
+
+const Project = props => {
+ const [originName] = useState(props.name)
+ const [name, setName] = useState(props.name)
+ const [active] = useState(props.active)
+
+ const updateActive = () => {
+ props.onClickActive(props.projectId, name, active)
+ }
+
+ const updateProjectName = () => {
+ if (name.length < 3) {
+ setName(originName)
+ } else if (originName !== name) {
+ props.onUpdateProjectName(props.projectId, name, active)
+ }
+ }
+
+ return (
+
+ |
+ {props.index + 1}
+ |
+
+ setName(e.target.value)}
+ onBlur={updateProjectName}
+ />
+ |
+
+ {props.active ? (
+
+
+
+ ) : (
+
+
+
+ )}
+ |
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+ )
+}
+export default Project
diff --git a/src/components/Projects/Project/index.js b/src/components/Projects/Project/index.js
new file mode 100644
index 0000000000..92f865daca
--- /dev/null
+++ b/src/components/Projects/Project/index.js
@@ -0,0 +1 @@
+export { default } from "./Project";
\ No newline at end of file
diff --git a/src/components/Projects/ProjectTableHeader/ProjectTableHeader.jsx b/src/components/Projects/ProjectTableHeader/ProjectTableHeader.jsx
new file mode 100644
index 0000000000..9e57fe9f77
--- /dev/null
+++ b/src/components/Projects/ProjectTableHeader/ProjectTableHeader.jsx
@@ -0,0 +1,27 @@
+/*********************************************************************************
+ * Component: Project Table Header
+ * Author: Henry Ng - 01/17/20
+ * This component is the top of the table. It displays titles.
+ ********************************************************************************/
+import React from 'react'
+import './../projects.css'
+import {PROJECT_NAME, ACTIVE, MEMBERS, WBS} from './../../../languages/en/ui'
+
+const ProjectTableHeader = () => {
+
+ return (
+
+ | # |
+ {PROJECT_NAME} |
+ {ACTIVE} |
+ {MEMBERS} |
+ {WBS} |
+ |
+
+
+ )
+
+}
+
+export default ProjectTableHeader;
+
diff --git a/src/components/Projects/ProjectTableHeader/index.js b/src/components/Projects/ProjectTableHeader/index.js
new file mode 100644
index 0000000000..3266071071
--- /dev/null
+++ b/src/components/Projects/ProjectTableHeader/index.js
@@ -0,0 +1 @@
+export { default } from "./ProjectTableHeader";
\ No newline at end of file
diff --git a/src/components/Projects/Projects.jsx b/src/components/Projects/Projects.jsx
new file mode 100644
index 0000000000..981c3f8b3d
--- /dev/null
+++ b/src/components/Projects/Projects.jsx
@@ -0,0 +1,173 @@
+/*********************************************************************************
+ * Component: PROJECTS
+ * Author: Henry Ng - 01/27/20
+ * This component is used to build the layout of the list of projects
+ * Childrens: Overview, ProjectTableHeader, Project ( List )
+ * Layout:
+ *
+ * { ... }
+ *
+ ********************************************************************************/
+import React, { Component } from 'react'
+import { fetchAllProjects, postNewProject, deleteProject, modifyProject } from '../../actions/projects'
+import Overview from './Overview'
+import AddProject from './AddProject'
+import ProjectTableHeader from './ProjectTableHeader'
+import Project from './Project'
+import ModalDelete from './../common/Modal'
+import ModalMsg from './../common/Modal'
+import * as Message from './../../languages/en/messages'
+import { NOTICE } from './../../languages/en/ui'
+import './projects.css'
+import { connect } from 'react-redux'
+import Loading from '../common/Loading'
+
+class Projects extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ showModalDelete: false,
+ showModalMsg: false,
+ trackModelMsg: false,
+ projectTarget: {
+ projectName: '',
+ projectId: -1,
+ active: false
+ }
+ };
+ }
+
+ componentDidMount() {
+ this.props.fetchAllProjects(); // Fetch to get all projects
+ }
+
+
+ /**
+ * Changes the number of active projects
+ */
+ onClickActive = (projectId, projectName, isActive) => {
+ this.props.modifyProject("setActive", projectId, projectName, isActive);
+ }
+
+ onUpdateProjectName = (projectId, projectName, isActive) => {
+ this.props.modifyProject("updateName", projectId, projectName, isActive);
+ }
+
+ /**
+ * Changes the number of projects
+ * Also update the number of active project
+ */
+ onClickDelete = (projectId, active, projectName) => {
+ this.setState({
+ showModalDelete: true,
+ projectTarget: {
+ projectId,
+ projectName,
+ active
+ }
+ })
+ }
+
+ confirmDelete = () => {
+ // get project info
+ let { projectId } = this.state.projectTarget;
+ // request delete on db
+ this.props.deleteProject(projectId);
+ // disable modal
+ this.setState({ showModalDelete: false });
+ }
+
+ setInactiveProject = () => {
+ let { projectId, projectName } = this.state.projectTarget;
+ this.props.modifyProject("setActive", projectId, projectName, true);
+ // disable modal
+ this.setState({ showModalDelete: false });
+
+ }
+
+ addProject = (name) => {
+ this.props.postNewProject(name, true);
+ this.setState({ trackModelMsg: true });
+ }
+
+
+
+
+ render() {
+
+ let { showModalDelete, projectTarget, trackModelMsg } = this.state;
+ let { projects, status, fetching, fetched } = this.props.state.allProjects;
+
+
+ let numberOfProjects = projects.length;
+ let numberOfActive = projects.filter(project => project.isActive).length;
+
+ let showModalMsg = false;
+ //console.log("STSTUS", status);
+
+ if (status !== 201 && trackModelMsg) {
+ showModalMsg = true;
+ }
+ // Display project lists
+ let ProjectsList = [];
+ if (projects.length > 0) {
+ ProjectsList = projects.map((project, index) => );
+ }
+
+
+
+ return (
+
+
+ {fetching || !fetched ?
: null}
+
+
+
+
+
+
+
+ {ProjectsList}
+
+
+
+
+
+
+
+
+
+
+ {error &&
{error}
}
+
+ {canEditFields && (
+
+
+
+
+ {imageUploadError && (
+ {imageUploadError}
+ )}
+
+ )}
+
+
Blue Squares
+
+
+
+
+
+
+ {firstNameError && (
+
{firstNameError}
+ )}
+
+
+
+
+ {lastNameError && (
+
{lastNameError}
+ )}
+
+
+ {this.activeOptions.map(item => (
+
+
+
+
+ ))}
+
+ {error &&
{error}
}
+
+
+
+
+
+
+ {error &&
{error}
}
+
+
+
+
+
+
+ {error &&
{error}
}
+
+
+
+
+
+ {error &&
{error}
}
+
+
+
+
+
+
+ Phone Number:
+
+
+
+
+
+
+
+
+
+
+ Publicly Accessible?
+
+
+
+
+
+
+
+
+ Email
+
+
+
+
+
+
+
+
+
+
+ Publicly Accessible?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default UserProfile
diff --git a/src/components/UserProfile/UserProfile.container.jsx b/src/components/UserProfile/UserProfile.container.jsx
new file mode 100644
index 0000000000..d150d7b8a7
--- /dev/null
+++ b/src/components/UserProfile/UserProfile.container.jsx
@@ -0,0 +1,23 @@
+import { connect } from 'react-redux'
+import _ from 'lodash'
+import {
+ getUserProfile,
+ updateUserProfile,
+ clearUserProfile
+} from '../../actions/userProfile'
+import { getUserTeamMembers } from '../../actions/team'
+
+import UserProfile from './UserProfile'
+
+const mapStateToProps = state => ({
+ auth: state.auth,
+ userProfile: _.get(state, 'userProfile'),
+ user: _.get(state, 'user', {})
+})
+
+export default connect(mapStateToProps, {
+ getUserProfile,
+ clearUserProfile,
+ updateUserProfile,
+ getUserTeamMembers
+})(UserProfile)
diff --git a/src/components/UserProfile/UserProfile.jsx b/src/components/UserProfile/UserProfile.jsx
new file mode 100644
index 0000000000..d51b877e32
--- /dev/null
+++ b/src/components/UserProfile/UserProfile.jsx
@@ -0,0 +1,348 @@
+import React, { Component } from 'react'
+import Loading from '../common/Loading'
+import {
+ Card,
+ Row,
+ CardTitle,
+ CardText,
+ Col,
+ Container,
+ CardSubtitle,
+ CardBody,
+ Input,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupText,
+ CardHeader,
+ CardFooter,
+ Badge,
+ Button,
+ FormGroup,
+ Label,
+ CardImg
+} from 'reactstrap'
+import { orange, silverGray } from '../../constants/colors'
+import cx from 'classnames'
+import Memberships from '../Memberships/Memberships'
+import ProfileLinks from '../ProfileLinks/ProfileLinks'
+import Joi from 'joi'
+import ShowSaveWarning from '../common/ShowSaveWarning'
+import Modal from '../common/Modal'
+
+import Badges from './Badges'
+import WorkHistory from './WorkHistory'
+import UserLinks from './UserLinks'
+
+import SideBar from './SideBar'
+
+class UserProfile extends Component {
+ state = {
+ isLoading: true,
+ error: '',
+ userProfile: {},
+ firstNameError: '',
+ lastNameError: '',
+ imageUploadError: '',
+ isValid: false
+ }
+
+ async componentDidMount() {
+ // this.props.getCurrentUser(getjwt())
+ let userId = this.props.match.params.userId
+ await this.props.getUserProfile(userId)
+ await this.props.getUserTeamMembers(userId)
+ //console.log(this.props.userProfile)
+ if (this.props.userProfile.firstName.length) {
+ // console.log(this.props.userProfile)
+ this.setState({ isLoading: false, userProfile: this.props.userProfile })
+ }
+ //console.log(this.props.userProfile)
+ }
+
+ handleUserProfile = event => {
+ console.log('handleUserProfile')
+ event.preventDefault()
+ if (event.target.id === 'firstName') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ firstName: event.target.value.trim()
+ },
+ showModal: event.target.value ? false : true,
+ modalTitle: 'First Name Error',
+ modalMessage: 'First Name cannot be empty'
+ })
+ }
+
+ if (event.target.id === 'lastName') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ lastName: event.target.value.trim()
+ },
+ showModal: event.target.value ? false : true,
+ modalTitle: 'First Name Error',
+ modalMessage: 'Last Name cannot be empty'
+ })
+ }
+ if (event.target.id === 'email') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ email: event.target.value.trim()
+ },
+ emailError: event.target.value ? '' : 'Email cannot be empty '
+ })
+ }
+ if (event.target.id === 'phoneNumber') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ phoneNumber: event.target.value.trim()
+ }
+ })
+ }
+ if (event.target.id === 'jobTitle') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ jobTitle: event.target.value
+ }
+ })
+ }
+
+ if (event.target.id === 'emailPubliclyAccessible') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ emailPubliclyAccessible: event.target.checked
+ }
+ })
+ }
+ if (event.target.id === 'phoneNumberPubliclyAccessible') {
+ this.setState({
+ userProfile: {
+ ...this.state.userProfile,
+ phoneNumberPubliclyAccessible: !this.state.userProfile
+ .phoneNumberPubliclyAccessible
+ }
+ })
+ }
+ }
+
+ handleImageUpload = async e => {
+ e.preventDefault()
+
+ const file = e.target.files[0]
+
+ const allowedTypesString = 'image/png,image/jpeg, image/jpg'
+ const allowedTypes = allowedTypesString.split(',')
+ let isValid = true
+ let imageUploadError = ''
+ if (!allowedTypes.includes(file.type)) {
+ imageUploadError = `File type must be ${allowedTypesString}.`
+ isValid = false
+
+ return this.setState({
+ imageUploadError,
+ isValid,
+ showModal: true,
+ modalTitle: 'Profile Pic Error',
+ modalMessage: imageUploadError
+ })
+ }
+ let filesizeKB = file.size / 1024
+ console.log(filesizeKB)
+
+ if (filesizeKB > 50) {
+ imageUploadError = `\nThe file you are trying to upload exceed the maximum size of 50KB. You can choose a different file or use an online file compressor.`
+ isValid = false
+
+ return this.setState({
+ imageUploadError,
+ isValid,
+ showModal: true,
+ modalTitle: 'Profile Pic Error',
+ modalMessage: imageUploadError
+ })
+ }
+
+ let reader = new FileReader()
+ reader.readAsDataURL(file)
+ reader.onloadend = () => {
+ console.log(reader, file)
+
+ this.setState({
+ imageUploadError: '',
+ userProfile: {
+ ...this.state.userProfile,
+ profilePic: reader.result
+ }
+ })
+ }
+ }
+
+ handleModelState = (status = true, type = 'message', linkType) => {
+ console.log(linkType)
+ this.setState({
+ showModal: status,
+ modalTitle: 'Add a New Link',
+ linkType: linkType,
+ type: type
+ })
+ }
+
+ addLink = (linkName, linkURL, linkType) => {
+ console.log('addLink', linkName, linkURL, linkType)
+
+ const link = { Name: linkName, Link: linkURL }
+ if (linkType !== 'Admin') {
+ return this.setState(prevState => {
+ return {
+ showModal: false,
+ userProfile: {
+ ...this.state.userProfile,
+ personalLinks: prevState.userProfile.personalLinks.concat(link)
+ }
+ }
+ })
+ }
+
+ this.setState(prevState => {
+ return {
+ showModal: false,
+ userProfile: {
+ ...this.state.userProfile,
+ adminLinks: prevState.userProfile.adminLinks.concat(link)
+ }
+ }
+ })
+ }
+
+ handleSubmit = async event => {
+ event.preventDefault()
+
+ const submitResult = await this.props.updateUserProfile(
+ this.props.match.params.userId,
+ this.state.userProfile
+ )
+ console.log(submitResult)
+
+ if (submitResult === 200) {
+ this.setState({
+ showModal: true,
+ modalMessage: 'Your Changes were saved successfully',
+ modalTitle: 'Success',
+ type: 'message'
+ })
+ } else {
+ this.setState({
+ showModal: true,
+ modalMessage: 'Please try again.',
+ modalTitle: 'Error',
+ type: 'message'
+ })
+ }
+ }
+
+ render() {
+ let { userId: targetUserId } = this.props.match.params
+ let { userid: requestorId, role: requestorRole } = this.props.auth.user
+
+ const { userProfile, isLoading, showModal } = this.state
+ const {
+ firstName,
+ lastName,
+ email,
+ profilePic = '',
+ phoneNumber,
+ jobTitle,
+ personalLinks,
+ adminLinks,
+ phoneNumberPubliclyAccessible,
+ emailPubliclyAccessible
+ } = userProfile
+
+ console.log('phoneNumberPubliclyAccessible', phoneNumberPubliclyAccessible)
+ let isUserSelf = targetUserId === requestorId
+ let canEditFields = isUserAdmin || isUserSelf
+ const isUserAdmin = requestorRole === 'Administrator'
+
+ if (isLoading === true) {
+ return
+ }
+ return (
+
+ {showModal && (
+ {
+ this.setState({ showModal: false })
+ }}
+ modalMessage={this.state.modalMessage}
+ modalTitle={this.state.modalTitle}
+ type={this.state.type}
+ confirmModal={this.addLink}
+ linkType={this.state.linkType}
+ />
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default UserProfile
diff --git a/src/components/UserProfile/WorkHistory.jsx b/src/components/UserProfile/WorkHistory.jsx
new file mode 100644
index 0000000000..302daa7440
--- /dev/null
+++ b/src/components/UserProfile/WorkHistory.jsx
@@ -0,0 +1,63 @@
+import React from 'react'
+
+import { Card, Row, CardTitle, CardText, Col, Badge } from 'reactstrap'
+const WorkHistory = () => (
+
+
+
+ Hours Contributed :
+
+ This Week
+ 10 hours
+
+
+ This Month 40 hours
+
+
+
+
+
+
+ Volunteering History :
+
+ Start Date:
+ 06/10/2019
+
+
+ End Date:
+ 07/11/2019
+
+
+
+
+)
+
+export default WorkHistory
diff --git a/src/components/UserProfile/index.jsx b/src/components/UserProfile/index.jsx
new file mode 100644
index 0000000000..9db4760c35
--- /dev/null
+++ b/src/components/UserProfile/index.jsx
@@ -0,0 +1,2 @@
+import UserProfile from './UserProfile.container'
+export default UserProfile
diff --git a/src/components/common/checkboxCollection.jsx b/src/components/common/CheckboxCollection/CheckboxCollection.jsx
similarity index 100%
rename from src/components/common/checkboxCollection.jsx
rename to src/components/common/CheckboxCollection/CheckboxCollection.jsx
diff --git a/src/components/common/CheckboxCollection/index.js b/src/components/common/CheckboxCollection/index.js
new file mode 100644
index 0000000000..02a875a48f
--- /dev/null
+++ b/src/components/common/CheckboxCollection/index.js
@@ -0,0 +1 @@
+export { default } from "./CheckboxCollection";
\ No newline at end of file
diff --git a/src/components/common/dropdown.jsx b/src/components/common/Dropdown/Dropdown.jsx
similarity index 100%
rename from src/components/common/dropdown.jsx
rename to src/components/common/Dropdown/Dropdown.jsx
diff --git a/src/components/common/Dropdown/index.js b/src/components/common/Dropdown/index.js
new file mode 100644
index 0000000000..d57dae817b
--- /dev/null
+++ b/src/components/common/Dropdown/index.js
@@ -0,0 +1 @@
+export { default } from "./Dropdown";
\ No newline at end of file
diff --git a/src/components/common/fileUpload.jsx b/src/components/common/FileUpload/FileUpload.jsx
similarity index 100%
rename from src/components/common/fileUpload.jsx
rename to src/components/common/FileUpload/FileUpload.jsx
diff --git a/src/components/common/FileUpload/index.js b/src/components/common/FileUpload/index.js
new file mode 100644
index 0000000000..48d6931961
--- /dev/null
+++ b/src/components/common/FileUpload/index.js
@@ -0,0 +1 @@
+export { default } from "./FileUpload";
diff --git a/src/components/common/form.jsx b/src/components/common/Form/Form.jsx
similarity index 94%
rename from src/components/common/form.jsx
rename to src/components/common/Form/Form.jsx
index cf9ab16a14..58ea9e3207 100644
--- a/src/components/common/form.jsx
+++ b/src/components/common/Form/Form.jsx
@@ -1,14 +1,14 @@
import React, { Component } from "react";
import Joi from "joi";
import _ from "lodash";
-import Input from "../common/input";
-import Dropdown from "./dropdown";
-import Radio from "./radio"
-import Image from "./image"
-import FileUpload from "./fileUpload"
+import Input from "../Input";
+import Dropdown from "../Dropdown";
+import Radio from "../Radio/"
+import Image from "../Image"
+import FileUpload from "../FileUpload"
import { Link } from 'react-router-dom'
-import TinyMCEEditor from './tinymceEditor'
-import CheckboxCollection from './checkboxCollection'
+import TinyMCEEditor from '../TinyceEditor/tinymceEditor'
+import CheckboxCollection from '../CheckboxCollection'
class Form extends Component {
state = {
diff --git a/src/components/common/Form/index.js b/src/components/common/Form/index.js
new file mode 100644
index 0000000000..7ba835779a
--- /dev/null
+++ b/src/components/common/Form/index.js
@@ -0,0 +1 @@
+export { default } from "./Form";
\ No newline at end of file
diff --git a/src/components/common/image.jsx b/src/components/common/Image/Image.jsx
similarity index 100%
rename from src/components/common/image.jsx
rename to src/components/common/Image/Image.jsx
diff --git a/src/components/common/Image/index.js b/src/components/common/Image/index.js
new file mode 100644
index 0000000000..4480974efe
--- /dev/null
+++ b/src/components/common/Image/index.js
@@ -0,0 +1 @@
+export { default } from "./Image";
\ No newline at end of file
diff --git a/src/components/common/input.jsx b/src/components/common/Input/Input.jsx
similarity index 100%
rename from src/components/common/input.jsx
rename to src/components/common/Input/Input.jsx
diff --git a/src/components/common/Input/index.js b/src/components/common/Input/index.js
new file mode 100644
index 0000000000..6e905c4f12
--- /dev/null
+++ b/src/components/common/Input/index.js
@@ -0,0 +1 @@
+export { default } from "./Input";
\ No newline at end of file
diff --git a/src/components/common/Loading.jsx b/src/components/common/Loading/Loading.jsx
similarity index 78%
rename from src/components/common/Loading.jsx
rename to src/components/common/Loading/Loading.jsx
index 0b631112fa..fd333ed64f 100644
--- a/src/components/common/Loading.jsx
+++ b/src/components/common/Loading/Loading.jsx
@@ -5,8 +5,7 @@ const Loading = () => {
diff --git a/src/components/common/Loading/index.js b/src/components/common/Loading/index.js
new file mode 100644
index 0000000000..cf6a6e712a
--- /dev/null
+++ b/src/components/common/Loading/index.js
@@ -0,0 +1 @@
+export { default } from "./Loading";
\ No newline at end of file
diff --git a/src/components/common/Modal/Modal.jsx b/src/components/common/Modal/Modal.jsx
new file mode 100644
index 0000000000..a9e357bd2f
--- /dev/null
+++ b/src/components/common/Modal/Modal.jsx
@@ -0,0 +1,98 @@
+import React, { useState } from 'react'
+import {
+ Button,
+ Modal,
+ ModalHeader,
+ ModalBody,
+ ModalFooter,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupText,
+ Input
+} from 'reactstrap'
+const ModalExample = props => {
+ const {
+ isOpen,
+ closeModal,
+ confirmModal,
+ setInactiveModal,
+ modalTitle,
+ modalMessage,
+ type,
+ linkType
+ } = props
+
+ const [modal, setModal] = useState(false)
+ const [linkName, setLinkName] = useState('')
+ const [linkURL, setLinkURL] = useState('')
+
+ const toggle = () => setModal(!modal)
+
+ const handleChange = event => {
+ event.preventDefault()
+
+ if (event.target.id === 'linkName') {
+ setLinkName(event.target.value.trim())
+ } else {
+ setLinkURL(event.target.value.trim())
+ }
+ }
+
+ const buttonDisabled = !(linkName && linkURL)
+
+ if (type) {
+ console.log('Type of Modal is ', type, linkName, linkURL, buttonDisabled)
+ }
+
+ return (
+
+ {modalTitle}
+
+
+ {type === 'input' ? (
+ <>
+
+
+ Name
+
+
+
+
+
+
+
+ Link URL
+
+
+
+
+ ) : (
+ modalMessage
+ )}
+
+
+
+
+ {confirmModal != null ? : null}
+ {setInactiveModal != null ? : null}
+
+ {type === 'input' && (
+
+ )}
+
+
+ )
+}
+
+export default ModalExample
diff --git a/src/components/common/Modal/index.js b/src/components/common/Modal/index.js
new file mode 100644
index 0000000000..8aec78fc34
--- /dev/null
+++ b/src/components/common/Modal/index.js
@@ -0,0 +1 @@
+export { default } from "./Modal";
\ No newline at end of file
diff --git a/src/components/common/ProtectedRoute.jsx b/src/components/common/ProtectedRoute/ProtectedRoute.jsx
similarity index 58%
rename from src/components/common/ProtectedRoute.jsx
rename to src/components/common/ProtectedRoute/ProtectedRoute.jsx
index 1687194ef7..f30818f642 100644
--- a/src/components/common/ProtectedRoute.jsx
+++ b/src/components/common/ProtectedRoute/ProtectedRoute.jsx
@@ -1,13 +1,13 @@
import React from "react";
-import { getCurrentUser } from "../../services/loginService";
import { Redirect, Route } from "react-router-dom";
+import { connect } from "react-redux";
-const ProtectedRoute = ({ component: Component, render, ...rest }) => {
+const ProtectedRoute = ({ component: Component, render, auth, ...rest }) => {
return (
{
- if (!getCurrentUser())
+ if (!auth.isAuthenticated)
return (
{
);
};
-export default ProtectedRoute;
+const mapStateToProps = state => ({
+ auth: state.auth
+});
+
+export default connect(mapStateToProps)(ProtectedRoute);
diff --git a/src/components/common/ProtectedRoute/index.js b/src/components/common/ProtectedRoute/index.js
new file mode 100644
index 0000000000..7b76a945bc
--- /dev/null
+++ b/src/components/common/ProtectedRoute/index.js
@@ -0,0 +1 @@
+export { default } from "./ProtectedRoute";
\ No newline at end of file
diff --git a/src/components/common/radio.jsx b/src/components/common/Radio/Radio.jsx
similarity index 100%
rename from src/components/common/radio.jsx
rename to src/components/common/Radio/Radio.jsx
diff --git a/src/components/common/Radio/index.js b/src/components/common/Radio/index.js
new file mode 100644
index 0000000000..2f3cff486a
--- /dev/null
+++ b/src/components/common/Radio/index.js
@@ -0,0 +1 @@
+export { default } from "./Radio";
diff --git a/src/components/common/TinyceEditor/index.js b/src/components/common/TinyceEditor/index.js
new file mode 100644
index 0000000000..900718da7d
--- /dev/null
+++ b/src/components/common/TinyceEditor/index.js
@@ -0,0 +1 @@
+export { default } from "./TinymceEditor";
\ No newline at end of file
diff --git a/src/components/common/tinymceEditor.jsx b/src/components/common/TinyceEditor/tinymceEditor.jsx
similarity index 100%
rename from src/components/common/tinymceEditor.jsx
rename to src/components/common/TinyceEditor/tinymceEditor.jsx
diff --git a/src/constants/auth.js b/src/constants/auth.js
new file mode 100644
index 0000000000..fe22715c06
--- /dev/null
+++ b/src/constants/auth.js
@@ -0,0 +1 @@
+export const SET_CURRENT_USER = 'SET_CURRENT_USER'
\ No newline at end of file
diff --git a/src/constants/colors.js b/src/constants/colors.js
new file mode 100644
index 0000000000..705a7ad447
--- /dev/null
+++ b/src/constants/colors.js
@@ -0,0 +1,2 @@
+export const orange = '#f26100'
+export const silverGray = '#e9e9e9'
diff --git a/src/constants/errors.js b/src/constants/errors.js
new file mode 100644
index 0000000000..9f8cd4201c
--- /dev/null
+++ b/src/constants/errors.js
@@ -0,0 +1,2 @@
+export const GET_ERRORS = "GET_ERRORS"
+export const CLEAR_ERRORS = "CLEAR_ERRORS"
\ No newline at end of file
diff --git a/src/constants/leaderBoardData.js b/src/constants/leaderBoardData.js
new file mode 100644
index 0000000000..6583e5f796
--- /dev/null
+++ b/src/constants/leaderBoardData.js
@@ -0,0 +1,6 @@
+export const GET_LEADERBOARD_DATA = 'GET_LEADERBOARD_DATA';
+
+export const getLeaderBoardData = data => ({
+ type: GET_LEADERBOARD_DATA,
+ payload: data
+});
diff --git a/src/constants/projectMembership.js b/src/constants/projectMembership.js
new file mode 100644
index 0000000000..3918de869b
--- /dev/null
+++ b/src/constants/projectMembership.js
@@ -0,0 +1,19 @@
+/*********************************************************
+ * There is the store to store constants that relate to
+ * actions which will be sent to the reducers
+ *********************************************************/
+
+// INIT MEMBERS
+export const FETCH_MEMBERS_START = "FETCH_MEMBERS_START";
+export const RECEIVE_MEMBERS = "RECIVES_MEMBERS";
+export const FETCH_MEMBERS_ERROR = "FETCH_MEMBERS_ERROR";
+
+// ASSIGN NEW MEMBERS
+export const ADD_NEW_MEMBER = 'ADD_NEW_MEMBER';
+export const ADD_NEW_MEMBER_ERROR = "ADD_NEW_MEMBER_ERROR";
+
+// UPDATE MEMBERS
+export const UPDATE_MEMBER = "UPDATE_MEMBER";
+
+// DELETE MEMBER
+export const DELETE_MEMBER = 'DELETE_MEMBER';
diff --git a/src/constants/projects.js b/src/constants/projects.js
new file mode 100644
index 0000000000..5c6ee32e69
--- /dev/null
+++ b/src/constants/projects.js
@@ -0,0 +1,19 @@
+/*********************************************************
+ * There is the store to store constants that relate to
+ * actions which will be sent to the reducers
+ *********************************************************/
+
+// INIT PROJECTS
+export const FETCH_PROJECTS_START = "FETCH_PROJECTS_START";
+export const RECEIVE_PROJECTS = "RECIVES_PROJECTS";
+export const FETCH_PROJECTS_ERROR = "FETCH_PROJECTS_ERROR";
+
+// ADD NEW PROJECTS
+export const ADD_NEW_PROJECT = 'ADD_NEW_PROJECT';
+export const ADD_NEW_PROJECT_ERROR = "ADD_NEW_PROJECT_ERROR";
+
+// UPDATE PROJECTS
+export const UPDATE_PROJECT = "UPDATE_PROJECT";
+
+// DELETE PROJECT
+export const DELETE_PROJECT = 'DELETE_PROJECT';
diff --git a/src/constants/userProfile.js b/src/constants/userProfile.js
new file mode 100644
index 0000000000..b9dec8624d
--- /dev/null
+++ b/src/constants/userProfile.js
@@ -0,0 +1,19 @@
+export const GET_USER_PROFILE = 'GET_USER_PROFILE'
+export const CLEAR_USER_PROFILE = 'CLEAR_USER_PROFILE'
+export const EDIT_USER_PROFILE = 'EDIT_USER_PROFILE'
+export const EDIT_FIRST_NAME = 'EDIT_FIRST_NAME'
+
+export const getUserProfile = data => ({
+ type: GET_USER_PROFILE,
+ payload: data
+})
+
+export const editFirstName = data => ({
+ type: EDIT_FIRST_NAME,
+ payload: data
+})
+
+export const editUserProfile = data => ({
+ type: EDIT_USER_PROFILE,
+ payload: data
+})
diff --git a/src/index.js b/src/index.js
index a3db18d157..b9afd7e51c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,23 +1,13 @@
import React from 'react';
import ReactDOM from 'react-dom';
-import { BrowserRouter as Router } from 'react-router-dom';
import App from './components/App';
import registerServiceWorker from './registerServiceWorker';
-import 'bootstrap/dist/css/bootstrap.css'
-import 'font-awesome/css/font-awesome.css'
-import logService from "./services/logService"
-import { Provider } from "react-redux";
-import store from "./store";
+import 'bootstrap/dist/css/bootstrap.css';
+import 'font-awesome/css/font-awesome.css';
+import logService from './services/logService';
logService.init();
-ReactDOM.render(
-
-
-
-
- ,
- document.getElementById("root")
-);
+ReactDOM.render(, document.getElementById('root'));
registerServiceWorker();
diff --git a/src/languages/en/messages.js b/src/languages/en/messages.js
new file mode 100644
index 0000000000..b69a708f14
--- /dev/null
+++ b/src/languages/en/messages.js
@@ -0,0 +1,6 @@
+export const CONFIRM_DELETION = "Confirm Deletion"
+export const DELETE = 'delete';
+export const ARE_YOU_SURE_YOU_WANT_TO = 'Are you sure you want to ';
+export const THIS_PROJECT_NAME_IS_ALREADY_TAKEN = 'This project name is already taken';
+export const THIS_ACTION_CAN_NOT_BE_UNDONE = 'This action cannot be undone';
+export const SWITCH_THEM_TO_INACTIVE_IF_YOU_LIKE_TO_KEEP_THEM_IN_THE_SYSTEM = 'Switch them to Inactive If you\'d like to keep them in the system';
\ No newline at end of file
diff --git a/src/languages/en/ui.js b/src/languages/en/ui.js
new file mode 100644
index 0000000000..820f1379fc
--- /dev/null
+++ b/src/languages/en/ui.js
@@ -0,0 +1,23 @@
+/*********************************************************************************
+ * LANGUAGE - UI - CONST
+ * Stores all variables that display texts on the UI
+ ********************************************************************************/
+export const ACTIVE = 'Active';
+export const ACTIVE_PROJECTS = 'Active Projects';
+export const DASHBOARD = 'Dashboard';
+export const DELETE = "Delete";
+export const LOGO = 'Time Tracking Tool';
+export const LOGOUT = 'Logout';
+export const MEMBERS = 'Members';
+export const OTHER_LINKS = 'Other Links';
+export const PROJECTS = 'Projects';
+export const PROJECT_NAME = 'Project Name';
+export const REPORTS = 'Reports';
+export const TEAMS = 'Teams';
+export const TIMELOG = 'Timelog';
+export const UPDATE_PASSWORD = 'Update Password';
+export const USER_MANAGEMENT = 'User Managment';
+export const VIEW_PROFILE = 'View Profile';
+export const WBS = "WBS";
+export const WELCOME = 'Welcome';
+export const NOTICE = 'Notice';
\ No newline at end of file
diff --git a/src/reducers/actionItemsReducer.js b/src/reducers/actionItemsReducer.js
new file mode 100644
index 0000000000..a9a467ad45
--- /dev/null
+++ b/src/reducers/actionItemsReducer.js
@@ -0,0 +1,7 @@
+export const actionItemsReducer = (actionItems = null, action) => {
+ if (action.type === 'GET_ACTION_ITEMS') {
+ return action.payload;
+ }
+
+ return actionItems;
+};
diff --git a/src/reducers/allProjectsReducer.js b/src/reducers/allProjectsReducer.js
new file mode 100644
index 0000000000..fb54c01b86
--- /dev/null
+++ b/src/reducers/allProjectsReducer.js
@@ -0,0 +1,70 @@
+import * as types from './../constants/projects'
+
+const allProjectsInital = {
+ fetching: false,
+ fetched: false,
+ projects: [],
+ status: "404"
+}
+
+export const updateObject = (oldObject, updatedProperties) => {
+ return {
+ ...oldObject,
+ ...updatedProperties
+ };
+};
+
+export const allProjectsReducer = (allProjects = allProjectsInital, action) => {
+
+ switch (action.type) {
+ case types.FETCH_PROJECTS_START:
+ return { ...allProjects, fetching: true }
+ break;
+ case types.FETCH_PROJECTS_ERROR:
+ console.log("Reducers error", action.payload);
+ return { ...allProjects, fetching: false, status: action.payload }
+ break
+ case types.RECEIVE_PROJECTS:
+ console.log("Reducers projects", action.payload);
+ return updateObject(allProjects, {
+ projects: action.payload,
+ fetching: false,
+ fetched: true
+ });
+ break;
+ case types.ADD_NEW_PROJECT:
+ console.log("PAYLOAD ADD", action.payload)
+ if (action.status == 201) {
+ return updateObject(allProjects, {
+ projects: [action.payload].concat(...allProjects.projects),
+ status: action.status
+ });
+ } else {
+ return updateObject(allProjects, {
+ status: action.status
+ });
+ }
+ break;
+ case types.DELETE_PROJECT:
+ if (action.status == 200) {
+ let index = allProjects.projects.findIndex(project => project._id == action.projectId);
+ return updateObject(allProjects, {
+ projects: Object.assign([...allProjects.projects.slice(0, index), ...allProjects.projects.slice(index + 1)])
+ }
+ );
+ }
+ break;
+ case types.UPDATE_PROJECT:
+ let index = allProjects.projects.findIndex(project => project._id == action.projectId);
+ return updateObject(allProjects, {
+ projects: Object.assign([...allProjects.projects.slice(0, index), {
+ _id: action.projectId,
+ isActive: action.isActive,
+ projectName: action.projectName
+ }, ...allProjects.projects.slice(index + 1)])
+ });
+
+
+ }
+ return allProjects
+};
diff --git a/src/reducers/allTeamsReducer.js b/src/reducers/allTeamsReducer.js
new file mode 100644
index 0000000000..99be10ef20
--- /dev/null
+++ b/src/reducers/allTeamsReducer.js
@@ -0,0 +1,7 @@
+export const allTeamsReducer = (allTeams = null, action) => {
+ if (action.type === 'GET_ALL_TEAMS') {
+ return action.payload;
+ }
+
+ return allTeams;
+};
diff --git a/src/reducers/allTimeEntriesReducer.js b/src/reducers/allTimeEntriesReducer.js
new file mode 100644
index 0000000000..f765eae40a
--- /dev/null
+++ b/src/reducers/allTimeEntriesReducer.js
@@ -0,0 +1,7 @@
+export const allTimeEntriesReducer = (allTimeEntries = null, action) => {
+ if (action.type === 'GET_ALL_TIME_ENTRIES') {
+ return action.payload;
+ }
+
+ return allTimeEntries;
+};
diff --git a/src/reducers/allUserProfilesReducer.js b/src/reducers/allUserProfilesReducer.js
new file mode 100644
index 0000000000..6dc4709b69
--- /dev/null
+++ b/src/reducers/allUserProfilesReducer.js
@@ -0,0 +1,7 @@
+export const allUserProfilesReducer = (userProfiles = null, action) => {
+ if (action.type === 'GET_ALL_USER_PROFILES') {
+ return action.payload;
+ }
+
+ return userProfiles;
+};
diff --git a/src/reducers/authReducer.js b/src/reducers/authReducer.js
new file mode 100644
index 0000000000..24721e6046
--- /dev/null
+++ b/src/reducers/authReducer.js
@@ -0,0 +1,28 @@
+import _ from "lodash";
+
+const initialState = {
+ isAuthenticated: false,
+ user: {}
+}
+
+export const authReducer = (auth = initialState, action) => {
+ if (action.type === 'SET_CURRENT_USER') {
+ if (!action.payload){
+ return initialState
+ }
+ else if (action.payload.new){
+ return {
+ isAuthenticated: false,
+ user: action.payload,
+ }
+ }
+ else {
+ return {
+ isAuthenticated: !_.isEmpty(action.payload),
+ user: action.payload,
+ }
+ }
+ }
+
+ return auth;
+};
diff --git a/src/reducers/dashboardDataReducer.js b/src/reducers/dashboardDataReducer.js
new file mode 100644
index 0000000000..feb4ef6494
--- /dev/null
+++ b/src/reducers/dashboardDataReducer.js
@@ -0,0 +1,7 @@
+export const dashboardDataReducer = (dashboardData = null, action) => {
+ if (action.type === 'GET_DASHBOARD_DATA') {
+ return action.payload;
+ }
+
+ return dashboardData;
+};
diff --git a/src/reducers/errorsReducer.js b/src/reducers/errorsReducer.js
new file mode 100644
index 0000000000..72526093d0
--- /dev/null
+++ b/src/reducers/errorsReducer.js
@@ -0,0 +1,14 @@
+import { GET_ERRORS, CLEAR_ERRORS } from '../constants/errors';
+
+const initialState = {};
+
+export const errorsReducer = (state = initialState, action) => {
+ switch (action.type) {
+ case GET_ERRORS:
+ return action.payload;
+ case CLEAR_ERRORS:
+ return {};
+ default:
+ return state;
+ }
+}
diff --git a/src/reducers/handleSuccessReducer.js b/src/reducers/handleSuccessReducer.js
new file mode 100644
index 0000000000..158a20578a
--- /dev/null
+++ b/src/reducers/handleSuccessReducer.js
@@ -0,0 +1,11 @@
+export const handleSuccessReducer = (status = null, action) => {
+ if (action.type === 'REQUEST_SUCCEEDED') {
+ return action.payload;
+ }
+
+ if (action.type === 'REQUEST_FAILED') {
+ return action.error.response;
+ }
+
+ return status;
+};
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 755fe0f6e1..096a3d26ad 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,227 +1,50 @@
-import { combineReducers } from "redux";
-import jwtDecode from 'jwt-decode';
-
-const currentUserReducer = (user = {}, action) => {
- if (action.type === "GET_CURRENT_USER") {
- try {
- let token = action.payload;
- return jwtDecode(token);
- } catch (err) {
- return user;
- }
- }
-
- return user;
-};
-
-const userProfileByIdReducer = (userProfile = null, action) => {
- if (action.type === "GET_USER_PROFILE") {
- return action.payload
- }
-
- if (action.type === "CLEAR_USER_PROFILE") {
- return null
- }
-
- return userProfile;
-}
-
-const allUserProfilesReducer = (userProfiles = null, action) => {
- if (action.type === "GET_ALL_USER_PROFILES") {
- return action.payload
- }
-
- return userProfiles;
-}
-
-const userTeamMembersReducer = (teamMembers = null, action) => {
- if (action.type === "GET_USER_TEAM_MEMBERS") {
- return action.payload
- }
-
- return teamMembers;
-}
-
-const usernameReducer = (username = null, action) => {
- if (action.type === "GET_USERNAME") {
- return action.payload
- }
-
- return username;
-}
-
-const userProjectMembersReducer = (projectMembers = null, action) => {
- if (action.type === "GET_USER_PROJECT_MEMBERS") {
- return action.payload
- }
-
- return projectMembers;
-}
-
-const dashboardDataReducer = (dashboardData = null, action) => {
- if (action.type === "GET_DASHBOARD_DATA") {
- return action.payload
- }
-
- return dashboardData;
-}
-
-const weeklyDashboardDataReducer = (weeklyDashboardData = null, action) => {
- if (action.type === "GET_WEEKLY_DASHBOARD_DATA") {
- return action.payload
- }
-
- return weeklyDashboardData;
-}
-
-const monthlyDashboardDataReducer = (monthlyDashboardData = null, action) => {
- if (action.type === "GET_MONTHLY_DASHBOARD_DATA") {
- return action.payload
- }
-
- return monthlyDashboardData;
-}
-
-const leaderboardDataReducer = (leaderboardData = null, action) => {
- if (action.type === "GET_LEADERBOARD_DATA") {
- return action.payload
- }
-
- return leaderboardData;
-}
-
-const actionItemsReducer = (actionItems = null, action) => {
- if (action.type === "GET_ACTION_ITEMS") {
- return action.payload
- }
-
- return actionItems;
-}
-
-const notificationsReducer = (notifications = null, action) => {
- if (action.type === "GET_NOTIFICATIONS") {
- return action.payload
- }
-
- return notifications;
-}
-
-const allProjectsReducer = (allProjects = null, action) => {
- if (action.type === "GET_ALL_PROJECTS") {
- return action.payload
- }
-
- return allProjects;
-}
-
-const projectByIdReducer = (project = null, action) => {
- if (action.type === "GET_PROJECT_BY_ID") {
- return action.payload
- }
-
- return project;
-}
-
-const projectsByUserReducer = (projects = null, action) => {
- if (action.type === "GET_PROJECTS_BY_USER") {
- return action.payload
- }
-
- return projects;
-}
-
-const projectMembershipReducer = (members = null, action) => {
- if (action.type === "GET_PROJECT_MEMBERSHIP") {
- return action.payload
- }
-
- return members
-}
-
-const allTeamsReducer = (allTeams = null, action) => {
- if (action.type === "GET_ALL_TEAMS") {
- return action.payload
- }
-
- return allTeams;
-}
-
-const teamByIdReducer = (team = null, action) => {
- if (action.type === "GET_TEAM_BY_ID") {
- return action.payload
- }
-
- return team;
-}
-
-const teamMembershipReducer = (members = null, action) => {
- if (action.type === "GET_TEAM_MEMBERSHIP") {
- return action.payload
- }
-
- return members
-}
-
-const allTimeEntriesReducer = (allTimeEntries = null, action) => {
- if (action.type === "GET_ALL_TIME_ENTRIES") {
- return action.payload
- }
-
- return allTimeEntries;
-}
-
-const timeEntriesForSpecifiedPeriodReducer = (timeEntries = null, action) => {
- if (action.type === "GET_TIME_ENTRY_FOR_SPECIFIED_PERIOD") {
- return action.payload
- }
-
- return timeEntries;
-}
-
-const timeEntriesForSpecifiedProjectReducer = (timeEntries = null, action) => {
- if (action.type === "GET_TIME_ENTRY_FOR_SPECIFIED_PROJECT") {
- return action.payload
- }
-
- return timeEntries;
-}
-
-const handleSuccessReducer = (status = null, action) => {
- if (action.type === "REQUEST_SUCCEEDED") {
- return action.payload
- }
-
- if (action.type === "REQUEST_FAILED") {
- return action.error.response
- }
-
- return status;
-}
+import { combineReducers } from 'redux'
+import { userProfileByIdReducer } from './userProfileByIdReducer'
+import { authReducer } from './authReducer'
+import { handleSuccessReducer } from './handleSuccessReducer'
+import { allUserProfilesReducer } from './allUserProfilesReducer'
+import { userTeamMembersReducer } from './userTeamMembersReducer'
+import { userProjectMembersReducer } from './userProjectMembersReducer'
+import { dashboardDataReducer } from './dashboardDataReducer'
+import { weeklyDashboardDataReducer } from './weeklyDashboardDataReducer'
+import { monthlyDashboardDataReducer } from './monthlyDashboardDataReducer'
+import { leaderboardDataReducer } from './leaderboardDataReducer'
+import { actionItemsReducer } from './actionItemsReducer'
+import { notificationsReducer } from './notificationsReducer'
+import { allProjectsReducer } from './allProjectsReducer'
+import { projectByIdReducer } from './projectByIdReducer'
+import { projectsByUserReducer } from './projectsByUserReducer'
+import { projectMembershipReducer } from './projectMembershipReducer'
+import { allTeamsReducer } from './allTeamsReducer'
+import { teamByIdReducer } from './teamByIdReducer'
+import { teamMembershipReducer } from './teamMembershipReducer'
+import { timeEntriesForSpecifiedProjectReducer } from './timeEntriesForSpecifiedProjectReducer'
+import { allTimeEntriesReducer } from './allTimeEntriesReducer'
+import { timeEntriesForSpecifiedPeriodReducer } from './timeEntriesForSpecifiedPeriodReducer'
+import { errorsReducer } from './errorsReducer'
export default combineReducers({
- user: currentUserReducer,
+ auth: authReducer,
userProfile: userProfileByIdReducer,
- allUserProfiles: allUserProfilesReducer,
- userTeamMembers: userTeamMembersReducer,
- username: usernameReducer,
- userProjectMembers: userProjectMembersReducer,
- dashboardData: dashboardDataReducer,
- leaderboardData: leaderboardDataReducer,
- weeklyDashboardData: weeklyDashboardDataReducer,
- monthlyDashboardData: monthlyDashboardDataReducer,
- actionItems: actionItemsReducer,
- notifications: notificationsReducer,
+ //allUserProfiles: allUserProfilesReducer,
+ //userTeamMembers: userTeamMembersReducer,
+ //userProjectMembers: userProjectMembersReducer,
+ //dashboardData: dashboardDataReducer,
+ leaderBoardData: leaderboardDataReducer,
+ //weeklyDashboardData: weeklyDashboardDataReducer,
+ //monthlyDashboardData: monthlyDashboardDataReducer,
+ // actionItems: actionItemsReducer,
+ // notifications: notificationsReducer,
allProjects: allProjectsReducer,
- project: projectByIdReducer,
- userProjects: projectsByUserReducer,
- projectMembers: projectMembershipReducer,
- allTeams: allTeamsReducer,
- team: teamByIdReducer,
- teamMembers: teamMembershipReducer,
- allTimeEntries: allTimeEntriesReducer,
- userTimeEntries: timeEntriesForSpecifiedPeriodReducer,
- projectTimeEntries: timeEntriesForSpecifiedProjectReducer,
- requestStatus: handleSuccessReducer
-
+ //project: projectByIdReducer,
+ //userProjects: projectsByUserReducer,
+ //projectMembers: projectMembershipReducer,
+ //allTeams: allTeamsReducer,
+ //team: teamByIdReducer,
+ //teamMembers: teamMembershipReducer,
+ //allTimeEntries: allTimeEntriesReducer,
+ //userTimeEntries: timeEntriesForSpecifiedPeriodReducer,
+ //projectTimeEntries: timeEntriesForSpecifiedProjectReducer,
+ //requestStatus: handleSuccessReducer,
+ errors: errorsReducer
})
-
diff --git a/src/reducers/leaderboardDataReducer.js b/src/reducers/leaderboardDataReducer.js
new file mode 100644
index 0000000000..2aa45912ca
--- /dev/null
+++ b/src/reducers/leaderboardDataReducer.js
@@ -0,0 +1,7 @@
+export const leaderboardDataReducer = (leaderBoardData = [], action) => {
+ if (action.type === 'GET_LEADERBOARD_DATA') {
+ return action.payload
+ }
+
+ return leaderBoardData
+}
diff --git a/src/reducers/monthlyDashboardDataReducer.js b/src/reducers/monthlyDashboardDataReducer.js
new file mode 100644
index 0000000000..c1f19692ce
--- /dev/null
+++ b/src/reducers/monthlyDashboardDataReducer.js
@@ -0,0 +1,10 @@
+export const monthlyDashboardDataReducer = (
+ monthlyDashboardData = null,
+ action,
+) => {
+ if (action.type === 'GET_MONTHLY_DASHBOARD_DATA') {
+ return action.payload;
+ }
+
+ return monthlyDashboardData;
+};
diff --git a/src/reducers/notificationsReducer.js b/src/reducers/notificationsReducer.js
new file mode 100644
index 0000000000..0bb2b7cc38
--- /dev/null
+++ b/src/reducers/notificationsReducer.js
@@ -0,0 +1,7 @@
+export const notificationsReducer = (notifications = null, action) => {
+ if (action.type === 'GET_NOTIFICATIONS') {
+ return action.payload;
+ }
+
+ return notifications;
+};
diff --git a/src/reducers/projectByIdReducer.js b/src/reducers/projectByIdReducer.js
new file mode 100644
index 0000000000..add4101b58
--- /dev/null
+++ b/src/reducers/projectByIdReducer.js
@@ -0,0 +1,7 @@
+export const projectByIdReducer = (project = null, action) => {
+ if (action.type === 'GET_PROJECT_BY_ID') {
+ return action.payload;
+ }
+
+ return project;
+};
diff --git a/src/reducers/projectMembershipReducer.js b/src/reducers/projectMembershipReducer.js
new file mode 100644
index 0000000000..65c27dbc6a
--- /dev/null
+++ b/src/reducers/projectMembershipReducer.js
@@ -0,0 +1,25 @@
+import * as types from './../constants/projectMembership'
+
+const allMembershipInital = {
+ projectName: '',
+ fetching: false,
+ fetched: false,
+ members: [],
+ error: "200"
+}
+
+
+export const projectMembershipReducer = (allMembership = allMembershipInital, action) => {
+ switch (action.type) {
+ case types.FETCH_MEMBERS_START:
+ return { ...allMembership, fetching: true }
+ break;
+ case types.FETCH_MEMBERS_ERROR:
+ return { ...allMembership, fetched: true, fetching: false, error: action.err }
+ break;
+ case types.RECEIVE_MEMBERS:
+ return { ...allMembership, members: action.members, fetched: true, fetching: false }
+ break;
+ }
+ return allMembership;
+};
diff --git a/src/reducers/projectsByUserReducer.js b/src/reducers/projectsByUserReducer.js
new file mode 100644
index 0000000000..db6856b4e0
--- /dev/null
+++ b/src/reducers/projectsByUserReducer.js
@@ -0,0 +1,7 @@
+export const projectsByUserReducer = (projects = null, action) => {
+ if (action.type === 'GET_PROJECTS_BY_USER') {
+ return action.payload;
+ }
+
+ return projects;
+};
diff --git a/src/reducers/teamByIdReducer.js b/src/reducers/teamByIdReducer.js
new file mode 100644
index 0000000000..b2dc67b99e
--- /dev/null
+++ b/src/reducers/teamByIdReducer.js
@@ -0,0 +1,7 @@
+export const teamByIdReducer = (team = null, action) => {
+ if (action.type === 'GET_TEAM_BY_ID') {
+ return action.payload;
+ }
+
+ return team;
+};
diff --git a/src/reducers/teamMembershipReducer.js b/src/reducers/teamMembershipReducer.js
new file mode 100644
index 0000000000..37020b5123
--- /dev/null
+++ b/src/reducers/teamMembershipReducer.js
@@ -0,0 +1,7 @@
+export const teamMembershipReducer = (members = null, action) => {
+ if (action.type === 'GET_TEAM_MEMBERSHIP') {
+ return action.payload;
+ }
+
+ return members;
+};
diff --git a/src/reducers/timeEntriesForSpecifiedPeriodReducer.js b/src/reducers/timeEntriesForSpecifiedPeriodReducer.js
new file mode 100644
index 0000000000..effe022117
--- /dev/null
+++ b/src/reducers/timeEntriesForSpecifiedPeriodReducer.js
@@ -0,0 +1,10 @@
+export const timeEntriesForSpecifiedPeriodReducer = (
+ timeEntries = null,
+ action,
+) => {
+ if (action.type === 'GET_TIME_ENTRY_FOR_SPECIFIED_PERIOD') {
+ return action.payload;
+ }
+
+ return timeEntries;
+};
diff --git a/src/reducers/timeEntriesForSpecifiedProjectReducer.js b/src/reducers/timeEntriesForSpecifiedProjectReducer.js
new file mode 100644
index 0000000000..efe8169ee4
--- /dev/null
+++ b/src/reducers/timeEntriesForSpecifiedProjectReducer.js
@@ -0,0 +1,10 @@
+export const timeEntriesForSpecifiedProjectReducer = (
+ timeEntries = null,
+ action,
+) => {
+ if (action.type === 'GET_TIME_ENTRY_FOR_SPECIFIED_PROJECT') {
+ return action.payload;
+ }
+
+ return timeEntries;
+};
diff --git a/src/reducers/userProfileByIdReducer.js b/src/reducers/userProfileByIdReducer.js
new file mode 100644
index 0000000000..a1784e3564
--- /dev/null
+++ b/src/reducers/userProfileByIdReducer.js
@@ -0,0 +1,25 @@
+import { GET_USER_PROFILE, EDIT_USER_PROFILE } from '../constants/userProfile'
+
+const initialUserProfileState = {
+ firstName: '',
+ lastName: '',
+ isActive: ''
+}
+export const userProfileByIdReducer = (userProfile = initialUserProfileState, action) => {
+ if (action.type === GET_USER_PROFILE) {
+ return action.payload
+ }
+
+ if (action.type === EDIT_USER_PROFILE) {
+ console.log('Payload is ', action.payload)
+
+ return { ...userProfile, ...action.payload }
+ //return userProfile
+ }
+
+ if (action.type === 'CLEAR_USER_PROFILE') {
+ return null
+ }
+
+ return userProfile
+}
diff --git a/src/reducers/userProjectMembersReducer.js b/src/reducers/userProjectMembersReducer.js
new file mode 100644
index 0000000000..9755251ea6
--- /dev/null
+++ b/src/reducers/userProjectMembersReducer.js
@@ -0,0 +1,7 @@
+export const userProjectMembersReducer = (projectMembers = null, action) => {
+ if (action.type === 'GET_USER_PROJECT_MEMBERS') {
+ return action.payload;
+ }
+
+ return projectMembers;
+};
diff --git a/src/reducers/userTeamMembersReducer.js b/src/reducers/userTeamMembersReducer.js
new file mode 100644
index 0000000000..d90210df01
--- /dev/null
+++ b/src/reducers/userTeamMembersReducer.js
@@ -0,0 +1,7 @@
+export const userTeamMembersReducer = (teamMembers = null, action) => {
+ if (action.type === 'GET_USER_TEAM_MEMBERS') {
+ return action.payload;
+ }
+
+ return teamMembers;
+};
diff --git a/src/reducers/weeklyDashboardDataReducer.js b/src/reducers/weeklyDashboardDataReducer.js
new file mode 100644
index 0000000000..55e57e5754
--- /dev/null
+++ b/src/reducers/weeklyDashboardDataReducer.js
@@ -0,0 +1,10 @@
+export const weeklyDashboardDataReducer = (
+ weeklyDashboardData = null,
+ action,
+) => {
+ if (action.type === 'GET_WEEKLY_DASHBOARD_DATA') {
+ return action.payload;
+ }
+
+ return weeklyDashboardData;
+};
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
index a3e6c0cfc1..df360c3d3c 100644
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -9,13 +9,13 @@
// This link also includes instructions on opting out of this behavior.
const isLocalhost = Boolean(
- window.location.hostname === 'localhost' ||
+ window.location.hostname === 'localhost'
// [::1] is the IPv6 localhost address.
- window.location.hostname === '[::1]' ||
+ || window.location.hostname === '[::1]'
// 127.0.0.1/8 is considered localhost for IPv4.
- window.location.hostname.match(
- /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
- )
+ || window.location.hostname.match(
+ /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/,
+ ),
);
export default function register() {
@@ -40,8 +40,8 @@ export default function register() {
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
- 'This web app is being served cache-first by a service ' +
- 'worker. To learn more, visit https://goo.gl/SC7cgQ'
+ 'This web app is being served cache-first by a service '
+ + 'worker. To learn more, visit https://goo.gl/SC7cgQ',
);
});
} else {
@@ -55,7 +55,7 @@ export default function register() {
function registerValidSW(swUrl) {
navigator.serviceWorker
.register(swUrl)
- .then(registration => {
+ .then((registration) => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
installingWorker.onstatechange = () => {
@@ -76,7 +76,7 @@ function registerValidSW(swUrl) {
};
};
})
- .catch(error => {
+ .catch((error) => {
console.error('Error during service worker registration:', error);
});
}
@@ -84,14 +84,14 @@ function registerValidSW(swUrl) {
function checkValidServiceWorker(swUrl) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl)
- .then(response => {
+ .then((response) => {
// Ensure service worker exists, and that we really are getting a JS file.
if (
- response.status === 404 ||
- response.headers.get('content-type').indexOf('javascript') === -1
+ response.status === 404
+ || response.headers.get('content-type').indexOf('javascript') === -1
) {
// No service worker found. Probably a different app. Reload the page.
- navigator.serviceWorker.ready.then(registration => {
+ navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then(() => {
window.location.reload();
});
@@ -103,14 +103,14 @@ function checkValidServiceWorker(swUrl) {
})
.catch(() => {
console.log(
- 'No internet connection found. App is running in offline mode.'
+ 'No internet connection found. App is running in offline mode.',
);
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
- navigator.serviceWorker.ready.then(registration => {
+ navigator.serviceWorker.ready.then((registration) => {
registration.unregister();
});
}
diff --git a/src/routes.js b/src/routes.js
index 81bd58ece3..6c038f291e 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,37 +1,38 @@
-import React from 'react';
-import Timelog from './components/Timelog';
-import Reports from './components/Reports';
+import React from 'react'
+import { Route, Switch } from 'react-router-dom'
+import { ToastContainer } from 'react-toastify'
+import Timelog from './components/Timelog'
+import Reports from './components/Reports'
import UserProfile from './components/UserProfile'
-import {Route, Switch} from 'react-router-dom';
import Dashboard from './components/Dashboard'
-import {Logout} from './components/Logout';
-import Login from './components/Login';
-import ForcePasswordUpdate from './components/ForcePasswordUpdate';
+import { Logout } from './components/Logout/Logout'
+import Login from './components/Login'
+import ForcePasswordUpdate from './components/ForcePasswordUpdate'
import ProtectedRoute from './components/common/ProtectedRoute'
import UpdatePassword from './components/UpdatePassword'
import Header from './components/Header'
-import { ToastContainer } from "react-toastify";
-import "react-toastify/dist/ReactToastify.css";
-
+import Projects from './components/Projects'
+import Members from './components/Projects/Members'
+import 'react-toastify/dist/ReactToastify.css'
export default (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-);
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+)
diff --git a/src/services/__mocks__/loginService.js b/src/services/__mocks__/loginService.js
index 35c2bed78a..0734afa73f 100644
--- a/src/services/__mocks__/loginService.js
+++ b/src/services/__mocks__/loginService.js
@@ -1,32 +1,24 @@
let getCurrentUser_result;
-let getCurrentUseroptions =
- {
- "userPresent" : {foo: "bar" , baz : "masklsd"},
- "userNotPresent" : null,
- "headerTest" : {
- name: "Foobar",
- profilePic: undefined,
- userId: "5be0952c633dae0016081b4b"
- }
+const getCurrentUseroptions = {
+ userPresent: { foo: 'bar', baz: 'masklsd' },
+ userNotPresent: null,
+ headerTest: {
+ name: 'Foobar',
+ profilePic: undefined,
+ userId: '5be0952c633dae0016081b4b',
+ },
- };
+};
getCurrentUser.__setValue = (option) => {
+ getCurrentUser_result = getCurrentUseroptions[option];
+};
- getCurrentUser_result = getCurrentUseroptions[option];
-
+export function getCurrentUser() {
+ return getCurrentUser_result;
}
-export function getCurrentUser()
-{
- return getCurrentUser_result ;
-
+export function login(credentials) {
+ console.log('Invoking fake login method of loginService');
+ return 'Success';
}
-
-export function login(credentials)
-{
- console.log("Invoking fake login method of loginService")
- return "Success"
-
-
-}
\ No newline at end of file
diff --git a/src/services/__mocks__/userProfileService.js b/src/services/__mocks__/userProfileService.js
index 9971c4e23c..15965d9a87 100644
--- a/src/services/__mocks__/userProfileService.js
+++ b/src/services/__mocks__/userProfileService.js
@@ -1,22 +1,17 @@
let getUserProfile_result;
-let getUserProfileOptions =
- {
- "userProfile" : {
- name: "Foobar",
- profilePic: undefined,
- userId: "5be0952c633dae0016081b4b"
- }
+const getUserProfileOptions = {
+ userProfile: {
+ name: 'Foobar',
+ profilePic: undefined,
+ userId: '5be0952c633dae0016081b4b',
+ },
- };
+};
getUserProfile.__setValue = (option) => {
+ getUserProfile_result = getUserProfileOptions[option];
+};
- getUserProfile_result = getUserProfileOptions[option];
-
+export function getUserProfile() {
+ return getUserProfile_result;
}
-
-export function getUserProfile()
-{
- return getUserProfile_result;
-
-}
\ No newline at end of file
diff --git a/src/services/dashBoardService.js b/src/services/dashBoardService.js
index 6cd08a28fb..52989c8de2 100644
--- a/src/services/dashBoardService.js
+++ b/src/services/dashBoardService.js
@@ -1,10 +1,9 @@
-import httpService from './httpService'
+import httpService from './httpService';
-//const ApiEndpoint = `https://hgn-rest-dev.herokuapp.com/api/dashboard`;
-const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/dashboard`;
+// const ApiEndpoint = `https://hgn-rest-dev.herokuapp.com/api/dashboard`;
+const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/dashboard`;
-export function getLeaderboardData(userId)
-{
- return httpService.get(`${ApiEndpoint}/leaderboard/${userId}`)
+export function getLeaderboardData(userId) {
+ return httpService.get(`${ApiEndpoint}/leaderboard/${userId}`);
}
diff --git a/src/services/forcePasswordUpdate.js b/src/services/forcePasswordUpdate.js
index 88236ab868..8cb8fa6a88 100644
--- a/src/services/forcePasswordUpdate.js
+++ b/src/services/forcePasswordUpdate.js
@@ -1,9 +1,7 @@
-import httpService from './httpService'
+import httpService from './httpService';
-const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/forcepassword`;
+const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/forcepassword`;
-export function forcePasswordUpdate(data)
-{
- return httpService.patch(ApiEndpoint, data);
-
-}
\ No newline at end of file
+// export function forcePasswordUpdate(data) {
+// return httpService.patch(ApiEndpoint, data);
+// }
diff --git a/src/services/httpService.js b/src/services/httpService.js
index 5d7c99192b..8b46d6ec83 100644
--- a/src/services/httpService.js
+++ b/src/services/httpService.js
@@ -1,22 +1,26 @@
-import axios from 'axios'
-import {toast} from 'react-toastify'
-import logService from './logService'
+import axios from 'axios';
+import { toast } from 'react-toastify';
+import logService from './logService';
axios.defaults.headers.post['Content-Type'] = 'application/json';
-axios.interceptors.response.use(null, error => {
+axios.interceptors.response.use(null, (error) => {
if (!(error.response && error.response.status >= 400 && error.response.status <= 500)) {
- logService.logError(error)
- toast.error("Unexpected error")
+ logService.logError(error);
+ toast.error('Unexpected error');
}
- return Promise.reject(error)
-})
+ return Promise.reject(error);
+});
-function setjwt(jwt)
-{
- axios.defaults.headers.common["Authorization"]= jwt
+function setjwt(jwt) {
+ if (jwt){
+ axios.defaults.headers.common.Authorization = jwt;
+ }
+ else {
+ delete axios.defaults.headers.common['Authorization'];
+ }
}
export default {
@@ -25,5 +29,5 @@ export default {
delete: axios.delete,
patch: axios.patch,
put: axios.put,
- setjwt: setjwt
-}
+ setjwt,
+};
diff --git a/src/services/logService.js b/src/services/logService.js
index 99392bac3f..89fb19bd31 100644
--- a/src/services/logService.js
+++ b/src/services/logService.js
@@ -1,23 +1,22 @@
import * as Sentry from '@sentry/browser';
function init() {
-
- Sentry.init({
- dsn: process.env.REACT_APP_SENTRY_URL
- });
+ Sentry.init({
+ dsn: process.env.REACT_APP_SENTRY_URL,
+ });
}
function logError(error) {
- Sentry.captureException(error)
+ Sentry.captureException(error);
}
function logInfo(message) {
- Sentry.captureMessage(message)
+ Sentry.captureMessage(message);
}
export default {
- init,
- logError,
- logInfo
+ init,
+ logError,
+ logInfo,
-}
\ No newline at end of file
+};
diff --git a/src/services/loginService.js b/src/services/loginService.js
index b6455d8d1e..7a68072a3c 100644
--- a/src/services/loginService.js
+++ b/src/services/loginService.js
@@ -1,45 +1,41 @@
-import httpService from './httpService'
-import config from "../config.json"
-import jwtDecode from 'jwt-decode'
+import jwtDecode from 'jwt-decode';
+import httpService from './httpService';
+import config from '../config.json';
const loginApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/login`;
-const tokenKey = config.tokenKey;
-
-httpService.setjwt(getjwt());
-
-export async function login(credentials) {
- let { data } = await httpService.post(loginApiEndpoint, credentials);
- if (!!data.new) {
- return { userType: "newUser", userId: data.userId };
- } else {
- localStorage.setItem(tokenKey, data.token);
- return;
- }
-}
-
-export function logout() {
- localStorage.removeItem(tokenKey);
-}
-
-export function getCurrentUser() {
- return isUserAuthenticated()
- ? jwtDecode(localStorage.getItem(tokenKey))
- : null;
-}
-export function loginWithJWT(jwt) {
- localStorage.setItem(tokenKey, jwt);
-}
-
-export function getjwt() {
- return localStorage.getItem(tokenKey) ? localStorage.getItem(tokenKey) : null;
-}
-
-export function isUserAuthenticated() {
- if (!localStorage.getItem(tokenKey)) {
- return false;
- }
- let token = localStorage.getItem(tokenKey);
- let { expiryTimestamp } = jwtDecode(token);
- return expiryTimestamp > new Date().toISOString();
-}
+const { tokenKey } = config;
+
+// export async function login(credentials) {
+// const { data } = await httpService.post(loginApiEndpoint, credentials);
+// if (data.new) {
+// return { userType: 'newUser', userId: data.userId };
+// }
+// localStorage.setItem(tokenKey, data.token);
+// }
+
+// export function logout() {
+// localStorage.removeItem(tokenKey);
+// }
+
+// export function getCurrentUser() {
+// return isUserAuthenticated()
+// ? jwtDecode(localStorage.getItem(tokenKey))
+// : null;
+// }
+// export function loginWithJWT(jwt) {
+// localStorage.setItem(tokenKey, jwt);
+// }
+
+// export function getjwt() {
+// return localStorage.getItem(tokenKey) ? localStorage.getItem(tokenKey) : null;
+// }
+
+// export function isUserAuthenticated() {
+// if (!localStorage.getItem(tokenKey)) {
+// return false;
+// }
+// const token = localStorage.getItem(tokenKey);
+// const { expiryTimestamp } = jwtDecode(token);
+// return expiryTimestamp > new Date().toISOString();
+// }
diff --git a/src/services/projectService.js b/src/services/projectService.js
index 0df38302b9..7a337d2e1d 100644
--- a/src/services/projectService.js
+++ b/src/services/projectService.js
@@ -1,9 +1,8 @@
-import httpService from './httpService'
+import httpService from './httpService';
-const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/projects`;
+const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/projects`;
-export function getAllProjects()
-{
- return httpService.get(`${ApiEndpoint}`)
-}
\ No newline at end of file
+export function getAllProjects() {
+ return httpService.get(`${ApiEndpoint}`);
+}
diff --git a/src/services/teamService.js b/src/services/teamService.js
index 91db0daa52..1038dc88cc 100644
--- a/src/services/teamService.js
+++ b/src/services/teamService.js
@@ -1,9 +1,8 @@
-import httpService from './httpService'
+import httpService from './httpService';
-const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/team`;
+const ApiEndpoint = `${process.env.REACT_APP_APIENDPOINT}/team`;
-export function getAllTeams()
-{
- return httpService.get(`${ApiEndpoint}`)
+export function getAllTeams() {
+ return httpService.get(`${ApiEndpoint}`);
}
diff --git a/src/services/userProfileService.js b/src/services/userProfileService.js
index 4319d87cc4..4b2e705e15 100644
--- a/src/services/userProfileService.js
+++ b/src/services/userProfileService.js
@@ -1,26 +1,15 @@
+import httpService from './httpService'
-import httpService from "./httpService"
+const APIEndPoint = `${process.env.REACT_APP_APIENDPOINT}/userprofile`
-const APIEndPoint = `${process.env.REACT_APP_APIENDPOINT}/userprofile`;
+// export function getUserProfile(userId) {
+// return httpService.get(`${APIEndPoint}/${userId}`)
+// }
+// export function editUserProfileData(user, userId) {}
- export function getUserProfile(userId)
- {
- return httpService.get(`${APIEndPoint}/${userId}`)
- }
-
- export function editUserProfileData(user, userId)
- {
- }
+// export function postUserProfileData(user) {}
- export function postUserProfileData(user)
- {
- }
-
-
- export function updatePassword(userId, newpassworddata) {
-
- return httpService.patch(`${APIEndPoint}/${userId}/updatePassword`,newpassworddata);
-
-
- }
\ No newline at end of file
+// export function updatePassword(userId, newpassworddata) {
+// return httpService.patch(`${APIEndPoint}/${userId}/updatePassword`, newpassworddata)
+// }
diff --git a/src/setupTests.js b/src/setupTests.js
index fdbaaca6fa..8aa5e98ae9 100644
--- a/src/setupTests.js
+++ b/src/setupTests.js
@@ -3,4 +3,4 @@ import Adapter from 'enzyme-adapter-react-16';
configure({ adapter: new Adapter() });
-//window.alert = ((msg)=> console.log(msg))
+// window.alert = ((msg)=> console.log(msg))
diff --git a/src/store.js b/src/store.js
index bff6ca9fcd..20615f4fc1 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,18 +1,37 @@
-import { createStore, applyMiddleware, compose } from "redux";
-import thunk from "redux-thunk";
-import reducers from "./reducers";
+import { createStore, applyMiddleware, compose } from 'redux';
+import { persistStore, persistReducer } from 'redux-persist'
+import storage from 'redux-persist/lib/storage' // defaults to localStorage for web
+
+import thunk from 'redux-thunk';
+import reducers from './reducers';
const middleware = [thunk];
-const intialState = {}
-const devTools = window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : (f) => f;
-
-const store = createStore(
- reducers,
- intialState,
- compose(
- applyMiddleware(...middleware),
- devTools
- )
-);
-
-export default store;
\ No newline at end of file
+const intialState = {};
+const devTools = window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f;
+
+
+const persistConfig = {
+ key: 'root',
+ storage,
+ blacklist: ['auth', 'errors']
+}
+
+const persistedReducer = persistReducer(persistConfig, reducers)
+
+
+
+
+export default () => {
+ const store = createStore(
+ persistedReducer,
+ intialState,
+ compose(
+ applyMiddleware(...middleware),
+ devTools,
+ ),
+ );
+ let persistor = persistStore(store)
+ return { store, persistor }
+}
+
+// export default store;
diff --git a/src/utils/URL.js b/src/utils/URL.js
new file mode 100644
index 0000000000..c2298a60f2
--- /dev/null
+++ b/src/utils/URL.js
@@ -0,0 +1,13 @@
+const APIEndpoint = process.env.REACT_APP_APIENDPOINT
+
+export const ENDPOINTS = {
+ USER_PROFILE: userId => `${APIEndpoint}/userprofile/${userId}`,
+ USER_TEAM: userId => `${APIEndpoint}/userprofile/teammembers/${userId}`,
+ LOGIN: `${APIEndpoint}/login`,
+ PROJECTS: () => `${APIEndpoint}/projects`,
+ PROJECT: () => `${APIEndpoint}/project/`,
+ PROJECT_MEMBER: projectId => `${APIEndpoint}/project/${projectId}/users`,
+ UPDATE_PASSWORD: userId => `${APIEndpoint}/userprofile/${userId}/updatePassword`,
+ FORCE_PASSWORD: `${APIEndpoint}/forcepassword`,
+ LEADER_BOARD: userId => `${APIEndpoint}/dashboard/leaderboard/${userId}`
+}
diff --git a/src/utils/effortColors.js b/src/utils/effortColors.js
new file mode 100644
index 0000000000..611b898e71
--- /dev/null
+++ b/src/utils/effortColors.js
@@ -0,0 +1,13 @@
+import _ from 'lodash'
+const getcolor = effort => {
+ let color = 'purple'
+ if (_.inRange(effort, 0, 5)) color = 'red'
+ if (_.inRange(effort, 5, 10)) color = 'orange'
+ if (_.inRange(effort, 10, 20)) color = 'green'
+ if (_.inRange(effort, 20, 30)) color = 'blue'
+ if (_.inRange(effort, 30, 40)) color = 'indigo'
+ if (_.inRange(effort, 40, 50)) color = 'violet'
+ return color
+}
+
+export default getcolor