Merge 047bf3d into 5910ea5

.travis.yml

@@ -16,6 +16,8 @@ stages:
 jobs:
     include:
       - stage: test
+        env:
+          - NODE_ENV=production
         before_script:
           # Download kubectl, which is a requirement for using minikube.
           - curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
@@ -31,6 +33,10 @@ jobs:
         install:
           - pip install .
           - pip install coveralls
+          - pushd game_frontend
+          - yarn
+          - node djangoBundler.js
+          - popd
         script:
           - python all_tests.py --coverage
         after_success:

game_frontend/.babelrc

@@ -5,7 +5,7 @@
       "cwd": "babelrc",
       "root": ["./src"],
       "alias": {
-        "features": "./src/redux/features",
+        "features": "./src/redux/features"
       }
     }]
   ]

game_frontend/src/index.js

@@ -27,7 +27,7 @@ const initialState = {
   },
   game: {
     connectionParameters: {
-      id: 1,
+      id: getGameIDFromURL() || 1,
       game_url_base: '',
       game_url_path: '',
       game_url_port: 0,
@@ -36,6 +36,12 @@ const initialState = {
   }
 }
 
+function getGameIDFromURL () {
+  const url = window.location.href
+  const gameIDFinder = /\/play\/([0-9]+)/
+  return gameIDFinder.exec(url)[1]
+}
+
 const reduxStore = configureStore(initialState)
 const muiTheme = createMuiTheme(theme)
 

players/game_renderer.py

@@ -20,7 +20,7 @@ def render_game(request, game):
 
     context.update(connection_settings)
 
-    return render(request, 'players/viewer.html', context)
+    return render(request, 'players/game_ide.html', context)
 
 
 def get_environment_connection_settings(game_id):

players/templates/players/base.html

@@ -58,12 +58,8 @@
 
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <ul class="nav navbar-nav">
-                        <li class="dropdown {% block nav-program-class %}{% endblock %}"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Program<span class="sr-only"> (current)</span><span class="caret"</span></a>
-                            {% game_dropdown_list 'aimmo/program' %}
-                        </li>
-                        </li>
-                        <li class="dropdown {% block nav-watch-class %}{% endblock %}"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Watch<span class="caret"></span></a>
-                            {% game_dropdown_list 'aimmo/watch' %}
+                        <li class="dropdown {% block nav-watch-class %}{% endblock %}"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Play<span class="caret"></span></a>
+                            {% game_dropdown_list 'aimmo/play' %}
                         </li>
                         <li class="{% block nav-statistics-class %}{% endblock %}"><a href="{% url 'aimmo/statistics' %}">Statistics</a></li>
                         <li><a href="{% url 'aimmo/logout' %}">Logout</a></li>

players/templates/players/dropdown.html

@@ -5,8 +5,4 @@
     {% endfor %}
     <li role="seperator" class="divider"></li>
     <li><a href="{% url 'aimmo/new_game' %}">Create a new game</a></li>
-    <li class="navbar-brand">Levels</li>
-    {% for i in level_numbers %}
-    <li><a href="{% url base_url|add:"_level" num=i %}">Level {{ i }}</a></li>
-    {% endfor %}
 </ul>