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

joan commented 2022-10-20 11:59:18 +00:00

Contributor

Copy Link

No description provided.

joan added 163 commits 2022-10-20 11:59:19 +00:00

6d457e9891 Updated Vue component to class-style component

077595dc8b added eslint rules

25e8ed8a06 Merge pull request 'added eslint rules' (#1) from eslint_rules into dev ...

Reviewed-on: #1

01a9747339 Updated eslint configuration

e74d92d105 feat(login): added login page ...

Refs: #3648

c1726c2bce Structured translations

4edb7de3ad login transalations amends

f423cc2a1d Added axios interceptor

5d6cdcb6df user panel refactor

44b823e376 Keep session and added Topbar component

fade50dd2a Header & userPanel componentization

ec05b368e9 Added Role composable

1d9bfacaf3 Updated to composition API

e89e325cad class components to composite API

b89163704d Updated components to composition API

cea499936f Merge pull request 'Removed vue-class-component in favour of composition API' (#2) from vue-composition-api into dev ...

Reviewed-on: #2

286605695b Added useSession and useState composables and remove vuex

581efb8ddb Updated useState composable

b64392431f Fixed login invalid function name

f6d75ec944 axios now gets token from useSession

3d0ef52ff6 Added customer module routing structure

561c4ef187 customer list styling

bbde49479b Added salix font icons

d223a5b029 custom icons importation

0b2783442e Merge pull request 'Added salix font icons' (#3) from vn-icons into dev ...

Reviewed-on: #3

0d6daa4079 Customer list "mockup"

548b65557b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

28dcf69c42 Show page title

a5fd21caf7 modified some styles for the customer list

efb857c08e Quasar project

5ccc0f6aa8 corrected indentation for files in directory's root

ad717cd2eb updated intentation for the files in test directory

affbd34f61 Added project files

517c6c2d5f Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli

363e866f03 indentations for src directory

659a396fbb Login fixed

ebc8c0f19b Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli

5362cd162e Translation key updated

0249403a77 Added cypress framework

7f576d3af4 intendation on package lock file

52d4dba950 e2e and unt test runners working

554eae8faf eslint rules update

847cb64ab7 Renamed topbar to navbar

0590a7642f Page title

cd86f371e8 Merge branch 'quasar-cli' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli

7156ceeeaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into quasar-cli

f09925493b Merge pull request 'quasar-cli' (#4) from quasar-cli into dev ...

Reviewed-on: #4

cbfcb237eb eslint errors on spec files on compilation fix

69728b32cb Removed editor settings and eslint formatter

7ce93ab676 Ignore vscode and .quasar folders

a91f1fd625 recompiled .quasar

22185c3e1c removed ignore files from repo

49b5ed8003 added .quasar to gitignore

760c89aff9 Route acls and added LeftMenu component

ef073d1c87 Responsive monitor

30356c6d0d Slide description text

9e79ad907b removed sample code

b847cf3450 testing made possible :(

5e5cf8810b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

d470a3f676 removed typescript

778835737b javascript changes first steps

601cdc0908 implementation of jest unit testing

ecdb785abb implemented cypress e2e testing

c29a51fc48 Formatted project

ee5098aede Added fonts

3683502f30 salix v2 to js migration

1af0a3db31 Unit tests

8343271b1a minor test refactor for component instances

34f4b001be jestHelpers implementation

d9099d1d84 login e2e path semi-completed

6141f9a136 Merge branch 'salix-front-js' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation

dc1f75b5e9 Proper component names

909756a1cc Merge pull request 'salix-front-js' (#5) from salix-front-js into dev ...

Reviewed-on: #5

da364e8a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation

ed9fc32973 jest-ci 1st attempt

9defd91e08 renamed Jenkinsfile

069771bef3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into jest-ci

e5157aae6d updated package-lock

6e336a22d8 Store user roles

30e54c5333 Merge branch 'router-navigation' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation

cee5605c63 routes naming

87d265276a Deploy frontend stack

db01747ca3 Updated image registry path

c7fdf8ef23 Added deploy instruction

fcd0d1fc9f Listen hostname localhost

44021ecd9d Removed boilerplate code

4fb5d46a52 Renamed branch name

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

c6316ce260 Updated stack name

67a65a359b Renamed tests folder

6503f9d97c Updated hostname

d3177e2869 Updated tests folder path

51015c72f6 Router navigation

79c9aba287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into router-navigation

4b4513ea44 Updated unit test

f20cd84df9 Merge pull request 'router-navigation' (#7) from router-navigation into dev ...

Reviewed-on: #7

08ecbcf15a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test

7f3010869b Router improvements and load roles on login

9a9bcc5e51 Removed empty line

20604a2441 front unit test fixed after login enhancement

565b91b235 cypress tests working after updating file paths

aada44755c Merge pull request 'Router improvements and load roles on login' (#8) from router-improvements into dev ...

Reviewed-on: #8

61ca063c95 Merge branch 'test' into dev

c51bfc6b3d Merge pull request 'dev to test merge' (#9) from dev into test ...

Reviewed-on: #9

b6aeb5e0e9 composables refactor and their unit tests

a96f87d2c9 Merge pull request 'composables refactor and their unit tests' (#10) from composable_tests into dev ...

Reviewed-on: #10

78baa306b0 Make use of slot

9123ce9f5f Changes

5c20871a71 disabled template ts error

a60351a0e9 Routing changes

38f0c89fbd Disabled experimental template support

4ff5692789 Default formatter

7a99ad1887 Change drawer state

ab9f19445c Updated routes

16020e9c16 Merge pull request 'Leftmenu drawer and card drawer' (#11) from drawer-card into dev ...

Reviewed-on: #11

345b943869 feat(darkMode): current darkMode value is now saved in vn.userConfig.darkMode

913be03e94 front unit tests amends for darkMode and setUser modifications

05272cbbb2 feat(language): selected language is now saved in account.user.lang and persists in navigation

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

d90fe72452 Router not longer redirects to dashboard on page reload

b2b8b47f56 Added CustomerCreate translation

cd12f75f25 Removed outdated tests

6c0688f1f0 Merge pull request 'Router not longer redirects to dashboard on page reload' (#13) from page_reload_fix into dev ...

Reviewed-on: #13

d2e78c4b56 feat(leftmenu): collapsable submodule routes #4044

229ddb8f2d Merge pull request '#4044 - feat(leftmenu): collapsable submodule routes' (#14) from 4044-leftmenu_submodules into dev ...

Reviewed-on: #14

66cbe7eeb8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test

157f218c97 e2e path for login, logout and nav ACLs

6270860509 Merge pull request 'e2e path for login, logout and nav ACLs' (#15) from 3916-router_tests into dev ...

Reviewed-on: #15

2baf3c04a2 Upgrade quasar project

f372bd5338 Customer list with q-card

af28371ec9 replaced quasar icon with salix icon

7473dceeea favorite modules component and navigationb composable

6038c662f8 removed a test that wouldn't work for the given user yet

12b1345315 dashboar can no longer be added to favorites

094fd21c25 style and icons refactor

a1d7a22c56 Merge pull request '2237-starred_modules' (#16) from 2237-starred_modules into dev ...

Reviewed-on: #16

365dddd84e Merge branch 'test' into dev

de05cb5298 Merge pull request 'dev to test update' (#17) from dev into test ...

Reviewed-on: #17

978197023f Infinite scroll

2b1060236a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4183-smart-list

69a4be1318 Card mockup

9e1d86e6bd feat(smartCard): added smart-card component

0940d73d2f Added unit tests

dddb5c05be Removed comment

10157230d6 Merge pull request '4183- Smart Card component' (#18) from 4183-smart-list into dev ...

Reviewed-on: #18

6317db2093 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test

f0df15f381 feat(ticket): add boxing in router

0fb77eadc0 feat(ticketBoxing): getVideo

7b2a4d75c6 feat(interceptor): axios response interceptor

424ff568cd feat(ticketBoxing): fix front

c16ef7e783 Updated unit test

807a6fa16f Updated tests

582eb4d808 Updated unit test

556caa0b1a Merge pull request '3836-axios_interceptor' (#19) from 3836-axios_interceptor into dev ...

Reviewed-on: #19

165075aaef Updated login unit test

22b5d06fca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4075-ticket_boxing

7f42655b1d feat(ticket_boxing): add section

0139b464b7 quit console logs

96c16727ff test(ticketBoxing): front test

f1d24cc103 test(ticketBoxing): e2e

c346ce30e6 Merge pull request '4075-ticket_boxing' (#20) from 4075-ticket_boxing into dev ...

Reviewed-on: #20

6f38c7e4bb Enable lilium for production

592dc7da22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test

joan merged commit fc68df73e4 into master 2022-10-20 11:59:30 +00:00

joan deleted branch test 2022-10-20 11:59:30 +00:00

joan referenced this issue from a commit 2022-10-20 11:59:31 +00:00

Merge pull request 'Merge to master' (#21) from test into master

alexm referenced this issue from a commit 2024-01-11 12:22:31 +00:00

Merge pull request 'Correcciones post PR' (#21) from features/ms_32_correcciones_post_pr_2 into dev

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#21

No description provided.