fixed web-dev

Author: abeer-f

.dockerignore

@@ -0,0 +1,2 @@
+node_modules/
+.git/

Dockerfile

@@ -1,7 +1,12 @@
-FROM node:10.1
-WORKDIR /usr/src/app
-COPY . /usr/src/app
+FROM node
+WORKDIR C:/Users/abeer/Development/ReacType-LA47
+COPY ./package*.json .
+ENV PATH="./node_modules/.bin:$PATH"
+RUN npm install -D concurrently electron-splashscreen --force
 RUN npm install
-RUN npm run prod-build
-EXPOSE 5000
-CMD npm run server
+COPY . .
+EXPOSE 3002
+
+
+
+

app/electron/main.js

@@ -19,7 +19,7 @@ const {
 
 
 // The splash screen is what appears while the app is loading
-const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
+// const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
 const { resolve } = require('app-root-path');
 
 // to install react dev tool extension
@@ -49,9 +49,10 @@ let menuBuilder;
 async function createWindow() {
   // install react dev tools if we are in development mode
   if (isDev) {
-    await installExtension([REACT_DEVELOPER_TOOLS])
-      .then(name => console.log(`Added Extension:  ${name}`))
-      .catch(err => console.log('An error occurred: ', err));
+    // await installExtension([REACT_DEVELOPER_TOOLS])
+    //   .then(name => console.log(`Added Extension:  ${name}`))
+    //   .catch(err => console.log('An error occurred: ', err));
+    console.log("install extention");
   } else {
     // this will happen before creating the browser window. it returns a Boolean whether the protocol of scheme 'app://' was successfully registered and a file (index-prod.html) was sent as the response
     protocol.registerBufferProtocol(Protocol.scheme, Protocol.requestHandler);
@@ -107,6 +108,8 @@ async function createWindow() {
     text: 'Initializing ...',
   });
 
+
+
   // Load app
   if (isDev) {
     // load app from web-dev server

app/src/components/right/TableStateProps.tsx

@@ -3,7 +3,7 @@ import React, { useState, useContext, useEffect } from 'react';
 import {
   DataGrid,
   GridEditRowsModel,
-} from '@material-ui/data-grid';
+} from '@mui/x-data-grid';
 import Button from '@material-ui/core/Button';
 import ClearIcon from '@material-ui/icons/Clear';
 import StateContext from '../../context/context';

app/src/index.js

@@ -19,7 +19,6 @@ import ProjectDashboard from './Dashboard/ProjectContainer.tsx';
 import styles from './Dashboard/styles.css';
 
 const client = new ApolloClient({
-  // uri: 'http://localhost:5000/graphql',
   uri: 'https://reactype-caret.herokuapp.com/graphql',
   cache: new InMemoryCache()
 });

docker-compose.yml

@@ -0,0 +1,11 @@
+version: '1'
+
+services:
+  # Create frontend container
+  frontend: # Name of our service
+    build: C:\Users\abeer\Development\ReacType-LA47 
+    ports: # Port binding to host from docker container
+      - "3002:3002" 
+    container_name: frontend-docker
+    restart: always # What to do if container crashes
+

package.json

@@ -49,6 +49,7 @@
   "scripts": {
     "postinstall": "set ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
+    "start": "concurrently --success first \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
     "dev": "concurrently --success first \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
     "p": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=production electron .\" \"nodemon server/server.js\" -k",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
@@ -59,8 +60,8 @@
     "dist-linux": "npm run prod-build && electron-builder --linux",
     "dist-windows": "npm run prod-build && electron-builder --windows",
     "dist-all": "npm run prod-build && electron-builder --mac --linux --windows",
-    "test": " concurrently  \"npm run dev-server\"   \"cross-env NODE_ENV=test jest --verbose \"",
-    "server": "cross-env NODE_ENV=development nodemon server/server.js"
+    "test": "concurrently  \"npm run dev-server\" \"cross-env NODE_ENV=test jest --verbose \"",
+    "server": "nodemon server/server.js"
   },
   "repository": {
     "type": "git",
@@ -112,16 +113,10 @@
     "@apollo/client": "^3.3.11",
     "@babel/cli": "^7.10.4",
     "@babel/register": "^7.10.4",
-    "@material-ui/core": "^4.11.0",
-    "@material-ui/data-grid": "^4.0.0-alpha.24",
-    "@material-ui/icons": "^4.0.1",
-    "@material-ui/styles": "^4.9.6",
-    "@material-ui/system": "^4.11.2",
     "@types/js-cookie": "^2.2.6",
     "@types/node": "^14.0.20",
     "@types/prettier": "^1.19.0",
     "@types/react": "^16.8.14",
-    "@types/react-dom": "^16.8.4",
     "@types/react-redux": "^7.0.8",
     "@types/react-router-dom": "^5.1.5",
     "ace-builds": "^1.4.12",
@@ -130,18 +125,14 @@
     "autoprefixer": "^9.0.1",
     "babel-polyfill": "^6.26.0",
     "bcryptjs": "^2.4.3",
-    "concurrently": "^5.1.0",
     "connected-react-router": "^6.8.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "d3": "^6.2.0",
     "dotenv": "^8.2.0",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
-    "electron-splashscreen": "^1.0.0",
     "electron-window-manager": "^1.0.6",
-    "enzyme": "^3.4.1",
-    "enzyme-adapter-react-16": "^1.2.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "express-graphql": "^0.12.0",
     "graphql": "^15.5.0",
@@ -157,12 +148,8 @@
     "prettier": "^1.19.1",
     "prop-types": "^15.6.2",
     "re-resizable": "^6.7.0",
-    "react": "^16.13.0",
-    "react-ace": "^8.1.0",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
-    "react-dom": "^16.4.1",
-    "react-facebook-login": "^4.1.1",
     "react-google-login": "^5.1.22",
     "react-router-dom": "^5.2.0",
     "regenerator-runtime": "^0.13.7",
@@ -178,25 +165,30 @@
     "@babel/preset-env": "^7.16.0",
     "@babel/preset-react": "^7.16.0",
     "@babel/preset-typescript": "^7.16.0",
+    "@emotion/react": "^11.7.1",
+    "@emotion/styled": "^11.6.0",
+    "@material-ui/core": "^4.12.3",
+    "@material-ui/icons": "^4.11.2",
+    "@mui/x-data-grid": "^5.2.1",
     "@testing-library/jest-dom": "^5.11.5",
     "@testing-library/react": "^10.4.6",
     "@types/chai": "^4.2.11",
-    "@types/enzyme": "^3.10.5",
-    "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/jest": "^25.2.3",
     "apollo": "^2.32.5",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^27.3.1",
     "babel-loader": "^8.2.3",
     "babel-plugin-module-resolver": "^4.1.0",
-    "concurrently": "^5.1.0",
+    "concurrently": "^5.3.0",
     "cross-env": "^5.2.1",
     "csp-html-webpack-plugin": "^4.0.0",
     "css-loader": "^2.1.1",
     "dotenv-webpack": "^5.0.1",
     "electron": "^15.3.0",
     "electron-builder": "^22.13.1",
+    "electron-splashscreen": "^1.0.0",
     "enzyme-to-json": "^3.5.0",
+    "esbuild": "^0.14.10",
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^13.2.0",
     "eslint-plugin-babel": "^5.3.1",
@@ -211,9 +203,9 @@
     "mongodb": "^3.5.9",
     "mongoose": "^5.9.22",
     "node-sass": "^6.0.1",
-    "nodemon": "^2.0.4",
-    "postcss-loader": "^6.2.0",
-    "sass-loader": "^12.3.0",
+    "nodemon": "^2.0.15",
+    "react": "^17.0.2",
+    "react-ace": "^9.5.0",
     "style-loader": "^0.20.3",
     "supertest": "^4.0.2",
     "ts-jest": "^25.5.1",

server/dockerfile

@@ -0,0 +1,10 @@
+FROM node
+WORKDIR /server
+COPY ./package.json ./
+RUN npm install
+COPY . .
+
+
+
+
+

server/package.json

@@ -11,7 +11,8 @@
     "test:watch": "jest --watch",
     "start": "cross-env NODE_ENV=production node server.js",
     "prod": "cross-env NODE_ENV=production nodemon server.js",
-    "dev": "cross-env NODE_ENV=development nodemon server.js"
+    "dev": "nodemon server.js",
+    "start1": "nodemon server.js"
   },
   "keywords": [],
   "author": "",
@@ -32,6 +33,7 @@
     "passport-github2": "^0.1.12"
   },
   "devDependencies": {
+    "esbuild": "^0.14.10",
     "jest": "^26.1.0",
     "supertest": "^4.0.2"
   }