Update remotes to add checkout

Author: statasaurus

mods/mod-remotesq2.R

@@ -4,8 +4,8 @@ remotesq2_ui <- function(id){
   tagList(
     h3("Working with Remotes"),
     p("Let's walk through Sylvie's workflow to make the updates for Camille. 
-      First we are going to clone the repository. Then, we will make a new branch, 
-      add a commit and finally push back to the remote so Camille can see the updates."),
+      First we are going to clone the repository. Then, need to 'checkout' the tagged commit by clicking on it. 
+      After, we can make a new branch, add a commit and finally push back to the remote so Camille can see the updates."),
     div(class = "box", id = ns("remotes"),
         div("Remote", style = "margin-bottom: 3px; width : 90%;" ),
         div(class = "graph", id = ns("graphr"),
@@ -62,22 +62,30 @@ remotesq2_server <- function(id){
       ns <- session$ns
       n_commits <- reactiveVal(0)
       remote_branch <- reactiveVal(FALSE)
+      local_branch <- reactiveVal(FALSE)
       remote_commit <- reactiveVal(0)
+      current_dot <- reactiveVal("dot4")
+      
+      observeEvent(input$close,{
+        removeModal()
+      })
 
       observeEvent(input$clone, {
         insertUI(
           selector = paste0("#",  ns("local")),
           where = "beforeEnd",
-          ui = div(class = "graph", id = ns("graphl"),
+          ui = div(class = "graph", id = ns("graph"),
                    div(class = "slice", id = ns("slice1l"),
                        div(class = c("branch", "main", "left"), 
                            "Main",
                            div(
+                             id = ns('dot1'),
                              class = "dot",
                              message = "Code V1"
                            ),
                            div(
-                             class = c("dot", "tagged", 'head'),
+                             id = ns('dot2'),
+                             class = c("dot", "tagged"),
                              message = "Code V2"
                            ),
                            style = "z-index: 3;"
@@ -86,11 +94,13 @@ remotesq2_server <- function(id){
                    div(class = "slice", id = ns("slice2l"), style = "z-index: 2;",
                        div(
                          div(
+                           id = ns('dot3'),
                            class = "dot",
                            message = "Code V3"
                          ),
                          div(
-                           class = c("dot"),
+                           id = ns('dot4'),
+                           class = c("dot", 'head'),
                            message = "Code V4"
                          ),
                          class = c("branch", "samebranch", "main", "right")
@@ -104,7 +114,8 @@ remotesq2_server <- function(id){
       })
 
       observeEvent(input$branch, {
-        if(input$clone > 0){
+        
+        if(input$clone > 0 & current_dot() == "dot2"){
           insertUI(
             selector = paste0("#",  ns("slice1l")),
             where = "afterBegin",
@@ -117,33 +128,80 @@ remotesq2_server <- function(id){
             ui = div(class = c("branch", "topbranch"), id = ns("b1l"))
           )
           disable("branch")
+          local_branch(TRUE)
+        } else if(input$clone == 0){
+          showModal(
+            modalDialog(
+              title = "Oops",
+              p("You need to clone before you can branch"),
+              footer=tagList(
+                actionButton(ns('close'), 'close')
+              )
+            )
+          )
+        } else if(current_dot() != "dot2"){
+          showModal(
+            modalDialog(
+              title = "Oops",
+              p("You need to 'checkout' to the tagged commit, by clicking on it before you can branch."),
+              footer=tagList(
+                actionButton(ns('close'), 'close')
+              )
+            )
+          )
         }
       })
 
       observeEvent(input$commit, {
-        if(input$branch > 0){
-          shinyjs::runjs(
-            str_glue(
-              "$('#{ns('graphl')}').find('.head').first().removeClass('head');
+        
+        if(local_branch()){
+          if(current_dot() %in% c("dot2", "dot1-b1")){
+            shinyjs::runjs(
+              str_glue(
+                "$('#{ns('graph')}').find('.head').first().removeClass('head');
               $('#{ns('b1l')}').addClass('analysis2');"
+              )
+              
             )
 
-          )
+            insertUI(
+              selector = paste0("#",  ns("b1l")),
+              where = "beforeEnd",
+              ui = div(
+                id = ns(paste0('dot',input$commit,'-b1')),
+                class = c("dot", 'head'),
+                message = ifelse(n_commits() == 0, "Journal Update",
+                                 "Final Journal Update")
+              )
+              
+            )
+            n_commits(n_commits()+1)
+            if(n_commits() >= 2){
+              disable("commit")
+            }
+          } else {
+            showModal(
+              modalDialog(
+                title = "Oops",
+                p("For now we are only adding commits to our new branch, try again"),
+                footer=tagList(
+                  actionButton(ns('close'), 'close')
+                )
+              )
+            )
+          }
 
-          insertUI(
-            selector = paste0("#",  ns("b1l")),
-            where = "beforeEnd",
-            ui = div(
-              class = c("dot", 'head'),
-              message = ifelse(n_commits() == 0, "Journal Update",
-                               "Final Journal Update")
+        } else {
+          showModal(
+            modalDialog(
+              title = "Oops",
+              p("You need to branch before you can commit"),
+              footer=tagList(
+                actionButton(ns('close'), 'close')
+              )
             )
-            
           )
-          n_commits(n_commits()+1)
-          if(n_commits() >= 2){
-            disable("commit")
-          }
+          
         }
       })
 
@@ -204,6 +262,12 @@ remotesq2_server <- function(id){
 
       })
 
+      dot_update("dot1", ns, session, current_dot)
+      dot_update("dot2", ns, session, current_dot)
+      dot_update("dot3", ns, session, current_dot)
+      dot_update("dot4", ns, session, current_dot)
+      dot_update("dot1-b1", ns, session, current_dot)
+      dot_update("dot2-b1", ns, session, current_dot)
 
 
     }

www/style.css

@@ -108,7 +108,7 @@ background-color: #f2e5e1;
 }
 
 .branch.topbranch:before {
-    width: calc(var(--radius)*2);
+    width: calc(var(--radius)*2.1);
     left: calc(var(--radius)*-1);
     top: 105%;
     transform: rotate(132deg);
@@ -184,4 +184,13 @@ background-color: #f2e5e1;
     min-width: fit-content;
 }
 
-
+.bottomtop:before{
+    width: calc(var(--radius)*6);
+    left: calc(var(--radius)*-1);
+    top: 111%;
+    transform: rotate(160deg);
+    content: '';
+    border-bottom: 3px solid;
+    position: absolute;
+    color: #000;
+}