Merge a3f7c75 into 188ce35

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+:tickets: **Ticket(s)**: Closes #
+
+---
+
+## :construction_worker: Changes
+
+A brief summary of what changes were introduced.
+
+## :flashlight: Testing Instructions
+
+Explain how to test your changes, if applicable.

.gitignore

@@ -1,14 +1,18 @@
 **.DS_Store
+**.vs
 **npm-debug.log
 
+**.env*
+
 /client/node_modules/
+/client/public/bundle.js
 
 /server/bin
 /server/build/
 /server/vendor/
 /server/server
 /server/server.exe
 /server/gin-bin
-/server/service-account.json
+/server/service-account*.json
 
 .inertia.toml

Dockerfile

@@ -1,5 +1,8 @@
 # Build and minify React client
 FROM node:carbon AS client
+WORKDIR /
+## ENV DEPENDENCY
+ADD .env .
 WORKDIR /client
 ADD client/package.json .
 RUN npm install
@@ -12,6 +15,7 @@ WORKDIR /app
 ENV SRC_DIR=/go/src/github.com/ubclaunchpad/bumper/server
 RUN apk add --update --no-cache git
 ADD server $SRC_DIR
+## ENV DEPENDENCY
 ADD server/service-account.json .
 WORKDIR $SRC_DIR
 RUN go get -u github.com/golang/dep/cmd/dep
@@ -27,6 +31,5 @@ WORKDIR /app
 COPY --from=server /app/service-account.json .
 COPY --from=server /app/server .
 
-ENV PORT 9090
 EXPOSE 9090
 ENTRYPOINT ./server

Makefile

@@ -5,11 +5,6 @@ deps:
 	(cd server ; go get -u github.com/golang/dep/cmd/dep ; dep ensure)
 	(cd client ; npm install )
 
-# Starts both the server and the client via docker-compose
-.PHONY: docker-start
-docker-start:
-	docker-compose -f docker-compose.dev.yml up
-
 # Starts the client
 .PHONY: client
 client:

README.md

@@ -6,21 +6,22 @@ bump other players and objects off to stay alive
 ## Getting Started
 Play the latest version [here](http://bumper.ubclaunchpad.com)!  
 
-## Docker Quickstart
-Install Docker and the Docker Compose toolset. Then run:
-
-```bash
-make docker-start
-```
-
-## Manual Quickstart
+## Quickstart
 
 Go and Node are required. To install the required dependencies:
 
 ```bash
 $ make deps
 ```
 
+Create a .env file with the following variables and place it in the project root:
+```
+NODE_ENV=$YOUR_VAR
+SERVER_URL=$YOUR_VAR
+DATABASE_URL=$YOUR_VAR
+PORT=$YOUR_VAR
+```
+
 ### Run the Server
 
 ```bash

client/App.js

@@ -10,9 +10,7 @@ import {
 const PLAYER_RADIUS = 25;
 const JUNK_SIZE = 15;
 
-const address = process.env.NODE_ENV === 'production'
-  ? 'ws://ec2-54-193-127-203.us-west-1.compute.amazonaws.com/connect'
-  : 'ws://localhost:9090/connect';
+const address = process.env.SERVER_URL;
 
 export default class App extends React.Component {
   constructor(props) {
@@ -68,7 +66,7 @@ export default class App extends React.Component {
   // connect player on load
   connectPlayer() {
     if (window.WebSocket) {
-      this.socket = new WebSocket(address);
+      this.socket = new WebSocket(`ws://${address}/connect`);
       this.socket.onopen = () => {
         this.socket.onmessage = event => this.handleMessage(JSON.parse(event.data));
       };

client/database/database.js

@@ -1,19 +1,23 @@
 import firebase from 'firebase/app';
 import 'firebase/database';
 
-const config = {
-  apiKey: 'AIzaSyA4CbYttLND1GH-uoLF523KYkn4tadF6rY',
-  authDomain: 'bumperdb-d7f48.firebaseapp.com',
-  databaseURL: 'https://bumperdb-d7f48.firebaseio.com',
-  projectId: 'bumperdb-d7f48',
-  storageBucket: 'bumperdb-d7f48.appspot.com',
-  messagingSenderId: '234111044340',
-};
-
-// When setting up a second project for Dev vs Prod:
-// const config = process.env.NODE_ENV === 'production'
-//   ? prodConfig
-//   : devConfig;
+const config = process.env.NODE_ENV === 'production'
+  ? {
+    apiKey: 'AIzaSyA4CbYttLND1GH-uoLF523KYkn4tadF6rY',
+    authDomain: 'bumperdb-d7f48.firebaseapp.com',
+    databaseURL: 'https://bumperdb-d7f48.firebaseio.com',
+    projectId: 'bumperdb-d7f48',
+    storageBucket: 'bumperdb-d7f48.appspot.com',
+    messagingSenderId: '234111044340',
+  }
+  : {
+    apiKey: 'AIzaSyD2p9WKP5cAugArSvUD1m8aUeqZRPnCu7Q',
+    authDomain: 'bumperdevdb.firebaseapp.com',
+    databaseURL: 'https://bumperdevdb.firebaseio.com',
+    projectId: 'bumperdevdb',
+    storageBucket: 'bumperdevdb.appspot.com',
+    messagingSenderId: '174823897090',
+  };
 
 if (!firebase.apps.length) {
   firebase.initializeApp(config);

client/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "webpack-dev-server --hot --host 0.0.0.0",
-    "build": "NODE_ENV=production webpack --config webpack.prod.js",
+    "build": "webpack --config webpack.prod.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "./node_modules/.bin/eslint . --ignore-pattern public/"
   },
@@ -16,6 +16,7 @@
     "babel-loader": "^7.1.2",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
+    "dotenv-webpack": "^1.5.7",
     "firebase": "^5.1.0",
     "react": "^16.2.0",
     "react-bootstrap": "^0.32.1",

client/webpack.config.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-const webpack = require('webpack');
+const Dotenv = require('dotenv-webpack');
 
 const config = {
   entry: './index.js',
@@ -25,10 +25,11 @@ const config = {
     ],
   },
   plugins: [
-    new webpack.EnvironmentPlugin([
-      'NODE_ENV',
-    ]),
-  ]
+    new Dotenv({
+      path: '../.env',
+      systemvars: true
+    }),
+  ],
 };
 
 module.exports = config;

docker-compose.dev.yml

@@ -5,19 +5,23 @@ services:
     build:
       context: .
       target: client
+    environment:
+      - NODE_ENV=${NODE_ENV}
+      - SERVER_URL=${SERVER_URL}
     volumes:
-      - ./client:/app
+      - ${PWD}/client:/app
     command: npm start
     ports:
       - "8080:8080"
   server:
     build:
       context: .
       target: server
-    volumes:
-      - ./server:/go/src/github.com/ubclaunchpad/bumper/server
     environment:
-      - PORT=8080
+      - SERVER_URL=${SERVER_URL}
+      - DATABASE_URL=${DATABASE_URL}
+    volumes:
+      - ${PWD}/server:/go/src/github.com/ubclaunchpad/bumper/server
     command: sh -c "go get github.com/codegangsta/gin ; gin -p 9090 -a 8080 -i run main.go"
     ports:
       - "9090:9090"

docker-compose.yml

@@ -1,8 +1,13 @@
-version: '3'
+version: '3.4'
 
 services:
   bumper:
     build: .
-    # network_mode: "host"
+    env_file: .env
+    environment:
+      - PORT=${PORT}
+      - NODE_ENV=${NODE_ENV}
+      - SERVER_URL=${SERVER_URL}
+      - DATABASE_URL=${DATABASE_URL}
     ports:
-      - "80:9090"
+      - "80:${PORT}"

server/Gopkg.toml

@@ -44,3 +44,7 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/joho/godotenv"
+  version = "1.2.0"

server/database/database.go

@@ -31,9 +31,10 @@ func ConnectDB(credentialsPath string) {
 	// Initialize default DB App
 	opt := option.WithCredentialsFile(credentialsPath)
 
+	log.Printf("Connecting to %v", os.Getenv("DATABASE_URL"))
 	ctx := context.Background()
 	config := &firebase.Config{
-		DatabaseURL: "https://bumperdb-d7f48.firebaseio.com",
+		DatabaseURL: os.Getenv("DATABASE_URL"),
 	}
 	app, err := firebase.NewApp(ctx, config, opt)
 	if err != nil {

server/main.go

@@ -7,13 +7,25 @@ import (
 	"os"
 	"time"
 
+	"github.com/joho/godotenv"
 	"github.com/ubclaunchpad/bumper/server/arena"
 	"github.com/ubclaunchpad/bumper/server/database"
 	"github.com/ubclaunchpad/bumper/server/game"
 	"github.com/ubclaunchpad/bumper/server/models"
 )
 
 func main() {
+	if err := godotenv.Load("../.env"); err != nil {
+		log.Println("Error loading environment variables from parent directory")
+		log.Print("Try current directory... ")
+
+		if err := godotenv.Load(); err != nil {
+			log.Println("Cannot load environment variables")
+		} else {
+			log.Println("Success")
+		}
+	}
+
 	rand.Seed(time.Now().UTC().UnixNano())
 	arena.MessageChannel = make(chan models.Message)
 	game := game.CreateGame()
@@ -26,6 +38,8 @@ func main() {
 	http.Handle("/", http.FileServer(http.Dir("./build")))
 	http.Handle("/connect", game)
 	game.StartGame()
+
+	log.Println("Server URL: " + os.Getenv("SERVER_URL"))
 	log.Println("Starting server on localhost:" + os.Getenv("PORT"))
 	log.Println(http.ListenAndServe(":"+os.Getenv("PORT"), nil))
 }