Merge to master #21

Merged

joan merged 163 commits from test into master 2022-10-20 11:59:30 +00:00

Conversation 0 Commits 163 Files Changed 114 +19901 -37981

163 Commits

Author	SHA1	Message	Date
Joan Sanchez	592dc7da22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2022-10-20 13:48:29 +02:00
Joan Sanchez	6f38c7e4bb	Enable lilium for production	2022-10-20 13:47:50 +02:00
Joan Sanchez	c346ce30e6	Merge pull request '4075-ticket_boxing' (#20) from 4075-ticket_boxing into dev ... Reviewed-on: #20	2022-10-20 05:41:11 +00:00
Alex Moreno	f1d24cc103	test(ticketBoxing): e2e	2022-09-30 12:59:35 +02:00
Alex Moreno	96c16727ff	test(ticketBoxing): front test	2022-09-28 15:01:08 +02:00
Alex Moreno	0139b464b7	quit console logs	2022-09-07 07:19:15 +02:00
Alex Moreno	7f42655b1d	feat(ticket_boxing): add section	2022-09-06 13:59:00 +02:00
Alex Moreno	22b5d06fca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4075-ticket_boxing	2022-09-05 07:55:19 +02:00
Joan Sanchez	165075aaef	Updated login unit test	2022-08-08 12:31:01 +02:00
Joan Sanchez	556caa0b1a	Merge pull request '3836-axios_interceptor' (#19) from 3836-axios_interceptor into dev ... Reviewed-on: #19	2022-08-08 10:23:52 +00:00
Joan Sanchez	582eb4d808	Updated unit test	2022-08-08 12:20:29 +02:00
Joan Sanchez	807a6fa16f	Updated tests	2022-08-08 12:15:54 +02:00
Joan Sanchez	c16ef7e783	Updated unit test	2022-08-08 11:17:03 +02:00
Alex Moreno	424ff568cd	feat(ticketBoxing): fix front	2022-08-03 14:58:58 +02:00
Joan Sanchez	7b2a4d75c6	feat(interceptor): axios response interceptor	2022-08-03 13:48:45 +02:00
Alex Moreno	0fb77eadc0	feat(ticketBoxing): getVideo	2022-08-02 15:11:40 +02:00
Alex Moreno	f0df15f381	feat(ticket): add boxing in router	2022-07-22 10:37:16 +02:00
Joan Sanchez	6317db2093	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2022-07-01 15:13:43 +02:00
Carlos Jimenez Ruiz	10157230d6	Merge pull request '4183- Smart Card component' (#18) from 4183-smart-list into dev ... Reviewed-on: #18	2022-06-21 12:48:33 +00:00
Joan Sanchez	dddb5c05be	Removed comment	2022-06-21 14:18:10 +02:00
Joan Sanchez	0940d73d2f	Added unit tests	2022-06-21 14:16:43 +02:00
Joan Sanchez	9e1d86e6bd	feat(smartCard): added smart-card component	2022-06-21 07:42:33 +02:00
Joan Sanchez	69a4be1318	Card mockup	2022-06-14 12:12:08 +02:00
Joan Sanchez	2b1060236a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4183-smart-list	2022-06-14 09:51:32 +02:00
Joan Sanchez	978197023f	Infinite scroll	2022-06-14 07:39:01 +02:00
Carlos Jimenez Ruiz	de05cb5298	Merge pull request 'dev to test update' (#17) from dev into test ... Reviewed-on: #17	2022-06-09 15:24:13 +00:00
Carlos Jimenez Ruiz	365dddd84e	Merge branch 'test' into dev	2022-06-09 15:21:53 +00:00
Carlos Jimenez Ruiz	a1d7a22c56	Merge pull request '2237-starred_modules' (#16) from 2237-starred_modules into dev ... Reviewed-on: #16	2022-06-09 15:20:21 +00:00
Carlos Jimenez Ruiz	094fd21c25	style and icons refactor	2022-06-09 17:15:17 +02:00
Carlos Jimenez Ruiz	12b1345315	dashboar can no longer be added to favorites	2022-06-09 09:45:53 +02:00
Carlos Jimenez Ruiz	6038c662f8	removed a test that wouldn't work for the given user yet	2022-06-09 09:45:00 +02:00
Carlos Jimenez Ruiz	7473dceeea	favorite modules component and navigationb composable	2022-06-08 14:53:10 +02:00
Carlos Jimenez Ruiz	af28371ec9	replaced quasar icon with salix icon	2022-06-08 12:31:08 +02:00
Joan Sanchez	f372bd5338	Customer list with q-card	2022-06-08 07:43:20 +02:00
Joan Sanchez	2baf3c04a2	Upgrade quasar project	2022-06-08 07:43:05 +02:00
Joan Sanchez	6270860509	Merge pull request 'e2e path for login, logout and nav ACLs' (#15) from 3916-router_tests into dev ... Reviewed-on: #15	2022-05-24 09:40:15 +00:00
Carlos Jimenez Ruiz	157f218c97	e2e path for login, logout and nav ACLs	2022-05-23 15:46:09 +02:00
Joan Sanchez	66cbe7eeb8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2022-05-17 15:27:10 +02:00
Carlos Jimenez Ruiz	229ddb8f2d	Merge pull request '#4044 - feat(leftmenu): collapsable submodule routes' (#14) from 4044-leftmenu_submodules into dev ... Reviewed-on: #14	2022-05-17 13:15:55 +00:00
Joan Sanchez	d2e78c4b56	feat(leftmenu): collapsable submodule routes #4044	2022-05-17 14:58:01 +02:00
Carlos Jimenez Ruiz	6c0688f1f0	Merge pull request 'Router not longer redirects to dashboard on page reload' (#13) from page_reload_fix into dev ... Reviewed-on: #13	2022-04-21 14:23:12 +00:00
Carlos Jimenez Ruiz	cd12f75f25	Removed outdated tests	2022-04-21 16:20:43 +02:00
Joan Sanchez	b2b8b47f56	Added CustomerCreate translation	2022-04-21 14:21:04 +02:00
Joan Sanchez	d90fe72452	Router not longer redirects to dashboard on page reload	2022-04-21 14:19:15 +02:00
Carlos Jimenez Ruiz	25244272fd	Merge pull request 'feat(darkMode): current darkMode value is now saved in vn.userConfig.darkMode' (#12) from 3904-user_dark_mode into dev ... Reviewed-on: #12	2022-04-20 14:28:20 +00:00
Carlos Jimenez Ruiz	05272cbbb2	feat(language): selected language is now saved in account.user.lang and persists in navigation	2022-04-20 16:23:03 +02:00
Carlos Jimenez Ruiz	913be03e94	front unit tests amends for darkMode and setUser modifications	2022-04-20 13:58:53 +02:00
Carlos Jimenez Ruiz	345b943869	feat(darkMode): current darkMode value is now saved in vn.userConfig.darkMode	2022-04-20 13:10:37 +02:00
Carlos Jimenez Ruiz	16020e9c16	Merge pull request 'Leftmenu drawer and card drawer' (#11) from drawer-card into dev ... Reviewed-on: #11	2022-04-19 13:34:58 +00:00
Joan Sanchez	ab9f19445c	Updated routes	2022-04-19 14:24:15 +02:00
Joan Sanchez	7a99ad1887	Change drawer state	2022-04-19 13:50:54 +02:00
Joan Sanchez	4ff5692789	Default formatter	2022-04-19 13:07:23 +02:00
Joan Sanchez	38f0c89fbd	Disabled experimental template support	2022-04-19 12:55:12 +02:00
Joan Sanchez	a60351a0e9	Routing changes	2022-04-19 12:37:47 +02:00
Carlos Jimenez Ruiz	5c20871a71	disabled template ts error	2022-04-19 12:28:23 +02:00
Joan Sanchez	9123ce9f5f	Changes	2022-04-19 11:03:37 +02:00
Joan Sanchez	78baa306b0	Make use of slot	2022-04-12 14:53:43 +02:00
Joan Sanchez	a96f87d2c9	Merge pull request 'composables refactor and their unit tests' (#10) from composable_tests into dev ... Reviewed-on: #10	2022-04-08 14:11:23 +00:00
Carlos Jimenez Ruiz	b6aeb5e0e9	composables refactor and their unit tests	2022-04-08 15:53:21 +02:00
Carlos Jimenez Ruiz	c51bfc6b3d	Merge pull request 'dev to test merge' (#9) from dev into test ... Reviewed-on: #9	2022-04-06 07:04:52 +00:00
Carlos Jimenez Ruiz	61ca063c95	Merge branch 'test' into dev	2022-04-06 07:00:38 +00:00
Carlos Jimenez Ruiz	aada44755c	Merge pull request 'Router improvements and load roles on login' (#8) from router-improvements into dev ... Reviewed-on: #8	2022-04-06 06:53:38 +00:00
Carlos Jimenez Ruiz	565b91b235	cypress tests working after updating file paths	2022-04-06 08:50:53 +02:00
Carlos Jimenez Ruiz	20604a2441	front unit test fixed after login enhancement	2022-04-06 08:46:34 +02:00
Joan Sanchez	9a9bcc5e51	Removed empty line	2022-04-05 16:32:30 +02:00
Joan Sanchez	7f3010869b	Router improvements and load roles on login	2022-04-05 16:30:53 +02:00
Joan Sanchez	08ecbcf15a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2022-04-01 15:09:35 +02:00
Joan Sanchez	f20cd84df9	Merge pull request 'router-navigation' (#7) from router-navigation into dev ... Reviewed-on: #7	2022-04-01 13:07:51 +00:00
Joan Sanchez	4b4513ea44	Updated unit test	2022-04-01 15:04:40 +02:00
Joan Sanchez	79c9aba287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation	2022-04-01 13:02:41 +02:00
Joan Sanchez	51015c72f6	Router navigation	2022-04-01 12:58:41 +02:00
Joan Sanchez	d3177e2869	Updated tests folder path	2022-04-01 10:03:44 +02:00
Joan Sanchez	6503f9d97c	Updated hostname	2022-04-01 09:17:54 +02:00
Joan Sanchez	67a65a359b	Renamed tests folder	2022-04-01 09:13:55 +02:00
Joan Sanchez	c6316ce260	Updated stack name	2022-04-01 08:33:26 +02:00
Joan Sanchez	328a6f0858	Merge pull request 'Added jest unit tests with CI and deploy stack into test branch' (#6) from jest-ci into dev ... Reviewed-on: #6	2022-03-31 08:21:06 +00:00
Joan Sanchez	4fb5d46a52	Renamed branch name	2022-03-31 10:12:56 +02:00
Joan Sanchez	44021ecd9d	Removed boilerplate code	2022-03-31 10:10:40 +02:00
Joan Sanchez	fcd0d1fc9f	Listen hostname localhost	2022-03-30 15:52:36 +02:00
Joan Sanchez	c7fdf8ef23	Added deploy instruction	2022-03-30 15:45:38 +02:00
Joan Sanchez	db01747ca3	Updated image registry path	2022-03-30 15:39:46 +02:00
Joan Sanchez	87d265276a	Deploy frontend stack	2022-03-30 15:29:20 +02:00
Carlos Jimenez Ruiz	cee5605c63	routes naming	2022-03-30 10:06:28 +02:00
Joan Sanchez	30e54c5333	Merge branch 'router-navigation' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation	2022-03-30 09:18:49 +02:00
Joan Sanchez	6e336a22d8	Store user roles	2022-03-30 09:18:39 +02:00
Carlos Jimenez Ruiz	e5157aae6d	updated package-lock	2022-03-29 14:49:13 +02:00
Carlos Jimenez Ruiz	069771bef3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into jest-ci	2022-03-29 14:48:29 +02:00
Carlos Jimenez Ruiz	9defd91e08	renamed Jenkinsfile	2022-03-29 12:59:57 +02:00
Carlos Jimenez Ruiz	ed9fc32973	jest-ci 1st attempt	2022-03-29 12:53:02 +02:00
Joan Sanchez	da364e8a9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation	2022-03-28 15:32:31 +02:00
Carlos Jimenez Ruiz	909756a1cc	Merge pull request 'salix-front-js' (#5) from salix-front-js into dev ... Reviewed-on: #5	2022-03-28 11:33:56 +00:00
Joan Sanchez	dc1f75b5e9	Proper component names	2022-03-28 09:06:36 +02:00
Joan Sanchez	6141f9a136	Merge branch 'salix-front-js' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation	2022-03-28 09:05:56 +02:00
Carlos Jimenez Ruiz	d9099d1d84	login e2e path semi-completed	2022-03-25 15:25:32 +01:00
Carlos Jimenez Ruiz	34f4b001be	jestHelpers implementation	2022-03-25 15:14:49 +01:00
Carlos Jimenez Ruiz	8343271b1a	minor test refactor for component instances	2022-03-25 14:37:14 +01:00
Joan Sanchez	1af0a3db31	Unit tests	2022-03-25 10:44:11 +01:00
Carlos Jimenez Ruiz	3683502f30	salix v2 to js migration	2022-03-24 16:49:33 +01:00
Joan Sanchez	ee5098aede	Added fonts	2022-03-24 15:02:30 +01:00
Joan Sanchez	c29a51fc48	Formatted project	2022-03-24 14:57:11 +01:00
Carlos Jimenez Ruiz	ecdb785abb	implemented cypress e2e testing	2022-03-24 14:12:14 +01:00
Carlos Jimenez Ruiz	601cdc0908	implementation of jest unit testing	2022-03-24 13:41:17 +01:00
Carlos Jimenez Ruiz	778835737b	javascript changes first steps	2022-03-24 13:33:14 +01:00
Carlos Jimenez Ruiz	d470a3f676	removed typescript	2022-03-24 13:26:19 +01:00
Carlos Jimenez Ruiz	5e5cf8810b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2022-03-24 11:45:15 +01:00
Carlos Jimenez Ruiz	b847cf3450	testing made possible :(	2022-03-24 11:44:23 +01:00
Carlos Jimenez Ruiz	9e79ad907b	removed sample code	2022-03-15 15:39:04 +01:00
Joan Sanchez	30356c6d0d	Slide description text	2022-03-15 10:37:59 +01:00
Joan Sanchez	ef073d1c87	Responsive monitor	2022-03-15 10:35:21 +01:00
Joan Sanchez	760c89aff9	Route acls and added LeftMenu component	2022-03-15 10:33:28 +01:00
Carlos Jimenez Ruiz	49b5ed8003	added .quasar to gitignore	2022-03-14 15:09:56 +01:00
Carlos Jimenez Ruiz	22185c3e1c	removed ignore files from repo	2022-03-14 15:09:13 +01:00
Joan Sanchez	a91f1fd625	recompiled .quasar	2022-03-14 15:05:58 +01:00
Joan Sanchez	7ce93ab676	Ignore vscode and .quasar folders	2022-03-14 11:32:19 +01:00
Joan Sanchez	69728b32cb	Removed editor settings and eslint formatter	2022-03-14 11:31:37 +01:00
Carlos Jimenez Ruiz	cbfcb237eb	eslint errors on spec files on compilation fix	2022-03-14 11:26:15 +01:00
Joan Sanchez	f09925493b	Merge pull request 'quasar-cli' (#4) from quasar-cli into dev ... Reviewed-on: #4	2022-03-14 09:39:34 +00:00
Joan Sanchez	7156ceeeaa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli	2022-03-14 10:37:59 +01:00
Joan Sanchez	cd86f371e8	Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli	2022-03-14 10:36:53 +01:00
Joan Sanchez	0590a7642f	Page title	2022-03-14 10:36:52 +01:00
Joan Sanchez	847cb64ab7	Renamed topbar to navbar	2022-03-14 10:36:12 +01:00
Carlos Jimenez Ruiz	554eae8faf	eslint rules update	2022-03-14 10:34:14 +01:00
Carlos Jimenez Ruiz	52d4dba950	e2e and unt test runners working	2022-03-11 17:28:30 +01:00
Carlos Jimenez Ruiz	7f576d3af4	intendation on package lock file	2022-03-11 14:42:12 +01:00
Joan Sanchez	0249403a77	Added cypress framework	2022-03-11 14:05:16 +01:00
Joan Sanchez	5362cd162e	Translation key updated	2022-03-11 13:02:47 +01:00
Joan Sanchez	ebc8c0f19b	Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli	2022-03-11 13:02:30 +01:00
Joan Sanchez	659a396fbb	Login fixed	2022-03-11 12:59:10 +01:00
Carlos Jimenez Ruiz	363e866f03	indentations for src directory	2022-03-11 12:39:12 +01:00
Joan Sanchez	517c6c2d5f	Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli	2022-03-11 11:41:25 +01:00
Joan Sanchez	affbd34f61	Added project files	2022-03-11 11:41:23 +01:00
Carlos Jimenez Ruiz	ad717cd2eb	updated intentation for the files in test directory	2022-03-11 11:39:56 +01:00
Carlos Jimenez Ruiz	5ccc0f6aa8	corrected indentation for files in directory's root	2022-03-11 11:36:40 +01:00
Joan Sanchez	efb857c08e	Quasar project	2022-03-11 11:25:30 +01:00
Carlos Jimenez Ruiz	a5fd21caf7	modified some styles for the customer list	2022-03-10 08:40:56 +01:00
Joan Sanchez	28dcf69c42	Show page title	2022-03-10 08:25:55 +01:00
Joan Sanchez	548b65557b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2022-03-10 07:43:09 +01:00
Joan Sanchez	0d6daa4079	Customer list "mockup"	2022-03-10 07:43:07 +01:00
Carlos Jimenez Ruiz	0b2783442e	Merge pull request 'Added salix font icons' (#3) from vn-icons into dev ... Reviewed-on: #3	2022-03-10 06:24:56 +00:00
Carlos Jimenez Ruiz	d223a5b029	custom icons importation	2022-03-09 16:53:01 +01:00
Joan Sanchez	bbde49479b	Added salix font icons	2022-03-09 15:44:28 +01:00
Carlos Jimenez Ruiz	561c4ef187	customer list styling	2022-03-09 11:35:24 +01:00
Joan Sanchez	3d0ef52ff6	Added customer module routing structure	2022-03-09 10:48:42 +01:00
Carlos Jimenez Ruiz	f6d75ec944	axios now gets token from useSession	2022-03-09 10:45:48 +01:00
Joan Sanchez	b64392431f	Fixed login invalid function name	2022-03-09 10:17:13 +01:00
Joan Sanchez	581efb8ddb	Updated useState composable	2022-03-09 10:16:33 +01:00
Joan Sanchez	286605695b	Added useSession and useState composables and remove vuex	2022-03-08 16:55:37 +01:00
Carlos Jimenez Ruiz	cea499936f	Merge pull request 'Removed vue-class-component in favour of composition API' (#2) from vue-composition-api into dev ... Reviewed-on: #2	2022-03-08 10:37:48 +00:00
Joan Sanchez	b89163704d	Updated components to composition API	2022-03-08 08:57:00 +01:00
Carlos Jimenez Ruiz	e89e325cad	class components to composite API	2022-03-07 16:40:03 +01:00
Joan Sanchez	1d9bfacaf3	Updated to composition API	2022-03-07 15:36:48 +01:00
Joan Sanchez	ec05b368e9	Added Role composable	2022-03-04 15:33:47 +01:00
Joan Sanchez	fade50dd2a	Header & userPanel componentization	2022-03-04 09:04:22 +01:00
Joan Sanchez	44b823e376	Keep session and added Topbar component	2022-03-02 15:29:41 +01:00
Carlos Jimenez Ruiz	5d6cdcb6df	user panel refactor	2022-03-01 16:58:30 +01:00
Joan Sanchez	f423cc2a1d	Added axios interceptor	2022-03-01 15:19:42 +01:00
Carlos Jimenez Ruiz	4edb7de3ad	login transalations amends	2022-02-28 17:00:06 +01:00
Joan Sanchez	c1726c2bce	Structured translations	2022-02-28 15:35:13 +01:00
Joan Sanchez	e74d92d105	feat(login): added login page ... Refs: #3648	2022-02-25 15:08:11 +01:00
Joan Sanchez	01a9747339	Updated eslint configuration	2022-02-25 13:12:14 +01:00
Joan Sanchez	25e8ed8a06	Merge pull request 'added eslint rules' (#1) from eslint_rules into dev ... Reviewed-on: #1	2022-02-24 15:39:52 +00:00
Carlos Jimenez Ruiz	077595dc8b	added eslint rules	2022-02-24 16:28:40 +01:00
Joan Sanchez	6d457e9891	Updated Vue component to class-style component	2022-02-24 11:04:35 +01:00