Merge pull request #4 from trinketapp/v3.1.0

V3.1.0

Author: brianpmarks

.dockerignore

@@ -0,0 +1,3 @@
+.git
+.gitignore
+/api/venv

.flaskenv

@@ -0,0 +1,7 @@
+FLASK_APP=main.py
+FLASK_ENV=development
+FLASK_RUN_HOST=localhost
+FLASK_RUN_PORT=8080
+GLOWSCRIPT_RUNNING_LOCALLY=true
+DATASTORE_EMULATOR_HOST=localhost:8081
+CLIENT_SECRET_VERSION=1

.gcloudignore

@@ -0,0 +1,17 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+/venv
+# Ignored by the build system
+/setup.cfg

.gitignore

@@ -1,7 +1,12 @@
+
 node_modules
 bower_components
 *.pyc
 .DS_Store
-*~
 /venv
+__pycache__/
+*~
+/.vscode/
+/ide/.vscode
+/ide/flask_secret.py
 

Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.8.5-buster
+
+RUN mkdir /app
+
+WORKDIR /app
+
+COPY ./requirements.txt /app
+
+RUN pip install -U pip
+
+RUN pip install -r requirements.txt
+
+COPY . /app
+
+CMD flask run
+
+
+

ForInstalledPython/glow.min.js

@@ -42,8 +42,8 @@
 <script type="text/javascript" src="glowscript_libraries/jquery.min.js"></script>
 <script type="text/javascript" src="glowscript_libraries/jquery-ui.custom.min.js"></script>
 <script type="text/javascript" src="glowscript_libraries/editor.js"></script>
-<script type="text/javascript" src="glowscript_libraries/RSrun.3.0.min.js"></script>
-<script type="text/javascript" src="glowscript_libraries/glow.3.0.min.js" charset="UTF-8"></script>
+<script type="text/javascript" src="glowscript_libraries/RSrun.3.1.min.js"></script>
+<script type="text/javascript" src="glowscript_libraries/glow.3.1.min.js" charset="UTF-8"></script>
 <script type="text/javascript" src="glowscript_libraries/split.min.js"></script>
 <script type="text/javascript" src="glowscript_libraries/Roboto_Medium_ttf_sans.js"></script>
 <script type="text/javascript" src="glowscript_libraries/NimbusRomNo9L_Med_otf_serif.js"></script>
@@ -60,14 +60,14 @@
 <input type="file" id="read_local_file"/>
 
 <script>
-var gsversion = '3.0'
+var gsversion = '3.1'
 var printpane = false
 var exporting = false // not currently in export mode
 var lastprintwidth = null
 
-var glowscript_run = undefined
 window.Jupyter_VPython = undefined
 if (!navigator.onLine) window.Jupyter_VPython = 'glowscript_data/' // get textures when offline
+
 // TAB at end of line should lengthen the line; implement Ctrl-1 and Ctrl-2
 
 // localCompile is a modification of https://github.com/vpython/glowscript/blob/master/ide/ide.js