syncing book chapters with main app

labtests · Jul 29, 2019 · 9093f1e · 9093f1e
1 parent eb2dd57
commit 9093f1e
Show file tree

Hide file tree

Showing 85 changed files with 313 additions and 140 deletions.
diff --git a/app/components/posts/PostEditor.tsx b/app/components/posts/PostEditor.tsx
@@ -213,6 +213,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
 
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
+
         if (text.startsWith('<code>@#')) {
           return `${text.replace('<code>@#', '<code>@')} `;
         }

diff --git a/book/1-begin/api/server/models/Post.ts b/book/1-begin/api/server/models/Post.ts
@@ -80,6 +80,11 @@
 
 //   renderer.link = (href, title, text) => {
 //     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //     return `
 //       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //         ${text}

diff --git a/book/1-begin/app/components/discussions/EditDiscussionForm.tsx b/book/1-begin/app/components/discussions/EditDiscussionForm.tsx
@@ -170,11 +170,7 @@
 
 //     NProgress.start();
 //     try {
-//       await discussion.edit({
-//         name,
-//         memberIds: [discussion.store.currentUser._id, ...memberIds],
-//         notificationType,
-//       });
+//       await discussion.edit({ name, memberIds, notificationType });
 
 //       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
 //       notify('You successfully edited Discussion.');

diff --git a/book/1-begin/app/components/posts/PostEditor.tsx b/book/1-begin/app/components/posts/PostEditor.tsx
@@ -217,6 +217,11 @@
 
 //       renderer.link = (href, title, text) => {
 //         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //         return `
 //           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //             ${text}

diff --git a/book/1-end/api/server/models/Post.ts b/book/1-end/api/server/models/Post.ts
@@ -80,6 +80,11 @@
 
 //   renderer.link = (href, title, text) => {
 //     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //     return `
 //       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //         ${text}

diff --git a/book/1-end/app/components/discussions/EditDiscussionForm.tsx b/book/1-end/app/components/discussions/EditDiscussionForm.tsx
@@ -170,11 +170,7 @@
 
 //     NProgress.start();
 //     try {
-//       await discussion.edit({
-//         name,
-//         memberIds: [discussion.store.currentUser._id, ...memberIds],
-//         notificationType,
-//       });
+//       await discussion.edit({ name, memberIds, notificationType });
 
 //       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
 //       notify('You successfully edited Discussion.');

diff --git a/book/1-end/app/components/posts/PostEditor.tsx b/book/1-end/app/components/posts/PostEditor.tsx
@@ -217,6 +217,11 @@
 
 //       renderer.link = (href, title, text) => {
 //         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //         return `
 //           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //             ${text}

diff --git a/book/10-begin/api/server/models/Post.ts b/book/10-begin/api/server/models/Post.ts
@@ -80,6 +80,11 @@
 
 //   renderer.link = (href, title, text) => {
 //     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //     return `
 //       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //         ${text}

diff --git a/book/10-begin/app/components/discussions/EditDiscussionForm.tsx b/book/10-begin/app/components/discussions/EditDiscussionForm.tsx
@@ -170,11 +170,7 @@
 
 //     NProgress.start();
 //     try {
-//       await discussion.edit({
-//         name,
-//         memberIds: [discussion.store.currentUser._id, ...memberIds],
-//         notificationType,
-//       });
+//       await discussion.edit({ name, memberIds, notificationType });
 
 //       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
 //       notify('You successfully edited Discussion.');

diff --git a/book/10-begin/app/components/posts/PostEditor.tsx b/book/10-begin/app/components/posts/PostEditor.tsx
@@ -217,6 +217,11 @@
 
 //       renderer.link = (href, title, text) => {
 //         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //         return `
 //           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //             ${text}

diff --git a/book/10-end/api/server/models/Post.ts b/book/10-end/api/server/models/Post.ts
@@ -80,6 +80,11 @@
 
 //   renderer.link = (href, title, text) => {
 //     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //     return `
 //       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //         ${text}

diff --git a/book/10-end/app/components/discussions/EditDiscussionForm.tsx b/book/10-end/app/components/discussions/EditDiscussionForm.tsx
@@ -170,11 +170,7 @@
 
 //     NProgress.start();
 //     try {
-//       await discussion.edit({
-//         name,
-//         memberIds: [discussion.store.currentUser._id, ...memberIds],
-//         notificationType,
-//       });
+//       await discussion.edit({ name, memberIds, notificationType });
 
 //       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
 //       notify('You successfully edited Discussion.');

diff --git a/book/10-end/app/components/posts/PostEditor.tsx b/book/10-end/app/components/posts/PostEditor.tsx
@@ -217,6 +217,11 @@
 
 //       renderer.link = (href, title, text) => {
 //         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //         return `
 //           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //             ${text}

diff --git a/book/11-begin/api/server/models/Post.ts b/book/11-begin/api/server/models/Post.ts
@@ -80,6 +80,11 @@
 
 //   renderer.link = (href, title, text) => {
 //     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //     return `
 //       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //         ${text}

diff --git a/book/11-begin/app/components/discussions/EditDiscussionForm.tsx b/book/11-begin/app/components/discussions/EditDiscussionForm.tsx
@@ -170,11 +170,7 @@
 
 //     NProgress.start();
 //     try {
-//       await discussion.edit({
-//         name,
-//         memberIds: [discussion.store.currentUser._id, ...memberIds],
-//         notificationType,
-//       });
+//       await discussion.edit({ name, memberIds, notificationType });
 
 //       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
 //       notify('You successfully edited Discussion.');

diff --git a/book/11-begin/app/components/posts/PostEditor.tsx b/book/11-begin/app/components/posts/PostEditor.tsx
@@ -217,6 +217,11 @@
 
 //       renderer.link = (href, title, text) => {
 //         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
 //         return `
 //           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
 //             ${text}

diff --git a/book/11-end/api/server/models/Post.ts b/book/11-end/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}

diff --git a/book/11-end/app/components/discussions/EditDiscussionForm.tsx b/book/11-end/app/components/discussions/EditDiscussionForm.tsx
@@ -169,11 +169,7 @@ class EditDiscussionForm extends React.Component<Props, State> {
 
     NProgress.start();
     try {
-      await discussion.edit({
-        name,
-        memberIds: [discussion.store.currentUser._id, ...memberIds],
-        notificationType,
-      });
+      await discussion.edit({ name, memberIds, notificationType });
 
       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
       notify('You successfully edited Discussion.');

diff --git a/book/11-end/app/components/posts/PostEditor.tsx b/book/11-end/app/components/posts/PostEditor.tsx
@@ -216,6 +216,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
 
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
         return `
           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
             ${text}

diff --git a/book/12-begin/api/server/models/Post.ts b/book/12-begin/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}

diff --git a/book/12-begin/app/components/discussions/EditDiscussionForm.tsx b/book/12-begin/app/components/discussions/EditDiscussionForm.tsx
@@ -169,11 +169,7 @@ class EditDiscussionForm extends React.Component<Props, State> {
 
     NProgress.start();
     try {
-      await discussion.edit({
-        name,
-        memberIds: [discussion.store.currentUser._id, ...memberIds],
-        notificationType,
-      });
+      await discussion.edit({ name, memberIds, notificationType });
 
       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
       notify('You successfully edited Discussion.');

diff --git a/book/12-begin/app/components/posts/PostEditor.tsx b/book/12-begin/app/components/posts/PostEditor.tsx
@@ -216,6 +216,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
 
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
         return `
           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
             ${text}

diff --git a/book/12-end/api/server/models/Post.ts b/book/12-end/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}

diff --git a/book/12-end/app/components/discussions/EditDiscussionForm.tsx b/book/12-end/app/components/discussions/EditDiscussionForm.tsx
@@ -169,11 +169,7 @@ class EditDiscussionForm extends React.Component<Props, State> {
 
     NProgress.start();
     try {
-      await discussion.edit({
-        name,
-        memberIds: [discussion.store.currentUser._id, ...memberIds],
-        notificationType,
-      });
+      await discussion.edit({ name, memberIds, notificationType });
 
       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
       notify('You successfully edited Discussion.');

diff --git a/book/12-end/app/components/posts/PostEditor.tsx b/book/12-end/app/components/posts/PostEditor.tsx
@@ -216,6 +216,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
 
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
         return `
           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
             ${text}

diff --git a/book/13-begin/api/server/models/Post.ts b/book/13-begin/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}

diff --git a/book/13-begin/app/components/discussions/EditDiscussionForm.tsx b/book/13-begin/app/components/discussions/EditDiscussionForm.tsx
@@ -169,11 +169,7 @@ class EditDiscussionForm extends React.Component<Props, State> {
 
     NProgress.start();
     try {
-      await discussion.edit({
-        name,
-        memberIds: [discussion.store.currentUser._id, ...memberIds],
-        notificationType,
-      });
+      await discussion.edit({ name, memberIds, notificationType });
 
       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
       notify('You successfully edited Discussion.');

diff --git a/book/13-begin/app/components/posts/PostEditor.tsx b/book/13-begin/app/components/posts/PostEditor.tsx
@@ -216,6 +216,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
 
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
         return `
           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
             ${text}

diff --git a/book/13-end/api/server/models/Post.ts b/book/13-end/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}

diff --git a/book/13-end/app/components/discussions/EditDiscussionForm.tsx b/book/13-end/app/components/discussions/EditDiscussionForm.tsx
@@ -169,11 +169,7 @@ class EditDiscussionForm extends React.Component<Props, State> {
 
     NProgress.start();
     try {
-      await discussion.edit({
-        name,
-        memberIds: [discussion.store.currentUser._id, ...memberIds],
-        notificationType,
-      });
+      await discussion.edit({ name, memberIds, notificationType });
 
       this.setState({ name: '', memberIds: [], disabled: false, notificationType: 'default' });
       notify('You successfully edited Discussion.');

diff --git a/book/13-end/app/components/posts/PostEditor.tsx b/book/13-end/app/components/posts/PostEditor.tsx
@@ -216,6 +216,11 @@ class PostEditor extends React.Component<MyProps, MyState> {
 
       renderer.link = (href, title, text) => {
         const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
         return `
           <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
             ${text}

diff --git a/book/14-begin/api/server/models/Post.ts b/book/14-begin/api/server/models/Post.ts
@@ -79,6 +79,11 @@ function markdownToHtml(content) {
 
   renderer.link = (href, title, text) => {
     const t = title ? ` title="${title}"` : '';
+
+    if (text.startsWith('<code>@#')) {
+      return `${text.replace('<code>@#', '<code>@')} `;
+    }
+
     return `
       <a target="_blank" href="${href}" rel="noopener noreferrer"${t}>
         ${text}