First working production release

* change requirements & issues ui in new project setup (#51) * change requirements & issues ui in new project setup * use icons as buttons in requirements & issues * add color to checked radio label * add theme & alert.js files code * remove css for image radio buttons * add dropdown filter for global admin (#55) * add dropdown filter for global admin * change isAdmin values * show filter for super admin * Fix the redux (#59) * Initial placeholder changes * Data table for release * Add Edit Release placeholder * View release UI changes * Intial redux setup for using datamesh * GET devpartner and project service * GET queries using Datamesh * code cleanup part 1 * code cleanup part 2 * code cleanup part 3 * Fix the redux (service queries) * Add overflow menu (Kanban view) * add overflow menu to cards * add edit & delete options for cards in overflow menu * Fix lint problems Co-authored-by: RadhikaPPatel <70138493+RadhikaPPatel@users.noreply.github.com> * Modify feature and issues form * update feature & issue form * remove options for tag field * Integration with BE (Product, Features, Issues, Convert to Issue) (#65) * Integrate create product with BE * Integrate features for BE * Integrate issues with BE * Integrate convert to issues to BE * User redirect to forms based on user type * show different forms for developer and product team * change user type to select text field * resolve linting errors * update user survey_status after filling product/developer forms * based on survey_status show form or dashboard * update user in context after user patch request * Changes for user form redirect Co-authored-by: RadhikaPPatel <70138493+RadhikaPPatel@users.noreply.github.com> * show select field when user selects separate updates (#75) * Feat#82/fetch credentials to do crud on third party tools (#86) * Changes for feature board and column list of the tool * Handle github login * Remove board id from the request * fetch credentials to create edit delete on third party tools * disable submit when org value is not entered * resolve useEffect not triggering while delete action * Delete yarn-error.log * show time estimate for kanban issue view * disable submit if tool board not entered * fetch creds before submitting * show convert to issue for every feature Co-authored-by: RadhikaPPatel <70138493+RadhikaPPatel@users.noreply.github.com> * Change logo and theme * change logo & color scheme * change register & login pages logo * change top bar logo size * change new logo name to insights-logo * Dashboard UI changes * Changes for feature board and column list of the tool * Handle github login * Remove board id from the request * fetch credentials to create edit delete on third party tools * disable submit when org value is not entered * resolve useEffect not triggering while delete action * Delete yarn-error.log * show time estimate for kanban issue view * add comment section, estimated date & associated feature * Update AddComments.js * change to pointer on comment icon * Adding Google Ad Tag. * View Feature On Name. * update status on drag and drop * Fix for ad tag. * Linter Issues Fix. * Fixing View URL & Pointer Icon * navbar changes * UI Changes. Co-authored-by: RadhikaPPatel <70138493+RadhikaPPatel@users.noreply.github.com> Co-authored-by: Siddharth Bhansali <siddharth.bhansali@ajackus.com> Co-authored-by: RadhikaPPatel <radhika.patel@ajackus.com> * Popover For Issue Details * Feat#87/multi step feat form, showing issue suggestions, auto-create issues (#93) * check if same feature exists & show validation * multi-step feature form * show disabled describe form on view feature * resolve error while adding feature * show confirm modal only when data is edited * when confirm modal closed route dashboard * retain step one form details while creating feature * retain repo value while editing issue * retain column name while creating feature * retain tool board value while creating feature * show issue suggestions & option to auto-create issue * hide convert to issue for features which are already issues * set repository according to the product repos * auto create no of issue tickets shown * add issue and feature while creating data * retain org value in issue form * show loader when data is loading * show progress bar based on kanban status * show loader when data is loading in user dashboard * Stripe integration for customer create and get card details (#100) * initial stripe integration changes for registration page * stripe changes for social login option * add stripe env variable to container * Configure project board on insights and other products (#103) * check if same feature exists & show validation * multi-step feature form * show disabled describe form on view feature * resolve error while adding feature * show confirm modal only when data is edited * when confirm modal closed route dashboard * retain step one form details while creating feature * retain repo value while editing issue * retain column name while creating feature * retain tool board value while creating feature * show issue suggestions & option to auto-create issue * hide convert to issue for features which are already issues * set repository according to the product repos * auto create no of issue tickets shown * add issue and feature while creating data * retain org value in issue form * show loader when data is loading * show progress bar based on kanban status * show loader when data is loading in user dashboard * configure project tool board for insights and third party tools * import tickets from third party tools * remove duplicate action * update kanban.js * Feat#87/Resolve issues while creating/updating issues (#106) * check if same feature exists & show validation * multi-step feature form * show disabled describe form on view feature * resolve error while adding feature * show confirm modal only when data is edited * when confirm modal closed route dashboard * retain step one form details while creating feature * retain repo value while editing issue * retain column name while creating feature * retain tool board value while creating feature * show issue suggestions & option to auto-create issue * hide convert to issue for features which are already issues * set repository according to the product repos * auto create no of issue tickets shown * add issue and feature while creating data * retain org value in issue form * show loader when data is loading * show progress bar based on kanban status * show loader when data is loading in user dashboard * configure project tool board for insights and third party tools * import tickets from third party tools * remove duplicate action * update kanban.js * remove board and col from issue form * Feat#87/Retain column value (#107) * check if same feature exists & show validation * multi-step feature form * show disabled describe form on view feature * resolve error while adding feature * show confirm modal only when data is edited * when confirm modal closed route dashboard * retain step one form details while creating feature * retain repo value while editing issue * retain column name while creating feature * retain tool board value while creating feature * show issue suggestions & option to auto-create issue * hide convert to issue for features which are already issues * set repository according to the product repos * auto create no of issue tickets shown * add issue and feature while creating data * retain org value in issue form * show loader when data is loading * show progress bar based on kanban status * show loader when data is loading in user dashboard * configure project tool board for insights and third party tools * import tickets from third party tools * remove duplicate action * update kanban.js * remove board and col from issue form * retain column value while editing * Feat#87/show import tickets button only if status is created (#108) * check if same feature exists & show validation * multi-step feature form * show disabled describe form on view feature * resolve error while adding feature * show confirm modal only when data is edited * when confirm modal closed route dashboard * retain step one form details while creating feature * retain repo value while editing issue * retain column name while creating feature * retain tool board value while creating feature * show issue suggestions & option to auto-create issue * hide convert to issue for features which are already issues * set repository according to the product repos * auto create no of issue tickets shown * add issue and feature while creating data * retain org value in issue form * show loader when data is loading * show progress bar based on kanban status * show loader when data is loading in user dashboard * configure project tool board for insights and third party tools * import tickets from third party tools * remove duplicate action * update kanban.js * remove board and col from issue form * retain column value while editing * if status show import button * show select column field when no feat org list (#109) * Resolve error while importing tickets in I & G Product (#114) * show select column field when no feat org list * send issue_detail while creating issue * change indentation * Show how to get access token link while creating new product (#115) * show select column field when no feat org list * send issue_detail while creating issue * change indentation * add links in create new product * change access token link color to white * give margin to MoreHoriz icon Co-authored-by: Radhika Patel <radhika.patel@ajackus.com> Co-authored-by: RadhikaPPatel <70138493+RadhikaPPatel@users.noreply.github.com> Co-authored-by: Siddharth Bhansali <siddharth.bhansali@ajackus.com>
buildly-release-management · Jun 15, 2022 · c8c7d14 · c8c7d14
1 parent 050e781
commit c8c7d14
Show file tree

Hide file tree

Showing 47 changed files with 4,041 additions and 910 deletions.
diff --git a/initialize_container.sh b/initialize_container.sh
@@ -11,6 +11,7 @@ RESULT+='", OAUTH_TOKEN_URL: "'$OAUTH_TOKEN_URL
 RESULT+='", GITHUB_CLIENT_ID: "'$GITHUB_CLIENT_ID
 RESULT+='", TRELLO_API_KEY: "'$TRELLO_API_KEY
 RESULT+='", FEEDBACK_SHEET: "'$FEEDBACK_SHEET
+RESULT+='", STRIPE_KEY: "'$STRIPE_KEY
 RESULT+='", PRODUCTION: '$PRODUCTION
 RESULT+='}'
 

diff --git a/package.json b/package.json
@@ -20,6 +20,8 @@
     "@mui/lab": "^5.0.0-alpha.61",
     "@mui/material": "^5.2.5",
     "@mui/styles": "^5.2.3",
+    "@stripe/react-stripe-js": "^1.7.2",
+    "@stripe/stripe-js": "^1.29.0",
     "@types/node": "^14.10.3",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",

diff --git a/src/assets/insights-logo.png b/src/assets/insights-logo.png
diff --git a/src/components/StripeCard/StripeCard.js b/src/components/StripeCard/StripeCard.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { CardElement } from '@stripe/react-stripe-js';
+import { FormControl, FormGroup, FormHelperText } from '@mui/material';
+import { makeStyles } from '@mui/styles';
+
+const elementStyles = {
+  base: {
+    iconColor: '#fff',
+    color: '#fff',
+    fontWeight: '500',
+    fontFamily: 'Roboto, Helvetica, Arial, sans-serif',
+    fontSize: '16px',
+    fontSmoothing: 'antialiased',
+    ':-webkit-autofill': {
+      color: '#fff',
+    },
+    '::placeholder': {
+      color: '#fff',
+    },
+  },
+  invalid: {
+    iconColor: '#832A24',
+    color: '#832A24',
+  },
+};
+
+const useStyles = makeStyles((theme) => ({
+  formGroup: {
+    margin: '0.3rem 0 1.8rem',
+  },
+  formControl: {
+    padding: '1rem 8px',
+    border: '1px dotted gray',
+  },
+  helperText: {
+    marginLeft: '8px',
+    color: 'red',
+  },
+}));
+
+const StripeCard = ({ cardError, setCardError }) => {
+  const classes = useStyles();
+
+  const onCardChange = (elementData) => {
+    if (elementData.error) {
+      setCardError(elementData.error.message);
+    } else if (!elementData.complete) {
+      setCardError('Card details cannot be empty');
+    } else {
+      setCardError('');
+    }
+  };
+
+  return (
+    <FormGroup className={classes.formGroup}>
+      <FormControl className={classes.formControl}>
+        <CardElement options={{ style: elementStyles }} onChange={onCardChange} />
+      </FormControl>
+      <FormHelperText className={classes.helperText}>
+        {cardError}
+      </FormHelperText>
+    </FormGroup>
+  );
+};
+
+export default StripeCard;
diff --git a/src/hooks/useInput.js b/src/hooks/useInput.js
@@ -6,6 +6,7 @@ export const useInput = (initialValue = '', validators = {}) => {
   return {
     value,
     required: validators.required,
+    ...(validators.productFeatures && { productFeatures: validators.productFeatures }),
     confirm: validators.confirm,
     ...(validators.confirm
       && validators.matchField && { matchField: validators.matchField.value }),

diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
+import { Elements } from '@stripe/react-stripe-js';
+import { loadStripe } from '@stripe/stripe-js';
 import App from './App';
 import './i18n';
 import configureStore from './redux/store';
@@ -23,10 +25,15 @@ if (window.env.PRODUCTION) {
 }
 
 const store = configureStore();
+// Make sure to call `loadStripe` outside of a component’s render to avoid
+// recreating the `Stripe` object on every render.
+const stripePromise = loadStripe(window.env.STRIPE_KEY);
 
 ReactDOM.render(
   <Provider store={store}>
-    <App />
+    <Elements stripe={stripePromise}>
+      <App />
+    </Elements>
   </Provider>,
   document.getElementById('root'),
 );
diff --git a/src/layout/Container/Container.js b/src/layout/Container/Container.js
@@ -4,7 +4,6 @@ import makeStyles from '@mui/styles/makeStyles';
 import { Container } from '@mui/material';
 import { UserContext, getUser } from '@context/User.context';
 import TopBar from '@layout/TopBar/TopBar';
-import NavBar from '@layout/NavBar/NavBar';
 import Dashboard from '@pages/Dashboard/Dashboard';
 import UserManagement from '@pages/UserManagement/UserManagement';
 import { routes } from '@routes/routesConstants';
@@ -44,12 +43,6 @@ const ContainerDashboard = ({ location, history }) => {
           location={location}
           history={history}
         />
-        {/* <NavBar
-          navHidden={navHidden}
-          setNavHidden={setNavHidden}
-          location={location}
-          history={history}
-        /> */}
         <Container className={classes.content}>
           <Switch>
             <Route
@@ -61,8 +54,8 @@ const ContainerDashboard = ({ location, history }) => {
             <Route path={routes.USER_MANAGEMENT} component={UserManagement} />
             <Route path={routes.NEW_PRODUCT} component={NewProduct} />
             <Route path={routes.DEVELOPER_FORM} component={DeveloperForm} />
-            {/* <Route exact path={`${routes.RELEASE}/view/:releaseID`} component={ViewRelease} /> */}
-            {/* <Route path={routes.RELEASE} component={Release} /> */}
+            <Route exact path={`${routes.RELEASE}/view/:releaseID`} component={ViewRelease} />
+            <Route path={routes.RELEASE} component={Release} />
           </Switch>
         </Container>
       </UserContext.Provider>

diff --git a/src/layout/NavBar/NavBar.js b/src/layout/NavBar/NavBar.js
diff --git a/src/layout/NavBar/NavBarConstants.js b/src/layout/NavBar/NavBarConstants.js