Resolved merge conflicts

Author: tsully

package.json

@@ -112,6 +112,7 @@
     "@material-ui/styles": "^4.9.6",
     "@types/enzyme": "^3.10.5",
     "@types/enzyme-adapter-react-16": "^1.0.6",
+    "@types/js-cookie": "^2.2.6",
     "@types/prettier": "^1.19.0",
     "@types/prismjs": "^1.16.0",
     "@types/react": "^16.8.14",
@@ -137,6 +138,7 @@
     "electron-splashscreen": "^1.0.0",
     "enzyme": "^3.4.1",
     "enzyme-adapter-react-16": "^1.2.0",
+    "js-cookie": "^2.2.1",
     "konva": "^4.2.0",
     "localforage": "^1.7.2",
     "lodash.throttle": "^4.1.1",

server/controllers/userController.js

@@ -7,17 +7,20 @@ const bcrypt = require('bcryptjs');
 
 userController.createUser = (req, res, next) => {
   console.log('Creating user...');
-  const { username, password } = req.body;
+  const { email, username, password } = req.body;
   // error handling if username or password is missing
   if (!username) {
     return res.status(400).json('No username input');
   }
+  if (!email) {
+    return res.status(400).json('No email input');
+  }
   if (!password) {
     return res.status(400).json('No password input');
   }
-  const projects = [];
+
   // create user using username and password
-  Users.create({ username, password, projects }, (err, newUser) => {
+  Users.create({ email, username, password, projects: [] }, (err, newUser) => {
     if (err) {
       return next({
         log: `Error in userController.createUser: ${err}`,

server/models/userModel.js

@@ -5,14 +5,14 @@ const Schema = mongoose.Schema;
 
 const userSchema = new Schema({
   username: { type: String, required: true, unique: true },
+  email: { type: String, required: true, unique: true },
   password: { type: String, required: true },
   projects: Array
 });
 
 // salt will go through 10 rounds of hashing
 const SALT_WORK_FACTOR = 10;
 const bcrypt = require('bcryptjs');
-const { session } = require('electron');
 
 // mongoose middleware that will run before the save to collection happens (user gets put into database)
 // cannot use arrow function here as context of 'this' is important

src/actionTypes/index.ts

@@ -41,7 +41,4 @@ export const UPDATE_CHILDREN_SORT: string = 'UPDATE_CHILDREN_SORT';
 export const UPDATE_CODE: string = 'UPDATE_CODE';
 export const UPDATE_HTML_ATTR: string = 'UPDATE_HTML_ATTR';
 
-export const SET_USERNAME: string = 'SET_USERNAME';
-export const SET_PASSWORD: string = 'SET_PASSWORD';
-export const LOGIN: string = 'LOGIN';
-export const SIGNUP: string = 'SIGNUP';
+export const SET_LOGIN_STATE: string = 'SET_LOGIN_STATE';

src/actions/actionCreators.ts

@@ -39,10 +39,7 @@ import {
   UNDO,
   UPDATE_HTML_ATTR,
   UPDATE_CODE,
-  SET_USERNAME,
-  SET_PASSWORD,
-  LOGIN,
-  SIGNUP
+  SET_LOGIN_STATE
 } from '../actionTypes/index';
 import { loadState } from '../localStorage';
 import createFiles from '../utils/createFiles.util';
@@ -333,28 +330,6 @@ export const updateHtmlAttr = ({
   payload: { attr, value }
 });
 
-export const setUsername = (username: string): Action => ({
-  type: SET_USERNAME,
-  payload: username
-});
-
-export const setPassword = (password: string): Action => ({
-  type: SET_PASSWORD,
-  payload: password
-})
-
-// export const login = (username: string, password: string) => ({
-//   return (dispatch: any) => {
-//     fetch('/login', {
-//       method: 'POST',
-//       body: JSON.stringify({ username, password })
-//     })
-//     .then(response => response.json())
-//     .then(data => console.log(data))
-//   }
-// })
-
-// export const signup = (username: string, password: string): Action => ({
-//   type: SIGNUP,
-//   payload: { username, password }
-// })
+export const setLoginState = (): Action => ({
+  type: SET_LOGIN_STATE
+})

src/components/left/ComponentPanelItemNew.tsx

@@ -4,7 +4,7 @@ import Grid from '@material-ui/core/Grid';
 import { useDrag } from 'react-dnd';
 import { ItemTypes } from '../../constants/ItemTypes';
 
-const ComponentPanelItem = (): JSX.Element => {
+const ComponentPanelItem: React.FC<{name: String, id: Number, root: Boolean, focusClick: any}> = ({name, id, root, focusClick}) => {
   // useDrag hook allows components in left panel to be drag source
   const [{ isDragging }, drag] = useDrag({
     item: {
@@ -14,6 +14,7 @@ const ComponentPanelItem = (): JSX.Element => {
       instanceId: 2
       // category,
     },
+    canDrag: !root,
     collect: (monitor: any) => ({
       isDragging: !!monitor.isDragging()
     })
@@ -22,18 +23,23 @@ const ComponentPanelItem = (): JSX.Element => {
     <Grid
       item
       ref={drag}
-      xs={12}
+      xs={8}
       style={{
         color: 'white',
         // this is experimental for version: BLADERUNNER THEME
-        backgroundColor: 'none',
-        borderRadius: '10px',
+        backgroundColor: 'transparent',
         // minWidth: '340px',
-        minHeight: '100px',
-        border: '2px solid white'
+        height: '80px',
+        marginBottom: '15px',
+        border: root ? '2px dotted rgba(255,255,255, 0.45)' : '2px solid rgba(255,255,255, 1)',
+        borderRadius: root ? '' : '8px',
       }}
     >
-      Component Panel
+
+      <div className="compPanelItem" onClick={focusClick}> 
+        <h3>{id} {name}</h3>
+      </div>
+      
     </Grid>
   );
 };