Move website to custom domain

M4MController · Jun 24, 2020 · bbb44a0 · bbb44a0
1 parent 9388fe0
commit bbb44a0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,12 +12,14 @@ RUN npm install
 ADD src ./src
 ADD public ./public
 
+ENV url=/
 RUN npm run build
 
 # copy generated files
 RUN mkdir -p /usr/html/ && cp -R build/. /usr/html/
 
-# remove unnecessary source files
+# remove unnecessary files
 RUN rm -fr /application
+RUN apk del nodejs npm git
 
 ADD nginx.conf /etc/nginx/nginx.conf
diff --git a/package.json b/package.json
@@ -2,7 +2,6 @@
   "name": "frontend-admin",
   "version": "0.1.0",
   "private": true,
-  "homepage": "/admin",
   "dependencies": {
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",

diff --git a/src/App.js b/src/App.js
@@ -16,7 +16,7 @@ export const pages =  {
   key: 'key'
 };
 
-export const baseUrl = `https://meter4.me`;
+export const baseUrl = process.env['url'] || `https://m4mcloud.ru`;
 
 export class App extends React.Component {
   constructor() {
@@ -59,7 +59,7 @@ export class App extends React.Component {
   }
 
   onLogin(campaignName, password) {
-    fetch(`${baseUrl}/api/admin/companies`, {
+    fetch(`${baseUrl}/api/companies`, {
       method: 'GET',
       mode: 'cors'
     })

diff --git a/src/Data/Data.js b/src/Data/Data.js
@@ -69,7 +69,7 @@ export class Data extends React.Component {
         const [ year, month, day ] = date.split('-');
         const name = `${sensor.email}-${sensor.sensor_id}-${date}.tsv`;
 
-        fetch(`${baseUrl}/api/admin/sensors/${sensor.sensor_id}/${year}/${month}/${day}?key=${key}`, {
+        fetch(`${baseUrl}/api/sensors/${sensor.sensor_id}/${year}/${month}/${day}?key=${key}`, {
             method: 'GET',
             mode: 'cors'
         })

diff --git a/src/Sensors/Sensors.js b/src/Sensors/Sensors.js
@@ -16,7 +16,7 @@ export class Sensors extends React.Component {
     const {campaignId, userId} = this.props;
 
     if (!sensors.length) {
-      fetch(`${baseUrl}/api/admin/${campaignId}/sensors/${userId}`, {
+      fetch(`${baseUrl}/api/${campaignId}/sensors/${userId}`, {
         method: 'GET',
         mode: 'cors'
       })

diff --git a/src/Users/Users.js b/src/Users/Users.js
@@ -16,7 +16,7 @@ export class Users extends React.Component {
     const {campaignId} = this.props;
 
     if (!users.length) {
-      fetch(`${baseUrl}/api/admin/${campaignId}/users`, {
+      fetch(`${baseUrl}/api/${campaignId}/users`, {
         method: 'GET',
         mode: 'cors'
       })