Skip to content

Merge develop in main#11

Draft
patricia-martinez-imatia wants to merge 27 commits intomainfrom
develop
Draft

Merge develop in main#11
patricia-martinez-imatia wants to merge 27 commits intomainfrom
develop

Conversation

@patricia-martinez-imatia
Copy link
Contributor

No description provided.

daniel-grana and others added 4 commits June 6, 2024 18:45
* Update README.md

* Update README.md
* New login example `login-02`

* Improved code

* Added dark mode styles

* Added README.md

* Removed theme.scss

* Updated README

* Updated readme

* Added en.json
@patricia-martinez-imatia patricia-martinez-imatia marked this pull request as draft June 25, 2024 08:45
javier-fernandez-imatia and others added 22 commits June 25, 2024 11:00
* Login template 04 ready

* Some changes on readme file and removed galician language

* Changed i18n entries

* Changed language selector

* Some changes to clean the code

* Update README.md

* Removed unused classes

* Update login.component.ts

* Update README.md

* Moved flex declaration to the html file

* Update login.component.scss

* Fixed language selector padding

* Added fxFill to containers and code optimized
* Login template 04 ready

* Some changes on readme file and removed galician language

* Changed i18n entries

* Changed language selector

* Some changes to clean the code

* Update README.md

* Removed unused classes

* Update login.component.ts

* Initial commit

* Template ready

* Update README.md

* Moved flex directive to html file

* Update login.component.scss

* Added fxFill to containers and code refactor
* Readme updates ready

* BR tags added

* Readme updates ready

* Update README.md

* Update README.md

* Added spaces between sections

* Updated list numeration

* Updated readme of 02 login page

* Update README.md

* Update README.md

* Update README.md
* Login page structure created

* Remember me ready

* Added theme file

* Added i18n and code depurated

* Update README.md

* Forgot password page created

* Change password page finished

* Added register form and scss refactor

* Added missing translations

* Login page 01 ready

* Added translate service to login component dialog

* Fix tab size

* Fix tab size on html files

* Login.ts refactor and added titble on register page

* Updated readme and traductions

* Login 01 ready

* Login page 01 ready

* Readme updated

* Readme and code updates

* Update README.md

* Added staces to readme

* Readme list numeration updated

* Added fields to readme file

* Update README.md

* Deleted duplicated scss files, removed console log lines and readme updated
* IInitial structure of third login page created

* Added readme and login page finished

* Added translations and readme modifyed

* Changed login methods

* Changed i18n prefixes

* Code refactor

* Update README.md

* Created register and forgot password screens

* Fixed password match on register form

* Login page 03 ready

* Fixed tab size

* Fixed tab size on forgot pass html

* Added translate service to login component dialog

* Login ts refactor

* update login.component.ts

* Forgot password setting by email

* Added responsive classes and ts files ready

* Update readme

* Readme updated

* Login page 03 ready

* Update readme and forgot pass ts

* Login page 03 ready

* Added spaces to readme

* Readme list numeration updated

* Readme changes ready

* Update README.md

* updated readme point 5

* Update README.md

* Deleted duplicated scss, removed console logs and readme updated

* Removed duplicated classes
* Login page 05 created

* I18n prefixes changed

* Changed login block logic

* Changed box shadow

* Update README.md

* Added register form

* Updated i18n file

* Forgot pass component ready

* Login component ts refactor

* Remember me method deleted

* update login.component.ts

* Created email registration and scss updates

* Login page 05 finished

* Login template 05 ready

* Modified readme and code refactor

* Login page 05 ready

* Added spaces to readme

* Readme list numeration updated

* Readme ready

* Update README.md

* Added link to home in pwd section

* Deleted duplicated scss, removed console logs and readme updated
* Template 01 list created

* Readme updated

* Readme updates

* Template 01 list ready

* Removed unused class

* Fixed theme file

* Added spaces to readme

* Added prefix and sufix to entities, attrs and services on list html and slider style fixed

* Updated readme list

* Readme and main-routin module updated

* List component now is a module

* Update README.md

* Added translations

* Added @ to list columns and readme updated

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update README.md

* readme point 3 changed

* Readme changes

* Update templates/list/01-list/list/list-home/list-home.component.ts

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update README.md

* Readme and template updates

---------

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* Grid template 01 created

* Scss refactor

* Background added to cards

* Added spaces to readme

* Readme and component updates

* Grid component transformed to module

* Added @ to grid columns and readme updated

* Update README.md

* Readme changes

* Updated grid template
* Template 01 list created

* Readme updated

* Readme updates

* Template 01 list ready

* Removed unused class

* Fixed theme file

* Added spaces to readme

* Added prefix and sufix to entities, attrs and services on list html and slider style fixed

* Updated readme list

* Readme and main-routin module updated

* List component now is a module

* Update README.md

* Added translations

* Added @ to list columns and readme updated

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update README.md

* readme point 3 changed

* Readme changes

* Update templates/list/01-list/list/list-home/list-home.component.ts

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/list/01-list/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update README.md

* Readme and template updates

* List template fixed

* Deleted unused div container

* Fixed account number width

* Added surfaces to template

---------

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* Grid template 01 created

* Scss refactor

* Background added to cards

* Added spaces to readme

* Readme and component updates

* Grid component transformed to module

* Added @ to grid columns and readme updated

* Update README.md

* Readme changes

* Updated grid template

* Modified grid example

* Changed employee type id definition

* Moved readme

* Dummy service improved and bg levels added

* Update templates/grid/01-grid/grid/grid-home/grid-home.component.html

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/grid/01-grid/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Fixed employee type name function and some code and readme updates

* Added class fill-form

* Added @ to html columns

* Update templates/grid/01-grid/assets/dummy-data/employee-types.json

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/grid/01-grid/assets/dummy-data/employee-types.json

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Removed unused variable

---------

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* Table template 01 created

* Added i18n

* Table template 01 ready

* Changed table theme scss

* Removed unused variables
* Form template 01 created

* Modify avatar image and added readme

* Depuring theme

* Changes made

* Attrs added on inputs, recalc % and margins

* README updated

* design changes made

* change photo type

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
* Dashboard folder created

* dashboard template done

* dashboard template done

* grids más expandidos en 1920x1080

* Update templates/dashboard/01-dashboard/dashboard/dashboard-theme.scss

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/dashboard/01-dashboard/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* font-size in the theme and @media for 1280

* queda por revisar en 1280 que no lo hace bien

* problema de pantallas solucionado

* responsive done

* dashboard example done

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* falta completar el tema

* paleta de colores completa

* custom-theme modificado con los colores proporcionados por diseño

* dark mode modified, change link for button, same style like o-cards on material cards

* README modified

* changes required done

* readme updated

* scroll on alerts panel in 1280px

* Update templates/dashboard/02-dashboard/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* no scroll on alerts panel in 1280px

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* OTranslateService added at pipe

* pipe and % flex container modified

* pipe using numberService

* readme modified

* readme modified again

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
* version 1280px

* version 1920px

* make dashboard layout responsive under 1920px

* pipe modified

* problema resoluciones solucionado

* traducciones es actualizadas

* i18n checked

* align icons with data and elevate cards

* fixed aligns and gaps

* number with percentages aligned

* employees card align fixed

* hide employees icon on 1280

* cards with same height

* delele mat-icon color from theme

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Patricia Martinez Tilve <patricia.martinez@imatia.com>
* Table template 02 created

* Added icon registry file and app finished

* Card size changed

* Requested changes made

* Update templates/table/02-table/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/table/02-table/table/table-home/table-home.component.ts

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Readme updated

* changes requested made

* renderer action no resizable and max-width

* Update templates/table/02-table/table/table-home/table-home.component.html

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/table/02-table/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/table/02-table/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* O-filter-builder explanation modified, change bg-level on theme, add new class to div bg-level-1 in html and modified in scss

* Cards style modified

* Standard styling applied and card styles in dark mode refined

* modified color in text and icon inside cards

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: nprol <134269709+nprol@users.noreply.github.com>
Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* first commit

* traducciones subidas

* Update translates and chart data

* Readme updated

* card's width with % instead of px, show-tooltip=true on piechart, donutchart and stackedareachart

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
* Form 02 template added

* Template responsive for 1280px

* Use of material-icons-outlined added on Readme

* Add some details on README

* use custom service in o-form and o-list

* update readme

* add hotel.service

* add a new point about custom services in Readme

* add mat-chip element on cabin cards and reduce font-size for some texts

* compressed images and add a new service for filter by type

* Add new point on Readme explaining filter service

* change o-list links docu for o-grid links

* override kv on query method with param type, add input parent-keys on grid, add explanation about add custom service provider on SharedModule

* Update templates/form/02-form/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* reduce query calls and sync resize with grid cols value

* added new component to reduce code and updated readme

* updated readme

* modify html

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
* grid 02 added

* added images and readme

* Update templates/grid/02-grid/README.md

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/grid/02-grid/grid/grid.theme.scss

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* Update templates/grid/02-grid/grid/grid.theme.scss

Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>

* required changes made

* padding grid

* delete clearFilter()

* modify constructor

* delete not used imports

---------

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Co-authored-by: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com>
…or code (#39)

Co-authored-by: Noelia Prol Carballo <noelia.prol@imatia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants