production changes

skfile · Aug 30, 2020 · 95f74dc · 95f74dc
1 parent ee983e1
commit 95f74dc
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,8 @@ RUN pip install -r requirements.txt
 # # For more information, please refer to https://aka.ms/vscode-docker-python
 # FROM python:3.8-slim-buster
 
-# EXPOSE 8000
+EXPOSE 80
+EXPOSE 443
 
 # # Keeps Python from generating .pyc files in the container
 # ENV PYTHONDONTWRITEBYTECODE 1
@@ -18,12 +19,12 @@ RUN pip install -r requirements.txt
 # ADD requirements.txt .
 # RUN python -m pip install -r requirements.txt
 
-# WORKDIR /app
-# ADD . /app
+WORKDIR /app
+ADD . /app
 
 # # Switching to a non-root user, please refer to https://aka.ms/vscode-docker-python-user-rights
 # RUN useradd appuser && chown -R appuser /app
 # USER appuser
 
 # During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug
-CMD ["gunicorn", "--bind", "0.0.0.0:8000", "SellersInn.wsgi"]
+CMD ["gunicorn", "--bind", "0.0.0.0", "SellersInn.wsgi"]
diff --git a/SellersInn/__pycache__/settings.cpython-37.pyc b/SellersInn/__pycache__/settings.cpython-37.pyc
diff --git a/SellersInn/__pycache__/settings.cpython-38.pyc b/SellersInn/__pycache__/settings.cpython-38.pyc
diff --git a/SellersInn/settings.py b/SellersInn/settings.py
@@ -39,7 +39,9 @@
     'django.contrib.staticfiles',
     'django.contrib.postgres',
 
-    'main'
+    'main',
+
+    'google_analytics'
 ]
 
 MIDDLEWARE = [
@@ -143,3 +145,7 @@
 # )
 
 # STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
+GOOGLE_ANALYTICS = {
+    'google_analytics_id': 'UA-93164009-3',
+}
diff --git a/SellersInn/urls.py b/SellersInn/urls.py
@@ -14,9 +14,10 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import path, include, re_path
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', include('main.urls'))
+    path('', include('main.urls')),
+    re_path('djga/', include('google_analytics.urls')),
 ]
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,26 @@
+version: "3.4"
+
+# services:
+#   sellersinn:
+#     image: sellersinn
+#     build:
+#       context: .
+#       dockerfile: Dockerfile
+#     ports:
+#       - 8000
+
+services:
+  ###
+  # services
+  ###
+  django:
+    build: .
+    command: python manage.py runserver 0.0.0.0:3001
+    volumes:
+      - .:/app
+    ports:
+      - "3001:3001"
+    tty: true
+    stdin_open: true
+    dns:
+      - 8.8.8.8
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,26 +1,18 @@
 version: "3.4"
 
-# services:
-#   sellersinn:
-#     image: sellersinn
-#     build:
-#       context: .
-#       dockerfile: Dockerfile
-#     ports:
-#       - 8000
-
 services:
-  ###
-  # services
-  ###
   django:
     build: .
-    command: python manage.py runserver 0.0.0.0:3001
+    command: bash -c "python manage.py runserver 0.0.0.0:80 && python manage.py runserver 0.0.0.0:443"
     volumes:
       - .:/app
     ports:
-      - "3001:3001"
+      - "80:80"
+      - "443:443"
     tty: true
     stdin_open: true
     dns:
       - 8.8.8.8
+    expose:
+      - 80
+      - 443
diff --git a/main/__pycache__/admin.cpython-37.pyc b/main/__pycache__/admin.cpython-37.pyc
diff --git a/main/__pycache__/forms.cpython-37.pyc b/main/__pycache__/forms.cpython-37.pyc
diff --git a/main/__pycache__/models.cpython-37.pyc b/main/__pycache__/models.cpython-37.pyc
diff --git a/main/__pycache__/urls.cpython-37.pyc b/main/__pycache__/urls.cpython-37.pyc
diff --git a/main/__pycache__/views.cpython-37.pyc b/main/__pycache__/views.cpython-37.pyc
diff --git a/main/migrations/__pycache__/0002_auto_20200828_1607.cpython-37.pyc b/main/migrations/__pycache__/0002_auto_20200828_1607.cpython-37.pyc
diff --git a/main/migrations/__pycache__/0003_contact.cpython-37.pyc b/main/migrations/__pycache__/0003_contact.cpython-37.pyc
diff --git a/main/templates/main/Main.html b/main/templates/main/Main.html
@@ -9,8 +9,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Sellers Inn</title>
-    <meta name="description" content="Sellers Inn - A Reviews Analyzer Application">
+    <meta name="description" content="Sellers Inn is a Reviews Analyzer Service that helps sellers understand what their customers are thinking and make smarter, more effective decisions about their products.">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1" />
+    <meta name="Keywords" content="eCommerce, Analytics, Sellers, Amazon, EBay, Walmart, Graphs, Data, Machine Learning, Artifical Intelligence, AI, Sentiment Analysis, Products, Customers, Plotly, Natural Language Processing">
+    <link rel="icon" href="{% static "images\favicon.png" %}" type="image/x-icon">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
@@ -92,12 +94,16 @@
         </div>
     </nav>
 
+
     {% block content %}
 
 
     {% endblock content %}
 
-
+    {% load google_analytics_tags %}
+    <div style="display:none">
+        <img src="{% google_analytics %}" width="0" height="0" />
+    </div>
 
     <footer class="text-center">
         <div class="container">

diff --git a/main/templates/main/signup.html b/main/templates/main/signup.html
@@ -35,7 +35,7 @@ <h2>Request a Product Analysis</h2>
                         required="required">
                 </div>
                 <div class="form-group">
-                    <input type="text" class="form-control" name="Zip_Code" placeholder="Zip Code" required="required">
+                    <input type="text" class="form-control" name="Zip_Code" placeholder="Zip Code">
                 </div>
                 <div class="form-group">
                     <label class="form-check-label"><input type="checkbox" required="required"> I accept the <a

diff --git a/requirements.txt b/requirements.txt
@@ -8,4 +8,5 @@ urllib3==1.25.3
 w3lib==1.21.0
 numpy==1.18.5
 pandas==1.1.0
-psycopg2==2.8.5
+psycopg2==2.8.5
+django-google-analytics-app==4.4.2
diff --git a/static/images/favicon.png b/static/images/favicon.png