Apply review requested changes

Author: yassa-tamer

.gitignore

@@ -49,3 +49,5 @@ yarn-debug.log*
 .yarn-integrity
 
 lib/bs
+
+client/app/bundles/comments/src/**/*.bs.mjs

app/views/pages/rescript.html.erb

@@ -1 +1 @@
-<%= react_component "RescriptPage" %>
+<%= react_component "RescriptShow", prerender: false %>

client/app/bundles/comments/src/Actions/Actions.res

@@ -32,8 +32,8 @@ module Fetch = {
     comments: comments
   }
 
-  let fetchComments = async (): result<comments, Types.errorT> => {
-    open Json.Decode;
+  let fetchComments = async (): result<comments, Types.error> => {
+    open Json.Decode
 
     let response = await Fetch.get("comments.json")
     let jsonRes = await response->Fetch.Response.json

client/app/bundles/comments/src/Actions/Types.res

@@ -1,28 +1,28 @@
-type formDisplayT = HorizontalForm | InlineForm | StackedFrom;
+type formDisplay = Horizontal | Inline | Stacked
 
-type commentFormStateT = {
+type commentFormState = {
   author: string,
   text: string,
-  form: formDisplayT
+  form: formDisplay
 }
 
-type commentFormActionT =
+type commentFormAction =
     | SetAuthor(string)
     | SetText(string)
-    | SetFormType(formDisplayT);
+    | SetFormType(formDisplay)
 
-type formDataT = {
+type formData = {
   formName: string,
-  formType: formDisplayT
-};
+  formType: formDisplay
+}
 
-type storeCommentActionT = (string, string) => unit;
+type storeCommentAction = (string, string) => unit
 
-type storeCommentDataT = {
+type storeCommentData = {
   author: string,
   text: string
 }
 
-type errorT = NoError | FailedToSaveComment | FailedToFetchComments;
+type error = NoError | FailedToSaveComment | FailedToFetchComments
 
-type isSavingT = Free | BusySaving;
+type isSaving = Free | BusySaving

client/app/bundles/comments/src/CommentForm/CommentForm.bs.mjs

@@ -41,7 +41,7 @@ function CommentForm(props) {
   var match = React.useReducer(reducer, {
         author: "",
         text: "",
-        form: /* HorizontalForm */0
+        form: /* Horizontal */0
       });
   var dispatch = match[1];
   var state = match[0];
@@ -66,21 +66,21 @@ function CommentForm(props) {
   var forms = [
     {
       formName: "Horizontal Form",
-      formType: /* HorizontalForm */0
+      formType: /* Horizontal */0
     },
     {
       formName: "Inline Form",
-      formType: /* InlineForm */1
+      formType: /* Inline */1
     },
     {
       formName: "Stacked Form",
-      formType: /* StackedFrom */2
+      formType: /* Stacked */2
     }
   ];
   var match$1 = state.form;
   var tmp;
   switch (match$1) {
-    case /* HorizontalForm */0 :
+    case /* Horizontal */0 :
         tmp = JsxRuntime.jsx(HorizontalForm.make, {
               author: state.author,
               handleAuthorChange: handleAuthorChange,
@@ -90,7 +90,7 @@ function CommentForm(props) {
               isSaving: isSaving
             });
         break;
-    case /* InlineForm */1 :
+    case /* Inline */1 :
         tmp = JsxRuntime.jsx(InlineForm.make, {
               author: state.author,
               handleAuthorChange: handleAuthorChange,
@@ -100,7 +100,7 @@ function CommentForm(props) {
               isSaving: isSaving
             });
         break;
-    case /* StackedFrom */2 :
+    case /* Stacked */2 :
         tmp = JsxRuntime.jsx(StackedFrom.make, {
               author: state.author,
               handleAuthorChange: handleAuthorChange,

client/app/bundles/comments/src/CommentForm/CommentForm.res

@@ -1,24 +1,24 @@
 @module("./CommentForm.module.scss") external css: {..} = "default"
 
 let reducer = (
-  state: Types.commentFormStateT, 
-  action: Types.commentFormActionT
-): Types.commentFormStateT => {
+  state: Types.commentFormState, 
+  action: Types.commentFormAction
+): Types.commentFormState => {
   switch (action) {
   | SetAuthor(author) => {...state, author}
   | SetText(text) => {...state, text}
   | SetFormType(form) => {...state, form: form}
-  };
+  }
 }
 
 
 @react.component
-let make = (~storeComment: Types.storeCommentActionT, ~isSaving: Types.isSavingT) => {
+let make = (~storeComment: Types.storeCommentAction, ~isSaving: Types.isSaving) => {
   let (state, dispatch) = React.useReducer(
     reducer, {
       author: "",
       text: "",
-      form: HorizontalForm
+      form: Horizontal
     }
   )
 
@@ -37,11 +37,11 @@ let make = (~storeComment: Types.storeCommentActionT, ~isSaving: Types.isSavingT
     storeComment(state.author, state.text)
   }
 
-  let forms: array<Types.formDataT> = 
+  let forms: array<Types.formData> = 
   [
-    {formName: "Horizontal Form", formType: HorizontalForm},
-    {formName: "Inline Form", formType: InlineForm},
-    {formName: "Stacked Form", formType: StackedFrom}
+    {formName: "Horizontal Form", formType: Horizontal},
+    {formName: "Inline Form", formType: Inline},
+    {formName: "Stacked Form", formType: Stacked}
   ]
 
   <div>
@@ -65,7 +65,7 @@ let make = (~storeComment: Types.storeCommentActionT, ~isSaving: Types.isSavingT
     <hr />
     {
       switch state.form {
-      | HorizontalForm
+      | Horizontal
         => <HorizontalForm
               author={state.author}
               handleAuthorChange
@@ -74,7 +74,7 @@ let make = (~storeComment: Types.storeCommentActionT, ~isSaving: Types.isSavingT
               handleSubmit
               isSaving 
             />
-      | StackedFrom 
+      | Stacked
         => <StackedFrom
               author={state.author}
               handleAuthorChange
@@ -83,7 +83,7 @@ let make = (~storeComment: Types.storeCommentActionT, ~isSaving: Types.isSavingT
               handleSubmit
               isSaving 
             />
-      | InlineForm
+      | Inline
         => <InlineForm
               author={state.author}
               handleAuthorChange

client/app/bundles/comments/src/CommentForm/forms/HorizontalForm.res

@@ -5,7 +5,7 @@ let make = (
   ~text,
   ~handleTextChange,
   ~handleSubmit,
-  ~isSaving: Types.isSavingT
+  ~isSaving: Types.isSaving
   ) => {
   <form className="form-horizontal"  onSubmit=handleSubmit disabled={isSaving == BusySaving}>
     <div className="form-group">

client/app/bundles/comments/src/CommentForm/forms/InlineForm.res

@@ -5,7 +5,7 @@ let make = (
   ~text,
   ~handleTextChange,
   ~handleSubmit,
-  ~isSaving: Types.isSavingT
+  ~isSaving: Types.isSaving
   ) => {
   <form className="form-inline" onSubmit=handleSubmit disabled={isSaving == BusySaving} >
     <div className="form-group">

client/app/bundles/comments/src/CommentForm/forms/StackedFrom.res

@@ -5,7 +5,7 @@ let make = (
   ~text,
   ~handleTextChange,
   ~handleSubmit,
-  ~isSaving: Types.isSavingT
+  ~isSaving: Types.isSaving
   ) => {
   <form onSubmit=handleSubmit disabled={isSaving == BusySaving}>
     <div className="form-group">

client/app/bundles/comments/src/CommentList/AlertError/AlertError.res

@@ -1,11 +1,11 @@
 @react.component
-let make = (~cssTransitionGroupClassNames: CSSAnimation.CSSTransition.t, ~error: Types.errorT) => {
+let make = (~cssTransitionGroupClassNames: CSSAnimation.CSSTransition.t, ~error: Types.error) => {
   let nodeRef = React.useRef(Js.Nullable.null)
 
   switch error {
   | FailedToSaveComment => 
     // The 500 must correspond to the 0.5s in:
-    //   ../../RescriptPage.module.scss:9
+    //   ../../RescriptShow.module.scss:9
     <CSSAnimation.CSSTransition
       key="commentFetchError"
       nodeRef={nodeRef}
@@ -18,7 +18,7 @@ let make = (~cssTransitionGroupClassNames: CSSAnimation.CSSTransition.t, ~error:
     </CSSAnimation.CSSTransition>
   | FailedToFetchComments =>
     // The 500 must correspond to the 0.5s in:
-    //   ../../RescriptPage.module.scss:9
+    //   ../../RescriptShow.module.scss:9
     <CSSAnimation.CSSTransition
       key="commentFetchError"
       nodeRef={nodeRef}

client/app/bundles/comments/src/CommentList/Comment/Comment.res

@@ -7,7 +7,7 @@ let make = (~comment: Actions.Fetch.t, ~cssTransitionGroupClassNames) => {
   let nodeRef = React.useRef(Js.Nullable.null)
 
   // The 500 must correspond to the 0.5s in:
-  //   ../../RescriptPage.module.scss:9
+  //   ../../RescriptShow.module.scss:9
   <CSSAnimation.CSSTransition
     key={"component_" ++ Belt.Int.toString(comment.id) }
     timeout={500}

client/app/bundles/comments/src/CommentList/CommentList.bs.mjs

@@ -5,9 +5,9 @@ import * as AlertError from "./AlertError/AlertError.bs.mjs";
 import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
 import * as JsxRuntime from "react/jsx-runtime";
 import * as ReactTransitionGroup from "react-transition-group";
-import RescriptPageModuleScss from "../RescriptPage.module.scss";
+import RescriptShowModuleScss from "../RescriptShow.module.scss";
 
-var css = RescriptPageModuleScss;
+var css = RescriptShowModuleScss;
 
 function CommentList(props) {
   var cssTransitionGroupClassNames_enter = css.elementEnter;

client/app/bundles/comments/src/CommentList/CommentList.res

@@ -1,7 +1,7 @@
-@module("../RescriptPage.module.scss") external css: {..} = "default"
+@module("../RescriptShow.module.scss") external css: {..} = "default"
 
 @react.component
-let make = (~comments: Actions.Fetch.comments, ~error: Types.errorT) => {
+let make = (~comments: Actions.Fetch.comments, ~error: Types.error) => {
   let cssTransitionGroupClassNames: CSSAnimation.CSSTransition.t = {
     enter: css["elementEnter"],
     enterActive: css["elementEnterActive"],

client/app/bundles/comments/src/RescriptPage.module.scss renamed to client/app/bundles/comments/src/ReScriptShow.module.scss

@@ -1,28 +1,28 @@
-type rescriptPageStateT = {
+type state = {
   comments: Actions.Fetch.comments,
-  error: Types.errorT,
-  isSaving: Types.isSavingT
+  error: Types.error,
+  isSaving: Types.isSaving
 }
 
-type rescriptPageActionT =
+type action =
   | SetComments(Actions.Fetch.comments)
-  | SetError(Types.errorT)
-  | SetIsSaving(Types.isSavingT)
+  | SetError(Types.error)
+  | SetIsSaving(Types.isSaving)
 
 
 let reducer = (
-  state: rescriptPageStateT, 
-  action: rescriptPageActionT
-): rescriptPageStateT => {
+  state: state, 
+  action: action
+): state => {
   switch (action) {
   | SetComments(comments) => {...state, comments}
   | SetError(error) => {...state, error}
   | SetIsSaving(isSaving) => {...state, isSaving}
-  };
+  }
 }
 
 @react.component
-let make = () => {
+let default = () => {
   let (state, dispatch) = React.useReducer(
     reducer, {
       comments: ([]: Actions.Fetch.comments),
@@ -53,12 +53,12 @@ let make = () => {
 
   React.useEffect1((_) => {
     let fetchData = async () => {
-      let comments = await Actions.Fetch.fetchComments();
+      let comments = await Actions.Fetch.fetchComments()
       switch comments {
       | Ok(comments) => SetComments(comments)->dispatch
       | Error(e) => SetError(e)->dispatch
       }
-    };
+    }
 
     fetchData()->ignore
     None
@@ -80,5 +80,3 @@ let make = () => {
     </div>
   </>
 }
-
-let default = make