server update

IgolJack · Oct 28, 2020 · fc05736 · fc05736
1 parent 42ee05e
commit fc05736
Show file tree

Hide file tree

Showing 51 changed files with 5,474 additions and 6,029 deletions.
diff --git a/server/.gitignore → .gitignore b/server/.gitignore → .gitignore
@@ -1,2 +1,3 @@
 /node_modules
 *.env
+/build
diff --git a/client/.gitignore b/client/.gitignore
diff --git a/client/package-lock.json → package-lock.json b/client/package-lock.json → package-lock.json
diff --git a/client/package.json → package.json b/client/package.json → package.json
@@ -8,9 +8,13 @@
     "@testing-library/user-event": "^7.1.2",
     "antd": "^4.6.6",
     "bootstrap": "^4.5.2",
+    "dotenv": "^8.2.0",
+    "express": "^4.17.1",
     "firebase": "^7.17.1",
+    "firebase-admin": "^9.3.0",
     "i": "^0.3.6",
     "moment": "^2.29.1",
+    "nodemailer": "^6.4.14",
     "react": "^16.13.1",
     "react-big-calendar": "^0.28.1",
     "react-bootstrap": "^1.3.0",
@@ -19,8 +23,7 @@
     "react-scripts": "^2.1.8"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "install": "react-scripts install",
+    "start": "node server.js",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
@@ -43,5 +46,5 @@
   "devDependencies": {
     "@babel/plugin-transform-react-jsx": "^7.10.4"
   },
-  "proxy":"https://localhost:5000"
+  "proxy": "https://localhost:5000"
 }
diff --git a/client/public/favicon.ico → public/favicon.ico b/client/public/favicon.ico → public/favicon.ico
diff --git a/client/public/index.html → public/index.html b/client/public/index.html → public/index.html
diff --git a/client/public/robots.txt → public/robots.txt b/client/public/robots.txt → public/robots.txt
diff --git a/server/server.js → server.js b/server/server.js → server.js
@@ -4,7 +4,7 @@ const nodemailer = require("nodemailer");
 
 
 require("dotenv").config({ path: __dirname + "/variables.env" });
-require('dotenv').config({path: __dirname + "/variables.env"})
+
 
 const sound_pass = process.env.SOUNDCOLOR_PASS;
 const google= JSON.parse(process.env.GOOGLE);
@@ -23,16 +23,17 @@ const { request } = require("express");
 const app = express();
 const port = process.env.PORT || 5000;
 
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
 
 
+app.use(express.static(__dirname));
+app.use(express.static(path.join(__dirname, 'build')));
 
 //======================================================================//
 //=============================GET=FIREBASE=============================//
 //======================================================================//
 
 
+
 //=================получить данные всех events [{a,b,c...}]=============//
 app.get("/api/getAllEvents", (request, response) => {
   db.collection("eventsCalendar")
@@ -294,7 +295,10 @@ transporter.sendMail(mailOptions, function(error, info){
 
 
 
-
+//обслуживание html
+app.get('/*', function (req, res) {
+  res.sendFile(path.join(__dirname, 'build', 'index.html'));
+});
 
 
 

diff --git a/server/now.json b/server/now.json