Gabriel/portal_editorial
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

listo para presentacion

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-04-03 18:14:36 -06:00
parent 003373ec73
commit 8fdc2361e2
3 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+54 -45
View File
@@ -5,15 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="6b925d8f-3741-4302-aa30-691568703891" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/d62f74f5-c7c9-4ba7-ad88-76b19837ba3a.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/componentes/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/componentes/header.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/componentes/similares.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pagina/categoria.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/categoria.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pagina/libro.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/libro.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pagina/lineamientos.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pagina/sinresultado.php" beforeDir="false" afterPath="$PROJECT_DIR$/pagina/sinresultado.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sql/base.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sql/base.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sql/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/sql/conexion.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -32,7 +25,12 @@
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<expand>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
<item name="portal_editorial@localhost" type="feb32156:DbDataSourceImpl" />
</path>
</expand>
<select />
</component>
<component name="ExecutionTargetDialog">
@@ -45,8 +43,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sql/base.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="77" column="36" selection-start-line="77" selection-start-column="36" selection-end-line="77" selection-end-column="36" />
<state relative-caret-position="370">
<caret line="80" lean-forward="true" selection-start-line="79" selection-end-line="80" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sql/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
@@ -117,7 +124,7 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pagina/lineamiento.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -182,7 +189,6 @@
<option value="$PROJECT_DIR$/componentes/menu.php" />
<option value="$PROJECT_DIR$/componentes/navegacion.php" />
<option value="$PROJECT_DIR$/componentes/footer.php" />
<option value="$PROJECT_DIR$/sql/conexion.php" />
<option value="$PROJECT_DIR$/componentes/libro.php" />
<option value="$PROJECT_DIR$/componentes/sugerencias.php" />
<option value="$PROJECT_DIR$/css/estilo.css" />
@@ -203,21 +209,22 @@
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/pagina/lineamientos.html" />
<option value="$PROJECT_DIR$/componentes/novedades.php" />
<option value="$PROJECT_DIR$/sql/base.sql" />
<option value="$PROJECT_DIR$/componentes/similares.php" />
<option value="$PROJECT_DIR$/pagina/libro.php" />
<option value="$PROJECT_DIR$/pagina/categoria.php" />
<option value="$PROJECT_DIR$/componentes/header.php" />
<option value="$PROJECT_DIR$/pagina/sinresultado.php" />
<option value="$PROJECT_DIR$/pagina/lineamiento.html" />
<option value="$PROJECT_DIR$/sql/base.sql" />
<option value="$PROJECT_DIR$/sql/conexion.php" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1757" />
<option name="y" value="-20" />
<option name="width" value="1295" />
<option name="height" value="743" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-8" />
<option name="y" value="24" />
<option name="width" value="1382" />
<option name="height" value="752" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
@@ -241,6 +248,11 @@
<item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
<item name="pagina" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
<item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
<item name="sql" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
@@ -327,34 +339,34 @@
<workItem from="1553737383779" duration="151000" />
<workItem from="1553812062217" duration="12603000" />
<workItem from="1554245981784" duration="9750000" />
<workItem from="1554314706171" duration="18496000" />
<workItem from="1554314706171" duration="20088000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="246631000" />
<option name="totallyTimeSpent" value="248223000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
<frame x="-8" y="24" width="1382" height="752" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.49942988" visible="true" weight="0.16909385" />
<window_info active="true" content_ui="combo" id="Project" order="1" sideWeight="0.49942988" visible="true" weight="0.1580938" />
<window_info id="Structure" order="2" sideWeight="0.5005701" side_tool="true" weight="0.15291262" />
<window_info anchor="bottom" id="Database Console" order="0" weight="0.44013682" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.3295325" />
<window_info anchor="bottom" id="Database Changes" order="2" />
<window_info anchor="bottom" id="Database Console" order="0" weight="0.4394184" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.3279483" />
<window_info anchor="bottom" id="Database Changes" order="2" weight="0.32956383" />
<window_info anchor="bottom" id="Event Log" order="3" side_tool="true" weight="0.3295325" />
<window_info anchor="bottom" id="Version Control" order="4" weight="0.3295325" />
<window_info anchor="bottom" id="Docker" order="5" show_stripe_button="false" />
<window_info anchor="bottom" id="Message" order="6" />
<window_info anchor="bottom" id="Find" order="7" weight="0.3295325" />
<window_info anchor="bottom" id="Run" order="8" weight="0.38654503" />
<window_info anchor="bottom" id="Run" order="8" weight="0.3861066" />
<window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="12" />
<window_info anchor="right" id="Database" order="0" weight="0.13615733" />
<window_info anchor="right" id="Database" order="0" visible="true" weight="0.13615733" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
@@ -379,16 +391,6 @@
<entry file="file://$PROJECT_DIR$/csv/copia_TEST.csv" />
<entry file="file://$PROJECT_DIR$/docs/2.jpg" />
<entry file="file://$PROJECT_DIR$/docs/3.jpg" />
<entry file="file://$PROJECT_DIR$/sql/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" selection-start-line="25" selection-end-line="25" />
<folding>
<element signature="e#6#21#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/componentes/libro.php" />
<entry file="file://$PROJECT_DIR$/docs/1.jpg" />
<entry file="file://$PROJECT_DIR$/css/estilo.css">
@@ -572,13 +574,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sql/base.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="77" column="36" selection-start-line="77" selection-start-column="36" selection-end-line="77" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pagina/libro.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
@@ -630,5 +625,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sql/base.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="80" lean-forward="true" selection-start-line="79" selection-end-line="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sql/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
</component>
</project>
sql/base.sql
+2 -2
View File
@@ -77,10 +77,10 @@ INSERT INTO usuario VALUES(id_usuario,nombre,user,password,tipo) ,(NULL, 'Admini
INSERT INTO tipo_venta VALUES (NULL,'tienda'), (NULL, 'linea'), (NULL, 'ambos');
CREATE PROCEDURE `st_consulta_libro`(IN `tit` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro WHERE titulo LIKE CONCAT('%', tit , '%'); END;
CREATE PROCEDURE `st_consulta_libro`(IN `tit` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro WHERE titulo LIKE CONCAT('%', tit , '%'); END; DELIMITER ;
CREATE PROCEDURE `st_consulta_categoria`(IN `cat` VARCHAR(150)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro WHERE categoria LIKE CONCAT('%', cat , '%'); END;
CREATE PROCEDURE `st_novedades`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro LIMIT 12; END;
CREATE PROCEDURE `st_inserta_libro`(IN `tit` VARCHAR(150), `aut` VARCHAR(150),`cat` VARCHAR(150), `pag` VARCHAR(150), `isb` VARCHAR(150), `pre` INT (5), `edi` VARCHAR(150), `tip` INT(2), `img` VARCHAR(150), `des` VARCHAR(500), `pdfs` VARCHAR(250)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN INSERT INTO libro(id_libro, titulo, autor, categoria, paginas, isbn, precio, edicion, tipo, imagen, descripcion, pdf)values (NULL ,tit,aut,cat,pag,isb,pre,edi,tip,img,des,pdfs); END;
CREATE PROCEDURE `st_libro_edicion`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM libro ORDER BY edicion DESC LIMIT 12; END;
CREATE PROCEDURE `st_menu`() NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT * FROM menu; END;
CREATE PROCEDURE st_login(IN `usr` varchar(45), `pass` varchar(45)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT nombre, user, password, tipo FROM usuario WHERE user = usr AND password = pass; END;
CREATE PROCEDURE `st_login`(IN `usr` varchar(45), `pass` varchar(45)) NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER BEGIN SELECT nombre, user, password, tipo FROM usuario WHERE user = usr AND password = pass; END;
sql/conexion.php
+7 -3
View File
@@ -1,7 +1,7 @@
<?php
/*
* local
* */
*
$host = 'localhost';
@@ -9,8 +9,12 @@
$pass = 'avatares1';
$dbname = 'portal_editorial';
$dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
*/
$host = '132.248.80.194';
$user = 'portal_editorial';
$pass = 'p0rt4l';
$dbname = 'P_orion_Portal_editorial';
$dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
try{