Merge pull request #1 from willemmirkovich/master

Creation of base application
numberscope · Feb 5, 2020 · 8e72df0 · 8e72df0
2 parents 03bca59 + de30272
commit 8e72df0
Show file tree

Hide file tree

Showing 30 changed files with 135 additions and 1 deletion.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/NumberscopeFlask.iml b/.idea/NumberscopeFlask.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
@@ -1 +1,26 @@
-# NumberscopeFlask
+# NumberscopeFlask
+
+## Installing Dependencies
+
+### Getting Python Setup
+
+You will need:
+- Python 3
+- Pip package installer 
+
+I recommend using Anaconda to manage python packages. To install, follow these instructions:
+ https://docs.anaconda.com/anaconda/install/
+
+ ### Installing the necessary packages
+
+ Simply run 
+ ```console 
+pip install -r requirements.txt
+ ```
+On the command line
+
+## To run
+
+```console
+./run.sh
+```
diff --git a/__pycache__/routes.cpython-37.pyc b/__pycache__/routes.cpython-37.pyc
diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+Flask
diff --git a/routes.py b/routes.py
@@ -0,0 +1,14 @@
+from run import app
+from flask import render_template, url_for
+
+@app.route('/')
+def main():
+    return render_template('base.html')
+
+@app.route('/index')
+def index():
+    return render_template('index.html')
+
+@app.route('/tool_page')
+def tool_page():
+    return render_template('tool.html')
diff --git a/run.py b/run.py
@@ -0,0 +1,9 @@
+from flask import Flask
+
+app = Flask(__name__)
+
+import routes
+
+if __name__ == '__main__':
+    app.run()
+
diff --git a/run.sh b/run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo 'Starting up Numberscope Server'
+FLASK_ENV=development
+export FLASK_ENV
+export FLASK_APP=run.py
+export FLASK_RUN_PORT=5001
+flask run
+echo 'Running on port 5001'
+
+# Idea here: build script for getting numberscope project and importing the relevant js files
diff --git a/static/img/MicroscopeLogo.png b/static/img/MicroscopeLogo.png
diff --git a/static/img/background2.jpg b/static/img/background2.jpg
diff --git a/static/img/background3.jpg b/static/img/background3.jpg
diff --git a/static/img/background4.jpg b/static/img/background4.jpg
diff --git a/static/img/backgroundx.jpg b/static/img/backgroundx.jpg
diff --git a/static/img/draw.png b/static/img/draw.png
diff --git a/static/img/gof.png b/static/img/gof.png
diff --git a/static/img/logo.png b/static/img/logo.png
diff --git a/static/img/sc.png b/static/img/sc.png
diff --git a/static/img/seq.png b/static/img/seq.png
diff --git a/static/img/tools.png b/static/img/tools.png
diff --git a/static/img/turtle.png b/static/img/turtle.png
diff --git a/static/img/verticalMicroscope.png b/static/img/verticalMicroscope.png
diff --git a/static/js/base.js b/static/js/base.js
@@ -0,0 +1,2 @@
+// This is an example javascript file
+console.log('hello');
diff --git a/templates/base.html b/templates/base.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Numberscope</title>
+    <!-- JQuery -->
+    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
+    <!-- JavaScript -->
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
+    <!-- Base.js -->
+    <script src="../static/js/base.js"></script>
+    {% block scripts %}
+    {% endblock %}
+</head>
+<body>
+    <h1>Welcome to Numberscope</h1>
+    <a href="{{ url_for('tool_page') }}">Tool Page</a>
+    <main>
+        {% block main %}
+        {% endblock %}
+    </main>
+</body>
+</html>
diff --git a/templates/index.html b/templates/index.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block main %}
+    <h2>This is the main page</h2>
+{% endblock %}
diff --git a/templates/tool.html b/templates/tool.html
@@ -0,0 +1,7 @@
+{% extends 'index.html' %}
+
+{% block main %}
+
+    <h3>This is the tool page</h3>
+
+{% endblock %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// This is an example javascript file
		console.log('hello');