Merge branch 'master' of github.com:ethancedwards8/ethancedwards-quotes

.github/workflows/docker-image.yml

@@ -0,0 +1,17 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Public to Registry
+      uses: elgohr/Publish-Docker-Github-Action@v4
+      with:
+        name: ethancedwards8/ethancedwards-api
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:alpine
 
 COPY . /app
-RUN pip install flask flask-restful
-ENTRYPOINT ["python", "/app/ethancedwards_quotes.py"]
+RUN pip3 install flask flask-restful
+ENTRYPOINT ["python3", "/app/src/ethancedwards_api.py"]

setup.py

@@ -8,32 +8,11 @@
 with open("README.md") as readme_file:
     README = readme_file.read()
 
-# setup_args = dict(
-#     name="ethancedwards-quotes",
-#     version="1.0",
-#     description="A cool api that gives you my favorite quotes :)",
-#     author="Ethan Edwards",
-#     author_email="ethan@ethancedwards.com",
-#     long_description=README,
-#     long_description_content_type="text/markdown",
-#     license="GPLv3",
-#     packages=find_packages(),
-#     url="https://github.com/ethancedwards8/api-quotes",
-#     entry_points={
-#         'console_scripts': ['ethancedwards-quotes = ethancedwards-quotes:run']
-#     }
-# )
-
-# install_requires = [ "flask", "flask-restful" ]
-
-# if __name__ == "__main__":
-#     setup(**setup_args, install_requires=install_requires)
-
 setup(
-    name='ethancedwards_quotes',
+    name='ethancedwards_api',
     version='0.1',
-    py_modules=['ethancedwards_quotes'],
+    py_modules=['ethancedwards_api'],
     entry_points={
-        'console_scripts': ['ethancedwards_quotes = ethancedwards_quotes:run']
+        'console_scripts': ['ethancedwards_api = ethancedwards_api:run']
     },
 )

src/ethancedwards_api.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+
+# Flask imports
+from flask import Flask
+from flask_restful import Api, Resource, reqparse
+
+# vanilla imports
+import os
+
+# imports for different modules
+from quotes.quotes import *
+
+app = Flask(__name__)
+api = Api(app)
+DEV = os.environ.get('DEV')
+
+# resources being added
+api.add_resource(Quote, "/quotes/v1", "/quotes/v1/", "/quotes/v1/<int:id>/")
+api.add_resource(Dump, "/quotes/v1/dump", "/quotes/v1/dump/")
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=(8000 if DEV else 80))

quotes.json → src/quotes/quotes.json

@@ -72,11 +72,16 @@
     {
         "id": 14,
         "author": "Henry Ford",
-        "quote": "Whether you think you can or think you can't you're right"
+        "quote": "Whether you think you can or think you can't you're right."
     },
     {
         "id": 15,
         "author": "Will Durant",
         "quote": "We are what we repeatedly do. Excellence, then, is not an act, but a habit."
+    },
+    {
+	"id": 16,
+	"author": "Victor Fontanez",
+	"quote": "The grass isn't greener on the other side, the grass is greener where you water it at."
     }
 ]

ethancedwards_quotes.py → src/quotes/quotes.py

@@ -1,22 +1,13 @@
-#!/usr/bin/env python3
-
 from flask import Flask
 from flask_restful import Api, Resource, reqparse
 
 import random
 import os
 import json
 
-app = Flask(__name__)
-api = Api(app)
-
-DEV = os.environ.get('DEV')
-
-with open('quotes.json') as f:
+with open(os.path.dirname(os.path.realpath(__file__)) + '/quotes.json') as f:
     quotes = json.load(f)
 
-print(quotes)
-
 class Quote(Resource):
     def get(self, id=0):
         if id == 0:
@@ -28,14 +19,6 @@ def get(self, id=0):
 
         return "quote not found", 404
 
-
 class Dump(Resource):
     def get(self):
         return quotes, 200
-
-
-api.add_resource(Quote, "/quotes/v1", "/quotes/v1/", "/quotes/v1/<int:id>/")
-api.add_resource(Dump, "/quotes/v1/dump", "/quotes/v1/dump/")
-
-if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=(8000 if DEV else 80))