From cd312b7a12001abc07757590cde82893d5150bc4 Mon Sep 17 00:00:00 2001 From: Araozu Date: Wed, 3 Mar 2021 09:56:22 -0500 Subject: [PATCH] Agregar posibilidad de maximizar los horarios. Mejorar colores. --- LICENSE | 280 ++++++++++++++++++ README.md | 56 +--- src/ContenedorHorarios/ContenedorHorarios.tsx | 48 ++- src/ContenedorHorarios/Horarios.tsx | 43 ++- src/ContenedorHorarios/MiHorario.tsx | 80 +++-- src/ContenedorHorarios/Tabla/CeldaFila.tsx | 14 +- src/Estilos.ts | 13 +- 7 files changed, 438 insertions(+), 96 deletions(-) diff --git a/LICENSE b/LICENSE index e69de29..d8cf7d4 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index af308de..7944a26 100755 --- a/README.md +++ b/README.md @@ -1,52 +1,12 @@ -This project was bootstrapped with [Create Solid](https://github.com/ryansolid/create-solid). Create Solid is a Fork of Create React App. +# Horarios UNSA -## Available Scripts +> ¡Ahora con JSX! -In the project directory, you can run: +## Versiones anteriores -### `npm start` +Con Vue.js (legacy): +- [Página web](https://a.com) +- [Repositorio](https://github.com) -Runs the app in the development mode.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.
-You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.
-It correctly bundles Solid in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.
-Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### Code Splitting - -This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting - -### Analyzing the Bundle Size - -This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size - -### Making a Progressive Web App - -This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app - -### Advanced Configuration - -This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration - -### Deployment - -This section has moved here: https://facebook.github.io/create-react-app/docs/deployment - -### `npm run build` fails to minify - -This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify +Con JavaScript puro (descontinuado): +- [Página web](http://unsasystem.atwebpages.com/) diff --git a/src/ContenedorHorarios/ContenedorHorarios.tsx b/src/ContenedorHorarios/ContenedorHorarios.tsx index a4afd00..f85b1f1 100755 --- a/src/ContenedorHorarios/ContenedorHorarios.tsx +++ b/src/ContenedorHorarios/ContenedorHorarios.tsx @@ -4,7 +4,7 @@ import { MiHorario } from "./MiHorario"; import { Horarios } from "./Horarios"; import { DatosHorario } from "../types/DatosHorario"; import { estilosGlobales } from "../Estilos"; -import { Show, createSignal, createEffect, batch } from "solid-js"; +import { Show, createSignal, createEffect, createMemo, batch } from "solid-js"; const datosPromise = (async () => { const file = await fetch("/horarios/2020_1_fps_ingenieriadesistemas.yaml"); @@ -17,16 +17,36 @@ const ElemCargando = () => Recuperando horarios... -const e = StyleSheet.create({ - contenedor: { - display: "grid", - gridTemplateColumns: "50% 50%" - } -}); +export type EstadoLayout = "MaxPersonal" | "Normal" | "MaxHorarios"; export function ContenedorHorarios() { const [datosCargados, setDatosCargados] = createSignal(false); const [datos, setDatos] = createSignal(null); + const [estadoLayout, setEstadoLayout] = createSignal("Normal"); + + const e = createMemo(() => { + let templateColumns = ""; + switch (estadoLayout()) { + case "MaxHorarios": { + templateColumns = "4rem auto"; + break; + } + case "MaxPersonal": { + templateColumns = "40% 60%"; + break; + } + case "Normal": { + templateColumns = "50% 50%" + } + } + + return StyleSheet.create({ + contenedor: { + display: "grid", + gridTemplateColumns: templateColumns + } + }); + }); createEffect(async () => { const datos = await datosPromise; @@ -36,10 +56,14 @@ export function ContenedorHorarios() { }); }); - return
- - - - + return
+
+ +
+
+ + + +
; } diff --git a/src/ContenedorHorarios/Horarios.tsx b/src/ContenedorHorarios/Horarios.tsx index ccd3d38..74b19df 100755 --- a/src/ContenedorHorarios/Horarios.tsx +++ b/src/ContenedorHorarios/Horarios.tsx @@ -4,8 +4,47 @@ import { css } from "aphrodite"; import { estilosGlobales } from "../Estilos"; import { Tabla } from "./Tabla"; import { Cursos } from "./Cursos"; +import { EstadoLayout } from "./ContenedorHorarios"; -export function Horarios(props: { data: DatosHorario }) { +const maximizarHorario = (setEstadoLayout: (v: EstadoLayout) => EstadoLayout) => { + setEstadoLayout("MaxHorarios"); +}; + +const minimizarHorario = (setEstadoLayout: (v: EstadoLayout) => EstadoLayout) => { + setEstadoLayout("Normal"); +}; + +function BotonExpandirOcultar(props: { setEstadoLayout: (v: EstadoLayout) => EstadoLayout }) { + const [horariosMax, setHorariosMax] = createSignal(false); + + const tituloBoton = () => horariosMax() ? "Minimizar horario" : "Maximizar horario"; + const iconoBoton = () => horariosMax() ? "ph-arrows-in" : "ph-arrows-out"; + + const funcionBoton = () => { + const estaMaximizado = horariosMax(); + setHorariosMax(!estaMaximizado); + if (estaMaximizado) { + minimizarHorario(props.setEstadoLayout); + } else { + maximizarHorario(props.setEstadoLayout); + } + }; + + return
+ +
+} + +export function Horarios(props: { data: DatosHorario, setEstadoLayout: (v: EstadoLayout) => EstadoLayout }) { const [anioActual, setAnioActual] = createSignal("1er año"); @@ -34,6 +73,8 @@ export function Horarios(props: { data: DatosHorario }) { return
{elAnios} + | +
diff --git a/src/ContenedorHorarios/MiHorario.tsx b/src/ContenedorHorarios/MiHorario.tsx index 6ee5e6d..b95dc59 100755 --- a/src/ContenedorHorarios/MiHorario.tsx +++ b/src/ContenedorHorarios/MiHorario.tsx @@ -2,8 +2,10 @@ import { estilosGlobales } from "../Estilos"; import { StyleSheet, css } from "aphrodite"; import { Tabla } from "./Tabla"; import { mostrarDescansos, setMostrarDescansos } from "../Store"; +import { EstadoLayout } from "./ContenedorHorarios"; +import { Switch, Match } from "solid-js"; -export function MiHorario() { +export function MiHorario(props: { estadoLayout: EstadoLayout }) { const e = StyleSheet.create({ horario: {}, boton: { @@ -17,42 +19,62 @@ export function MiHorario() { } }); + const iconoBoton = () => props.estadoLayout === "Normal" ? "ph-arrows-in" : "ph-arrows-out"; + const claseBotonMostrarDescansos = () => mostrarDescansos() ? "ph-check " + css(e.boton) : "ph-circle " + css(e.boton); return
-
-
- Mi horario -
- {/* -
setMostrarDescansos(!mostrarDescansos())} - > - -  Mostrar descansos -
- */} -
+ + + +
+
+ Mi horario +
+ {/* +
setMostrarDescansos(!mostrarDescansos())} + > + +  Mostrar descansos +
+ */} +
-
- -
+
+ +
+ + +
+ +
+ +
; diff --git a/src/ContenedorHorarios/Tabla/CeldaFila.tsx b/src/ContenedorHorarios/Tabla/CeldaFila.tsx index f8aa3ab..faec2e3 100755 --- a/src/ContenedorHorarios/Tabla/CeldaFila.tsx +++ b/src/ContenedorHorarios/Tabla/CeldaFila.tsx @@ -6,7 +6,7 @@ const e = StyleSheet.create({ celdaComun: { width: "20%", textAlign: "center", - padding: "0 0.5rem", + padding: "0 0.7rem", boxSizing: "border-box" }, celdaCurso: { @@ -14,18 +14,22 @@ const e = StyleSheet.create({ padding: "0.25rem 0.35rem", cursor: "pointer", borderRadius: "5px", - transition: "background-color 100ms" + transition: "background-color 100ms, color 100ms" }, celdaCursoActiva: { - backgroundColor: "rgba(200, 200, 200, 0.25)" + backgroundColor: "rgba(200, 200, 200, 0.5)", + color: "#151515" }, celdaCursoTeoria: { fontWeight: "bold" + }, + celdaCursoLab: { + fontStyle: "italic" } }); interface Props { - datos: {id: string, txt: string, esLab: boolean}[], + datos: { id: string, txt: string, esLab: boolean }[], idHover: () => string, setIdHover: (v: string) => string } @@ -41,7 +45,7 @@ export function CeldaFila(props: Props) { {({id, txt, esLab}) => { const clases = () => { - const clases = [e.celdaCurso, !esLab && e.celdaCursoTeoria]; + const clases = [e.celdaCurso, esLab ? e.celdaCursoLab : e.celdaCursoTeoria]; if (id === idHover()) clases.push(e.celdaCursoActiva); return css(...clases); }; diff --git a/src/Estilos.ts b/src/Estilos.ts index 1bf5717..d7daf57 100755 --- a/src/Estilos.ts +++ b/src/Estilos.ts @@ -24,7 +24,18 @@ export const estilosGlobales = StyleSheet.create({ contenedorCursorActivo: { backgroundColor: "rgba(200, 200, 200, 0.3)" }, + contenedorPhospor: { + padding: "0.5rem 0.65rem", + transform: "translateY(0.2rem)" + }, inlineBlock: { display: "inline-block" - } + }, + botonPhospor: { + "::before": { + fontSize: "1.25rem", + // transform: "translateY(0.2rem)", + textDecoration: "underline rgba(255, 255, 255, 0.4)", + } + }, });