General Updates

MichelDiz · MichelDiz · commit 0adbef938b17 · 2018-07-02T18:29:44.000-03:00
Changes of syntax and warnings.
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@ A blazingly fast Stack Overflow clone running the real Stack Exchange dataset.
 
 **NOTE: The repository is no longer being actively maintained by the Dgraph team. If something is broken, we'd happily accept a pull request from you, but won't fix anything ourselves.**
 
+**Update: I'll (MichelDiz) start a kind of "support" for this PJ, so right now I'm on Windows and I will create a Branch
+just for my tests. Some things may be different on other systems. I will not change anything drasticly on this branch, I will only modify some syntax changes and give some tips on how to handle this project. For this branch, read the file "syntax_changes.txt ".
+
 [Live](https://graphoverflow.dgraph.io)
 
 ## Running locally
diff --git a/app/api.js b/app/api.js
@@ -34,7 +34,7 @@ app.get("/api/current_user", (req, res) => {
     return;
   }
 
-  findUserByUID(req.user._uid_)
+  findUserByUID(req.user.uid)
     .then(user => {
       console.log("user found", user);
       res.json(user);
diff --git a/app/auth.js b/app/auth.js
@@ -5,7 +5,7 @@ import { runQuery, getEndpointBaseURL } from "./helpers";
 function createUser(accessToken, displayName, GitHubID) {
   console.log("creating user...", accessToken);
   const query = `
-mutation {
+ {
   set {
     <_:user> <DisplayName> "${displayName}" .
     <_:user> <GitHubAccessToken> "${accessToken}" .
@@ -36,7 +36,7 @@ export function findUserByUID(uid) {
   const query = `
 {
   user(func: uid(${uid})) {
-    _uid_
+    uid
     Reputation
     DisplayName
     CreationDate
@@ -56,14 +56,14 @@ export function findUserByUID(uid) {
 // configPassport configures passport using GitHub strategy
 export function configPassport(passport) {
   passport.serializeUser(function(user, done) {
-    done(null, user._uid_);
+    done(null, user.uid);
   });
 
   passport.deserializeUser(function(id, done) {
     const query = `
   {
     user(func: uid(${id})) {
-      _uid_
+      uid
       Reputation
       CreationDate
       LastAccessDate
@@ -105,7 +105,7 @@ export function configPassport(passport) {
         const query = `
   {
     user(func: eq(GitHubID, ${profile.id})) {
-      _uid_
+      uid
       Reputation
       DisplayName
       CreationDate
diff --git a/app/client/src/components/AnswerComposer.js b/app/client/src/components/AnswerComposer.js
@@ -23,7 +23,7 @@ export default class AnswerComposer extends React.Component {
           body={body}
           onUpdateBody={this.handleUpdateBody}
           onSubmitPost={() => {
-            onCreateAnswer(question._uid_, body);
+            onCreateAnswer(question.uid, body);
             this.setState({ body: "" });
           }}
         />
diff --git a/app/client/src/components/AnswerItem.js b/app/client/src/components/AnswerItem.js
@@ -7,8 +7,8 @@ import QuestionItemLastActivity from "./QuestionItemLastActivity";
 import "../assets/styles/QuestionItem.css";
 
 const QuestionItem = ({ question, history }) => {
-  // console.log(question._uid_);
-  const questionLink = `/questions/${question._uid_}`;
+  // console.log(question.uid);
+  const questionLink = `/questions/${question.uid}`;
   const questionScore = question.UpvoteCount - question.DownvoteCount;
 
   return (
diff --git a/app/client/src/components/CommentItem.js b/app/client/src/components/CommentItem.js
@@ -4,7 +4,7 @@ import moment from "moment";
 import marked from "marked";
 
 const CommentItem = ({ comment, currentUser, onDeleteComment }) => {
-  const isOwner = currentUser && comment.Author[0]._uid_ === currentUser._uid_;
+  const isOwner = currentUser && comment.Author[0].uid === currentUser.uid;
   const author = comment.Author[0];
 
   return (
@@ -19,7 +19,7 @@ const CommentItem = ({ comment, currentUser, onDeleteComment }) => {
         />{" "}
         -{" "}
         <span className="comment-author-name">
-          <Link to={`/users/${author._uid_}`}>
+          <Link to={`/users/${author.uid}`}>
             {author.DisplayName}
           </Link>
         </span>{" "}
@@ -31,7 +31,7 @@ const CommentItem = ({ comment, currentUser, onDeleteComment }) => {
               href="#delete"
               onClick={e => {
                 e.preventDefault();
-                onDeleteComment(comment._uid_);
+                onDeleteComment(comment.uid);
               }}
             >
               <i className="fa fa-close" />
diff --git a/app/client/src/components/CommentList.js b/app/client/src/components/CommentList.js
@@ -35,7 +35,7 @@ export default class CommentList extends React.Component {
           {commentsOnDisplay.map(comment => {
             return (
               <CommentItem
-                key={comment._uid_}
+                key={comment.uid}
                 comment={comment}
                 currentUser={currentUser}
                 onDeleteComment={onDeleteComment}
diff --git a/app/client/src/components/History.js b/app/client/src/components/History.js
@@ -21,7 +21,7 @@ const History = ({ author, verb, timestamp }) => {
         ? <div className="author-info">
             <div className="meta">
               <div className="author-name">
-                <Link to={`/users/${author._uid_}`}>
+                <Link to={`/users/${author.uid}`}>
                   {author.DisplayName}
                 </Link>
               </div>
diff --git a/app/client/src/components/Home.js b/app/client/src/components/Home.js
@@ -73,7 +73,7 @@ class Home extends React.Component {
         this.setState({ questions: [] });
         return;
       }
-      query = getRecommendedQuestionsQuery(user._uid_);
+      query = getRecommendedQuestionsQuery(user.uid);
     } else if (currentTab === ALL_TABS.TAB_RECENT) {
       query = `{ ${recentQuestionsQuery} }`;
     }
diff --git a/app/client/src/components/Post.js b/app/client/src/components/Post.js
@@ -25,7 +25,7 @@ class Post extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.post._uid_ !== nextProps.post._uid_) {
+    if (this.props.post.uid !== nextProps.post.uid) {
       this.setState({
         comments: nextProps.post.Comment,
         userUpvoted: nextProps.post.UserUpvoteCount === 1,
@@ -39,7 +39,7 @@ class Post extends React.Component {
     const { post } = this.props;
 
     request
-      .post(`/api/posts/${post._uid_}/comments`)
+      .post(`/api/posts/${post.uid}/comments`)
       .send({ body })
       .then(res => {
         const { commentUID } = res.body;
@@ -63,10 +63,10 @@ class Post extends React.Component {
     const { comments } = this.state;
 
     request
-      .delete(`/api/posts/${post._uid_}/comments/${commentUID}`)
+      .delete(`/api/posts/${post.uid}/comments/${commentUID}`)
       .then(() => {
         const newComments = comments.filter(comment => {
-          return comment._uid_ !== commentUID;
+          return comment.uid !== commentUID;
         });
         this.setState({
           comments: newComments
@@ -78,7 +78,7 @@ class Post extends React.Component {
     const { post } = this.props;
     const { userUpvoted, userDownvoted } = this.state;
 
-    request.post(`/api/posts/${post._uid_}/vote`).send({ type }).then(() => {
+    request.post(`/api/posts/${post.uid}/vote`).send({ type }).then(() => {
       let scoreDelta = 0;
       if (type === "Upvote") {
         if (userDownvoted) {
@@ -113,7 +113,7 @@ class Post extends React.Component {
       scoreDelta = 1;
     }
 
-    request.delete(`/api/posts/${post._uid_}/vote`).send({ type }).then(() => {
+    request.delete(`/api/posts/${post.uid}/vote`).send({ type }).then(() => {
       this.setState(prevState => {
         return {
           userUpvoted: false,
@@ -135,7 +135,7 @@ class Post extends React.Component {
           answer: post.Type === "Answer"
         })}
       >
-        <div href="#" id={post._uid_} />
+        <div href="#" id={post.uid} />
         {/* questions have title and answers don't */}
         {post.Title
           ? <div className="post-title-container">
diff --git a/app/client/src/components/PostActions.js b/app/client/src/components/PostActions.js
@@ -2,17 +2,17 @@ import React from "react";
 import { Link } from "react-router-dom";
 
 const PostActions = ({ post, currentUser, onDeletePost }) => {
-  const isOwner = currentUser && post.Owner[0]._uid_ === currentUser._uid_;
+  const isOwner = currentUser && post.Owner[0].uid === currentUser.uid;
   return (
     <div>
       {isOwner
         ? <div>
-            <Link to={`/posts/${post._uid_}/edit`}>edit</Link>
+            <Link to={`/posts/${post.uid}/edit`}>edit</Link>
             <a
               href="#delete"
               onClick={e => {
                 e.preventDefault();
-                onDeletePost(post._uid_);
+                onDeletePost(post.uid);
               }}
             >
               Delete
diff --git a/app/client/src/components/Question.js b/app/client/src/components/Question.js
@@ -50,7 +50,7 @@ class Question extends React.Component {
     const { user } = this.props;
     let currentUserUID;
     if (user) {
-      currentUserUID = user._uid_;
+      currentUserUID = user.uid;
     }
     const query = getQuestionQuery(questionUID, currentUserUID);
 
diff --git a/app/client/src/components/QuestionItem.js b/app/client/src/components/QuestionItem.js
@@ -7,7 +7,7 @@ import QuestionItemLastActivity from "./QuestionItemLastActivity";
 import "../assets/styles/QuestionItem.css";
 
 const QuestionItem = ({ question, history }) => {
-  const questionLink = `/questions/${question._uid_}`;
+  const questionLink = `/questions/${question.uid}`;
   const questionScore = question.UpvoteCount - question.DownvoteCount;
 
   return (
diff --git a/app/client/src/components/QuestionItemLastActivity.js b/app/client/src/components/QuestionItemLastActivity.js
@@ -17,7 +17,7 @@ const QuestionItemLastActivity = ({ question }) => {
       <div>
         asked {moment(questionCreatedAt).fromNow()} by{" "}
         <Link
-          to={`/users/${owner._uid_}`}
+          to={`/users/${owner.uid}`}
           onClick={e => {
             e.stopPropagation();
           }}
@@ -37,7 +37,7 @@ const QuestionItemLastActivity = ({ question }) => {
       answered {moment(lastAnswerCreatedAt).fromNow()} by{" "}
       {lastAnswerOwner
         ? <div>
-            <Link to={`/users/${lastAnswer.Owner[0]._uid_}`}>
+            <Link to={`/users/${lastAnswer.Owner[0].uid}`}>
               {lastAnswerOwner.DisplayName || "no_username"}
             </Link>{" "}
             <span className="reputation">
diff --git a/app/client/src/components/QuestionLayout.js b/app/client/src/components/QuestionLayout.js
@@ -86,7 +86,7 @@ const QuestionLayout = ({
                 {answers.map(answer => {
                   return (
                     <Post
-                      key={answer._uid_}
+                      key={answer.uid}
                       post={answer}
                       currentUser={currentUser}
                       onDeletePost={onDeletePost}
diff --git a/app/client/src/components/QuestionList.js b/app/client/src/components/QuestionList.js
@@ -6,7 +6,7 @@ const QuestionList = ({ questions }) => {
   return (
     <ul className="list-unstyled question-list">
       {questions.map(question => {
-        return <QuestionItem question={question} key={question._uid_} />;
+        return <QuestionItem question={question} key={question.uid} />;
       })}
     </ul>
   );
diff --git a/app/client/src/components/RelatedQuestionList.js b/app/client/src/components/RelatedQuestionList.js
@@ -5,11 +5,11 @@ const RelatedQuestionList = ({ questions }) => {
   return (
     <ul className="list-unstyled">
       {questions.map(question => {
-        const questionLink = `/questions/${question._uid_}`;
+        const questionLink = `/questions/${question.uid}`;
         const questionScore = question.UpvoteCount - question.DownvoteCount;
 
         return (
-          <li className="related-question-item" key={question._uid_}>
+          <li className="related-question-item" key={question.uid}>
             <Link to={questionLink}>
               <span className="related-question-score">
                 {questionScore}
diff --git a/app/client/src/components/SearchResultAnswerItem.js b/app/client/src/components/SearchResultAnswerItem.js
@@ -11,7 +11,7 @@ const SearchResultAnswerItem = ({ answer, searchTerm, searchTermWords }) => {
     return null;
   }
 
-  const questionLink = `/questions/${answer.question[0]._uid_}#${answer._uid_}`;
+  const questionLink = `/questions/${answer.question[0].uid}#${answer.uid}`;
   const score = answer.UpvoteCount - answer.DownvoteCount;
 
   return (
diff --git a/app/client/src/components/SearchResultList.js b/app/client/src/components/SearchResultList.js
@@ -13,7 +13,7 @@ const SearchResultList = ({ posts, searchTerm, searchTermWords }) => {
               question={post}
               searchTerm={searchTerm}
               searchTermWords={searchTermWords}
-              key={post._uid_}
+              key={post.uid}
             />
           );
         } else {
@@ -22,7 +22,7 @@ const SearchResultList = ({ posts, searchTerm, searchTermWords }) => {
               answer={post}
               searchTerm={searchTerm}
               searchTermWords={searchTermWords}
-              key={post._uid_}
+              key={post.uid}
             />
           );
         }
diff --git a/app/client/src/components/SearchResultQuestionItem.js b/app/client/src/components/SearchResultQuestionItem.js
@@ -10,7 +10,7 @@ const SearchResultQuestionItem = ({
   searchTerm,
   searchTermWords
 }) => {
-  const questionLink = `/questions/${question._uid_}`;
+  const questionLink = `/questions/${question.uid}`;
   const questionScore = question.UpvoteCount - question.DownvoteCount;
 
   return (
diff --git a/app/client/src/components/Tag.js b/app/client/src/components/Tag.js
@@ -103,7 +103,7 @@ class Tag extends React.Component {
                 <ul className="list-unstyled">
                   {relatedTags.map(tag => {
                     return (
-                      <li key={tag._uid_}>
+                      <li key={tag.uid}>
                         <span className="tag">
                           <Link to={`/tags/${tag.TagName}`}>
                             {tag.TagName}
diff --git a/app/client/src/components/TopTagList.js b/app/client/src/components/TopTagList.js
@@ -11,7 +11,7 @@ const TopTagList = ({ tags }) => {
       <ul className="tag-list">
         {tags.map(tag => {
           return (
-            <li className="tag-item" key={tag._uid_}>
+            <li className="tag-item" key={tag.uid}>
               <span className="tag">
                 <Link to={`/tags/${tag.TagName}`}>
                   {tag.TagName}{" "}
diff --git a/app/client/src/components/TopUserItem.js b/app/client/src/components/TopUserItem.js
@@ -9,7 +9,7 @@ const TopUserItem = ({ user }) => {
     <div className="top-user-item">
       <div className="info-row">
         <div className="info">
-          <Link to={`/users/${user._uid_}`} className="username">
+          <Link to={`/users/${user.uid}`} className="username">
             {user.DisplayName}
           </Link>
           <p className="about-me">
diff --git a/app/client/src/components/TopUserList.js b/app/client/src/components/TopUserList.js
@@ -12,7 +12,7 @@ const TopUserList = ({ users }) => {
       <ul className="top-user-list">
         {users
           ? users.map(user => {
-              return <TopUserItem key={user._uid_} user={user} />;
+              return <TopUserItem key={user.uid} user={user} />;
             })
           : <div>No ranking available. Not enough recent acitivities.</div>}
       </ul>
diff --git a/app/client/src/components/UserActions.js b/app/client/src/components/UserActions.js
@@ -5,7 +5,7 @@ const UserActions = ({ onLogout, user }) => {
   return (
     <div className="actions">
       <div className="user">
-        <Link to={`/users/${user._uid_}`}>
+        <Link to={`/users/${user.uid}`}>
           {user.DisplayName}
         </Link>
       </div>
diff --git a/app/client/src/components/UserPostItem.js b/app/client/src/components/UserPostItem.js
@@ -3,7 +3,7 @@ import { Link } from "react-router-dom";
 
 const UserPostItem = ({ post }) => {
   const score = post.upvoteCount - post.downvoteCount;
-  const questionLink = `/questions/${post._uid_}`;
+  const questionLink = `/questions/${post.uid}`;
 
   return (
     <li className="user-post-item">
diff --git a/app/client/src/components/UserPostList.js b/app/client/src/components/UserPostList.js
@@ -6,7 +6,7 @@ const UserPostList = ({ posts }) => {
   return (
     <ul className="list-unstyled">
       {posts.map(post => {
-        return <UserPostItem key={post._uid_} post={post} />;
+        return <UserPostItem key={post.uid} post={post} />;
       })}
     </ul>
   );
diff --git a/app/client/src/queries/Home.js b/app/client/src/queries/Home.js
diff --git a/app/client/src/queries/Question.js b/app/client/src/queries/Question.js
diff --git a/app/client/src/queries/SearchResult.js b/app/client/src/queries/SearchResult.js
diff --git a/app/client/src/queries/Tag.js b/app/client/src/queries/Tag.js
diff --git a/app/client/src/queries/User.js b/app/client/src/queries/User.js
diff --git a/app/routes/post.js b/app/routes/post.js
diff --git a/comments/query-2 b/comments/query-2
diff --git a/posts/query-8 b/posts/query-8
diff --git a/queries/home-query b/queries/home-query
diff --git a/queries/hot-questions-query b/queries/hot-questions-query
diff --git a/queries/question-query b/queries/question-query
diff --git a/syntax_changes.md b/syntax_changes.md

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ app.get("/api/current_user", (req, res) => {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- findUserByUID(req.user._uid_)`
	`37`	`+ findUserByUID(req.user.uid)`
`38`	`38`	`.then(user => {`
`39`	`39`	`console.log("user found", user);`
`40`	`40`	`res.json(user);`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class Home extends React.Component {`
`73`	`73`	`this.setState({ questions: [] });`
`74`	`74`	`return;`
`75`	`75`	`}`
`76`		`- query = getRecommendedQuestionsQuery(user._uid_);`
	`76`	`+ query = getRecommendedQuestionsQuery(user.uid);`
`77`	`77`	`} else if (currentTab === ALL_TABS.TAB_RECENT) {`
`78`	`78`	query = `{ ${recentQuestionsQuery} }`;
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class Question extends React.Component {`
`50`	`50`	`const { user } = this.props;`
`51`	`51`	`let currentUserUID;`
`52`	`52`	`if (user) {`
`53`		`- currentUserUID = user._uid_;`
	`53`	`+ currentUserUID = user.uid;`
`54`	`54`	`}`
`55`	`55`	`const query = getQuestionQuery(questionUID, currentUserUID);`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ const SearchResultAnswerItem = ({ answer, searchTerm, searchTermWords }) => {`
`11`	`11`	`return null;`
`12`	`12`	`}`
`13`	`13`
`14`		- const questionLink = `/questions/${answer.question[0]._uid_}#${answer._uid_}`;
	`14`	+ const questionLink = `/questions/${answer.question[0].uid}#${answer.uid}`;
`15`	`15`	`const score = answer.UpvoteCount - answer.DownvoteCount;`
`16`	`16`
`17`	`17`	`return (`