修改完成待测试

utils/navigation/routes.js

@@ -87,7 +87,7 @@ export const ROUTES = Object.freeze({
     kind: "page",
     parent: "G01",
     requiredParams: ["genealogyId"],
-    allowedSources: ["G01", "G05", "N01", "N02"],
+    allowedSources: ["G05", "N01", "N02"],
   }),
   G11: defineRoute({
     path: "/pages/genealogy/settings",
@@ -101,14 +101,14 @@ export const ROUTES = Object.freeze({
     kind: "flow",
     parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["G01", "G05"],
+    allowedSources: ["G05"],
   }),
   G13: defineRoute({
     path: "/pages/genealogy/members",
     kind: "page",
     parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["G01", "G05"],
+    allowedSources: ["G05"],
   }),
   G14: defineRoute({
     path: "/pages/genealogy/capability-center",
@@ -123,7 +123,7 @@ export const ROUTES = Object.freeze({
     parent: "G05",
     requiredParams: ["genealogyId"],
     optionalParams: ["selectedId"],
-    allowedSources: ["G01", "G05", "T02", "T04", "T06", "T07"],
+    allowedSources: ["G05", "T02", "T04", "T06", "T07"],
   }),
   T02: defineRoute({
     path: "/pages/tree/pedigree",
@@ -131,7 +131,7 @@ export const ROUTES = Object.freeze({
     parent: "G05",
     requiredParams: ["genealogyId"],
     optionalParams: ["selectedId"],
-    allowedSources: ["G01", "G05", "T01"],
+    allowedSources: ["G05", "T01"],
   }),
   T03: defineRoute({
     path: "/pages/tree/member-profile",
@@ -182,32 +182,38 @@ export const ROUTES = Object.freeze({
     allowedSources: ["T03"],
   }),
   F01: defineRoute({
-    path: "/pages/family/feed",
+    path: "/pages/family/site-home",
     kind: "root",
     parent: null,
-    optionalParams: ["genealogyId"],
   }),
   F02: defineRoute({
     path: "/pages/family/feed-editor",
     kind: "flow",
-    parent: "F01",
+    parent: "F12",
     requiredParams: ["genealogyId", "mode"],
     optionalParams: ["feedId"],
-    allowedSources: ["F01", "F03"],
+    allowedSources: ["F12", "F03"],
   }),
   F03: defineRoute({
     path: "/pages/family/feed-detail",
     kind: "page",
-    parent: "F01",
+    parent: "F12",
     requiredParams: ["genealogyId", "feedId"],
-    allowedSources: ["F01", "F02", "N02"],
+    allowedSources: ["F12", "F02", "N02"],
+  }),
+  F12: defineRoute({
+    path: "/pages/family/feed",
+    kind: "page",
+    parent: "G05",
+    requiredParams: ["genealogyId"],
+    allowedSources: ["G05"],
   }),
   F04: defineRoute({
     path: "/pages/family/articles",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05", "M01"],
   }),
   F05: defineRoute({
     path: "/pages/family/article-detail",
@@ -227,9 +233,9 @@ export const ROUTES = Object.freeze({
   F07: defineRoute({
     path: "/pages/family/albums",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
   }),
   F08: defineRoute({
     path: "/pages/family/album-detail",
@@ -248,16 +254,23 @@ export const ROUTES = Object.freeze({
   F10: defineRoute({
     path: "/pages/family/videos",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
+  }),
+  F13: defineRoute({
+    path: "/pages/family/site-article-list",
+    kind: "page",
+    parent: "F01",
+    optionalParams: ["articleType", "title"],
+    allowedSources: ["F01", "M01"],
   }),
   R01: defineRoute({
     path: "/pages/records/people",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
   }),
   R02: defineRoute({
     path: "/pages/records/person-detail",
@@ -270,9 +283,9 @@ export const ROUTES = Object.freeze({
   R03: defineRoute({
     path: "/pages/records/relative-records",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
   }),
   R04: defineRoute({
     path: "/pages/records/relative-record-editor",
@@ -285,9 +298,9 @@ export const ROUTES = Object.freeze({
   R05: defineRoute({
     path: "/pages/records/ceremonies",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
   }),
   R06: defineRoute({
     path: "/pages/records/ceremony-detail",
@@ -321,17 +334,17 @@ export const ROUTES = Object.freeze({
   R10: defineRoute({
     path: "/pages/records/memos",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
     optionalParams: ["memoId", "memoType"],
-    allowedSources: ["F01", "N02"],
+    allowedSources: ["G05", "N02"],
   }),
   R11: defineRoute({
     path: "/pages/records/merit-records",
     kind: "page",
-    parent: "F01",
+    parent: "G05",
     requiredParams: ["genealogyId"],
-    allowedSources: ["F01"],
+    allowedSources: ["G05"],
   }),
   R12: defineRoute({
     path: "/pages/records/person-documents",
@@ -345,7 +358,7 @@ export const ROUTES = Object.freeze({
     kind: "page",
     parent: "G01",
     optionalParams: ["genealogyId"],
-    allowedSources: ["G01", "M01"],
+    allowedSources: ["G01", "F01", "M01"],
   }),
   N02: defineRoute({
     path: "/pages/notification/message-detail",
@@ -363,7 +376,7 @@ export const ROUTES = Object.freeze({
     path: "/pages/profile/edit-profile",
     kind: "flow",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   M03: defineRoute({
     path: "/pages/profile/security",
@@ -387,7 +400,7 @@ export const ROUTES = Object.freeze({
     path: "/pages/profile/help",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   M07: defineRoute({
     path: "/pages/profile/feedback",
@@ -399,38 +412,38 @@ export const ROUTES = Object.freeze({
     path: "/pages/profile/promotions",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   M09: defineRoute({
     path: "/pages/profile/vip",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   M10: defineRoute({
     path: "/pages/profile/settings",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   F11: defineRoute({
     path: "/pages/family/platform-videos",
     kind: "page",
-    parent: "F01",
+    parent: "F10",
     optionalParams: ["placement", "videoId"],
-    allowedSources: ["F10", "G01"],
+    allowedSources: ["F10"],
   }),
   M11: defineRoute({
     path: "/pages/profile/ceremony-invitations",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01", "N02"],
+    allowedSources: ["F01", "M01", "N02"],
   }),
   M12: defineRoute({
     path: "/pages/profile/earnings",
     kind: "page",
     parent: "M01",
-    allowedSources: ["M01"],
+    allowedSources: ["F01", "M01"],
   }),
   M13: defineRoute({
     path: "/pages/profile/compliance-document",

utils/tree/layout.js

@@ -1,6 +1,6 @@
 const GRID_UNIT = 5;
-const NODE_HALF_WIDTH = 80;
-const NODE_HALF_HEIGHT = 112;
+const NODE_HALF_WIDTH = 77;
+const NODE_HALF_HEIGHT = 100;
 const FAMILY_LINK_OFFSET = 18;
 const MEMBER_GAP = 178;
 const GENERATION_GAP = 296;