colaboracion estable

Author: scyth3-c

src/components/basecanvas.vue

@@ -49,20 +49,15 @@
 
       </b-modal>
 
-<<<<<<< HEAD
       <b-modal hide-header hide-footer id="program-input">
         <p style="cursor:pointer" @click="$bvModal.hide('program-input')">X</p>
-=======
-      <b-modal hide-footer id="program-input">
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
           <inputData />
         </b-modal>
 
         <b-modal hide-footer id="headers">
           <headers />
         </b-modal>
 
-<<<<<<< HEAD
       <b-modal title="Compartir" id="share-link" hide-footer hide-header>
         <p style="cursor:pointer" @click="$bvModal.hide('share-link')">X</p>
        <b-container fluid>
@@ -80,15 +75,6 @@
 
         <b-modal hide-footer  hide-header  id="flags-modal">
           <p style="cursor:pointer" @click="$bvModal.hide('flags-modal')">X</p>
-=======
-      <b-modal title="Compartir" id="share-link" hide-footer>
-         <b-icon icon="share-fill" class="text-primary" ></b-icon> 
-
-         <span class="text-dark font-weight-bolder ml-2 mb-"> Comparte este codigo usando este enlace</span> <br/> <br/>
-         <a :href="shared_path()">{{shared_path()}}</a> <b-icon scale="1.3" class="ml-1 hovery"  @click="copy(shared_path())"  icon="files"></b-icon>      </b-modal>
-      
-        <b-modal hide-footer   id="flags-modal" title="flags">
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
           <b-badge class="mb-1 bg-transparent text-dark"
             >e.g  &nbsp; -Wall -pedantic</b-badge
           >
@@ -317,19 +303,15 @@ export default {
     });
 
   },
-<<<<<<< HEAD
 
 
-=======
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
   beforeMount(){
     const url = window.location.href;
     const params = new URL(url).searchParams;
     const Search_Query = params.get('sq');
     if(Search_Query){
       this.$store.dispatch("extract_notecode", Search_Query)
     }
-<<<<<<< HEAD
     const codespace = params.get('codespace');
 
     if(this.$store.state.visibles.colab && codespace && this.$store.state.isHost == false){
@@ -350,19 +332,13 @@ export default {
       this.$store.dispatch('socketOn', this)
     }
 
-=======
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
   },
   mounted() {
     this.local_widthQuery.addEventListener('change',()=>{
     this.local_widthMatch = this.local_widthQuery.matches;
     });
-<<<<<<< HEAD
     this.$store.commit("setColabUrl")
 
-=======
-    
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
   },
 
   data(){
@@ -438,7 +414,6 @@ export default {
     deep: true,
   },
 
-<<<<<<< HEAD
 
   computed: {
     ...mapGetters(["time", "seed", "cmOption", "codeSpaces", "mode", "visibles"]),
@@ -447,16 +422,6 @@ export default {
       return this.$store.getters.codeSpaces[0].code;
     },
 
-=======
-    share_id:{
-      get(){
-       return this.$store.state.share_id
-      },
-      set(value){
-        this.$store.state.share_id = value
-      }
-    },
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
     flags: {
       get() {
         return this.$store.state.cxxflags;
@@ -623,7 +588,6 @@ export default {
 }
 
 .hovery{
-<<<<<<< HEAD
 color: #272927;
 }
 .hovery:hover{
@@ -660,12 +624,3 @@ pre {
 }
 
 </style>  
-=======
-color: #A5D6A7;
-}
-.hovery:hover{
-color:#839192;
-}
-
-</style>
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de

src/components/extra/headers.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <b-badge class="p-2" variant="white">set the headers here: </b-badge> <br>
-    <b-input disabled class="w-100 text-dark" placeholder="entrada del usuario" title="librerias necesarias" v-model="getIn">
+    <b-input disabled class="w-100 text-dark mb-1" placeholder="entrada del usuario" title="librerias necesarias" v-model="getIn">
     </b-input>
     <b-input
       title="escribe las cabeceras aqui"

src/components/extra/program-input.vue

@@ -3,7 +3,7 @@
     <b-badge variant="transparent" class="p-2 text-dark w-100"
       >Escribe la entrada del usuario al programa
     </b-badge>
-     <b-input disabled class="w-100 text-dark" placeholder="entrada del usuario" title="entrada del usuario al programa" v-model="getIn">
+     <b-input disabled class="w-100 text-dark mb-1" placeholder="entrada del usuario" title="entrada del usuario al programa" v-model="getIn">
      </b-input>
     <b-input
       title="establece la entrada del programa"

src/store.js

@@ -633,7 +633,6 @@ int main() {
       }
     },
 
-<<<<<<< HEAD
    async internal_colab_clock({state,commit}, enviroment){
       clearTimeout(state.timer);
 
@@ -700,8 +699,6 @@ int main() {
       }
      },
 
-=======
->>>>>>> 42a6373dfe0b96835938772736c39a5376c5d6de
      async share({state,commit}){
 
       let code = state.codeSpaces[state.actualCodeSpace].code;