Merge remote-tracking branch 'origin/production'

.env

@@ -24,6 +24,9 @@ AZURE_AD_TENANT_ID=f69d1a93-bfba-498a-9b60-e87c1bc26276
 
 APPLE_TEAM_ID=XC57P9SXDK
 APPLE_KEY_ID=TB3V355G5Y
+APPLE_APP_ID=com.mwhitnessing.sofia
+APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IjlRVzkyNkZTSzkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxNDY3MDQxOSwiZXhwIjoxNzMwMjIyNDIwLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.KUW2roM2MAyfe2RphAoeAB-OK4LolGcO347SCxIocM3RXR0Z_5GVwu0BJiHwh2nO4WGXi2xHJgBvuwZhdAPWug
+APPLE_PK=-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgLJtuaml9xsCzcKSH\nRvaTqmxoQgPzxXtk9jWZGU90FQCgCgYIKoZIzj0DAQehRANCAATM910/AhLshLvn\nWbmWi7F580AqLoNvHKHB4A1bccz+9QSvj0AcYA4J0BiMFfQrhXC5/SKEe7I0pDcv\nn4UlL3Sx\n-----END PRIVATE KEY-----
 
 # APPLE_APP_ID=com.mwhitnessing.sofia
 # APPLE_SECRET=eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJpYXQiOjE3MTMzMDQ1OTMsImV4cCI6MTcyODg1NjU5MywiYXVkIjoiaHR0cHM6Ly9hcHBsZWlkLmFwcGxlLmNvbSIsImlzcyI6IlhDNTdQOVNYREsiLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.iO2prjQ_4P7F17R7LTJfG9zHluj59uUtm8DA1LbK49jVBMeGHQP_Az7s_yU5D-GeMHSwU7VnVHcaVKiGWT_Yjg
@@ -32,8 +35,7 @@ APPLE_KEY_ID=TB3V355G5Y
 #APPLE_APP_ID=XC57P9SXDK.com.mwhitnessing.sofia
 #APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IlRCM1YzNTVHNVkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxMjE3ODM0MiwiZXhwIjoxNzI3NzMwMzQzLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.XceA0qUQi0tXg0GM_LkJkpNU5AqXLiSB2JlEVbHCB_nINbQTWkjtoWxfqmvdOkIzwKtvdQ8FFb-crK9no9Bbbw
 # to generate
-APPLE_APP_ID=com.mwhitnessing.sofia
-APPLE_SECRET=eyJhbGciOiJFUzI1NiIsImtpZCI6IjlRVzkyNkZTSzkifQ.eyJhdWQiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiaXNzIjoiWEM1N1A5U1hESyIsImlhdCI6MTcxNDY3MDQxOSwiZXhwIjoxNzMwMjIyNDIwLCJzdWIiOiJjb20ubXdoaXRuZXNzaW5nLnNvZmlhIn0.KUW2roM2MAyfe2RphAoeAB-OK4LolGcO347SCxIocM3RXR0Z_5GVwu0BJiHwh2nO4WGXi2xHJgBvuwZhdAPWug
+
 
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pwwa",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "private": true,
   "description": "JW PW Web App",
   "repository": "http://git.d-popov.com/popov/next-cart-app.git",

pages/api/auth/[...nextauth].ts

@@ -45,10 +45,17 @@ export const authOptions: NextAuthOptions = {
         }
       }
     }),
-    // AppleProvider({
+    AppleProvider({
       // clientId: process.env.APPLE_APP_ID,
       // clientSecret: process.env.APPLE_SECRET
-    // }),
+      clientId: process.env.APPLE_APP_ID,
+      clientSecret: {
+        appleId: process.env.APPLE_APP_ID,
+        teamId: process.env.APPLE_TEAM_ID,
+        privateKey: process.env.APPLE_PK,
+        keyId: process.env.APPLE_KEY_ID,
+      }
+    }),
     // AzureADProvider({
     //   clientId: process.env.AZURE_AD_CLIENT_ID,
     //   clientSecret: process.env.AZURE_AD_CLIENT_SECRET,
@@ -251,13 +258,13 @@ export const authOptions: NextAuthOptions = {
       };
     },
   },
-  pages: {
-    signIn: "/auth/signin",
-    signOut: "/auth/signout",
-    error: "/message", // Error code passed in query string as ?error=
-    verifyRequest: "/auth/verify-request", // (used for check email message)
-    newUser: null // If set, new users will be directed here on first sign in
-  },
+  //   pages: {
+  //     signIn: "/auth/signin",
+  //     signOut: "/auth/signout",
+  //     error: "/message", // Error code passed in query string as ?error=
+  //     verifyRequest: "/auth/verify-request", // (used for check email message)
+  //     newUser: null // If set, new users will be directed here on first sign in
+  //   },
 }
 
 export default NextAuth(authOptions)

pages/auth/signin.tsx

@@ -70,8 +70,6 @@ export default function SignIn({ csrfToken }) {
                                     src="https://authjs.dev/img/providers/google.svg" className="mr-2" />
                                 Влез чрез Google
                             </button>
-                            {/* Add more buttons for other SSO providers here in similar style */}
-                        </div>
                             {/* Apple Sign-In Button */}
                             <button onClick={() => signIn('apple', { callbackUrl: '/' })}
                                 className="mt-4 flex items-center justify-center w-full py-3 px-4 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50">
@@ -79,6 +77,9 @@ export default function SignIn({ csrfToken }) {
                                     src="https://authjs.dev/img/providers/apple.svg" className="mr-2" />
                                 Влез чрез Apple
                             </button>
+                            {/* Add more buttons for other SSO providers here in similar style */}
+
+                        </div>
 
                         {/* Divider (Optional) */}
                         <div className="w-full max-w-xs mt-8 mb-8">

server.js

@@ -336,8 +336,11 @@ nextApp
             placeOfEvent: shift.cartEvent.location.name,
             time: time,
             //bold the text after - in the notes
-            notes: shift.notes.substring(0, shift.notes.indexOf("-") + 1),
-            notes_bold: shift.notes.substring(shift.notes.indexOf("-") + 1),
+            //notes: shift.notes.substring(0, shift.notes.indexOf("-") + 1),
+            //notes_bold: shift.notes.substring(shift.notes.indexOf("-") + 1),
+            notes: shift.assignments.some(a => a.isWithTransport) ? "Транспорт: " : "",
+            notes_bold: shift.assignments.filter(a => a.isWithTransport).map(a => common.getInitials(a.publisher.firstName + " " + a.publisher.lastName)).join(", "),
+
             names: shift.assignments
               .map((assignment) => {
                 return (