From 85d95c647228e9c7d2498ed763e9d1f355f5909a Mon Sep 17 00:00:00 2001 From: itzjohn Date: Fri, 5 Nov 2021 20:14:45 -0400 Subject: [PATCH 01/68] test --- test.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.js diff --git a/test.js b/test.js new file mode 100644 index 0000000..e69de29 From 735bbb3095da515bf58804cb2b50695234f2b6d1 Mon Sep 17 00:00:00 2001 From: jwmaguire15 Date: Fri, 5 Nov 2021 20:40:27 -0400 Subject: [PATCH 02/68] FIRST COMMIT git push origin dev :wq --- .gitignore | 3 +++ index.html | 13 +++++++++++ package.json | 57 +++++++++++++++++++++++++++++++++++++++++++++++ test.js | 0 webpack.config.js | 46 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 .gitignore create mode 100644 index.html create mode 100644 package.json delete mode 100644 test.js create mode 100644 webpack.config.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..af068e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules +package-lock.json +.DS_STORE \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 0000000..678c362 --- /dev/null +++ b/index.html @@ -0,0 +1,13 @@ + + + + Halfway + + +
+ + + + + + diff --git a/package.json b/package.json new file mode 100644 index 0000000..1cd0543 --- /dev/null +++ b/package.json @@ -0,0 +1,57 @@ +{ + "name": "halfway", + "version": "1.0.0", + "description": "A tool for people to meet halfway", + "main": "index.js", + "scripts": { + "start": "NODE_ENV=production nodemon server/server.js", + "build": "NODE_ENV=production webpack", + "dev": "NODE_ENV=development nodemon server/server.js & NODE_ENV=development webpack serve --open", + "gulp-prod": "node_modules/.bin/gulp prod", + "gulp-dev": "node_modules/.bin/gulp dev" + }, + "nodemonConfig": { + "ignore": [ + "build", + "client" + ] + }, + "author": "James Maguire, Cecily Jansen, Johnny Bryan, Yogi Paturu, John Lin", + "license": "ISC", + "dependencies": { + "@babel/plugin-transform-async-to-generator": "^7.16.0", + "@babel/runtime": "^7.16.0", + "axios": "^0.24.0", + "eslint": "^8.1.0", + "express": "^4.12.3", + "pg": "^8.7.1", + "prop-types": "^15.6.1", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-redux": "^7.2.6", + "recharts": "^2.1.6", + "redux": "^4.1.2", + "redux-devtools-extension": "^2.13.9", + "redux-thunk": "^2.4.0" + }, + "devDependencies": { + "@babel/core": "^7.16.0", + "@babel/plugin-transform-runtime": "^7.16.0", + "@babel/preset-env": "^7.16.0", + "@babel/preset-react": "^7.16.0", + "babel-core": "^6.26.3", + "babel-loader": "^8.2.3", + "concurrently": "^6.0.2", + "cross-env": "^7.0.3", + "css-loader": "^6.5.0", + "html-webpack-plugin": "^5.5.0", + "isomorphic-fetch": "^3.0.0", + "nodemon": "^2.0.7", + "sass": "^1.43.4", + "sass-loader": "^12.3.0", + "style-loader": "^3.3.1", + "webpack": "^5.61.0", + "webpack-cli": "^4.8.0", + "webpack-dev-server": "^4.4.0" + } +} diff --git a/test.js b/test.js deleted file mode 100644 index e69de29..0000000 diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..3d1c249 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,46 @@ +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const path = require('path'); + +module.exports = { + mode: process.env.NODE_ENV, + entry: { + index: './client/index.js' + }, + output: { + filename: 'bundle.js', + path: path.resolve(__dirname, 'build') + }, + devServer: { + static: { + directory: path.resolve(__dirname, 'build'), + publicPath: './build', + }, + proxy: { + '/': 'http://localhost:3000' + }, + }, + plugins: [new HtmlWebpackPlugin({ + template: './index.html', + })], + module: { + rules: [{ + test: /\.jsx?/, + exclude: /(node_modules)/, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env', '@babel/preset-react'], + plugins: ['@babel/plugin-transform-runtime', '@babel/transform-async-to-generator'], + } + }, + }, + { + test: /\.s[ac]ss$/i, + use: ['style-loader', 'css-loader', 'sass-loader'] + } + ] + }, + resolve: { + extensions: ['.js', '.jsx'], + }, +}; \ No newline at end of file From a7476dc6a34b72a4a840b4774f14f783d92c336f Mon Sep 17 00:00:00 2001 From: jwmaguire15 Date: Fri, 5 Nov 2021 21:07:44 -0400 Subject: [PATCH 03/68] test --- test.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.js diff --git a/test.js b/test.js new file mode 100644 index 0000000..e69de29 From 53bbadd93c57492ca93d78515381b0b5d17c70ca Mon Sep 17 00:00:00 2001 From: YogiPaturu Date: Sat, 6 Nov 2021 09:39:43 -0500 Subject: [PATCH 04/68] test commit --- test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test.js b/test.js index e69de29..b9ee7a5 100644 --- a/test.js +++ b/test.js @@ -0,0 +1 @@ +// test test \ No newline at end of file From 6f20fb8fde64a9858f2bb6f87183788691af2b3a Mon Sep 17 00:00:00 2001 From: YogiPaturu Date: Sat, 6 Nov 2021 11:22:53 -0500 Subject: [PATCH 05/68] Condition rendering functional --- build/bundle.js | 2 ++ build/bundle.js.LICENSE.txt | 41 ++++++++++++++++++++++++++++++ build/index.html | 1 + client/App.jsx | 19 ++++++++++++++ client/actions/actions.js | 18 +++++++++++++ client/components/Access.jsx | 29 +++++++++++++++++++++ client/components/Main.jsx | 1 + client/constants/actionTypes.js | 3 +++ client/index.js | 12 +++++++++ client/reducers/combineReducer.js | 6 +++++ client/reducers/mainPageReducer.js | 30 ++++++++++++++++++++++ client/store.js | 11 ++++++++ index.html | 4 +-- package.json | 6 +++++ test.js | 1 - webpack.config.js | 2 +- 16 files changed, 182 insertions(+), 4 deletions(-) create mode 100644 build/bundle.js create mode 100644 build/bundle.js.LICENSE.txt create mode 100644 build/index.html create mode 100644 client/App.jsx create mode 100644 client/actions/actions.js create mode 100644 client/components/Access.jsx create mode 100644 client/components/Main.jsx create mode 100644 client/constants/actionTypes.js create mode 100644 client/index.js create mode 100644 client/reducers/combineReducer.js create mode 100644 client/reducers/mainPageReducer.js create mode 100644 client/store.js delete mode 100644 test.js diff --git a/build/bundle.js b/build/bundle.js new file mode 100644 index 0000000..18829fd --- /dev/null +++ b/build/bundle.js @@ -0,0 +1,2 @@ +/*! For license information please see bundle.js.LICENSE.txt */ +(()=>{var e={217:()=>{},679:(e,t,n)=>{"use strict";var r=n(864),l={childContextTypes:!0,contextType:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,getDerivedStateFromError:!0,getDerivedStateFromProps:!0,mixins:!0,propTypes:!0,type:!0},a={name:!0,length:!0,prototype:!0,caller:!0,callee:!0,arguments:!0,arity:!0},o={$$typeof:!0,compare:!0,defaultProps:!0,displayName:!0,propTypes:!0,type:!0},u={};function i(e){return r.isMemo(e)?o:u[e.$$typeof]||l}u[r.ForwardRef]={$$typeof:!0,render:!0,defaultProps:!0,displayName:!0,propTypes:!0},u[r.Memo]=o;var c=Object.defineProperty,s=Object.getOwnPropertyNames,f=Object.getOwnPropertySymbols,d=Object.getOwnPropertyDescriptor,p=Object.getPrototypeOf,h=Object.prototype;e.exports=function e(t,n,r){if("string"!=typeof n){if(h){var l=p(n);l&&l!==h&&e(t,l,r)}var o=s(n);f&&(o=o.concat(f(n)));for(var u=i(t),m=i(n),y=0;y{"use strict";var t=Object.getOwnPropertySymbols,n=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;function l(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map((function(e){return t[e]})).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach((function(e){r[e]=e})),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(e){return!1}}()?Object.assign:function(e,a){for(var o,u,i=l(e),c=1;c{"use strict";var r=n(414);function l(){}function a(){}a.resetWarningCache=l,e.exports=function(){function e(e,t,n,l,a,o){if(o!==r){var u=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw u.name="Invariant Violation",u}}function t(){return e}e.isRequired=e;var n={array:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,elementType:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t,checkPropTypes:a,resetWarningCache:l};return n.PropTypes=n,n}},697:(e,t,n)=>{e.exports=n(703)()},414:e=>{"use strict";e.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},448:(e,t,n)=>{"use strict";var r=n(294),l=n(418),a=n(840);function o(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,n=1;n