Merge branch 'master' into bump_ll

ItsCalebJones · Jul 30, 2024 · e34d637 · e34d637
2 parents cfadd7e + a021459
commit e34d637
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,4 @@ dist/**
 .vscode/**
 docker/*.backup
 *.log
-.history/
+.history/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v4.4.6 (2024-07-29)
+
+### Fix
+
+* Issue with removed instagram and twitter links ([`9f8cf9f`](https://github.com/ItsCalebJones/SpaceLaunchNow-Server/commit/9f8cf9f23518564042f603b9f896df51d52ade73))
+
 ## v4.4.5 (2024-05-26)
 
 ### Fix

diff --git a/docker/README.md b/docker/README.md
@@ -1,4 +1,4 @@
-# Running LL via Docker
+c# Running LL via Docker
 
 ## Run Test
 1) Run `docker-compose -f docker-compose.test.yml build`

diff --git a/k8s/helm/templates/crons/cronjob.yaml b/k8s/helm/templates/crons/cronjob.yaml
@@ -80,7 +80,7 @@ spec:
                 secretKeyRef:
                   name: sln-auth-prod
                   key: aws-secret-access-key
-            - name: SLN_SECRET_KEY
+            - name: SLN_SENTRY_KEY
               valueFrom:
                 secretKeyRef:
                   name: sln-sentry-key

diff --git a/k8s/helm/templates/notification-service/deployment.yaml b/k8s/helm/templates/notification-service/deployment.yaml
@@ -116,7 +116,7 @@ spec:
                 secretKeyRef:
                   name: sln-auth-prod
                   key: fcm-key
-            - name: SLN_SECRET_KEY
+            - name: SLN_SENTRY_KEY
               valueFrom:
                 secretKeyRef:
                   name: sln-sentry-key

diff --git a/k8s/helm/templates/web/deployment.yaml b/k8s/helm/templates/web/deployment.yaml
@@ -146,7 +146,7 @@ spec:
                 secretKeyRef:
                   name: sln-auth-prod
                   key: discord-webhook
-            - name: SLN_SECRET_KEY
+            - name: SLN_SENTRY_KEY
               valueFrom:
                 secretKeyRef:
                   name: sln-sentry-key

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spacelaunchnow-server"
-version = "4.4.5"
+version = "4.4.6"
 description = "The Backend and Webserver for Space Launch Now"
 authors = ["Caleb Jones <[email protected]>"]
 readme = "README.md"

diff --git a/src/version.py b/src/version.py
@@ -1 +1 @@
-__version__ = "4.4.5"
+__version__ = "4.4.6"
diff --git a/src/web/templates/web/astronaut/astronaut_detail.html b/src/web/templates/web/astronaut/astronaut_detail.html
@@ -14,8 +14,8 @@
     <meta property="og:description"
           content="{{ astronaut.name }} - {{ astronaut.bio|truncatechars:100 }}">
     <meta property="og:url" content="https://spacelaunchnow.me/astronaut/{{ astronaut.slug }}"/>
-    {% if astronaut.astronaut_image.image %}
-        <meta property="og:image" content="{{ astronaut.astronaut_image.image.url }}"/>
+    {% if astronaut.image.image %}
+        <meta property="og:image" content="{{ astronaut.image.image.url }}"/>
     {% else %}
         <meta property="og:image" content="{% static  'img/social.png' %}"/>
         <meta property="og:image:width" content="3000"/>
@@ -31,8 +31,8 @@
     <meta name="twitter:card" content="summary_large_image"/>
     <meta name="twitter:title" content="Space Launch Now - {{ astronaut.name }}">
     <meta name="twitter:description" content="{{ astronaut.name }} - {{ astronaut.bio|truncatechars:100 }}">
-        {% if astronaut.astronaut_image.image %}
-        <meta name="twitter:image" content="{{ astronaut.astronaut_image.image.url }}"/>
+        {% if astronaut.image.image %}
+        <meta name="twitter:image" content="{{ astronaut.image.image.url }}"/>
     {% else %}
         <meta name="twitter:image" content="{% static  'img/social.png' %}"/>
     {% endif %}
@@ -53,8 +53,8 @@
             <!-- Post Content Column -->
             <div class="col-lg-9 col-md-12 col-xl-9">
                 <div class="text-center">
-                    {% if astronaut.astronaut_image.image %}
-                        <img src="{{ astronaut.astronaut_image.image }}"
+                    {% if astronaut.image.image %}
+                        <img src="{{ astronaut.image.image.url }}"
                              alt="Circle Image"
                              class="img-raised rounded-circle img-fluid text-center"
                              style="overflow: hidden;width: 400px;height: 400px;object-fit: cover;padding:1px;border:1px solid #cccccc;">

diff --git a/src/web/templates/web/astronaut/astronaut_list.html b/src/web/templates/web/astronaut/astronaut_list.html
@@ -140,8 +140,9 @@ <h4>Filter by Nationality</h4>
                                         <div class="card-body ">
                                             <div class="team-player">
                                                 <div class="col-md-12 col-sm-8 col-xs-8 mx-auto">
-                                                    {% if astronaut.astronaut_image.image %}
-                                                        {% thumbnail astronaut.astronaut_image.image "300x300" crop="80% top" as im %}
+                                                    {{ astronaut.image.image }}
+                                                    {% if astronaut.image.image %}
+                                                        {% thumbnail astronaut.image.image "300x300" crop="80% top" as im %}
                                                             <img class="img-raised rounded-circle img-fluid text-center"
                                                                  src="{{ im.url }}"
                                                                  style="padding:1px;border:1px solid #cccccc;max-height: 200px;max-width: 200px">

diff --git a/src/web/templates/web/astronaut/astronaut_search.html b/src/web/templates/web/astronaut/astronaut_search.html
@@ -88,8 +88,8 @@ <h3 class="title">Displaying {{ astronauts|length }} results.</h3>
                                         <div class="card-body ">
                                             <div class="team-player">
                                                 <div class="col-md-10 mx-auto">
-                                                    {% if astronaut.astronaut_image.image %}
-                                                        {% thumbnail astronaut.astronaut_image.image "300x300" crop="center" as im %}
+                                                    {% if astronaut.image.image %}
+                                                        {% thumbnail astronaut.image.image "300x300" crop="center" as im %}
                                                             <img class="img-raised rounded-circle img-fluid text-center"
                                                                  src="{{ im.url }}"
                                                                  style="padding:1px;border:1px solid #cccccc;">