From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Site3/views/login.json | 156 +++++++++++++++++++++++++++------------------------
1 files changed, 83 insertions(+), 73 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/views/login.json b/force-app/main/default/experiences/Site3/views/login.json
index 4c47b88..e39d05f 100644
--- a/force-app/main/default/experiences/Site3/views/login.json
+++ b/force-app/main/default/experiences/Site3/views/login.json
@@ -1,74 +1,84 @@
{
- "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "6d2b638e-a48b-49d3-a675-e36e30791e1c",
- "label" : "Login",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : { },
- "componentName" : "salesforceIdentity:communityLogo2",
- "id" : "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "forgotPasswordLabel" : "Forgot your password?",
- "forgotPasswordUrl" : "/ForgotPassword",
- "loginButtonLabel" : "Log in",
- "passwordLabel" : "Password",
- "selfRegisterLabel" : "Not a member?",
- "selfRegisterUrl" : "/SelfRegister",
- "startUrl" : "",
- "usernameLabel" : "Username"
- },
- "componentName" : "salesforceIdentity:loginForm2",
- "id" : "e3131b45-1a93-41a0-9226-8042b9c3fda2",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "headerText" : "",
- "showHeader" : false,
- "useCommunityDomainSso" : false
- },
- "componentName" : "salesforceIdentity:socialLogin2",
- "id" : "11821772-7bd0-4462-871a-2f1d3643c6fe",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "employeeLoginLinkLabel" : "Are you an employee? Login here"
- },
- "componentName" : "salesforceIdentity:employeeLoginLink2",
- "id" : "04362051-cb7e-4dc6-8a26-bec13247eb84",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "e58b0f5b-923e-4126-aa5c-610c548487ce",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "Login"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "23ceab67-1956-4a59-918a-a65cd1da2c0d",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "5fc9f8cd-81d0-4209-9177-e7267fad5d99",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Login",
- "type" : "view",
- "viewType" : "login-home"
-}
\ No newline at end of file
+ "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
+ "label": "Login",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "salesforceIdentity:communityLogo2",
+ "id": "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "forgotPasswordLabel": "Forgot your password?",
+ "forgotPasswordUrl": "/ForgotPassword",
+ "loginButtonLabel": "Log in",
+ "passwordLabel": "Password",
+ "selfRegisterLabel": "Not a member?",
+ "selfRegisterUrl": "/SelfRegister",
+ "startUrl": "",
+ "usernameLabel": "Username"
+ },
+ "componentName": "salesforceIdentity:loginForm2",
+ "id": "e3131b45-1a93-41a0-9226-8042b9c3fda2",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "headerText": "",
+ "showHeader": false,
+ "useCommunityDomainSso": false
+ },
+ "componentName": "salesforceIdentity:socialLogin2",
+ "id": "11821772-7bd0-4462-871a-2f1d3643c6fe",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "employeeLoginLinkLabel": "Are you an employee? Login here"
+ },
+ "componentName": "salesforceIdentity:employeeLoginLink2",
+ "id": "04362051-cb7e-4dc6-8a26-bec13247eb84",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e58b0f5b-923e-4126-aa5c-610c548487ce",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Login"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "23ceab67-1956-4a59-918a-a65cd1da2c0d",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "5fc9f8cd-81d0-4209-9177-e7267fad5d99",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "login-home"
+}
--
Gitblit v1.9.1