Merge branch 'dev' into adam-cleanup

Author: atvanek

app/src/redux/reducers/slice/appStateSlice.ts

@@ -1,9 +1,8 @@
 // Main slice for all the component state.///
-import { createSlice, current } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
 // Import Interfaces for State, and HTML Types
 import {
   State,
-  Action,
   Component,
   ChildElement,
   HTMLType
@@ -201,13 +200,6 @@ const deleteById = (id: number, name: string, state: State): Component[] => {
   return updateIds(filteredArr);
 };
 
-const convertToJSX = (arrayOfElements) => {
-  // if id exists in state.HTMLTypes
-  for (let i = 0; i < initialState.HTMLTypes.length; i += 1) {
-    arrayOfElements[i] = initialState.HTMLTypes[i];
-  }
-};
-
 const updateUseStateCodes = (currentComponent) => {
   // array of snippets of state prop codes
   const localStateCode: string[] = []; // avoid never by assigning it to string
@@ -409,7 +401,6 @@ const appStateSlice = createSlice({
           action.payload.contextParam
         );
       }
-      // console.log('addchild state before update', current(state));
       state.components = components;
       state.nextChildId = nextChildId;
       state.canvasFocus = canvasFocus;
@@ -864,14 +855,11 @@ const appStateSlice = createSlice({
         componentId: 1,
         childId: null
       };
-      // convertToJSX(action.payload.HTMLTypes);
       state.canvasFocus = canvasFocus;
     },
+    //deleted 'convertToJSX' function, which threw errors upon opening
     openProject: ( state, action) => {
-      // convertToJSX(action.payload.HTMLTypes);
-      
       return action.payload
-
     },
     addElement: (state, action) => {
       const HTMLTypes = [...state.HTMLTypes];

app/src/redux/reducers/slice/codePreviewSlice.ts

@@ -1,32 +1,10 @@
-import { createSlice , PayloadAction } from '@reduxjs/toolkit';
-
-// interface InititalState {
-//   code: string;
-//   input: string
-// }
+import { createSlice } from '@reduxjs/toolkit';
 
 const initialState = {
   code: ``,
   input: ``
 };
 
-// interface Action {
-//   payload: any,
-//   type: string
-// }
-
-// interface Reducers {
-//   codePreviewSave: (state:InititalState, action:Action) => void;
-//   codePreviewInput: (state:InititalState , action:Action) => void;
-//   codePreviewCooperative: (state:InititalState , action:Action) => ObjectConstructor;
-// }
-
-// interface CodePreviewSlice {
-//   name: string;
-//   initialState: InititalState;
-//   reducers: Reducers;
-// }
-
 const codePreviewSlice = createSlice({
   name: 'codePreview',
   initialState,

server/models/Oauth-model.ts

@@ -3,8 +3,8 @@ const Schema = mongoose.Schema;
 
 const userSchema = new Schema({
   username: { type: String },
-  githubId: { type: String, unique: true },
-  googleId: { type: String, unique: true }
+  githubId: { type: String, unique: false },
+  googleId: { type: String, unique: false }
 });
 
 const User = mongoose.model('OauthUsers', userSchema);