From e3abbfd0dc92bc145d6400d462d70b1c6ac79c34 Mon Sep 17 00:00:00 2001 From: martin chaparro Date: Mon, 10 May 2021 23:34:58 -0500 Subject: [PATCH] Esqueleto presupuesto --- APP/components/Formularios/Fingreso.vue | 83 +++++++ APP/components/Formularios/Fpresupuesto.vue | 70 ++++++ APP/components/Layout/DashboardNavbar.vue | 21 +- APP/components/Navbar/BaseNav.vue | 4 + APP/nuxt.config.js | 3 +- APP/pages/compras.vue | 23 +- APP/pages/ingresos.vue | 251 +++++++++++++++++++- APP/pages/presupuesto.vue | 173 +++++++++++++- APP/static/favicdon.ico | Bin 0 -> 1393 bytes APP/static/favicon.ico | Bin 1393 -> 9662 bytes APP/static/favicon.png | Bin 2761 -> 2452 bytes APP/static/icon.png | Bin 2761 -> 0 bytes APP/static/img/apple-icon.png | Bin 805 -> 2452 bytes APP/static/img/apple-icone.png | Bin 0 -> 805 bytes APP/store/index.js | 4 +- index.js | 1 + routes/ingresos.js | 73 ++++++ 17 files changed, 677 insertions(+), 29 deletions(-) create mode 100644 APP/components/Formularios/Fingreso.vue create mode 100644 APP/components/Formularios/Fpresupuesto.vue create mode 100644 APP/static/favicdon.ico delete mode 100644 APP/static/icon.png mode change 100755 => 100644 APP/static/img/apple-icon.png create mode 100755 APP/static/img/apple-icone.png create mode 100644 routes/ingresos.js diff --git a/APP/components/Formularios/Fingreso.vue b/APP/components/Formularios/Fingreso.vue new file mode 100644 index 0000000..91503bf --- /dev/null +++ b/APP/components/Formularios/Fingreso.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/APP/components/Formularios/Fpresupuesto.vue b/APP/components/Formularios/Fpresupuesto.vue new file mode 100644 index 0000000..c977975 --- /dev/null +++ b/APP/components/Formularios/Fpresupuesto.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/APP/components/Layout/DashboardNavbar.vue b/APP/components/Layout/DashboardNavbar.vue index 4a767d2..69e1e0d 100755 --- a/APP/components/Layout/DashboardNavbar.vue +++ b/APP/components/Layout/DashboardNavbar.vue @@ -16,11 +16,11 @@ - {{ routeName }} + diff --git a/APP/components/Navbar/BaseNav.vue b/APP/components/Navbar/BaseNav.vue index 1313685..65a16e6 100644 --- a/APP/components/Navbar/BaseNav.vue +++ b/APP/components/Navbar/BaseNav.vue @@ -120,6 +120,10 @@ export default { return this.$slots.default; } }, + mounted() { + this.$store.dispatch("getCategorias"); + this.$store.dispatch("getMetodos"); + }, methods: { toggleMenu() { this.$emit('change', !this.show); diff --git a/APP/nuxt.config.js b/APP/nuxt.config.js index a86a6b4..1a64bda 100644 --- a/APP/nuxt.config.js +++ b/APP/nuxt.config.js @@ -59,7 +59,8 @@ export default { // Axios module configuration (https://go.nuxtjs.dev/config-axios) axios: { - baseURL: "http://127.0.0.1:4000/api" + //baseURL: "http://192.168.1.111:4000/api" + baseURL:"http://localhost:4000/api" }, /* diff --git a/APP/pages/compras.vue b/APP/pages/compras.vue index 52be63d..4e909d7 100644 --- a/APP/pages/compras.vue +++ b/APP/pages/compras.vue @@ -34,6 +34,7 @@ prop="categoria" label="Categoria" sortable + >
@@ -107,14 +108,23 @@ export default { openForm: false, }; }, - mounted() { + mounted() { + + + + // this.$store.dispatch("getCategorias"); + //this.$store.dispatch("getMetodos"); this.newCompra.fecha = this.$store.state.fecha; - this.$store.dispatch("getCategorias"); - this.$store.dispatch("getMetodos"); this.categorias = this.$store.state.categorias; this.metodos_pago = this.$store.state.metodos_de_pago; + this.getCompras(); + + + + }, + methods: { cell(row, column, cellValue, index) { @@ -203,9 +213,10 @@ export default { this.newCompra.categoria = ""; this.isUpdate = false; }, - getIcon(name) { - const found = this.$store.state.categorias.find((ic) => ic.name === name); - console.log(found); + getIcon(row, column, cellValue, index) { + const found = this.$store.state.categorias.filter((ic) => ic.name === cellValue)[0]; + //console.log(found); + return `${cellValue}` }, formatMoneda(dato) { diff --git a/APP/pages/ingresos.vue b/APP/pages/ingresos.vue index 48882de..f71d235 100644 --- a/APP/pages/ingresos.vue +++ b/APP/pages/ingresos.vue @@ -1,17 +1,258 @@ diff --git a/APP/pages/presupuesto.vue b/APP/pages/presupuesto.vue index 6012f67..ecc099d 100644 --- a/APP/pages/presupuesto.vue +++ b/APP/pages/presupuesto.vue @@ -1,14 +1,177 @@ \ No newline at end of file diff --git a/APP/static/favicdon.ico b/APP/static/favicdon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3632d0c89129045dc4103e84e59e426c57b8f51a GIT binary patch literal 1393 zcmV-%1&;cOP)Px)D@jB_R9Fe^ReNldMG&9eyIx;VxmMIdgjhwCKeVN$X=xNR5F_{iAD9pW6t#*F zgsb$5TDXc(+R_KbHns{HwTUSSMxqkbMAXm+Qmqd}qLq*w23kw2)Y7}&?)uyB`r&ui zgSLtP7@6d5XJ%(+e>;!;h%VEAG6Suz+(=E0vHu2kKIR~YDr+g=KThO5N?%t`9J7Cz z!`J{cS7sBbmBg4LMc2`Q*c=vb%;M+)D8)#rilGypCSqLx@dPzj-aO`0Ee@jx&{DMo z2WG&xg=Vd*Cq_lch7F)fE%7L^BtJ8$xL~eTcPV~!0CdAiRcr*Z+1D9sR%#uxa2%lS zMHc30U1D*;LsF_{LE;nVHg~>ZH^SfO0I1*c5a(Lr^e$ztX)$85I|Ia7@DN4Y6RSN5 zisVjYMleQy5y_2LmgG+w;e3P~i4NCXgH*d=HbBx*5MrLSb{`J>9A!vneqSRxGno<9 zE23>mQG7tr%OUm=gpmORdJXM@drwr%R(lc%Hl26;kf|LIe!i@Uup z*Llp$^8n6C$?f4TR{7EZgs8wRV8aUOrpM1&9Zf!U!LkK0XZn-1d__lJO8SGj2H%rk z@(%pkpq}e2T|eKn4__}1pt<5c)b=i<{s+pMyer&M%jvnfQA(ANZUt|F4GdoFEX4rC-M{KbO^D{(o%D)QCbo>s)CXAnlwG$1v zG;RKh+q6M%LCF^=-+R!_`1Hh)C$%n|A_Hh?Ux_qOl*A&ww!d(JcrU;Vzm zBG@?@XRm(q{u@8){e>ARy8+@`9F{%vo}5Rut}DOnXHL8pwpR&B8???!!vXa93sL(d z7}ev^F#=m1G@tfB&J5T*g`4%n#MuEhNFI+z66b5RB$+6gvwV4s=Hnc(FX2KxVAtV= zoT7Cmg#u`*xdEwPjlh3UtnETz)7V_4UsRy3cBH?kdC#u1re3e@AG~=G{(JEdP3`SM z|A4$M&soglW;|3e0KQf0ObP`+zET)O5%DcFb4{0NWL@>xLB1RP@zaEilp5=v$vc>R zJ#Os7gltH=e}(ZJCtn{ATlR}$Y6*J5Xi{ze4}hlX*{IVZpg%zqd9@kLx?0B$wa+`~ z@dT{8k1qE3ZMq>boI;T?y4pSnK!58AkB&jyP1Dx+f_&(| z@D4l!jWKpe^+%z*p;ELnVGFW!2Bo?%mfh~sy^PqGXwo~9O7a(Kk05}S%B4vCOgJ2( zS!?%%h6+l?*b!|q$1akMRcDMPsTZLO8B1irg)A#%p)|d&4pVxhE)Ffb6^8??E%{@J9`p7P#__uNTS#9TpzPzVuwC5DwQPdixgxK z$6~Dd^w&+2dJAv+m`Oz2ol=McA&%%hWCL`l@?rdE;fE27OwMDy=O^#?a$EmkbYzQ* zYh|omoW8~B2*hv;bbiiZi+cUyUYB?NFB$k7NQU1u0aJ3K00000NkvXXu0mjfj6#%2 literal 0 HcmV?d00001 diff --git a/APP/static/favicon.ico b/APP/static/favicon.ico index 3632d0c89129045dc4103e84e59e426c57b8f51a..a5ad53d405b941c58be3509c130df6a6d259a34a 100644 GIT binary patch literal 9662 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 literal 1393 zcmV-%1&;cOP)Px)D@jB_R9Fe^ReNldMG&9eyIx;VxmMIdgjhwCKeVN$X=xNR5F_{iAD9pW6t#*F zgsb$5TDXc(+R_KbHns{HwTUSSMxqkbMAXm+Qmqd}qLq*w23kw2)Y7}&?)uyB`r&ui zgSLtP7@6d5XJ%(+e>;!;h%VEAG6Suz+(=E0vHu2kKIR~YDr+g=KThO5N?%t`9J7Cz z!`J{cS7sBbmBg4LMc2`Q*c=vb%;M+)D8)#rilGypCSqLx@dPzj-aO`0Ee@jx&{DMo z2WG&xg=Vd*Cq_lch7F)fE%7L^BtJ8$xL~eTcPV~!0CdAiRcr*Z+1D9sR%#uxa2%lS zMHc30U1D*;LsF_{LE;nVHg~>ZH^SfO0I1*c5a(Lr^e$ztX)$85I|Ia7@DN4Y6RSN5 zisVjYMleQy5y_2LmgG+w;e3P~i4NCXgH*d=HbBx*5MrLSb{`J>9A!vneqSRxGno<9 zE23>mQG7tr%OUm=gpmORdJXM@drwr%R(lc%Hl26;kf|LIe!i@Uup z*Llp$^8n6C$?f4TR{7EZgs8wRV8aUOrpM1&9Zf!U!LkK0XZn-1d__lJO8SGj2H%rk z@(%pkpq}e2T|eKn4__}1pt<5c)b=i<{s+pMyer&M%jvnfQA(ANZUt|F4GdoFEX4rC-M{KbO^D{(o%D)QCbo>s)CXAnlwG$1v zG;RKh+q6M%LCF^=-+R!_`1Hh)C$%n|A_Hh?Ux_qOl*A&ww!d(JcrU;Vzm zBG@?@XRm(q{u@8){e>ARy8+@`9F{%vo}5Rut}DOnXHL8pwpR&B8???!!vXa93sL(d z7}ev^F#=m1G@tfB&J5T*g`4%n#MuEhNFI+z66b5RB$+6gvwV4s=Hnc(FX2KxVAtV= zoT7Cmg#u`*xdEwPjlh3UtnETz)7V_4UsRy3cBH?kdC#u1re3e@AG~=G{(JEdP3`SM z|A4$M&soglW;|3e0KQf0ObP`+zET)O5%DcFb4{0NWL@>xLB1RP@zaEilp5=v$vc>R zJ#Os7gltH=e}(ZJCtn{ATlR}$Y6*J5Xi{ze4}hlX*{IVZpg%zqd9@kLx?0B$wa+`~ z@dT{8k1qE3ZMq>boI;T?y4pSnK!58AkB&jyP1Dx+f_&(| z@D4l!jWKpe^+%z*p;ELnVGFW!2Bo?%mfh~sy^PqGXwo~9O7a(Kk05}S%B4vCOgJ2( zS!?%%h6+l?*b!|q$1akMRcDMPsTZLO8B1irg)A#%p)|d&4pVxhE)Ffb6^8??E%{@J9`p7P#__uNTS#9TpzPzVuwC5DwQPdixgxK z$6~Dd^w&+2dJAv+m`Oz2ol=McA&%%hWCL`l@?rdE;fE27OwMDy=O^#?a$EmkbYzQ* zYh|omoW8~B2*hv;bbiiZi+cUyUYB?NFB$k7NQU1u0aJ3K00000NkvXXu0mjfj6#%2 diff --git a/APP/static/favicon.png b/APP/static/favicon.png index 7d8b7d072215eadc900d6e9e74e51971ea9895e7..986dd5db2503db601c007c8434997b8be6ac67be 100644 GIT binary patch delta 2182 zcmZ{lX*d*&7RQGfqHH1ABFpf~Hlr~sVxrI`WJ!o&W^ALe?->bM%NoMiv#-&M#E7Jb zCf?H6Vq%&{wk+A=>Ur*mdq3O{=lq}N{LkA zXu!oGnBI2`!BE3 zDyu}(G~qcR$=C!eqrW0eY>d;~%N0UwUN4$1ER5KPBts`|uTtt>2FdK1Jg)m^xPygZ zyY?kVck`?sjK3d;_njZdYF!Z8YSBJ@!;3b z`|g+bl+rZfE#3I^+2ut^B8T3f?QTC%Y_2d{=(KyomFxsm@K5XCp;}z}MmnE9b^Q3$ z=75lCTa-gKe4;EObJOdcccgz#t^WF1*r+?$c+_;n`=*(4enV8;XLDBIX(Q7j@Jrbu0}BjAV~4Wf-m0i?5c%79tV{_egk+v zFU@V$8tbF@jU-g=@uct+-#|*`G@=dX&Uhc%X0t%it5l{=_VwkjxT@vNcsO`nGJcE2 zV1RM>fwBCuxevW(11W0y|jw^3W9BC2ux@=)R^Fy3CwR`0zt z$Xn6i$Bvw$u6c_m$_}#L`r#B%0st82Fs3-&SeF$%8E=M1~^@lu9W5`L_5U732YZD9Z! z-{HAX2;y+EN;<1ixWJFwyirRr`8*xdOuCX&k0Y^{#fLgq4h;2S20{hVJcQMA=eK)L z3mMH*>r*0$P9t_H%V}O7ms1QHj6Mgq$Pb-ke-XC4$(^Ba^Ky>9=sU9!bace64f9_n z+zosuq(t}wTmSy}u_<(*`^HzL$3Kd*iV&u;Pr*Us*0vyOfa;K|sN`@@b3c9fkv2+GW}7rbVI|`*PQm~wbsS&F~-IbhKE}+U|DK^tbEEe!=$rD z4|0zy%i`gpDBzS*$?mIHCLYwLCYwR=Sz3P;Rd-PQ@^)9q<^HEqKz|dD=bgkw`4T=z zyDQN4n({!4_#+!;g_R@4^W}Yd3tC97qv{MI8~dh)?Yu8E9~Rnds)L`O@mJ!tH*F@q z_8GT+d^S@5U088g4@<35Pui&Z2l#cINYt>QQ%`$)pun)i5&r@}fasg@4?VdRfhbPR zv&70{VZs{iJ>L{vq9<=X@u+rov{+Y3&H9&gxMA$m*KK2gcka_E0WanTRZ4EcuxgSj z6FYc&kIbV4>0DaT;Q_o>W*U5==#Xdz`xYrrUT8^cZgqHx+t(z_mXr~PSgY%rA(Q!1 z;>LWs!UCw#SW>Ots>(7&!0n^NYUG85!=|S-2XSMpy#v0@&FwEVpnf0r1@e^Q5)+s> zm!2b}1*cv84W#5Hg|cfUMwepk$?2&q_J#T&X)7h8)BU>vZ&X;wa9NY*7mW z3t}34>>CA~&b^0eG;GPv9461Y(%=K*xZGVCtiE@>h5+A>j|>t=D|2Gj$;$3;MCLl@ z-L58|q5Yj#aSt338v(PFt#_r2Cs(tr(C+raI$(be%An5vOEM^#p>Qc&toVyZxQ42cXHjbem3NH(iu4XS? zR&@L(!GT6M1M#>(0@}@=a4Y~V2o#|X(Nc#XtsyA%MJW0rN)-Y{Lm;LSjA#D?_>l3Q z#IXMlU<_Ra0hv0y$|vCJ5V$%Np6SIa3tH@fJ3mYmMME>lmqfjMuRkH!Q}d?fm2gX1(en=OjvL`W>WL$%`xAW0{(;U&C=7K`!}pH6|D8qm<8Xk9k-1?5)+OfOrr7xs delta 2470 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 diff --git a/APP/static/img/apple-icon.png b/APP/static/img/apple-icon.png old mode 100755 new mode 100644 index 0577a336b0be976da22acd71d9ea7fc3a157a5dd..986dd5db2503db601c007c8434997b8be6ac67be GIT binary patch literal 2452 zcmZ{mdpOi-8^?c|(Q0!Fl~a-&Rv0sy=7^X^4!vd($|8+9m|-+y4C7Q(lvA5R2t%bD zb6Q%YOeNWfCbq-m5EIk9aw;Um{_M4X^zL=N*YCQ2_x0TO=l*`5>-pz-Qrt+6N2toYZ_agL`oUc^<+1)I~OYcexVt-h@n3SaP=))`iilQAf zc*U#RNNBw#c_KY&;Z;?pFrd_`-1_S!Ji;NxD@=hptIt_3X}d0jopYxs+Q~|aQq@;O zpbPiIpozI^GSw|X)d#bav5}uVzeQQe+c{XjeA)c*Wuq@zuW@`AruyYLCil|qfJNO; z1JhqV71r2v)~wa8ZF*7{um4%YA~ZeR!p@-S40ZfbwVb3Sujtf7SANmZ{HWRLhPwen zL8XJ;pF~uvn8|Xiqyvu894~kig32x%TkpvUl+JyIoXyLiOnVYS4d1g=OBh!RH!F6e zmky#E$wA_0QH@?>wxuS5w~rp>PX(Ii4KaL!_dESTz~doF)Q-OV8zavjY**PK$z!wc z3O)=C9ZQ%OhS)(@NQQl^O_c7|GL|>rK^2mTv{8=R5>?sUtd;9|@VA@O8~s|X+n;xS z$QlkY>ncyq2~6!I3~2Ps=o@PotJer-n+r}Jx6U&_SXcO$sv) z+G1t0Zz|V~5pa(5Q=~XwM}*GIEvT^Gl)8}2Z#(TfC|tBK10Im()F-2J+QpV5k1Oar zTN61559aIQ7(3CQV;*tivjHaM)aW4FK#=C!oLgyz4(xZmaHRfMO`F+cb4And{HC5b z`w6vHaz(U|(Wak z$2<=Gl2WjY7xl%Ht3tQRTCPl7_DH4nmCl+7RurdkUd){vN5@VTEH#6013j05TR z)ef&B>kYbg$lj>AAKiF)_t676b{bDzdvFP{zkDWrao$+1_=AqR60hO+7cXj~I_@8S zXME*jaaIx9CGnO~M8BsuR1j{~6{z8N@MOSQbZNOUSWf#9XUe2-Bfk|uS76bqCZdaV zy4BSK?{b>N=Ev zG74XGMQIIabn%5ecY*-{sRnCmdvAC=;q5P18RY?f zZnLHrvi_qRLrlE&xUr9S;;bnA?ntNUwWCOaxwh%+MXC=Yb1hjnS6H;Vf~wRTH2R@v zmF|jsA7{WGtIw!w@V!S~wxkVTyFu@gPS0BM-{$LRIw{(yDPwyRS(Ucarjzl?lowjl zaeKyAYj0JoB=t#`Rut#v7TyRUc8>^mF`Er1B#@MmOF61mD52vwNM34`tWv9YBGHF^ z>4H?Y=XQjyu)d#mv)}6sJ3CL zM0NC&bHC~l>_TqCloda|5VPbOB(I14J&yd2&YazFvb8p}YkBcu(s@7h=kVe9`KQ;# zR~@rGa6vw5)<#^pPV41+Y-pNz_x_k|#cvojU7BLyT=37s=Q&F^3-KG0)+#UVmp_N1 zmBTXVTS#g3Q;?W|#XlBWC!tH7rC9{i#-92@@3&#Kh0jMWGh}%jL+#G!1dgE#M%#vh zzxL>krAKg~$AkO$@o#gewYN18)<$!o{6ffNbgUrG9Dds7XWMfkF=Qbq)W_#7 zDf0GLqYMW~Ep9n}C&#>2dN|BHB&}-FE*t*S>3wz*eNR7xvEN>y$3l zZASSC7|ymurJ0M;qNP(01pJ*-fn!Uq+D?#pVRUh?Y534oQ|#_RcEq#b-Mx?t@7&~S zbr!d-R^`B6e=dKmqAQ%16Yq$Wisnpo*W?vZCFVZ5H;TY}(TL}8lt(4=XgCU&1}4A? zjzC+$tt{XePdFC07lGT0HG?B?aJY+>__zNV2xU{5^yvRTfF}m3fCC5D9m3gk9-qvm z0nVZ1Aet*Vh)D_2N5RlAj0IL7v_x6JQ5Fc4zB?EU9*={wwB+;oFy=Z921vu$+@SF` zwJ9%BI@7i9A?JQ01OOnb%;PXG^4cswh8>M?d9PN(3vb6cmy!Z2o8%)riNQm z$XpgXoWrF>GA)m~AB=IQds!k7`}SJ??Sw)iFmMYx^91<>h4xQol35m98i&p01z-?J Y>|PkSU+#(VAkYnPb|4X}3CGX;1#`bh2LJ#7 literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&3?x5zE|dgP6#+gWu0VP~fanR24xq*AB|(0{ z3@pER-aWgkC2{7c@`5QzpRbkeu!%4d>S>BKTUO}1adnV~+<~er$4eVdt!7|gGWB$E z42d}W_S(&9iwp$V5>{<;xbfZfVC?I^_X})#Ik=X*U8w(T&codwoQnRbs4PiZ6Sn&5 zt9bUElP!*2&^#&g&D_)PQT4W-gdg!LSI@1Mo_vtMX~xWH){+W=HZoGTFUfjUS7*+V zv6~h1Z1*;YUrJJo({Ftd;CT8=`t@v^w6MGr6Rje6?p<^Y;IG`#+xNLLL6&Q_GVfgf zzn`UEik|v=HRW>P%Q%I-6OY$jk?SoC%}KC1I9q#yThphTS2{DfZe9KTz%Q`FBsIO% z*G$oO@;`4Wm1w`qA(u?EEY404#-#jWeKX_S&<(gi8x3;Fou?j4c*uLN1 z5VL*O!G9M*uD_TicR6CZ8ei-SLO*kLYj;T}PYt7exZ#6BnJYRLhS!J^PVZON^+m z^itNG$JJfz7KPkNdDga1e@PnKO_}ZcL`%~`$UpJI#i^eSzG)e^%il})_mmP{moCMe r_V&JCj+!SwgG9r|sI_6M|KE}SwfeuC^P3e_pv3O!>gTe~DWM4fNLe=u diff --git a/APP/static/img/apple-icone.png b/APP/static/img/apple-icone.png new file mode 100755 index 0000000000000000000000000000000000000000..0577a336b0be976da22acd71d9ea7fc3a157a5dd GIT binary patch literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&3?x5zE|dgP6#+gWu0VP~fanR24xq*AB|(0{ z3@pER-aWgkC2{7c@`5QzpRbkeu!%4d>S>BKTUO}1adnV~+<~er$4eVdt!7|gGWB$E z42d}W_S(&9iwp$V5>{<;xbfZfVC?I^_X})#Ik=X*U8w(T&codwoQnRbs4PiZ6Sn&5 zt9bUElP!*2&^#&g&D_)PQT4W-gdg!LSI@1Mo_vtMX~xWH){+W=HZoGTFUfjUS7*+V zv6~h1Z1*;YUrJJo({Ftd;CT8=`t@v^w6MGr6Rje6?p<^Y;IG`#+xNLLL6&Q_GVfgf zzn`UEik|v=HRW>P%Q%I-6OY$jk?SoC%}KC1I9q#yThphTS2{DfZe9KTz%Q`FBsIO% z*G$oO@;`4Wm1w`qA(u?EEY404#-#jWeKX_S&<(gi8x3;Fou?j4c*uLN1 z5VL*O!G9M*uD_TicR6CZ8ei-SLO*kLYj;T}PYt7exZ#6BnJYRLhS!J^PVZON^+m z^itNG$JJfz7KPkNdDga1e@PnKO_}ZcL`%~`$UpJI#i^eSzG)e^%il})_mmP{moCMe r_V&JCj+!SwgG9r|sI_6M|KE}SwfeuC^P3e_pv3O!>gTe~DWM4fNLe=u literal 0 HcmV?d00001 diff --git a/APP/store/index.js b/APP/store/index.js index 9bf7e20..f99843f 100644 --- a/APP/store/index.js +++ b/APP/store/index.js @@ -62,7 +62,6 @@ export const actions = { this.$axios.get("/categoria", axiosHeader) .then(res => { - this.commit("setCategorias", res.data.data); @@ -91,4 +90,5 @@ export const actions = { -} \ No newline at end of file +} + diff --git a/index.js b/index.js index 5e18514..ccb6a47 100644 --- a/index.js +++ b/index.js @@ -26,6 +26,7 @@ app.use(cors()); //Rutas app.use('/api',require('./routes/users')); app.use('/api',require('./routes/compras')) +app.use('/api',require('./routes/ingresos')) app.use('/api',require('./routes/categorias')) app.use('/api',require('./routes/metodos_pago')) app.disable('x-powered-by'); diff --git a/routes/ingresos.js b/routes/ingresos.js new file mode 100644 index 0000000..f828757 --- /dev/null +++ b/routes/ingresos.js @@ -0,0 +1,73 @@ +const router = require("express").Router(); +const Ingreso = require("../models/ingresos"); +const { checkAuth } = require("../middlewares/authentication"); + + +router.get("/ingreso", checkAuth, async (req, res) => { + var Ingresos; + Ingresos = await Ingreso.find({ user: req.userData._id }).sort({ + fecha: "desc", + }); + + return res.send( + { + status:"ok", + data:Ingresos + } + ) + }); + + router.post("/ingreso", checkAuth, async (req, res) => { + const { fecha, detalle, valor} = req.body; + const newIngreso = new Ingreso({ + fecha, + detalle, + valor + }); + + console.log(newIngreso) + newIngreso.user = req.userData._id; + await newIngreso.save(); + + res.json({ + status:"OK" + }) + + + }); + + + router.put("/ingreso", checkAuth, async (req, res) => { + const { _id, fecha, detalle, valor } = req.body; + const Ingreso_edit = await Ingreso.findOne({ _id: _id }); + await Ingreso_edit.updateOne({ fecha, detalle, valor}); + + + res.json({ + status:"OK" + }) + + + }); + + + + router.delete("/ingreso", checkAuth, async (req, res) => { + + try{ + const userId = req.userData._id; + const id = req.query.id; + + const resultado = await Ingreso.deleteOne({user:userId,_id:id}); + + return res.json({status:"ok",data: resultado}) + + } + catch(error){ + console.log(error); + return res.status(500).json({status:"fail",error:error}) + } + }); + + + module.exports = router; \ No newline at end of file