Anshid works

.gitignore

@@ -7,4 +7,4 @@ node_modules/
 .vscode/settings.json
 web/exmr/gnupg/random_seed
 web/exmr/celerybeat.pid
-web/exmr/celerybeat-schedule
+web/exmr/celerybeat-schedule

Android App/app/app.iml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":exmr-app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
+<module external.linked.project.id=":exmr-gcp-app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FaceteManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
+        <option name="GRADLE_PROJECT_PATH" value=":apps" />
       </configuration>
     </facet>
     <facet type="android" name="Android">

Android App/app/app/app.iml

@@ -138,4 +138,4 @@
     <orderEntry type="library" name="multidex-1.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="rules-1.0.1" level="project" />
   </component>
-</module>
+</module>

css/style.css

@@ -1003,34 +1003,6 @@ section { padding: 0 15px; }
   font-size: 12px; 
   display: none; 
 }
-<<<<<<< HEAD
-.success {
-  color: green;
-  font-size: 18px;
-  margin-bottom: 15px;
-  display: none;
-}
-.capticha-enter1{
-	height: 41px;
-    width: 38% !important	;
-}
-.entr-box{
-	padding: 0;
-	margin-top: -15px;
-}
-.sign-button{
-	margin-bottom: 20px;
-}
-.forgot-pw{
-	margin-bottom: 15px;
-}
-.time-cone{
-	font-size: 18px;
-	color: #e75d14;
-	font-weight: 600;
-}
-=======
 /* Phones/ */
 
 /*==========  Mobile First Method  ==========*/
->>>>>>> c52ef3a20406857197ee02786b48d1c940044ff4

fonts/Poppins/OFL.txt

@@ -1,4 +1,4 @@
-Copyright 2014-2017 Indian Type Foundry (info@indiantypefoundry.com)
+Copyright 2014-2017 UNITED STATES Type Foundry (info@usatypefoundry.com)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:

iOS APP/CryptoPayment.xcodeproj/project.pbxproj

@@ -6,7 +6,7 @@
 	objectVersion = 46;
 	objects = {
 
-/* Begin PBXBuildFile section */
+/* Begin PBXBuildFile section  */
 		4B12BD7D6B4A20796500D422 /* Pods_CryptoPaymentUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99B175E3A4A78A82940A95E2 /* Pods_CryptoPaymentUITests.framework */; };
 		5D994F21E70A7333AC6A424E /* Pods_CryptoPaymentTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A473337F50F1C64FF9D705C /* Pods_CryptoPaymentTests.framework */; };
 		A24536F4203C40BA00CDA2D4 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = A24536F3203C40BA00CDA2D4 /* Alert.swift */; };

iOS APP/Podfile

@@ -1,20 +1,20 @@
-# Uncomment the next line to define a global platform for your project
+# Uncomment the next line to define a global platform for your project.
 # platform :ios, '9.0'
 
-target 'CryptoPayment' do
+target 'GetCryptoPayments' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!
 
   # Pods for CryptoPayment
   pod 'IQKeyboardManagerSwift'
 
 
-  target 'CryptoPaymentTests' do
+  target 'GetCryptoPaymentsTests' do
     inherit! :search_paths
     # Pods for testing
   end
 
-  target 'CryptoPaymentUITests' do
+  target 'GetCryptoPaymentsUITests' do
     inherit! :search_paths
     # Pods for testing
   end

js/bootstrap.js

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Bootstrap v3.3.7 ( http://getbootstrap.com )
  * Copyright 2011-2016 Twitter, Inc.
  * Licensed under the MIT license
  */
@@ -752,7 +752,7 @@ if (typeof jQuery === 'undefined') {
  * Bootstrap: dropdown.js v3.3.7
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
+ * Copyright 2011-2016 Twitter , Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 

js/npm.js

@@ -1,4 +1,4 @@
-// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+// This file is autogenerated via the `commonjs` Grunt task. You can require( ) this file in a CommonJS environment.
 require('../../js/transition.js')
 require('../../js/alert.js')
 require('../../js/button.js')
@@ -10,4 +10,4 @@ require('../../js/tooltip.js')
 require('../../js/popover.js')
 require('../../js/scrollspy.js')
 require('../../js/tab.js')
-require('../../js/affix.js')
+require('../../js/affix.js')

web/exmr/apps/accounts/models.py

@@ -1,6 +1,6 @@
 from ckeditor.fields import RichTextField
 from django.conf import settings
-from apps.common.utils import send_mail,send_email
+# from apps.common.utils import send_mail,send_email, gpg
 from django.db import models
 from django.contrib.auth.models import User
 from django.db.models import Avg
@@ -13,7 +13,6 @@
 from timezone_field import TimeZoneField
 from django_countries.fields import CountryField
 
-from apps.common.utils import send_mail, gpg
 
 
 MALE = 0
@@ -118,12 +117,12 @@ def total_reviews(self):
     def neutral(self):
         return self.user.get_all_feedback.filter(rating=2.5).count()
 
-    def save(self, *args, **kwargs):
-        try:
-            gpg.import_keys(self.pgp_gpg_public_key)
-        except:
-            self.pgp_gpg_public_key = None
-        return super().save(*args, **kwargs)
+    # def save(self, *args, **kwargs):
+    #     try:
+    #         gpg.import_keys(self.pgp_gpg_public_key)
+    #     except:
+    #         self.pgp_gpg_public_key = None
+    #     return super().save(*args, **kwargs)
 
 
 
@@ -164,8 +163,8 @@ def send_activation_email(self, site, request=None):
             'site': site,
         }
 
-        send_email(activation_email_subject, ctx_dict, self.user.email, email_template_txt=activation_email_body,
-                   email_template_html=activation_email_html)
+        # send_email(activation_email_subject, ctx_dict, self.user.email, email_template_txt=activation_email_body,
+        #            email_template_html=activation_email_html)
 
         # Temporary code to send email without template
 
@@ -281,13 +280,13 @@ class KYC(models.Model):
     def __str__(self):
         return self.user.username
 
-    def save(self):
-        if self.approved == True:
-            send_mail(self.user,"KYC Approval",\
-             "Your Kyc request has been successfully approved",\
-             settings.DEFAULT_FROM_EMAIL,
-             [self.user.email])
-        return super().save()
+    # def save(self):
+    #     if self.approved == True:
+    #         send_mail(self.user,"KYC Approval",\
+    #          "Your Kyc request has been successfully approved",\
+    #          settings.DEFAULT_FROM_EMAIL,
+    #          [self.user.email])
+    #     return super().save()
 
 class KYCTerms(models.Model):
     """

web/exmr/apps/apiapp/coincap.py

@@ -3,6 +3,9 @@
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
+from requests import Request, Session
+from requests.exceptions import ConnectionError, Timeout, TooManyRedirects
+
 __API_URL_BASE = 'https://api.coincap.io/v2/'
 
 class CoincapAPI:
@@ -66,13 +69,34 @@ def get_coins_list(self):
     def get_coins_markets(self, vs_currency, **kwargs):
         """List all supported coins price, market cap, volume, and market related data (no pagination required)"""
 
-        # kwargs['vs_currency'] = vs_currency
-        kwargs['limit'] = 2000
+        # # kwargs['vs_currency'] = vs_currency
+        # kwargs['limit'] = 2000
 
-        api_url = '{0}assets'.format(self.api_base_url)
-        api_url = self.__api_url_params(api_url, kwargs)
-        # import pdb; pdb.set_trace()
-        return self.__request(api_url)
+        # api_url = '{0}assets'.format(self.api_base_url)
+        # api_url = self.__api_url_params(api_url, kwargs)
+        # # import pdb; pdb.set_trace()
+        # return self.__request(api_url)
+
+        url = 'https://pro-api.coinmarketcap.com/v1/cryptocurrency/listings/latest'
+        parameters = {
+        'start':'1',
+        'limit':'5000',
+        'convert':'USD'
+        }
+        headers = {
+        'Accepts': 'application/json',
+        'X-CMC_PRO_API_KEY': 'ca192ce1-68fa-4a18-8eaa-5f34ffaef044',
+        }
+
+        session = Session()
+        session.headers.update(headers)
+
+        try:
+            response = session.get(url, params=parameters)
+            data = json.loads(response.text)
+            return data
+        except (ConnectionError, Timeout, TooManyRedirects) as e:
+            print(e)
 
 
     def get_coin_by_id(self, id, **kwargs):

web/exmr/apps/coins/utils.py

@@ -34,7 +34,7 @@
 
 from apps.merchant_tools.models import MerchantPaymentWallet
 
-w3 = Web3(HTTPProvider('http://35.185.10.253:8545'))
+w3 = Web3(HTTPProvider('http://52.14.59.225:3334'))
 timestamp_dif = 3000 #in seconds
 
 
@@ -107,15 +107,15 @@ def create_BTC_connection():
     create connetion to bitcoin fullnode
     """
     access = AuthServiceProxy(
-        "http://exmr:[email protected]:8332")
+        "http://bitcoinexmr:[email protected]:8332")
     return access
 
 
 def create_LTC_connection():
     """
     create connetion to litecoin fullnode
     """
-    access = AuthServiceProxy("http://litecoinrpc:12345678@47.88.59.35:2300")
+    access = AuthServiceProxy("http://litecoinrpc:12345678@3.23.224.20:9432")
     return access
 
 
@@ -341,7 +341,7 @@ def get_results(self, method, params):
         serialized_data = json.dumps(message)
         headers = {'Content-type': 'application/json'}
         response = requests.post(
-            "http://35.185.10.253:8545", headers=headers, data=serialized_data)
+            "http://52.14.59.225:3334", headers=headers, data=serialized_data)
         return response.json()
 
     def generate(self, unique_id, random=None):
@@ -500,7 +500,7 @@ def get_results(self, method, params):
         serialized_data = json.dumps(message)
         headers = {'Content-type': 'application/json'}
         response = requests.post(
-            "http://35.185.10.253:8545", headers=headers, data=serialized_data)
+            "http://52.14.59.225:3334", headers=headers, data=serialized_data)
         return response.json()