Merge pull request #218 from fleizean/spa

Spa
fleizean · Apr 17, 2024 · 0a8148c · 0a8148c
2 parents e4eef59 + 06cacc4
commit 0a8148c
Show file tree

Hide file tree

Showing 18 changed files with 539 additions and 472 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,23 +9,22 @@ services:
     restart: always
     ports:
       - 8000:8000
-#   depends_on:
-#     - db
-#   env_file:
-#     - .env
-#   networks:
-#      - indianpongnet
-
-#  db:
-#    container_name: db
-#    image: db
-#    build:
-#      context: ./
-#      dockerfile: docker.dockerfile
-#    restart: always
-#    networks:
-#      - indianpongnet
-#    
-#networks:
-#  indianpongnet:
-#    driver: bridge
+    depends_on:
+      - db
+    env_file:
+      - .env
+    networks:
+      - indianpongnet
+  db:
+    container_name: db
+    image: db
+    build:
+      context: ./
+      dockerfile: docker.dockerfile
+    restart: always
+    networks:
+      - indianpongnet
+
+networks:
+  indianpongnet:
+    driver: bridge
diff --git a/indianpong/indianpong/settings.py b/indianpong/indianpong/settings.py
@@ -101,16 +101,16 @@
 
 # Database
 # https://docs.djangoproject.com/en/5.0/ref/settings/#databases
-
+""" 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': BASE_DIR / 'db.sqlite3',
     }
-}
+} """
 
 
-""" DATABASES = {
+DATABASES = {
     'default': {
         'ENGINE': os.getenv('DB_ENGINE', default='django.db.backends.postgresql'),
         'NAME': os.getenv('DB_NAME', default='pong'), 
@@ -119,7 +119,7 @@
         'HOST': 'db',  # Değişiklik burada
         'PORT': os.getenv('DB_PORT', default='5432'),
     }
-} """
+}
 
 # For production, you should use a more robust caching backend like Memcached or Redis.
 CACHES = {

diff --git a/indianpong/pong/langs.py b/indianpong/pong/langs.py
@@ -86,6 +86,12 @@ def get_lang_en():
         "setPasswordInputConfirmPasswordText": "Confirm New Password",
         "setPasswordButtonText": "Set ✓",
 
+        #ActivationFailed
+        "activationFailedPageTittle": "Activation Failed",
+        "activationFailedHeaderText": "Activation Failed",
+        "activationFailedSubHeaderText": "Your activation is failed!",
+        "activationFailedButtonText": "GO HOME",
+
         #Dashboard
         "dashboardPageTittle": "Dashboard",
         "dashboardText1": "Welcome, ",
@@ -449,6 +455,12 @@ def get_lang_tr():
         "setPasswordInputConfirmPasswordText": "Yeni Şifreyi Onayla",
         "setPasswordButtonText": "Belirle ✓",
 
+        #ActivationFailed
+        "activationFailedPageTittle": "Aktivasyon Başarısız",
+        "activationFailedHeaderText": "Aktivasyon Basarisiz",
+        "activationFailedSubHeaderText": "Aktivasyonunuz başarısız oldu!",
+        "activationFailedButtonText": "ANA SAYFA'YA DÖN",
+
         #Dashboard
         "dashboardPageTittle": "Ana Sayfa",
         "dashboardText1": "HOŞ GELDİNİZ, ",
@@ -816,6 +828,12 @@ def get_lang_pt():
         "setPasswordInputConfirmPasswordText": "Confirme a Nova Senha",
         "setPasswordButtonText": "Definir ✓",
 
+        #ActivationFailed
+        "activationFailedPageTittle": "Ativação Falhou",
+        "activationFailedHeaderText": "Ativacao Falhou",
+        "activationFailedSubHeaderText": "Sua ativação falhou!",
+        "activationFailedButtonText": "VOLTAR AO LOGIN",
+
         #Dashboard
         "dashboardPageTittle": "Painel",
         "dashboardText1": "Bem-vindo, ",
@@ -1177,6 +1195,12 @@ def get_lang_hi():
         "setPasswordInputConfirmPasswordText": "नया पासवर्ड की पुष्टि करें",
         "setPasswordButtonText": "सेट करें ✓",
 
+        #ActivationFailed
+        "activationFailedPageTittle": "सक्रियण विफल",
+        "activationFailedHeaderText": "सक्रियण विफल",
+        "activationFailedSubHeaderText": "आपका सक्रियण विफल हुआ!",
+        "activationFailedButtonText": "वापस लॉगिन",
+
         #Dashboard
         "dashboardPageTittle": "डैशबोर्ड",
         "dashboardText1": "स्वागत, ",

diff --git a/indianpong/pong/models.py b/indianpong/pong/models.py
@@ -111,8 +111,7 @@ def get_rank_name(self):
             if rank_range[0] <= self.elo_point <= rank_range[1]:
                 return rank_name
         return "Reinald"
-
-
+
 class UserItem(models.Model):
     user = models.ForeignKey(UserProfile, on_delete=models.CASCADE)
     item = models.ForeignKey(StoreItem, on_delete=models.CASCADE)

diff --git a/indianpong/pong/templates/aboutus.html b/indianpong/pong/templates/aboutus.html
@@ -16,7 +16,7 @@
             <div class="profile_card c4">
                 <div class="profile_card__inner">
                     <div class="profile_card__front">
-                        <img src="https://i.hizliresim.com/mu0ink4.jpg" alt="Avatar" class="profile-img">
+                        <img src="{% static 'assets/profile/sciftci.jpeg' %}" alt="Avatar" class="profile-img">
                         <div class="profile_card__detail">
                             <br>
                             <p class="profile__title">Samet Çiftçi</p>
@@ -32,7 +32,7 @@
             <div class="profile_card c4">
                 <div class="profile_card__inner">
                     <div class="profile_card__front">
-                        <img src="https://i.hizliresim.com/ij9ktl2.jpeg" alt="Avatar" class="profile-img">
+                        <img src="{% static 'assets/profile/fyurtsev.jpeg' %}" alt="Avatar" class="profile-img">
                         <div class="profile_card__detail">
                             <p class="profile__title">Furkan Yurtseven</p>
                         </div>
@@ -47,7 +47,7 @@
             <div class="profile_card c4">
                 <div class="profile_card__inner">
                     <div class="profile_card__front">
-                        <img src="https://avatars.githubusercontent.com/u/96894640?v=4" alt="Avatar" class="profile-img">
+                        <img src="{% static 'assets/profile/yeaktas.jpeg' %}" alt="Avatar" class="profile-img">
                         <div class="profile_card__detail">
                             <p class="profile__title">Yunus Emre Aktaş</p>
                         </div>
@@ -62,7 +62,7 @@
             <div class="profile_card c4">
                 <div class="profile_card__inner">
                     <div class="profile_card__front">
-                        <img src="https://avatars.githubusercontent.com/u/66090171?v=4" alt="Avatar" class="profile-img">
+                        <img src="{% static 'assets/profile/eyagiz.jpeg' %}" alt="Avatar" class="profile-img">
                         <div class="profile_card__detail">
                             <br>
                             <p class="profile__title">Enes Yağız</p>
@@ -78,7 +78,7 @@
             <div class="profile_card c4">
                 <div class="profile_card__inner">
                     <div class="profile_card__front">
-                        <img src="https://avatars.githubusercontent.com/u/94763376?v=4" alt="Avatar" class="profile-img">
+                        <img src="{% static 'assets/profile/ataskin.jpeg' %}" alt="Avatar" class="profile-img">
                         <div class="profile_card__detail">
                             <br>
                             <p class="profile__title">A. Can Taşkın</p>

diff --git a/indianpong/pong/templates/activate_account_email.html b/indianpong/pong/templates/activate_account_email.html
@@ -249,6 +249,15 @@
 																						style="display: block; height: auto; border: 0;"
 																						title="yaktas" width="32" /></a>
 																			</td>
+
+																			<td style="padding:0 5px 0 5px;"><a
+																				href="https://github.com/cantaskin"
+																				target="_blank"><img alt="cantaskin"
+																					height="32"
+																					src="https://avatars.githubusercontent.com/u/94763376?v=4"
+																					style="display: block; height: auto; border: 0;"
+																					title="cantaskin" width="32" /></a>
+																			</td>
 																		</tr>
 																	</table>
 																</div>

diff --git a/indianpong/pong/templates/activation_fail.html b/indianpong/pong/templates/activation_fail.html
@@ -1,10 +1,23 @@
 {% extends "base.html" %}
 
-{% block title %}Activation Failed{% endblock %}
+{% block title %}{{context.activationFailedPageTittle}}{% endblock %}
 
 {% block app %}
 <div class="HeaderArea" id="HeaderArea">
-    <div class="big-text">Activation Failed</div>
-    <div class="small-text">Your activation is failed!</div>
+    <div class="big-text">{{context.activationFailedHeaderText}}</div>
+    <div class="small-text">{{context.activationFailedSubHeaderText}}</div>
+    <div class="gohome-button-container">
+        <a onclick="swapApp('/login')"><button class="gohome-button" type="button">
+          <strong><i class="bi bi-box-arrow-in-right"></i> {{context.activationFailedButtonText}}</strong>
+          <div id="container-stars">
+            <div id="stars"></div>
+          </div>
+
+          <div id="glow">
+            <div class="circle"></div>
+            <div class="circle"></div>
+          </div>
+        </button></a>
+    </div>
 </div>
 {% endblock app %}
diff --git a/indianpong/pong/templates/password_reset_email.html b/indianpong/pong/templates/password_reset_email.html
@@ -254,6 +254,14 @@
 																						style="display: block; height: auto; border: 0;"
 																						title="yaktas" width="32" /></a>
 																			</td>
+																			<td style="padding:0 5px 0 5px;"><a
+																				href="https://github.com/cantaskin"
+																				target="_blank"><img alt="cantaskin"
+																					height="32"
+																					src="https://avatars.githubusercontent.com/u/94763376?v=4"
+																					style="display: block; height: auto; border: 0;"
+																					title="cantaskin" width="32" /></a>
+																			</td>
 																		</tr>
 																	</table>
 																</div>

diff --git a/indianpong/pong/views.py b/indianpong/pong/views.py
@@ -105,10 +105,12 @@ def signup(request):
 
 @never_cache
 def activate_account(request, token):
+    lang = request.COOKIES.get('selectedLanguage', 'en')
+    context = langs.get_langs(lang)
     try:
         token = VerifyToken.objects.get(token=token)
     except VerifyToken.DoesNotExist:
-        return render(request, "activation_fail.html")
+        return render(request, "activation_fail.html", {"context": context})
     token.user.is_verified = True
     token.user.save()
     token.delete()

diff --git a/indianpong/renewdb.sh b/indianpong/renewdb.sh
@@ -16,6 +16,6 @@ rm -rf media/*
 python3 manage.py makemigrations
 python3 manage.py migrate
 python3 manage.py initdata
-#python3 manage.py populate 10
+python3 manage.py populate 10
 #python3 manage.py populate
 exec "$@"
diff --git a/indianpong/static/assets/profile/ataskin.jpeg b/indianpong/static/assets/profile/ataskin.jpeg
diff --git a/indianpong/static/assets/profile/eyagiz.jpeg b/indianpong/static/assets/profile/eyagiz.jpeg
diff --git a/indianpong/static/assets/profile/fyurtsev.jpeg b/indianpong/static/assets/profile/fyurtsev.jpeg
diff --git a/indianpong/static/assets/profile/sciftci.jpeg b/indianpong/static/assets/profile/sciftci.jpeg
diff --git a/indianpong/static/assets/profile/yeaktas.jpeg b/indianpong/static/assets/profile/yeaktas.jpeg
diff --git a/indianpong/static/css/style.css b/indianpong/static/css/style.css
@@ -111,6 +111,15 @@ body {
   margin-bottom: 5px;
 }
 
+
+.big-text-activation {
+  animation: backInDown 1s ease;
+  font-size: 6em;
+  color: aliceblue;
+  font-family: "VT323", monospace;
+  margin-bottom: 5px;
+}
+
 .big-text-email {
   animation: backInDown 1s ease;
   font-size: 6em;