Merge remote-tracking branch 'origin/enginx'

fleizean · Apr 15, 2024 · fae5c64 · fae5c64
2 parents f9e6354 + 9a61fe1
commit fae5c64
Show file tree

Hide file tree

Showing 11 changed files with 1,768 additions and 1,990 deletions.
diff --git a/indianpong/indianpong/settings.py b/indianpong/indianpong/settings.py
@@ -128,16 +128,6 @@
     }
 }
 
-""" DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': environ.get("DB_NAME", default="transcendence"),
-        'USER': environ.get("DB_USER"),
-        'PASSWORD': environ.get("DB_PASSWORD"),
-        'HOST': environ.get("DB_HOST", default="localhost"),
-        'PORT': environ.get("DB_PORT", default="5432")
-    }
-} """
 
 AUTH_USER_MODEL = "pong.UserProfile"
 LOGIN_URL = "login"
@@ -191,18 +181,18 @@
 MEDIA_URL = "/media/"
 MEDIA_ROOT = BASE_DIR / "media"
 
-EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
+""" EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
 EMAIL_FILE_PATH = BASE_DIR / 'sent_emails'
-EMAIL_HOST_USER = 'indianpong@gmail.com'
+EMAIL_HOST_USER = 'indianpong@gmail.com' """
 
-""" EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'smtp.gmail.com'
 EMAIL_PORT = 587
 EMAIL_HOST_USER = environ.get("EMAIL_HOST_USER", default="indianpong@gmail.com")
 EMAIL_HOST_PASSWORD = environ.get("EMAIL_HOST_PASSWORD", default="hxog cqpq jltp xjhi")
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
 EMAIL_USE_TLS = True
-EMAIL_USE_SSL = False """
+EMAIL_USE_SSL = False
 
 """ import certifi
 environ['SSL_CERT_FILE'] = certifi.where() """
diff --git a/indianpong/pong/forms.py b/indianpong/pong/forms.py
@@ -33,8 +33,8 @@ def __init__(self, *args, **kwargs):
         self.lang = kwargs.pop('lang', 'en')  # Varsayılan dil: İngilizce
         super().__init__(*args, **kwargs)
 
-        #TODO make link spa compatible
-    """ def confirm_login_allowed(self, user):
+    #TODO make link spa compatible
+        """     def confirm_login_allowed(self, user):
         if not user.is_verified:
             raise forms.ValidationError(
                 mark_safe( 
@@ -545,7 +545,7 @@ def save(self, domain_override=None, token_generator=default_token_generator, re
         # Add the HTML version. This could be the same as the body if your email is only HTML.
         email.attach_alternative(message, "text/html")
 
-        # List of images
+        """ # List of images
         images = ['github.png', '268a.jpg', 'back.png', 'head.png']
 
         for img_name in images:
@@ -562,7 +562,7 @@ def save(self, domain_override=None, token_generator=default_token_generator, re
             img.add_header('Content-ID', f'<{img_name}>')
 
             # Attach the image to the email
-            email.attach(img)
+            email.attach(img) """
 
         # Send the email
         email.send(fail_silently=True)

diff --git a/indianpong/pong/langs.py b/indianpong/pong/langs.py
diff --git a/indianpong/pong/models.py b/indianpong/pong/models.py
@@ -225,7 +225,7 @@ def send_verification_email(self, request, user):
         # Add the HTML version. This could be the same as the body if your email is only HTML.
         email.attach_alternative(message, "text/html")
 
-        # List of images
+        """         # List of images
         images = ['github.png', '268a.jpg', 'back.png', 'head.png']
 
         for img_name in images:
@@ -242,7 +242,7 @@ def send_verification_email(self, request, user):
             img.add_header('Content-ID', f'<{img_name}>')
 
             # Attach the image to the email
-            email.attach(img)
+            email.attach(img) """
 
         # Send the email
         email.send(fail_silently=True)

diff --git a/indianpong/pong/templates/activate_account_email.html b/indianpong/pong/templates/activate_account_email.html
@@ -18,7 +18,7 @@
 				<td>
 					<table align="center" border="0" cellpadding="0" cellspacing="0" class="row row-1"
 						role="presentation"
-						style="mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #091548; background-image: url('cid:background_2.png'); background-position: center top; background-repeat: repeat;"
+						style="mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #091548; background-image: url('https://i.hizliresim.com/etd7upl.png'); background-position: center top; background-repeat: repeat;"
 						width="100%">
 						<tbody>
 							<tr>
@@ -44,7 +44,7 @@
 																<div align="center" class="alignment"
 																	style="line-height:10px">
 																	<div style="max-width: 232px;"><img alt="Main Image"
-																			src="cid:header3.png"
+																			src="https://i.hizliresim.com/ge7dj0t.png"
 																			style="display: block; height: auto; border: 0; width: 100%;"
 																			title="Main Image" width="232" /></div>
 																</div>
@@ -176,7 +176,7 @@
 																<div align="center" class="alignment"
 																	style="line-height:10px">
 																	<div style="max-width: 116px;"><img alt="Your Logo"
-																			src="cid:2_68747470733a.jpg"
+																			src="https://i.hizliresim.com/8j2vd79.jpg"
 																			style="display: block; height: auto; border: 0; width: 100%;"
 																			title="Your Logo" width="116" /></div>
 																</div>
@@ -198,7 +198,7 @@
 																		<tr>
 																			<td class="divider_inner"
 																				style="font-size: 1px; line-height: 1px; border-top: 1px solid #5A6BA8;">
-																				<span> </span></td>
+																				<span> </span></td>
 																		</tr>
 																	</table>
 																</div>
@@ -221,31 +221,31 @@
 																					href="https://github.com/temasictfic"
 																					target="_blank"><img alt="sciftci"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="sciftci"
 																						width="32" /></a></td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/fleizean"
 																					target="_blank"><img alt="eyagiz"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="eyagiz" width="32" /></a>
 																			</td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/fyurtsev"
 																					target="_blank"><img alt="fyurtsev"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="fyurtsev"
 																						width="32" /></a></td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/yeaktas"
 																					target="_blank"><img alt="yaktas"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="yaktas" width="32" /></a>
 																			</td>

diff --git a/indianpong/pong/templates/password_reset_email.html b/indianpong/pong/templates/password_reset_email.html
@@ -18,7 +18,7 @@
 				<td>
 					<table align="center" border="0" cellpadding="0" cellspacing="0" class="row row-1"
 						role="presentation"
-						style="mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #091548; background-image: url('cid:background_2.png'); background-position: center top; background-repeat: repeat;"
+						style="mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #091548; background-image: url('https://i.hizliresim.com/etd7upl.png'); background-position: center top; background-repeat: repeat;"
 						width="100%">
 						<tbody>
 							<tr>
@@ -44,7 +44,7 @@
 																<div align="center" class="alignment"
 																	style="line-height:10px">
 																	<div style="max-width: 232px;"><img alt="Main Image"
-																			src="cid:header3.png"
+																			src="https://i.hizliresim.com/ge7dj0t.png"
 																			style="display: block; height: auto; border: 0; width: 100%;"
 																			title="Main Image" width="232" /></div>
 																</div>
@@ -181,7 +181,7 @@
 																<div align="center" class="alignment"
 																	style="line-height:10px">
 																	<div style="max-width: 116px;"><img alt="Your Logo"
-																			src="cid:2_68747470733a.jpg"
+																			src="https://i.hizliresim.com/8j2vd79.jpg"
 																			style="display: block; height: auto; border: 0; width: 100%;"
 																			title="Your Logo" width="116" /></div>
 																</div>
@@ -226,31 +226,31 @@
 																					href="https://github.com/temasictfic"
 																					target="_blank"><img alt="sciftci"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="sciftci"
 																						width="32" /></a></td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/fleizean"
 																					target="_blank"><img alt="eyagiz"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="eyagiz" width="32" /></a>
 																			</td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/fyurtsev"
 																					target="_blank"><img alt="fyurtsev"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="fyurtsev"
 																						width="32" /></a></td>
 																			<td style="padding:0 5px 0 5px;"><a
 																					href="https://github.com/yeaktas"
 																					target="_blank"><img alt="yaktas"
 																						height="32"
-																						src="cid:1_icons8-github-50.png"
+																						src="https://i.hizliresim.com/inttftp.png"
 																						style="display: block; height: auto; border: 0;"
 																						title="yaktas" width="32" /></a>
 																			</td>