Merge pull request #151 from MicroPyramid/dev

enhancements

Author: ashwin31

ENV.md

@@ -1,16 +1,17 @@
-
 # Environment variables guidelines
 
+- All environment variables defined below and their usage.
+- Kindly add below environment variables to your local development with appropriate key/value accordingly.
 
 ## Common keys
 
 DEBUG=True/False
-SECRET_KEY="kaljoi uJFVK356"
-HTML_MINIFY=False
-ENV_TYPE="DEV/PROD"
-DEFAULT_FROM_EMAIL=''
-CONTACT_NUMBER=''
-PEEL_URL=""
+SECRET_KEY=""
+HTML_MINIFY=True/False
+ENV_TYPE="DEV" or "PROD"
+DEFAULT_FROM_EMAIL='PeelJobs <[email protected]>'
+CONTACT_NUMBER='850 009 9499'
+PEEL_URL="http://peeljobs.com/"
 CACHE_BACKEND = "memcached://127.0.0.1:11211/"
 MINIFIED_URL=''
 
@@ -23,8 +24,7 @@ CELERY_BROKER_URL='redis://localhost:6379/1'
 
 GOOGLE_CLIENT_ID=""
 GOOGLE_CLIENT_SECRET=""
-GOOGLE_LOGIN_HOST='http://localhost:8000/'
-GOOGLE_MAPS_API_KEY=""
+GOOGLE_LOGIN_HOST='http://localhost:8000'
 ## Elasticsearch keys
 
 HAYSTACKURL='http://127.0.0.1:9200/'

Pipfile

@@ -24,6 +24,7 @@ sorl-thumbnail = "==12.9.0"
 twython = "==3.9.1"
 dj-rest-auth = "==2.2.5"
 pyjwt = "==2.5.0"
+pytz = "==2025.1"
 djangorestframework = "==3.15.2"
 djangorestframework-simplejwt = "==5.5.0"
 sentry-sdk = "==2.22.0"

README.md

@@ -38,10 +38,10 @@ pip-check -H  # to see upgradable packages
 Following are the setup instruction for ubuntu 20.04.
 
 ```bash
-sudo apt install git postgresql python3 python3-dev python3-virtualenv build-essential ruby ruby-dev gem redis-server memcached redis-tools -y
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+sudo apt install git postgresql python3 python3-dev python3-virtualenv build-essential ruby ruby-dev gem redis-server memcached redis-tools virtualenv apt-transport-https ca-certificates curl software-properties-common gcc g++ make -y
+curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 sudo apt-get install -y nodejs
-sudo apt-get install node-less
+sudo npm install -g less
 ```
 
 ### Install and configure sass and less compilers
@@ -69,7 +69,18 @@ add the following to your path
 ##### Install requirements
 
 ```bash
+cp env.md .env
+sed -i 's/^SECRET_KEY=.*/SECRET_KEY="'$(openssl rand -base64 50 | tr -d '\n' | tr -d '=')'"/' .env
 pipenv install -d
+python manage.py migrate
+python manage.py loaddata industries
+python manage.py loaddata qualification
+python manage.py loaddata skills
+python manage.py loaddata countries
+python manage.py loaddata states
+python manage.py loaddata cities
+python manage.py update_index
+python manage.py createsuperuser
 ```
 
 For env variables, refer to env.md in source directory and you need to create a .env file to keep all env variables with their respective values.

dashboard/urls.py

@@ -62,7 +62,7 @@
     subscribers,
     view_subscribers,
     search_summary,
-    applicants_mail,
+    # applicants_mail,
     removing_duplicate_companies,
     reports,
     new_company,
@@ -286,7 +286,7 @@
         search_summary,
         name="search_summary",
     ),
-    url(r"^applicants-mails/", applicants_mail, name="applicants_mail"),
+    # url(r"^applicants-mails/", applicants_mail, name="applicants_mail"),
     url(
         r"^update-company-jobposts/",
         removing_duplicate_companies,

dashboard/views.py

@@ -3735,45 +3735,45 @@ def edit_company(request, company_id):
     return render(request, "dashboard/company/new_company.html", {"company": company})
 
 
-@permission_required("activity_edit", "activity_view")
-def applicants_mail(request):
-    current_date = datetime.strptime(str(datetime.now().date()), "%Y-%m-%d").strftime(
-        "%Y-%m-%d"
-    )
-
-    all_mail_applicants = list(db.users.find({"date": current_date}))
-
-    items_per_page = 100
-
-    no_pages = int(math.ceil(float(len(all_mail_applicants)) / items_per_page))
-    page = request.POST.get("page")
-    if page and bool(re.search(r"[0-9]", page)) and int(page) > 0:
-        if int(page) > (no_pages + 2):
-            return HttpResponseRedirect(reverse("dashboard:applicants"))
-        page = int(page)
-    else:
-        page = 1
-
-    all_mail_applicants = all_mail_applicants[
-        (page - 1) * items_per_page : page * items_per_page
-    ]
-    prev_page, previous_page, aft_page, after_page = get_prev_after_pages_count(
-        page, no_pages
-    )
-
-    return render(
-        request,
-        "dashboard/all_mail_applicants.html",
-        {
-            "all_mail_applicants": all_mail_applicants,
-            "aft_page": aft_page,
-            "after_page": after_page,
-            "prev_page": prev_page,
-            "previous_page": previous_page,
-            "current_page": page,
-            "last_page": no_pages,
-        },
-    )
+# @permission_required("activity_edit", "activity_view")
+# def applicants_mail(request):
+#     current_date = datetime.strptime(str(datetime.now().date()), "%Y-%m-%d").strftime(
+#         "%Y-%m-%d"
+#     )
+
+#     all_mail_applicants = list(db.users.find({"date": current_date}))
+
+#     items_per_page = 100
+
+#     no_pages = int(math.ceil(float(len(all_mail_applicants)) / items_per_page))
+#     page = request.POST.get("page")
+#     if page and bool(re.search(r"[0-9]", page)) and int(page) > 0:
+#         if int(page) > (no_pages + 2):
+#             return HttpResponseRedirect(reverse("dashboard:applicants"))
+#         page = int(page)
+#     else:
+#         page = 1
+
+#     all_mail_applicants = all_mail_applicants[
+#         (page - 1) * items_per_page : page * items_per_page
+#     ]
+#     prev_page, previous_page, aft_page, after_page = get_prev_after_pages_count(
+#         page, no_pages
+#     )
+
+#     return render(
+#         request,
+#         "dashboard/all_mail_applicants.html",
+#         {
+#             "all_mail_applicants": all_mail_applicants,
+#             "aft_page": aft_page,
+#             "after_page": after_page,
+#             "prev_page": prev_page,
+#             "previous_page": previous_page,
+#             "current_page": page,
+#             "last_page": no_pages,
+#         },
+#     )
 
 
 def edit_job_title(request, post_id):

env.md

@@ -121,12 +121,15 @@
                 </ul>
             </li>
           <li {% if request.session.url_id == 'subscribers' %}class="active_menu"{% endif %}><a href="{% url "dashboard:subscribers" %}" class="menu_item"><i class="fa fa-bell"></i><span>Subscribe</span></a></li>
+          {% comment %}
           <li {% if request.session.url_id == 'subscribers' %}class="active_menu"{% endif %}>
             <a><i class="fa fa-share"></i><span>Sent Mails</span></a>
             <ul class="sub_list">
               <li><a href="{% url "dashboard:applicants_mail" %}" class="menu_item"><i class='fa fa-caret-right'></i>Today's Mails</a></li>
             </ul>
           </li>
+          {% endcomment %}
+
           <li><a><i class="fa fa-medkit"></i><span>Duplicates</span></a>
             <ul class="sub_list">
               <li><a href="{% url 'dashboard:removing_duplicate_companies' %}" class="menu_item"><i class='fa fa-caret-right'></i>Company Jobposts</a></li>
@@ -191,9 +194,6 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js" integrity="sha512-2ImtlRlf2VVmiGZsjm9bEyhjGW4dU7B6TNwh/hx/iSByxNENtj3WVE6o/9Lj4TJeVXPi4bnOIMXFIJJAeufa0A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <!-- Select2 -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
-
-<!-- <script src="https://maps.googleapis.com/maps/api/js?key={{ GOOGLE_MAPS_API_KEY }}&libraries=places&sensor=false"
-        type="text/javascript"></script> -->
 <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
 
 {% compress js %}