Merge pull request #808 from contentstack/dev

Dev

Author: sayalijoshi27

.github/workflows/secrets-scan.yml

@@ -1 +1,9 @@
-* @contentstack/security-admin
+* @contentstack/tso-migration-pr-reviewers
+
+.github/workflows/sca-scan.yml @contentstack/security-admin
+
+**/.snyk @contentstack/security-admin
+
+.github/workflows/policy-scan.yml @contentstack/security-admin
+
+.github/workflows/issues-jira.yml @contentstack/security-admin

CODEOWNERS

@@ -694,6 +694,29 @@ const startMigration = async (req: Request): Promise<any> => {
         );
         break;
       }
+      case CMS.AEM: {
+        await aemService.createAssets({ projectId, packagePath, destinationStackId: project?.current_test_stack_id });
+        await aemService.createEntry({
+          packagePath,
+          contentTypes,
+          master_locale: project?.stackDetails?.master_locale,
+          destinationStackId: project?.destination_stack_id,
+          projectId,
+          keyMapper: project?.mapperKeys,
+          project
+        })
+        await aemService?.createLocale(
+          req,
+          project?.destination_stack_id,
+          projectId,
+          project
+        );
+        await aemService?.createVersionFile(
+          project?.destination_stack_id
+        );
+        break;
+      }
+      
       default:
         break;
     }

api/src/services/migration.service.ts

@@ -21,13 +21,13 @@
       "content_type": "image/svg+xml",
       "file_size": "10160",
       "tags": [],
-      "filename": "icon-cs-mobile.svg",
-      "url": "https://images.contentstack.io/v3/assets/blt7359e2a55efae483/blt0b9a8281aeac3ec0/664c27d3c9024c35b5ad593a/CS_logo.png",
+      "filename": "contentstack-logo.svg",
+      "url": "https://images.contentstack.io/v3/assets/blt77d44a06c81b1730/blt2e24a315fedaeaf7/68bc10f25f14881bc908b6c2/CS_OnlyLogo.webp",
       "ACL": [],
       "is_dir": false,
       "parent_uid": "blt8e7f7872baa3a09e",
       "_version": 1,
-      "title": "icon-cs-mobile.svg"
+      "title": "Contentstack"
     },
     "url": "/projects"
   }

ui/public/favicon.ico

@@ -2,7 +2,7 @@
   "title": "Account Login",
   "url": "/region-login",
   "heading": "Account Login",
-  "description": "Please select Contentstack <strong>North America (AWS, Azure or GCP)</strong> or Contentstack <strong>Europe (AWS or Azure)</strong> to continue",
+  "description": "Select <strong>North America</strong> (AWS, Azure or GCP); <strong>Europe</strong> (AWS, Azure or GCP); <strong>Australia</strong> (AWS) to continue.",
   "regions": [
     {
       "region": "NA",
@@ -128,6 +128,54 @@
       "region_title": "Europe",
       "cta": { "title": "Continue", "url": "/login" },
       "_metadata": { "uid": "cs7c90ee35480e165e" }
+    },
+    {
+      "region": "GCP_EU",
+      "service_icon": {
+        "uid": "blt85d2a7024c613199",
+        "created_at": "2023-10-31T07:00:56.567Z",
+        "updated_at": "2023-10-31T07:00:56.567Z",
+        "created_by": "bltb317ebe35429ebe6",
+        "updated_by": "bltb317ebe35429ebe6",
+        "content_type": "image/svg+xml",
+        "file_size": "821",
+        "tags": [],
+        "filename": "google-cloud_1.svg",
+        "url": "https://images.contentstack.io/v3/assets/bltd3620ec6418ad3ad/blt57dafa9c1472b46f/66a775b7d14106640a554ec7/google-cloud_1.svg",
+        "ACL": [],
+        "is_dir": false,
+        "parent_uid": null,
+        "_version": 1,
+        "title": "google-cloud_1.svg"
+      },
+      "service_title": "Google Cloud Platform",
+      "region_title": "Europe",
+      "cta": { "title": "Continue", "url": "/login" },
+      "_metadata": { "uid": "cs7c90ee35480e165e" }
+    },
+    {
+      "region": "AU",
+      "service_icon": {
+        "uid": "bltbe45879eac0025d8",
+        "created_at": "2023-10-31T06:59:22.783Z",
+        "updated_at": "2023-10-31T06:59:22.783Z",
+        "created_by": "bltb317ebe35429ebe6",
+        "updated_by": "bltb317ebe35429ebe6",
+        "content_type": "image/svg+xml",
+        "file_size": "92431",
+        "tags": [],
+        "filename": "aws.svg",
+        "url": "https://images.contentstack.io/v3/assets/bltd3620ec6418ad3ad/bltbe45879eac0025d8/6540a5ca1680320407c3a753/aws.svg",
+        "ACL": [],
+        "is_dir": false,
+        "parent_uid": null,
+        "_version": 1,
+        "title": "AWS"
+      },
+      "service_title": "Amazon Web Services",
+      "region_title": "Australia",
+      "cta": { "title": "Continue", "url": "/login" },
+      "_metadata": { "uid": "csf578f8fbea1ae0c0" }
     }
   ],
   "tags": [],

ui/public/images/ContentstackLogo.png

@@ -7,18 +7,19 @@
  * It contains styles for the layout, logo, background image, action section, content, heading, and circles.
  */
 .AccountPage {
-  align-items: stretch;
-  display: flex;
-  height: 100vh;
-  overflow: hidden;
+  
 
   &__logo {
-    display: inline-block;
-    height: 3.75rem;
-    left: 4%;
+    background-color: $color-gray-bg;
+    left: 0;
+    padding: 1rem;
     position: relative;
-    top: 5%;
+    top: 0;
+    width: 100%;
     z-index: 10;
+    img {
+      height: 1.5rem;
+    }
   }
 
   &__intro {
@@ -31,29 +32,22 @@
   }
 
   &__action {
-    flex: 0 0 65%;
-    max-width: 65%;
-    position: relative;
-    width: 65%;
-    z-index: 10;
-
-    &::before {
-      backdrop-filter: blur(104px);
-      background: $color-brand-white-base;
-      /* background: rgba(249, 251, 253, 0.5); */
-      content: '';
-      display: block;
-      height: 100%;
-      width: 100%;
-    }
+    align-items: center;
+    background-color: $color-brand-white-base;
+    display: flex;
+    height: calc(100vh - 3.6rem);
+    justify-content: center;
   }
 
   &__content {
-    left: 50%;
-    position: absolute;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    z-index: 20;
+    // left: 50%;
+    // position: absolute;
+    // top: 50%;
+    // transform: translate(-50%, -50%);
+    // z-index: 20;
+    align-items: center;
+    display: flex;
+    justify-content: center;
   }
 
   &__heading {
@@ -175,6 +169,8 @@
   color: $color-font-base;
   font-size: 0.75rem;
   letter-spacing: 0.02em;
-  left: 2.5rem;
+  left: 0;
   position: absolute;
+  right: 0;
+  text-align: center;
 }