diff --git a/app.py b/app.py index 6104bec..5a8bbc2 100644 --- a/app.py +++ b/app.py @@ -1,13 +1,20 @@ -from services import (UserService, UserListService) -from config import app, api, docs, CORS - -#*______________ Service Registration ______________ -api.add_resource(UserService, '/api/user/') -docs.register(UserService) -api.add_resource(UserListService, '/api/list/user') -docs.register(UserListService) -#*______________ Application Creation ______________ -if __name__ == '__main__': - app.run(debug=True) - - +import os +from flask import Flask, render_template +from planets import createRandomPlanet + +app = Flask(__name__) + + +IMG_FOLDER = os.path.join('static', 'IMG') + +app.config['UPLOAD_FOLDER'] = IMG_FOLDER +@app.route('/') +def hello(seed): + print(seed) + createRandomPlanet(seed) + planet = os.path.join(app.config['UPLOAD_FOLDER'], 'planet.png') + return render_template('hello.html', planet=planet) + + +if __name__=='__main__': + app.run(debug=True, host='0.0.0.0') \ No newline at end of file diff --git a/config.py b/config.py deleted file mode 100644 index 4d75670..0000000 --- a/config.py +++ /dev/null @@ -1,40 +0,0 @@ -from flask import Flask -from flask_restful import Api -from apispec import APISpec -from apispec.ext.marshmallow import MarshmallowPlugin -from flask_apispec.extension import FlaskApiSpec -from flask_marshmallow import Marshmallow -from flask_sqlalchemy import SQLAlchemy -from flask_cors import CORS -#!______________ App Setup _____________ _ -app = Flask(__name__, static_url_path='/static') -api_v1_cors_config = { - "origins": ["http://localhost:5000"] -} - -#!______________ CORS Setup _____________ _ -CORS(app, resources={"/api/*": api_v1_cors_config}) - -#!______________ DB Setup ______________ -app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///markdown.db' -app.config['SECRET_KEY'] = 'InputSecretKeyHere' -db = SQLAlchemy(app) - -#!______________ Marshmallow Setup ______________ -ma = Marshmallow(app) - -#!______________ API & Swagger Setup ______________ -api = Api(app) -app.config.update({ - 'APISPEC_SPEC': APISpec( - title='Markdown Presenter', - version='v0.0.1', - plugins=[MarshmallowPlugin()], - openapi_version='2.0.0' - ), - 'APISPEC_SWAGGER_URL': '/swagger/', - 'APISPEC_SWAGGER_UI_URL': '/swagger-ui/' -}) - -#!______________ Docs Setup ______________ -docs = FlaskApiSpec(app) \ No newline at end of file diff --git a/models.py b/models.py deleted file mode 100644 index 5ac9c7b..0000000 --- a/models.py +++ /dev/null @@ -1,10 +0,0 @@ -from config import db - -#!______________ DB Models ______________ -class User(db.Model): - __tablename__ = "User" - id = db.Column(db.Integer, primary_key=True) - name = db.Column(db.String(50)) - image = db.Column(db.String()) - description = db.Column(db.String()) - diff --git a/planet1.png b/planet1.png deleted file mode 100644 index d17ec16..0000000 Binary files a/planet1.png and /dev/null differ diff --git a/planet2.png b/planet2.png index 13e7403..8972167 100644 Binary files a/planet2.png and b/planet2.png differ diff --git a/planets.py b/planets.py index f995c1e..13b84f6 100644 --- a/planets.py +++ b/planets.py @@ -25,7 +25,7 @@ def changePlanetLayerColor(planetLayer): red = random.uniform(-0.5,1.5) green = random.uniform(-0.5,1.5) blue = random.uniform(-0.5,1.5) - print(red,green,blue) + #print(red,green,blue) changedColor = changeImageColor(planetLayer, red, green, blue) return changedColor @@ -42,8 +42,6 @@ def mergePlanetParts(light, noise1, noise2, noise3, sphere): planet.paste(noise1, (0, 0), noise1) planet = Image.blend(planet, noise2, 0.1) planet = Image.blend(planet, noise3, 0.1) - #planet.paste(noise2, (0, 0), noise2) - #planet.paste(noise3, (0, 0), noise3) return planet @@ -63,9 +61,9 @@ def createRandomPlanet(seed): sphere = changePlanetLayerColor(sphere) planet = mergePlanetParts(light, noise1, noise2, noise3, sphere) - - return planet + planet.save("static/IMG/planet.png") + return -planet = createRandomPlanet(random.randrange(0,10000)) -planet.save("planet2.png") \ No newline at end of file +#planet = createRandomPlanet('Elijah') +#planet.save("planet2.png") \ No newline at end of file diff --git a/rebuild_db.py b/rebuild_db.py deleted file mode 100644 index 2c56232..0000000 --- a/rebuild_db.py +++ /dev/null @@ -1,18 +0,0 @@ -import os -from config import db -from termcolor import colored -from config import app - -def RebuildDatabase(): - if os.path.exists('acceth.db'): - print(colored('Removing existing DB', 'blue')) - os.remove('acceth.db') - - with app.app_context(): - db.create_all() - db.session.commit() - - print(colored('New DB created.', 'green')) - -if __name__ == '__main__': - RebuildDatabase() \ No newline at end of file diff --git a/schemes.py b/schemes.py deleted file mode 100644 index 7f180fd..0000000 --- a/schemes.py +++ /dev/null @@ -1,25 +0,0 @@ -from marshmallow_sqlalchemy import SQLAlchemyAutoSchema -from config import db -from models import User -from marshmallow import fields - -#*______________ Base Schema ______________ -class BaseScheme(SQLAlchemyAutoSchema): - def __str__(self): - return str(self.__class__) + ": " + str(self.__dict__) - class Meta: - ordered = True - sqla_session = db.session - include_fk = True - load_instance = True - -#*______________ User Schemes ______________ -class UserSchema(BaseScheme): - class Meta(BaseScheme.Meta): - model = User - id = fields.Int() - name = fields.Str() -class UserInsertSchema(UserSchema): - user_id = fields.Int() -class UserResponseSchema(UserSchema): - name = fields.Str() \ No newline at end of file diff --git a/services.py b/services.py deleted file mode 100644 index 70568ed..0000000 --- a/services.py +++ /dev/null @@ -1,46 +0,0 @@ -from flask_apispec import marshal_with, doc, use_kwargs -from flask_apispec.views import MethodResource -from flask_restful import Resource -from schemes import (UserSchema, UserResponseSchema) -from config import db -from models import User - -#!______________ User ______________ -class UserService(MethodResource, Resource): - @doc(description='Get User by User_id', tags=['User']) - @marshal_with(UserResponseSchema) - def get(self, user_id): - quser = db.session.query(User).get(user_id) - return UserSchema().dump(quser) - - @doc(description='Add new User', tags=['User']) - @use_kwargs(UserSchema, location=('json')) - @marshal_with(UserResponseSchema()) - def post(self, user, user_id): - db.session.add(user) - db.session.commit() - return UserSchema().dump(user) - - @doc(description='Update User with PUT', tags=['User']) - @use_kwargs(UserSchema, location=('json')) - @marshal_with(UserResponseSchema()) - def put(self, user, user_id): - db.session.add(user) - db.session.commit() - return UserSchema().dump(user) - - @doc(description='Delete existing User', tags=['User']) - @use_kwargs(UserSchema, location=('json')) - @marshal_with(UserResponseSchema()) - def delete(self, user, user_id): - user = db.session.query(User).get(user_id) - db.session.delete(user) - db.session.commit() - return UserSchema().dump(user) - -class UserListService(MethodResource, Resource): - @doc(description='Get a List of all User', tags=['List']) - @marshal_with(UserResponseSchema(many=True)) - def get(self): - users = db.session.query(User).all() - return UserSchema(many=True).dump(users) \ No newline at end of file diff --git a/static/IMG/planet.png b/static/IMG/planet.png new file mode 100644 index 0000000..98b98b9 Binary files /dev/null and b/static/IMG/planet.png differ diff --git a/templates/hello.html b/templates/hello.html new file mode 100644 index 0000000..2cf64ac --- /dev/null +++ b/templates/hello.html @@ -0,0 +1,10 @@ + + + + + Hello Worl! + + + Planet + + diff --git a/test3.png b/test3.png deleted file mode 100644 index 474956c..0000000 Binary files a/test3.png and /dev/null differ diff --git a/test4.png b/test4.png deleted file mode 100644 index 16f6c9c..0000000 Binary files a/test4.png and /dev/null differ diff --git a/wsgi.py b/wsgi.py deleted file mode 100644 index 0ad1c54..0000000 --- a/wsgi.py +++ /dev/null @@ -1,5 +0,0 @@ -from config import app - -if __name__ == "__main__": - app.run() -