Merge pull request #6 from oslabs-beta/resolve-merge

Resolve merge

Author: namos2502

app/src/components/left/RoomsContainer.tsx

@@ -16,8 +16,8 @@ import store from '../../redux/store';
 //pasted from navbarbuttons
 import debounce from '../../../../node_modules/lodash/debounce.js';
 
-// for websockets
-// Part  - join room and room code functionality
+// // for websockets
+// // Part  - join room and room code functionality
 let socket;
 const { API_BASE_URL } = config;
 const RoomsContainer = () => {
@@ -29,11 +29,12 @@ const RoomsContainer = () => {
     joinedRoom: store.roomCodeSlice.roomCode
   }));
   React.useEffect(() => {
-    console.log('joinedRoom: ', joinedRoom);
+    console.log('You Joined Room: ', joinedRoom);
   }, [joinedRoom]);
 
   function initSocketConnection(roomCode) {
     if (socket) {
+      //edge case check if socket connection existed
       socket.disconnect();
     }
 
@@ -79,9 +80,9 @@ const RoomsContainer = () => {
   function handleUserEnteredRoom(roomCode) {
     initSocketConnection(roomCode);
   }
-  //line 83-113 was pasted in from NavBarButtons
-  let previousState = store.getState();
 
+  let previousState = store.getState();
+  // console.log('Store States: ', store.getState);
   // sending info to backend whenever the redux store changes
   const handleStoreChange = debounce(() => {
     const newState = store.getState();
@@ -113,7 +114,6 @@ const RoomsContainer = () => {
   function joinRoom() {
     dispatch(changeRoom(roomCode));
     setConfirmRoom((confirmRoom) => roomCode);
-
     // Call handleUserEnteredRoom when joining a room
     handleUserEnteredRoom(roomCode);
   }
@@ -129,6 +129,9 @@ const RoomsContainer = () => {
         }}
       >
         {' '}
+        <Typography variant="h6" color={'white'}>
+          Live Room: {joinedRoom}
+        </Typography>
         <TextField
           hiddenLabel
           id="filled-hidden-label-small"
@@ -162,9 +165,6 @@ const RoomsContainer = () => {
         >
           Join Room
         </Button>
-        <Typography variant="h6" color={'white'}>
-          In Room: {joinedRoom}
-        </Typography>
       </Stack>
       {/* <button onClick={() => joinRoom()}>Join Room</button> */}
     </div>

app/src/components/top/NavBarButtons.tsx

@@ -254,6 +254,33 @@ function navbarDropDown(props) {
   //   // Call handleUserEnteredRoom when joining a room
   //   handleUserEnteredRoom(roomCode);
   // }
+<<<<<<< HEAD
+  // Part - Dark Mode
+  const switchDark = isDarkMode ? (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      className="bi bi-lightbulb"
+      viewBox="0 0 16 16"
+    >
+      <path d="M2 6a6 6 0 1 1 10.174 4.31c-.203.196-.359.4-.453.619l-.762 1.769A.5.5 0 0 1 10.5 13a.5.5 0 0 1 0 1 .5.5 0 0 1 0 1l-.224.447a1 1 0 0 1-.894.553H6.618a1 1 0 0 1-.894-.553L5.5 15a.5.5 0 0 1 0-1 .5.5 0 0 1 0-1 .5.5 0 0 1-.46-.302l-.761-1.77a1.964 1.964 0 0 0-.453-.618A5.984 5.984 0 0 1 2 6zm6-5a5 5 0 0 0-3.479 8.592c.263.254.514.564.676.941L5.83 12h4.342l.632-1.467c.162-.377.413-.687.676-.941A5 5 0 0 0 8 1z" />
+    </svg>
+  ) : (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      className="bi bi-moon"
+      viewBox="0 0 16 16"
+    >
+      <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278zM4.858 1.311A7.269 7.269 0 0 0 1.025 7.71c0 4.02 3.279 7.276 7.319 7.276a7.316 7.316 0 0 0 5.205-2.162c-.337.042-.68.063-1.029.063-4.61 0-8.343-3.714-8.343-8.29 0-1.167.242-2.278.681-3.286z" />
+    </svg>
+  );
+=======
+>>>>>>> dev
 
   let showMenu = props.dropMenu ? 'navDropDown' : 'hideNavDropDown';
 
@@ -327,6 +354,14 @@ function navbarDropDown(props) {
           <path d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5ZM11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H2.506a.58.58 0 0 0-.01 0H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1h-.995a.59.59 0 0 0-.01 0H11Zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5h9.916Zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47ZM8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5Z" />
         </svg>
       </button>
+<<<<<<< HEAD
+      {/* {<ExportButton />} */}
+      {/* 
+      <button onClick={handleDarkModeToggle}>
+        {isDarkMode ? 'Light' : 'Dark'} Mode {switchDark}
+      </button> */}
+=======
+>>>>>>> dev
       {state.isLoggedIn && (
         <button onClick={handleClick}>
           Manage Project

config.js

@@ -3,10 +3,10 @@ const config = {
   DEV_PORT: 5656,
   API_BASE_URL: isProduction
     ? 'https://app.reactype.dev'
-    //: 'http://localhost:8080',
-   :'http://localhost:5656',
+    : 'http://localhost:5656',
+  // : 'http://localhost:8080',
   API_BASE_URL2: isProduction
     ? 'https://app.reactype.dev'
-    : 'http://localhost:8080',
+    : 'http://localhost:8080'
 };
 module.exports = config;

package.json

@@ -3,7 +3,7 @@
   "version": "17.0.0 by Victor Martins, Liam Roh, Denton Wong, Ahnaf Khan, Hernan Damazo",
   "description": "Prototyping tool for React/Typescript Applications.",
   "private": true,
-  "main": "app/electron/main.js",
+  "main": "app/.electron/main.js",
   "author": "OS Labs",
   "contributors": [
     "Victor Martins",

server/server.ts

@@ -41,7 +41,7 @@ const isTest = process.env.NODE_ENV === 'test';
 
 app.use(express.json({ limit: '100mb' }));
 app.use(express.urlencoded({ limit: '100mb', extended: true }));
-app.use(cookieParser());//added cookie parser
+app.use(cookieParser()); //added cookie parser
 // Routes
 // const stylesRouter = require('./routers/stylesRouter');
 import stylesRouter from './routers/stylesRouter';
@@ -96,9 +96,9 @@ const io = new Server(httpServer, {
 });
 
 io.on('connection', (socket) => {
-  console.log(socket.id);
+  console.log('Socket ID: -----', socket.id);
   socket.on('custom-event', (string, redux_store, room) => {
-    console.log(room);
+    console.log('Room Code', room);
     if (room) {
       socket.to(room).emit('receive message', redux_store);
     } else {
@@ -173,17 +173,16 @@ app.post(
 );
 
 //confirming whether user is logged in for index.tsx rendering
-app.get(
-  '/loggedIn',
-  sessionController.isLoggedIn,
-  (req, res) => res.status(200).json(res.locals.loggedIn)
-)
+app.get('/loggedIn', sessionController.isLoggedIn, (req, res) =>
+  res.status(200).json(res.locals.loggedIn)
+);
 
-app.get('/logout', 
-cookieController.deleteCookies,
-sessionController.endSession,
-(req,res) => res.status(200).json(res.locals.deleted)
-)
+app.get(
+  '/logout',
+  cookieController.deleteCookies,
+  sessionController.endSession,
+  (req, res) => res.status(200).json(res.locals.deleted)
+);
 
 // user must be logged in to get or save projects, otherwise they will be redirected to login page
 app.post(
@@ -193,7 +192,6 @@ app.post(
   (req, res) => res.status(200).json(res.locals.savedProject)
 );
 
-
 app.post(
   '/getProjects',
   sessionController.isLoggedIn,
@@ -236,7 +234,7 @@ app.get(
 app.get(
   '/cloneProject/:docId',
   sessionController.isLoggedIn,
-  marketplaceController.cloneProject, 
+  marketplaceController.cloneProject,
   (req, res) => res.status(200).json(res.locals.clonedProject)
 );
 
@@ -266,7 +264,6 @@ if (isDocker) {
   });
 }
 
-
 app.get('/test', (req, res) => {
   res.send('test request is working');
 });