diff --git a/components/FormInputImage.vue b/components/FormInputImage.vue
index 5c1b8b2..fb17c8a 100644
--- a/components/FormInputImage.vue
+++ b/components/FormInputImage.vue
@@ -10,7 +10,7 @@
         :src="croppieImage"
         :stencil-props="{ aspectRatio: 1 }"
       />
-      <div>
+      <div class="buttons">
         <button class="filter-button" @click.prevent="crop">Aplicar</button>
         <button @click.prevent="cancel">Cancelar</button>
       </div>
@@ -31,7 +31,7 @@ export default {
   components: { Cropper },
   props: {
     imageUrl: {
-      type: String,
+      type: [String, Object],
       default: null,
     },
   },
@@ -106,5 +106,10 @@ export default {
 }
 .input {
   max-width: 100%;
+  margin-bottom: 1em;
+}
+
+.buttons {
+  margin-top: 1em;
 }
 </style>
diff --git a/components/ProductForm.vue b/components/ProductForm.vue
index 22c3781..2dbdefe 100644
--- a/components/ProductForm.vue
+++ b/components/ProductForm.vue
@@ -1,12 +1,10 @@
 <template>
   <form class="form" @submit.prevent="sendProduct">
-    {{ form }}
     <div class="cont-col">
       <BFormCheckbox
           id="customSwitch1"
           v-model="form.active"
           class="label"
-          :value="form.active"
         >Activo
           <span class="help-text"
           >Desactiva el producto si quieres paralizar temporalmente su
@@ -15,7 +13,7 @@
       </BFormCheckbox>
     </div>
     <br />
-    <FormHeader title="general" />
+    <FormHeader title="General" />
     <p class="help-text">
       Estos son los datos básicos de un producto. Procura completar el mayor
       número de campos posible. Los campos señalados con asterisco (*) son
@@ -34,35 +32,41 @@
         />
         <FormInput
           v-model="form.price"
+          :value="form.price ? form.price : ''"
           min="0"
           step="0.01"
           type="number"
           label-text="Precio"
           placeholder="precio + iva"
+          @input="form.price = $event"
         />
       </div>
       <div class="cont">
         <FormInput
           v-model="form.url"
+          :value="form.url ? form.url : ''"
           type="text"
           label-text="Url"
           placeholder="enlace directo al producto en tu tienda o web"
+          @input="form.url = $event"
         />
-        <small class="error" v-if="form.url && !isValidUrl(form.url)"
-          >La url no es válida</small
-        >
+        <small v-if="form.url && !isValidUrl(form.url)" class="error">
+          La url no es válida
+        </small>
         <br />
         <FormInput
           v-model="form.sku"
+          :value="form.sku ? form.sku : ''"
           type="text"
           label-text="SKU o identificador"
+          @input="form.sku = $event"
         />
       </div>
       <div class="cont-col">
         <label for="imagen">Imagen</label>
-        <client-only>
-          <FormInputImage :imageUrl="form.image" @change="handleImage" />
-        </client-only>
+        <ClientOnly>
+          <FormInputImage :image-url="form.image" @change="handleImage" />
+        </ClientOnly>
       </div>
       <!-- <div class="cont-col">
         <input
@@ -79,20 +83,33 @@
         <textarea v-model="form.description" class="textarea" type="text" />
       </div>
       <div class="cont">
-        <FormInput v-model="form.stock" type="number" label-text="Stock" />
+        <FormInput 
+          v-model="form.stock"
+          :value="form.stock ? form.stock : ''"
+          type="number" 
+          label-text="Stock"
+          @input="form.stock = $event"
+          />
         <FormInput
           v-model="form.discount"
+          :value="form.discount ? form.discount : ''"
           step="0.01"
           type="number"
           label-text="Descuento"
+          @input="form.discount = $event"
         />
       </div>
       <div class="cont-col">
-        <FormInput v-model="form.identifiers" label-text="Identificador único" />
+        <FormInput 
+          v-model="form.identifiers" 
+          :value="form.identifiers ? form.identifiers : ''"
+          label-text="Identificador único"
+          @input="form.identifiers = $event"
+        />
       </div>
     </fieldset>
     <fieldset class="fieldset">
-      <FormHeader title="categorías" />
+      <FormHeader title="Categorías" />
       <p class="help-text">
         Estos datos ayudan a que tu producto sea encontrado por los clientes.
         Procura completar el mayor número de campos posibles. Los campos
@@ -101,15 +118,14 @@
 
       <div class="cont-col">
         <label for="category">Categoría*</label>
-        <b-form-input
+        <BFormInput
+          id="category"
           v-model="form.category"
           autocomplete="off"
           list="my-list-id"
-          id="category"
-        ></b-form-input>
-
+        />
         <datalist id="my-list-id">
-          <option v-for="(choice, index) in categories" :key="index">
+          <option v-for="(choice, index) in categories" :key="`category-${index}`">
             {{ choice }}
           </option>
         </datalist>
@@ -126,22 +142,22 @@
       </div>
       <div class="cont-col">
         <label for="tags-basic">Palabras clave</label>
-        <b-form-tags
+        <BFormTags
           v-model="form.tags"
           placeholder="Añade palabras clave (moda, complementos...)"
           input-id="tags-basic"
-        ></b-form-tags>
+        />
       </div>
       <div class="cont-col">
         <label for="tags-basic">Atributos</label>
-        <b-form-tags
+        <BFormTags
           v-model="form.attributes"
           placeholder="Añade características del producto (talla, color...)"
           input-id="tags-basic"
-        ></b-form-tags>
+        />
       </div>
     </fieldset>
-    <FormHeader title="envío" />
+    <FormHeader title="Envío" />
     <fieldset class="fieldset">
       <div class="cont-col">
         <label for="">Condiciones de envío</label>
@@ -156,16 +172,20 @@
       <div class="cont-col">
         <FormInput
           v-model="form.shipping_cost"
+          :value="form.shipping_cost ? form.shipping_cost : ''"
           step="0.01"
           type="number"
           label-text="Gastos de envío"
           placeholder="ej. 4,50"
+          @input="form.shipping_cost = $event"
         />
       </div>
     </fieldset>
     <div class="submit-btn" align="center">
-      <SubmitButton text="guardar" imageUrl="" />
+      <SubmitButton text="guardar" image-url="" />
     </div>
+    PRODUCT FORM: {{ productForm }} <br><br><br>
+    FORM: {{ form }}
   </form>
 </template>
 
@@ -174,7 +194,13 @@ import FormInputImage from './FormInputImage.vue'
 import dataProcessing from '~/utils/dataProcessing'
 export default {
   components: { FormInputImage },
-  props: ['productForm'],
+  props: {
+    productForm: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  emits: ['send'],
   data() {
     return {
       form: {
@@ -222,19 +248,24 @@ export default {
     }
   },
 
-  mounted() {
-    if (this.productForm) {
+  async mounted() {
+    await this.getAllCategories()
+    if (this.productForm && Object.keys(this.productForm).length > 0) {
       Object.keys(this.form).forEach((key) => {
         this.form[key] = this.productForm[key]
       })
     }
-    this.getAllCategories()
   },
-
+  
   methods: {
     isValidUrl: dataProcessing.isValidUrl,
     async getAllCategories() {
-      const { data } = await this.$api.get(`/products/all_categories/`)
+      const config = useRuntimeConfig()
+      const data = await $fetch(`/products/all_categories/`,{
+        baseURL: config.public.baseURL,
+        method: 'GET',
+        
+      })
       this.categories = data
     },
     parseForm() {
@@ -249,7 +280,7 @@ export default {
       if (typeof formData.get('image') === 'string') {
         formData.delete('image')
       }
-
+      //console.log('FormData:', formData)
       return formData
     },
 
@@ -259,6 +290,7 @@ export default {
 
     sendProduct() {
       const formData = this.parseForm()
+      //TODO: review with Diego. I changed formaData with this.form
       this.$emit('send', formData)
     },
   },
@@ -333,7 +365,7 @@ export default {
   font-family: $font-secondary;
   background-color: $color-light;
   margin-bottom: 20px;
-  margin-top: -10px;
+  margin-top: 6px;
 
   a {
     text-decoration: underline;
diff --git a/pages/editar/productos/[id].vue b/pages/editar/productos/[id].vue
index 2ad8a48..07d0b18 100644
--- a/pages/editar/productos/[id].vue
+++ b/pages/editar/productos/[id].vue
@@ -1,5 +1,12 @@
 <template>
   <BContainer class="container">
+    <BModal 
+        id="modal-center" 
+        v-model="activeModal" 
+        centered 
+        title="latienda.coop" 
+        :ok-variant="modalColor"> {{ modalText }}
+    </BModal>
     <BRow align-h="center">
       <BCol class="edit-product">
         <h1 class="title">Editar producto</h1>
@@ -27,6 +34,7 @@
 
 <script>
 import dataProcessing from '~/utils/dataProcessing'
+import { useAuthStore } from '@/stores/auth'
 export default {
   setup() {
     definePageMeta({
@@ -43,22 +51,26 @@ export default {
   data() {
     return {
       form: {},
+      activeModal: false,
+      modalText: '',
+      modalColor: '',
     }
   },
 
   async created() {
     try {
       const config = useRuntimeConfig()
-      const form = await $fetch(`my_products/${this.$route.params.id}/`, {
+      const route = useRoute()
+      this.form = await $fetch(`my_products/${route.params.id}/`, {
         baseURL: config.public.baseURL,
         method: 'GET',
         headers: {
           Authorization: `Bearer ${this.auth.access}`,
         },
       })
-      if (form.source !== 'MANUAL') {
+      if (this.form.source !== 'MANUAL' && this.form.history) {
         try {
-          const result = await $fetch(`history/${form.history}/`, {
+          const result = await $fetch(`history/${this.form.history}/`, {
             baseURL: config.public.baseURL,
             method: 'GET',
             headers: {
@@ -71,7 +83,6 @@ export default {
           form.sync_date = null
         }
       }
-      return { form }
     } catch (error) {
       console.error(error)
     }
@@ -81,24 +92,27 @@ export default {
     formatDatetime: dataProcessing.formatDatetime,
 
     async submitProduct(value) {
+      console.log('Submitting product:', value)
+      const config = useRuntimeConfig()
+      const route = useRoute()
+      //TODO: review PUT method, its sending 200 status but not updating the product
       try {
-        await this.$api.put(`/my_products/${this.$route.params.id}/`, value, {
+        await $fetch(`/my_products/${route.params.id}/`, {
+          baseURL: config.public.baseURL,
+          method: 'PUT',
+          body: value,
           headers: {
-            'Content-Type': 'multipart/form-data',
+            Authorization: `Bearer ${this.auth.access}`,
           },
         })
-        this.$bvToast.toast(`Producto actualizado correctamente`, {
-          title: 'latienda.coop',
-          autoHideDelay: 5000,
-          appendToast: true,
-        })
-      } catch {
-        this.$bvToast.toast(`Ha habido un error`, {
-          title: 'latienda.coop',
-          autoHideDelay: 5000,
-          appendToast: true,
-          variant: 'danger',
-        })
+        this.modalText = 'Producto actualizado correctamente'
+        this.modalColor = 'success'
+        this.activeModal = true
+      } catch (error) {
+        this.modalText = 'Ha habido un error'
+        this.modalColor = 'danger'
+        this.activeModal = true
+        console.error('Error updating product:', error)
       }
     },
   },
diff --git a/pages/editar/productos/crear.vue b/pages/editar/productos/crear.vue
index 4c84228..392e7a1 100644
--- a/pages/editar/productos/crear.vue
+++ b/pages/editar/productos/crear.vue
@@ -1,15 +1,118 @@
 <template>
-  <div>
-    <h1>Crear producto /editar/productos/crear</h1>
-  </div>
+  <BContainer class="container">
+    <BModal 
+        id="modal-center" 
+        v-model="activeModal" 
+        centered 
+        title="latienda.coop" 
+        ok-variant="danger"> {{ modalText }}
+    </BModal>
+    <BRow align-h="center">
+      <BCol class="add-product">
+        <h1 class="title">Añadir producto</h1>
+        <ProductForm @send="submitProduct" />
+      </BCol>
+    </BRow>
+  </BContainer>
 </template>
 
 <script>
-  export default {
-    
-  }
+import { useAuthStore } from '@/stores/auth'
+export default {
+  setup() {
+    definePageMeta({
+      layout: 'editar',
+      middleware: 'auth',
+      auth: { authority: 'COOP_MANAGER' },
+    })
+    const auth = useAuthStore();
+    return {
+      auth
+    }
+  },
+  data() {
+    return {
+      activeModal: false,
+      modalText: '',
+    }
+  },
+  methods: {
+    async submitProduct(value) {
+      console.log('Creating product:', value)
+      const config = useRuntimeConfig()
+      try {
+        await $fetch(`/products/`, {
+          baseURL: config.public.baseURL,
+          method: 'POST',
+          body: value,
+          headers: {
+            Authorization: `Bearer ${this.auth.access}`,
+          },
+        })
+        this.$router.push({
+          name: 'editar-productos',
+          params: { action: 'created' },
+        })
+      } catch (error) {
+        this.modalText = 'Ha habido un error'
+        this.activeModal = true
+        console.error('Error updating product:', error)
+      }
+    }
+  },
+}
 </script>
 
 <style lang="scss" scoped>
+.container {
+  margin-top: 40px;
+  margin-bottom: 80px;
+}
+.add-product {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.title {
+  color: $color-navy;
+  font-size: $xxl;
+  margin-bottom: 60px;
+  text-align: left;
+  @include desktop {
+    width: 40%;
+  }
+  @include tablet {
+    width: 60%;
+  }
+  @include mobile {
+    width: 90%;
+    margin-top: 70px;
+  }
+}
+.help-text {
+  border: 1px solid $color-greylayout;
+  border-radius: 8px;
+  padding: 12px;
+  text-align: justify;
+  hyphens: auto;
+  font-size: $xs;
+  font-weight: $regular;
+  color: $color-greylayout;
+  font-family: $font-secondary;
+  background-color: $color-light;
 
-</style>
\ No newline at end of file
+  a {
+    text-decoration: underline;
+    color: $color-greytext;
+  }
+}
+
+.data {
+  margin: 0 100px;
+  margin-top: 80px;
+  font-size: $xs;
+  display: flex;
+  justify-content: space-evenly;
+  color: $color-greytext;
+}
+</style>