Merge backend new and backend and delete backend new directory (#156)

* added pylint workflow w/artifacts run: pylint --fail-under=1 $(find . -name "*.py" | xargs) note: set the failure threshold as indicated above actions/starter-workflows#636 (comment) * Added CodeQL & Pylint badges, edits * Added CodeQL badge * Added Pylint badge * Minor edits: updated git clone steps * Lowered pylint failure theshold * Update and rename build.yml to coveralls.yml * Added test files to pylint.yml * Updated py files to improve pylint score * Fixed error in coveralls.yml * Removed individual tests in pylint.yml * Added pylint labels * Added test workflow * Update and rename nodejsTest.yml to nodejs.yml * Update nodejs.yml * Update nodejs.yml * Added workflow build badge to README * Added yet another workflow All for the sake of a test badge. * Added test badge * Revert "group25 workflows" * Added post to Service.js and connected login form (incomplete) * Added appropriate error messages and display for errors * Added Sign up form * Added error handling and redirecting for login and sign up * fix to react compile warning * Dashboard and tag edits are now limited by user * New tags can now be saved in the database * Adding Product Controller and Test Cases * Adding more user auth and product auth test cases * Changing gitignore * Fixing test cases for user-auth class * Removing test cases which are not used * Commented out unused tests, added pylint comments * Restored and commented out unused tests * Added pylint skip comments * Removing merging backend and backend-new into a single directory * Increasing Pylint Score * Increasing Pylint score * Restored deleted backend files * Removing backend-new and merging it with backend dir Co-authored-by: Leila Moran <lmmoran@ncsu.edu> Co-authored-by: Emily Tracey <etracey@ncsu.edu> Co-authored-by: peeyush10234 <ptaneja@ncsu.edu>
CSC510-Group-25 · Nov 4, 2021 · 49d3653 · 49d3653
1 parent 0765989
commit 49d3653
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 359 deletions.
diff --git a/backend-new/Dockerfile b/backend-new/Dockerfile
diff --git a/backend-new/linter.py b/backend-new/linter.py
diff --git a/backend-new/requirements.txt b/backend-new/requirements.txt
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,9 +1,12 @@
-FROM python:3.8
-COPY ./requirements.txt /usr/src/app/requirements.txt
-WORKDIR /usr/src/app
-RUN pip install --upgrade pip
+FROM python:3.8.1
+
+ENV APP_HOME /app
+WORKDIR $APP_HOME
+
+COPY . /app
+WORKDIR /app
 RUN pip install -r requirements.txt
-COPY . /usr/src/app
-EXPOSE 5000
+
 ENTRYPOINT ["python"]
-CMD ["index.py"]
+CMD ["app.py"]
+
diff --git a/backend-new/app.py → backend/app.py b/backend-new/app.py → backend/app.py
@@ -3,13 +3,15 @@
 
 from flask import Flask
 from os import environ
+from flask_cors import CORS
 
 app = Flask(__name__)
 from auth_controller import *
 from products import *
 from product_controller import *
 from db_init import db
 app.secret_key = "testing"
+CORS(app)
 
 if __name__ == "__main__":
     app.run(debug=True, port=environ.get("PORT", 5000) , host='0.0.0.0')

diff --git a/backend/app/__init__.py b/backend/app/__init__.py
diff --git a/backend/app/controllers/__init__.py b/backend/app/controllers/__init__.py
diff --git a/backend/app/controllers/auth_controller.py b/backend/app/controllers/auth_controller.py
diff --git a/backend/app/controllers/products.py b/backend/app/controllers/products.py
diff --git a/backend/app/dist/404.html b/backend/app/dist/404.html
diff --git a/backend/app/dist/index.html b/backend/app/dist/index.html
diff --git a/backend-new/auth_controller.py → backend/auth_controller.py b/backend-new/auth_controller.py → backend/auth_controller.py
diff --git a/backend-new/db_init.py → backend/db_init.py b/backend-new/db_init.py → backend/db_init.py
@@ -1,6 +1,6 @@
 import pymongo
 
-client = pymongo.MongoClient("mongodb+srv://bot:bot123@cluster0.xph5e.mongodb.net/myFirstDatabase?retryWrites=true&w=majority")
+client = pymongo.MongoClient("mongodb+srv://bot:bot123@cluster0.xph5e.mongodb.net/feature-hunt?retryWrites=true&w=majority")
 db = client.get_database('feature-hunt')
 records = db.users
 product_records = db.products