Merge branch 'develop' into dayana

7 files changed, 86 insertions, 450 deletions

diff --git a/front/odiparpack/app/api/almacen.js b/front/odiparpack/app/api/almacen.js
new file mode 100644
index 0000000..dcc629b
--- /dev/null
+++ b/front/odiparpack/app/api/almacen.js
@@ -0,0 +1,6 @@
+import { apiGet } from 'odi-utils/api';
+
+//GET APIS
+export const getAlmacenesAPI = async () => {
+    return await apiGet(`ayuda/almacen`)
+}
\ No newline at end of file
diff --git a/front/odiparpack/app/api/brand.js b/front/odiparpack/app/api/brand.js
index 883eed5..216e180 100644
--- a/front/odiparpack/app/api/brand.js
+++ b/front/odiparpack/app/api/brand.js
@@ -1,8 +1,8 @@
 module.exports = {
-  name: 'Boss Ultimate',
-  desc: 'Boss Ultimate - Material Admin Dashboard',
-  prefix: 'boss',
-  footerText: 'Boss Ultimate All Rights Reserved 2018',
-  logoText: 'Boss Ultimate',
+  name: 'OdiparPack',
+  desc: 'OdiparPack - Planeamiento de rutas',
+  prefix: 'odipk',
+  footerText: 'OdiparPack All Rights Reserved 2022',
+  logoText: 'OdiparPack',
   needLogin: false
 };
diff --git a/front/odiparpack/app/api/dummyContents.js b/front/odiparpack/app/api/dummyContents.js
index 104cdfd..2f839fb 100644
--- a/front/odiparpack/app/api/dummyContents.js
+++ b/front/odiparpack/app/api/dummyContents.js
@@ -1,7 +1,7 @@
 import avatarApi from './avatars';
 const dummyContent = {
   user: {
-    name: 'John Doe',
+    name: 'Mitsuo Tokumori',
     title: 'Administrator',
     avatar: avatarApi[6]
   },
diff --git a/front/odiparpack/app/api/menu.js b/front/odiparpack/app/api/menu.js
index dce8f58..637424a 100644
--- a/front/odiparpack/app/api/menu.js
+++ b/front/odiparpack/app/api/menu.js
@@ -1,454 +1,51 @@
 module.exports = [
   {
-    key: 'dashboard',
-    name: 'Dashboard',
-    icon: 'dashboard',
-    child: [
-      {
-        key: 'dashboard_v1',
-        name: 'Dashboard V1',
-        link: '/app'
-      },
-      {
-        key: 'dashboard_v2',
-        name: 'Dashboard V2',
-        link: '/app/dashboard-v2'
-      },
-    ]
+    key: 'seguimiento',
+    name: 'Seguimiento',
+    icon: 'near_me',
+    link: '/app/dashboard-v2',
+    child: [ ]
   },
   {
-    key: 'layouts',
-    name: 'Layouts',
-    icon: 'view_column',
-    child: [
-      {
-        key: 'grid',
-        name: 'Grid',
-        link: '/app/layouts/grid'
-      },
-      {
-        key: 'application_layout',
-        name: 'App Layout',
-        link: '/app/layouts/app-layout'
-      },
-      {
-        key: 'responsive',
-        name: 'Responsive',
-        link: '/app/layouts/responsive'
-      }
-    ]
+    key: 'pedidos',
+    name: 'Pedidos',
+    icon: 'inventory_2',
+    link: '/app/pedidos',
+    child: [ ]
   },
   {
-    key: 'tables',
-    name: 'Tables',
-    icon: 'grid_on',
-    child: [
-      {
-        key: 'basic_table',
-        name: 'Basic Table',
-        link: '/app/tables/basic-table'
-      },
-      {
-        key: 'data_table',
-        name: 'Data Table',
-        link: '/app/tables/data-table'
-      },
-      {
-        key: 'tree_table',
-        name: 'Tree Table',
-        link: '/app/tables/tree-table'
-      },
-      {
-        key: 'crud_table',
-        name: 'CRUD Table',
-        link: '/app/tables/crud-table'
-      },
-      {
-        key: 'table_playground',
-        name: 'Table Playgound',
-        link: '/app/tables/table-playground'
-      },
-    ]
+    key: 'camiones',
+    name: 'Camiones',
+    icon: 'local_shipping',
+    link: '/app/layouts/grid',
+    child: [ ]
   },
   {
-    key: 'forms',
-    name: 'Form Button',
-    icon: 'border_color',
-    child: [
-      {
-        key: 'reduxform',
-        name: 'Redux Form',
-        link: '/app/forms/reduxform'
-      },
-      {
-        key: 'datetimepicker',
-        name: 'Date Time Picker',
-        link: '/app/forms/date-time-picker'
-      },
-      {
-        key: 'checkbox_radio',
-        name: 'Checkbox & Radio',
-        link: '/app/forms/checkbox-radio'
-      },
-      {
-        key: 'switches',
-        name: 'Switches',
-        link: '/app/forms/switches'
-      },
-      {
-        key: 'selectbox',
-        name: 'Select',
-        link: '/app/forms/selectbox'
-      },
-      {
-        key: 'buttons',
-        name: 'Buttons',
-        link: '/app/forms/buttons'
-      },
-      {
-        key: 'textfields',
-        name: 'Textfields',
-        link: '/app/forms/textfields'
-      },
-      {
-        key: 'autocomplete',
-        name: 'Autocomplete & Tag',
-        link: '/app/forms/autocomplete'
-      },
-      {
-        key: 'slider',
-        name: 'Slider Range',
-        link: '/app/forms/slider-range'
-      },
-      {
-        key: 'upload',
-        name: 'Upload',
-        link: '/app/forms/upload'
-      },
-      {
-        key: 'ratting',
-        name: 'Ratting',
-        link: '/app/forms/ratting'
-      },
-      {
-        key: 'texteditor',
-        name: 'WYSIWYG Editor',
-        link: '/app/forms/wysiwyg-editor'
-      },
-    ]
+    key: 'almacenes',
+    name: 'Almacenes',
+    icon: 'warehouse',
+    link: '/app/tables/crud-table',
+    child: [ ]
   },
   {
-    key: 'ui',
-    name: 'UI Elements',
-    icon: 'flag',
-    child: [
-      {
-        key: 'icons',
-        name: 'Icons',
-        link: '/app/ui/icons'
-      },
-      {
-        key: 'avatars',
-        name: 'Avatars',
-        link: '/app/ui/avatars'
-      },
-      {
-        key: 'badges',
-        name: 'Badges',
-        link: '/app/ui/badges'
-      },
-      {
-        key: 'card_papper',
-        name: 'Card & Papper',
-        link: '/app/ui/card-papper'
-      },
-      {
-        key: 'dialog_modal',
-        name: 'Dialog & Modal',
-        link: '/app/ui/dialog-modal'
-      },
-      {
-        key: 'drawer_menu',
-        name: 'Drawer & Menu',
-        link: '/app/ui/drawer-menu'
-      },
-      {
-        key: 'tab',
-        name: 'Tabs Navigation',
-        link: '/app/ui/tabs'
-      },
-      {
-        key: 'accordion',
-        name: 'Accordion',
-        link: '/app/ui/accordion'
-      },
-      {
-        key: 'image_gird',
-        name: 'Image Grid Gallery',
-        link: '/app/ui/image-grid'
-      },
-      {
-        key: 'list_divider',
-        name: 'List & Divider',
-        link: '/app/ui/list'
-      },
-      {
-        key: 'popover_tooltip',
-        name: 'Popover & Tooltip',
-        link: '/app/ui/popover-tooltip'
-      },
-      {
-        key: 'progress',
-        name: 'Progress & Spinners',
-        link: '/app/ui/progress'
-      },
-      {
-        key: 'tags',
-        name: 'Tags',
-        link: '/app/ui/tags'
-      },
-      {
-        key: 'steppers',
-        name: 'Steppers',
-        link: '/app/ui/steppers'
-      },
-      {
-        key: 'notification',
-        name: 'Notification',
-        link: '/app/ui/notification'
-      },
-      {
-        key: 'breadcrumbs',
-        name: 'Breadcrumbs',
-        link: '/app/ui/breadcrumbs'
-      },
-      {
-        key: 'dividers',
-        name: 'Dividers',
-        link: '/app/ui/dividers'
-      },
-      {
-        key: 'typography',
-        name: 'Typography',
-        link: '/app/ui/typography'
-      },
-      {
-        key: 'slider_carousel',
-        name: 'Slider & Carousel',
-        link: '/app/ui/slider-carousel'
-      },
-      {
-        key: 'paginations',
-        name: 'Paginations',
-        link: '/app/ui/paginations'
-      },
-    ]
+    key: 'red_tramos',
+    name: 'Red de Tramos',
+    icon: 'location_on',
+    link: '/app/forms/reduxform',
+    child: [ ]
   },
   {
-    key: 'charts',
-    name: 'Charts',
-    icon: 'insert_chart',
-    child: [
-      {
-        key: 'line_charts',
-        name: 'Line Charts',
-        link: '/app/charts/line-charts'
-      },
-      {
-        key: 'bar_charts',
-        name: 'Bar Charts',
-        link: '/app/charts/bar-charts'
-      },
-      {
-        key: 'area_charts',
-        name: 'Area Charts',
-        link: '/app/charts/area-charts'
-      },
-      {
-        key: 'pie_charts',
-        name: 'Pie & Donuts Charts',
-        link: '/app/charts/pie-charts'
-      },
-      {
-        key: 'radar_charts',
-        name: 'Radar Charts',
-        link: '/app/charts/radar-charts'
-      },
-      {
-        key: 'scatter_charts',
-        name: 'Scatter Charts',
-        link: '/app/charts/scatter-charts'
-      },
-      {
-        key: 'compossed_charts',
-        name: 'Compossed Charts',
-        link: '/app/charts/compossed-chart'
-      },
-      {
-        key: 'responsive_charts',
-        name: 'Responsive Charts',
-        link: '/app/charts/responsive-chart'
-      },
-    ]
+    key: 'otros',
+    name: 'Otros parámetros',
+    icon: 'settings',
+    link: '/app/ui/icons',
+    child: [ ]
   },
   {
-    key: 'apps',
-    name: 'Apps',
-    icon: 'bubble_chart',
-    child: [
-      {
-        key: 'social_media',
-        name: 'Social Media',
-        link: '/app/pages/social-media'
-      },
-      {
-        key: 'ecommerce',
-        name: 'Ecommerce',
-        link: '/app/pages/ecommerce'
-      },
-      {
-        key: 'contact',
-        name: 'Contact',
-        link: '/app/pages/contact'
-      },
-      {
-        key: 'calendar',
-        name: 'Calendar',
-        link: '/app/pages/calendar'
-      },
-      {
-        key: 'email',
-        name: 'Email',
-        link: '/app/pages/email'
-      },
-      {
-        key: 'chat',
-        name: 'Chat',
-        link: '/app/pages/chat'
-      },
-    ]
-  },
-  {
-    key: 'pages',
-    name: 'Pages',
-    icon: 'library_books',
-    child: [
-      {
-        key: 'user_profile',
-        name: 'User Profile',
-        link: '/app/pages/user-profile'
-      },
-      {
-        key: 'gallery',
-        name: 'Photo Gallery',
-        link: '/app/pages/photo-gallery'
-      },
-      {
-        key: 'not_found_page',
-        name: 'Not Found Page',
-        link: '/app/pages/not-found'
-      },
-      {
-        key: 'error_page',
-        name: 'Error Page',
-        link: '/app/pages/error'
-      },
-      {
-        key: 'maintenance',
-        name: 'Maintenance',
-        link: '/maintenance'
-      },
-      {
-        key: 'login',
-        name: 'Login',
-        link: '/login'
-      },
-      {
-        key: 'register',
-        name: 'Register',
-        link: '/register'
-      },
-      {
-        key: 'reset',
-        name: 'Reset Password',
-        link: '/reset-password'
-      },
-      {
-        key: 'lock',
-        name: 'Lock Screen',
-        link: '/lock-screen'
-      },
-      {
-        key: 'blank',
-        name: 'Blank Page',
-        link: '/app/pages/blank-page'
-      },
-      {
-        key: 'help_support',
-        name: 'Help & Support',
-        link: '/app/pages/help-support'
-      },
-    ]
-  },
-  {
-    key: 'maps',
-    name: 'Maps',
-    icon: 'maps',
-    child: [
-      {
-        key: 'map_marker',
-        name: 'Map Marker',
-        link: '/app/maps/map-marker'
-      },
-      {
-        key: 'map_direction',
-        name: 'Map Direction',
-        link: '/app/maps/map-direction'
-      },
-      {
-        key: 'map_searchbox',
-        name: 'Map with Searchbox',
-        link: '/app/maps/map-searchbox'
-      },
-      {
-        key: 'map_traffic',
-        name: 'Traffic Indicator',
-        link: '/app/maps/map-traffic'
-      },
-      {
-        key: 'street_view',
-        name: 'Street View',
-        link: '/app/maps/street-view'
-      },
-    ]
-  },
-  {
-    key: 'menu_levels',
-    name: 'Menu Levels',
-    icon: 'sort',
-    child: [
-      {
-        key: 'level_1',
-        name: 'Level 1',
-        link: '/#'
-      },
-      {
-        key: 'level_2',
-        keyParent: 'menu_levels',
-        name: 'Level 2',
-        child: [
-          {
-            key: 'sub_menu_1',
-            name: 'Sub Menu 1',
-            link: '/#'
-          },
-          {
-            key: 'sub_menu_2',
-            name: 'Sub Menu 2',
-            link: '/#'
-          },
-        ]
-      },
-    ]
+    key: 'simulacion',
+    name: 'Simulación',
+    icon: 'fast_forward',
+    link: '/app/pages/calendar',
+    child: [ ]
   }
-];
+];
\ No newline at end of file
diff --git a/front/odiparpack/app/api/notifMessage.js b/front/odiparpack/app/api/notifMessage.js
index 2d2b48b..bc7a60c 100644
--- a/front/odiparpack/app/api/notifMessage.js
+++ b/front/odiparpack/app/api/notifMessage.js
@@ -1,10 +1,10 @@
 module.exports = {
-  saved: 'Data has been saved',
-  updated: 'Data has been updated',
-  removed: 'Item has been removed',
+  saved: 'Se ha guardado correctamente',
+  updated: 'Se ha actualizado correctamente',
+  removed: 'Se ha eliminado correctamente',
   posted: 'Your post has been submitted',
   commented: 'Your comment has been submitted',
-  discard: 'Action canceled',
+  discard: 'Cancelado',
   addCart: 'Item added to cart',
   checkout: 'Thank you for shopping',
   sent: 'Email sent',
diff --git a/front/odiparpack/app/api/pedido.js b/front/odiparpack/app/api/pedido.js
new file mode 100644
index 0000000..63d6e2e
--- /dev/null
+++ b/front/odiparpack/app/api/pedido.js
@@ -0,0 +1,18 @@
+import axios from 'axios';
+import { apiGet } from '../utils/odipar/api';
+
+//GET APIS
+export const getPedidosAPI = async () => {
+    return await apiGet(`ayuda/`)
+}
+
+export function getAPi(){
+    axios.get(
+        `http://localhost:8083/ayuda/`, //TODO: check currentTimeStamp
+        { 
+            headers: {
+                'Content-type': 'application/json',
+            },
+        }
+    )
+}
\ No newline at end of file
diff --git a/front/odiparpack/app/api/themePalette.js b/front/odiparpack/app/api/themePalette.js
index c7971b3..eaec9e7 100644
--- a/front/odiparpack/app/api/themePalette.js
+++ b/front/odiparpack/app/api/themePalette.js
@@ -200,7 +200,22 @@ const themePalette = (color) => ({
     secondary: palette[color].palette.secondary,
   },
   typography: {
-    useNextVariants: true,
+    h5: {
+      fontSize: 18,
+      fontWeight: 600,
+      color: "#202A75",
+      margin: "5px 0 10px",
+    },
+    h4: {
+      fontSize: 25,
+      fontWeight: 500,
+      margin: "10px 0 5px",
+    },
+    h6: {
+      fontSize: 17,
+      fontWeight: 420,
+      margin: "0px 0 0px",
+    },
   },
 });