Главная Обзор Помощь
Вход
yunoadmin
/
bambuddy
зеркало из https://github.com/maziggy/bambuddy
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge branch 'feature_user_authentication' of https://github.com/cadtoolbox/bambuddy into feature_user_authentication

Thomas Rambach 3 месяцев назад
Родитель
43d7788651 f482fc504c
Сommit
0c1e29954a
5 измененных файлов с 19 добавлено и 19 удалено
Единый вид Показать статистику Diff
  1. 14 14
      backend/app/services/email_service.py
  2. 1 1
      frontend/src/pages/UsersPage.tsx
  3. 2 2
      install/README.md
  4. 1 1
      install/docker-install.sh
  5. 1 1
      install/install.sh

+ 14 - 14
backend/app/services/email_service.py
Просмотреть файл 

@@ -281,8 +281,8 @@ BamBuddy Team
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 </head>
 
 </head>
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
-    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding: 20px; border-radius: 8px 8px 0 0;">
 
-        <h1 style="color: white; margin: 0; font-size: 24px;">Welcome to BamBuddy!</h1>
 
+    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); background-color: #667eea; padding: 20px; border-radius: 8px 8px 0 0;">
 
+        <h1 style="color: #ffffff; margin: 0; font-size: 24px; text-shadow: 0 1px 2px rgba(0,0,0,0.3);">Welcome to BamBuddy!</h1>
 
     </div>
 
     </div>
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
         <p style="font-size: 16px;">Your account has been created. Here are your login details:</p>
 
         <p style="font-size: 16px;">Your account has been created. Here are your login details:</p>
 
@@ -293,7 +293,7 @@ BamBuddy Team
 
         </div>
 
         </div>
 
 
 
         <div style="text-align: center; margin: 30px 0;">
 
         <div style="text-align: center; margin: 30px 0;">
 
-            <a href="{login_url}" style="display: inline-block; background: #667eea; color: white; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
+            <a href="{login_url}" style="display: inline-block; background-color: #667eea; color: #ffffff; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
         </div>
 
         </div>
 
 
 
         <p style="font-size: 14px; color: #666; border-top: 1px solid #ddd; padding-top: 20px; margin-top: 20px;">
 
         <p style="font-size: 14px; color: #666; border-top: 1px solid #ddd; padding-top: 20px; margin-top: 20px;">
 
@@ -349,8 +349,8 @@ BamBuddy Team
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 </head>
 
 </head>
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
-    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding: 20px; border-radius: 8px 8px 0 0;">
 
-        <h1 style="color: white; margin: 0; font-size: 24px;">Password Reset</h1>
 
+    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); background-color: #667eea; padding: 20px; border-radius: 8px 8px 0 0;">
 
+        <h1 style="color: #ffffff; margin: 0; font-size: 24px; text-shadow: 0 1px 2px rgba(0,0,0,0.3);">Password Reset</h1>
 
     </div>
 
     </div>
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
         <p style="font-size: 16px;">Your BamBuddy password has been reset.</p>
 
         <p style="font-size: 16px;">Your BamBuddy password has been reset.</p>
 
@@ -361,10 +361,10 @@ BamBuddy Team
 
         </div>
 
         </div>
 
 
 
         <div style="text-align: center; margin: 30px 0;">
 
         <div style="text-align: center; margin: 30px 0;">
 
-            <a href="{login_url}" style="display: inline-block; background: #667eea; color: white; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
+            <a href="{login_url}" style="display: inline-block; background-color: #667eea; color: #ffffff; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
         </div>
 
         </div>
 
 
 
-        <div style="background: #fff3cd; border: 1px solid #ffc107; border-radius: 4px; padding: 15px; margin: 20px 0;">
 
+        <div style="background-color: #fff3cd; border: 1px solid #ffc107; border-radius: 4px; padding: 15px; margin: 20px 0;">
 
             <p style="margin: 0; font-size: 14px; color: #856404;">
 
             <p style="margin: 0; font-size: 14px; color: #856404;">
 
                 <strong>⚠️ Security Alert:</strong> If you did not request this password reset, please contact your administrator immediately.
 
                 <strong>⚠️ Security Alert:</strong> If you did not request this password reset, please contact your administrator immediately.
 
             </p>
 
             </p>
 
@@ -426,14 +426,14 @@ async def create_welcome_email_from_template(
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 </head>
 
 </head>
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
-    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding: 30px; border-radius: 8px 8px 0 0;">
 
-        <h1 style="color: white; margin: 0; font-size: 24px;">{html.escape(subject)}</h1>
 
+    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); background-color: #667eea; padding: 30px; border-radius: 8px 8px 0 0;">
 
+        <h1 style="color: #ffffff; margin: 0; font-size: 24px; text-shadow: 0 1px 2px rgba(0,0,0,0.3);">{html.escape(subject)}</h1>
 
     </div>
 
     </div>
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
         <div style="font-size: 16px;">{escaped_text_body}</div>
 
         <div style="font-size: 16px;">{escaped_text_body}</div>
 
 
 
         <div style="text-align: center; margin: 30px 0;">
 
         <div style="text-align: center; margin: 30px 0;">
 
-            <a href="{login_url}" style="display: inline-block; background: #667eea; color: white; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
+            <a href="{login_url}" style="display: inline-block; background-color: #667eea; color: #ffffff; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
 </body>
 
 </body>
 
@@ -488,17 +488,17 @@ async def create_password_reset_email_from_template(
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 </head>
 
 </head>
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333; max-width: 600px; margin: 0 auto; padding: 20px;">
 
-    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding: 30px; border-radius: 8px 8px 0 0;">
 
-        <h1 style="color: white; margin: 0; font-size: 24px;">{html.escape(subject)}</h1>
 
+    <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); background-color: #667eea; padding: 30px; border-radius: 8px 8px 0 0;">
 
+        <h1 style="color: #ffffff; margin: 0; font-size: 24px; text-shadow: 0 1px 2px rgba(0,0,0,0.3);">{html.escape(subject)}</h1>
 
     </div>
 
     </div>
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
     <div style="background: #f9f9f9; padding: 30px; border-radius: 0 0 8px 8px; border: 1px solid #ddd; border-top: none;">
 
         <div style="font-size: 16px;">{escaped_text_body}</div>
 
         <div style="font-size: 16px;">{escaped_text_body}</div>
 
 
 
         <div style="text-align: center; margin: 30px 0;">
 
         <div style="text-align: center; margin: 30px 0;">
 
-            <a href="{login_url}" style="display: inline-block; background: #667eea; color: white; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
+            <a href="{login_url}" style="display: inline-block; background-color: #667eea; color: #ffffff; padding: 12px 30px; text-decoration: none; border-radius: 4px; font-weight: bold;">Login Now</a>
 
         </div>
 
         </div>
 
 
 
-        <div style="background: #fff3cd; border: 1px solid #ffc107; border-radius: 4px; padding: 15px; margin: 20px 0;">
 
+        <div style="background-color: #fff3cd; border: 1px solid #ffc107; border-radius: 4px; padding: 15px; margin: 20px 0;">
 
             <p style="margin: 0; font-size: 14px; color: #856404;">
 
             <p style="margin: 0; font-size: 14px; color: #856404;">
 
                 <strong>⚠️ Security Alert:</strong> If you did not request this password reset, please contact your administrator immediately.
 
                 <strong>⚠️ Security Alert:</strong> If you did not request this password reset, please contact your administrator immediately.
 
             </p>
 
             </p>

+ 1 - 1
frontend/src/pages/UsersPage.tsx
Просмотреть файл 

@@ -394,7 +394,7 @@ export function UsersPage() {
 
                             disabled={resetPasswordMutation.isPending}
 
                             disabled={resetPasswordMutation.isPending}
 
                           >
 
                           >
 
                             <RotateCcw className="w-4 h-4" />
 
                             <RotateCcw className="w-4 h-4" />
 
-                            {t('users.resetPassword') || 'Reset Password'}
 
+                            {t('users.form.resetPassword') || 'Reset Password'}
 
                           </Button>
 
                           </Button>
 
                         )}
 
                         )}
 
                       </div>
 
                       </div>

+ 2 - 2
install/README.md
Просмотреть файл 

@@ -8,14 +8,14 @@ Interactive installation scripts for BamBuddy with support for both native and D
 
 
 
 **Linux/macOS:**
 
 **Linux/macOS:**
 
 ```bash
 
 ```bash
 
-curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/docker-install.sh | bash
 
+curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/docker-install.sh -o docker-install.sh && chmod +x docker-install.sh && ./docker-install.sh
 
 ```
 
 ```
 
 
 
 ### Native Installation
 
 ### Native Installation
 
 
 
 **Linux/macOS:**
 
 **Linux/macOS:**
 
 ```bash
 
 ```bash
 
-curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/install.sh | bash
 
+curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/install.sh -o install.sh && chmod +x install.sh && ./install.sh
 
 ```
 
 ```
 
 
 
 ---
 
 ---

+ 1 - 1
install/docker-install.sh
Просмотреть файл 

@@ -4,7 +4,7 @@
 
 # Supports: Linux (all distros), macOS
 
 # Supports: Linux (all distros), macOS
 
 #
 
 #
 
 # Usage:
 
 # Usage:
 
-#   Interactive:  curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/docker-install.sh | bash
 
+#   Interactive:  curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/docker-install.sh -o docker-install.sh && chmod +x docker-install.sh && ./docker-install.sh
 
 #   Unattended:   ./docker-install.sh --path /opt/bambuddy --port 8000 --yes
 
 #   Unattended:   ./docker-install.sh --path /opt/bambuddy --port 8000 --yes
 
 #
 
 #
 
 # Options:
 
 # Options:

+ 1 - 1
install/install.sh
Просмотреть файл 

@@ -4,7 +4,7 @@
 
 # Supports: Debian/Ubuntu, RHEL/Fedora/CentOS, Arch Linux, macOS
 
 # Supports: Debian/Ubuntu, RHEL/Fedora/CentOS, Arch Linux, macOS
 
 #
 
 #
 
 # Usage:
 
 # Usage:
 
-#   Interactive:  curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/install.sh | bash
 
+#   Interactive:  curl -fsSL https://raw.githubusercontent.com/maziggy/bambuddy/main/install/install.sh -o install.sh && chmod +x install.sh && ./install.sh
 
 #   Unattended:   ./install.sh --path /opt/bambuddy --port 8000 --yes
 
 #   Unattended:   ./install.sh --path /opt/bambuddy --port 8000 --yes
 
 #
 
 #
 
 # Options:
 
 # Options: