1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Commit Graph

327 Commits

Author SHA1 Message Date
Sylvain
9edc148ef0 (bug) form tooltip is partly hidden by the next tooltip trigger 2022-05-04 12:28:31 +02:00
Sylvain
3ff416cf8a (ui) openid connect configuration interface 2022-05-04 12:28:31 +02:00
Sylvain
674abed1d2 (ui) adjust tooltip aspect
+ (bug) do not ignore clipboard.writeText promise
+ (i18n) fix typo in translation
2022-05-04 12:28:31 +02:00
Sylvain
f9e5e7f2a8 (ui) display authorization callback url directly in interface 2022-05-04 12:28:29 +02:00
Sylvain
63b03568e4 (i18n) reorganize translations per components 2022-05-04 12:27:48 +02:00
Sylvain
073b0c8eae (ui) add tooltip to FormInput
+ add tooltip for auth_provider/mappings/API field input
2022-05-04 12:27:48 +02:00
Sylvain
04ae91a7d1 (ui) improve the appeareance for the auth provider definition form 2022-05-04 12:27:46 +02:00
Sylvain
470a8284ff (ui) sso data mapping - by type 2022-05-04 12:27:12 +02:00
Sylvain
e51e2d63cb (wip)(ui) type mapping ui 2022-05-04 12:26:42 +02:00
Sylvain
3bfe842bc3 (style) placeholder style for react-select 2022-05-04 12:25:46 +02:00
Sylvain
6d31331fab renamed form.scss to form-item.scss to match naming convention 2022-05-04 12:25:44 +02:00
Sylvain
7f7830a98c (style) fix placeholder appearance
Credits goes to @Vincent
2022-05-04 12:25:10 +02:00
vincent
08a95dea81 Fix styles on multi-select 2022-05-04 12:25:10 +02:00
vincent
86403cb1f2 Override React-select styles 2022-05-04 12:25:08 +02:00
Sylvain
7beb1466bf (archi) organize react-hook-form components in a separate folder 2022-05-04 12:23:22 +02:00
Sylvain
4bf05a5024 (ui) select authentication provier type 2022-05-04 12:20:52 +02:00
vincent
66beffa0c3 Hide empty calendar side pannel 2022-05-04 12:16:38 +02:00
vincent
ca9a564474 Make calendar wider 2022-05-04 12:16:36 +02:00
vincent
dbd15539e1 Add video embed on the text editor 2022-05-04 11:54:23 +02:00
vincent
ce6d7d1148 Add description to plan category 2022-05-04 11:46:51 +02:00
vincent
1868be1642 Add labels 2022-05-04 11:20:19 +02:00
vincent
67f678a282 Add image embed in the text editor 2022-05-04 11:20:19 +02:00
vincent
cd5c253b3e Add video embed on the text editor 2022-05-04 11:20:17 +02:00
vincent
7ebdc1b06e Test video embed on the text editor 2022-05-04 11:18:28 +02:00
vincent
c1ec8b5ce8 Add style variables 2022-05-04 11:16:57 +02:00
vincent
3f4714861b Add description to plan category 2022-05-04 11:16:51 +02:00
vincent
5024037ce6 (wip) fab-socials 2022-05-04 10:25:15 +02:00
vincent
bf380c45d4 Adjust styles and icons 2022-05-04 10:21:37 +02:00
vincent
7461f6d1d5 (wip) show and edit social networks 2022-05-04 10:21:05 +02:00
Sylvain
654f0880a0 (ui) user profile form: confirmation message + save button 2022-05-03 16:45:06 +02:00
Sylvain
7ee4c8f4c0 (ui) avatar input 2022-05-03 16:14:20 +02:00
Sylvain
7a6fe34b90 (ui) profile data: website, job, cad softwares, interests 2022-05-02 15:29:32 +02:00
Sylvain
6be3a4c324 (ui) stylized form-switch 2022-04-27 15:36:36 +02:00
Sylvain
a5ff03334a (ui) form-switch component
+ refactored form components
2022-04-27 12:55:43 +02:00
Sylvain
aa432d08b3 (wip)(ui) refactor user edition form 2022-04-26 18:05:18 +02:00
Sylvain
0dd6f4bff5 Merge branch 'openid' into v5.4 2022-04-25 15:43:03 +02:00
Sylvain
d72de33670 (ui) automatic field mapping configuration for openid 2022-04-20 15:22:07 +02:00
Sylvain
1960c7139f (ui)(api) configure data mapping for openid 2022-04-20 14:12:22 +02:00
Sylvain
79bb235eaa (ui) automatically test for discovery endpoint 2022-04-19 14:57:53 +02:00
Sylvain
9ef2e251b0 (bug) form tooltip is partly hidden by the next tooltip trigger 2022-04-19 09:42:16 +02:00
Sylvain
0e35616710 (ui) openid connect configuration interface 2022-04-13 15:50:33 +02:00
vincent
0775a9592f Hide empty calendar side pannel 2022-04-12 18:01:49 +02:00
Sylvain
9a0de78da7 (ui) adjust tooltip aspect
+ (bug) do not ignore clipboard.writeText promise
+ (i18n) fix typo in translation
2022-04-12 16:53:31 +02:00
Sylvain
c3f7249242 (ui) display authorization callback url directly in interface 2022-04-12 16:34:44 +02:00
vincent
78be7bb276 Make calendar wider 2022-04-12 15:54:12 +02:00
Sylvain
ecc7565346 (i18n) reorganize translations per components 2022-04-12 13:54:47 +02:00
Sylvain
e91fa00afc (ui) add tooltip to FormInput
+ add tooltip for auth_provider/mappings/API field input
2022-04-12 12:12:04 +02:00
Sylvain
4da6a5fa72 (ui) improve the appeareance for the auth provider definition form 2022-04-11 16:12:13 +02:00
Sylvain
d542292dbf (ui) sso data mapping - by type 2022-04-11 13:19:07 +02:00
Sylvain
6ac3ad4373 (wip)(ui) type mapping ui 2022-04-06 17:14:23 +02:00
Sylvain
d427617ea6 (style) placeholder style for react-select 2022-04-06 12:43:39 +02:00
Sylvain
a10fd77e95 renamed form.scss to form-item.scss to match naming convention 2022-04-06 12:39:05 +02:00
Sylvain
39c33b0686 (style) fix placeholder appearance
Credits goes to @Vincent
2022-04-06 12:32:41 +02:00
vincent
c50d94b2a9 Fix styles on multi-select 2022-04-05 19:31:13 +02:00
vincent
1435a46c99 Override React-select styles 2022-04-05 19:09:59 +02:00
Sylvain
6254db4ff9 (archi) organize react-hook-form components in a separate folder 2022-04-05 14:25:58 +02:00
Sylvain
8fee9c6bb8 (ui) select authentication provier type 2022-04-05 11:43:28 +02:00
vincent
f25fdd4091 merge 2022-04-01 17:48:32 +02:00
vincent
c16150d7cc Add labels 2022-03-28 17:58:35 +02:00
vincent
2939bbce69 Add image embed in the text editor 2022-03-28 14:01:14 +02:00
vincent
2dc7529b3f Add video embed on the text editor 2022-03-25 18:44:37 +01:00
Sylvain
d1dddb7656 Updated deprecated division operators in sass 2022-03-16 10:37:04 +01:00
Sylvain
ac0dacbc88 fix webpack 5 errors 2022-03-14 14:52:23 +01:00
Sylvain
39f1b3cf7c updated API usages + [ongoing] updating integrations 2022-03-09 17:37:59 +01:00
vincent
24a048b1d4 Fix cookies modal's size 2022-03-08 12:16:43 +01:00
vincent
98361707da Test video embed on the text editor 2022-02-10 15:01:33 +01:00
vincent
d94f5efbcd Add style variables 2022-02-04 15:09:38 +01:00
vincent
719c1abd63 Add description to plan category 2022-02-03 15:32:02 +01:00
vincent
f15907c405 Merge branch 'dev' into wip-demo-update 2022-01-07 08:23:34 +01:00
Du Peng
6019767a3b update multi VAT 2021-12-28 13:45:29 +01:00
Sylvain
fe96e01b7f refactor spaces/extended_prices code architecture to match the FM style guide 2021-12-28 11:25:10 +01:00
Sylvain
db4230def1 Revert "Fix classes names"
This reverts commit c394b3a275.
2021-12-28 09:47:44 +01:00
vincent
c394b3a275 Fix classes names 2021-12-22 17:25:02 +01:00
vincent
163e56d2f2 Add minor style adjustments for the demo 2021-12-03 18:25:25 +01:00
vincent
54cb9ab152 fix images' size and ratio 2021-11-24 18:47:07 +01:00
Sylvain
840c536c75 Ability to configure data sources for preventing booking on overlapping slots 2021-10-22 14:50:02 +02:00
Sylvain
336a4b789c proceed with payment on subscription renewal 2021-10-13 17:39:39 +02:00
Sylvain
6cd91d0291 [WIP] refactor renew subscription modal 2021-10-12 17:29:35 +02:00
Sylvain
70f0e21543 move free extend modal to react 2021-10-11 18:50:53 +02:00
Du Peng
1fdf3d35b5 adjuste packs pricing popover position 2021-08-03 17:03:03 +02:00
Sylvain
e150e13227 [bug] cookies modal buttons are too small 2021-07-02 14:26:35 +02:00
Sylvain
19717d1351 use localPaymentModal in cart directive 2021-06-30 16:35:25 +02:00
Sylvain
d43f719038 buy packs using local payment 2021-06-30 15:32:10 +02:00
Sylvain
10aaf0042c integration of packs-summary 2021-06-29 15:59:57 +02:00
Sylvain
bbb1aca4fb display validity for each pack 2021-06-28 12:24:31 +02:00
Sylvain
86de1f6253 styled packs 2021-06-28 11:49:51 +02:00
Sylvain
f16cbc44ff WIP: buy pack modal 2021-06-25 17:24:34 +02:00
Sylvain
26f98f30f6 edit pack modal 2021-06-25 09:56:39 +02:00
Sylvain
0345d22582 delete & disable packs 2021-06-24 17:59:05 +02:00
Sylvain
1f8fd47317 pack creation and listing 2021-06-23 17:00:15 +02:00
Sylvain
f81e0910c2 packs popover 2021-06-23 11:33:42 +02:00
Sylvain
8cc4811794 edit machines pricings 2021-06-22 17:56:13 +02:00
Sylvain
870de2b421 reserve machine button in show machine page 2021-06-18 16:40:39 +02:00
Sylvain
fcdc357f89 required training modal 2021-06-18 16:05:36 +02:00
Sylvain
4ecdf431d5 fix pending traning modal 2021-06-18 12:47:04 +02:00
Sylvain
f9a8453b70 fixes in machines galery:
- display a placeholder when no picture
- display an opacity filter when machine is disabled
- filtering by enabled/disabled
- text in pending training modal
2021-06-18 11:51:26 +02:00
Sylvain
bff5415a1e refactor API services to use only static methods
Also: separate reserve-button component
2021-06-17 17:09:10 +02:00
Sylvain
4aa3fdff0e filter machines by status 2021-06-17 10:25:13 +02:00
Sylvain
80d206fc99 responsively styled the machines list 2021-06-17 09:48:29 +02:00
Sylvain
de3ab3b6d0 organize sass files 2021-06-17 09:08:15 +02:00
Sylvain
565002a124 WIP: migrate machines list to react 2021-06-16 18:10:29 +02:00
Sylvain
e184bf3d3c filter plans y duration 2021-06-10 14:06:53 +02:00
Sylvain
4580bfc7d7 allow user to filter plans by groups 2021-06-10 12:52:14 +02:00
Sylvain
854db568bf Ability to configure the prefix of the payment-schedules' files 2021-06-10 12:04:00 +02:00
Sylvain
05882b3743 display list of plans grouped by category 2021-06-09 13:03:58 +02:00
Sylvain
08ad436351 split plan-catageories management into separate components 2021-06-09 09:24:39 +02:00
Sylvain
ae039cdd0c ordering categories 2021-06-08 17:00:52 +02:00
Sylvain
e1e446ab3f API+ interface to CRUD plan categories 2021-06-08 16:43:43 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
4e109f7edb retrieve gateway objects with multiple ids 2021-06-03 09:48:21 +02:00
Sylvain
16df7f9506 fix data migrations + update test fixtures 2021-05-27 11:31:07 +02:00
Sylvain
b938232c19 Merge branch 'dev' into payzen 2021-05-25 14:06:30 +02:00
Sylvain
4fe3a204b8 fixes for upgrade to dart-sass 2021-05-25 11:31:22 +02:00
Sylvain
6bcd9f6fef Merge branch 'dev' into payzen 2021-05-17 15:07:41 +02:00
Sylvain
1c4f46f935 [bug] responsiveness of the about page title 2021-05-14 14:55:14 +02:00
Sylvain
436db80ccf Increased the width of the input field for the prices of the events
This is especially useful for currencies like FCFA that have large numbers and large currency symbol
2021-05-12 15:16:10 +02:00
Sylvain
2a7a7fd614 [bug] the event themes are not kept when editing the event again 2021-05-12 14:54:56 +02:00
Sylvain
953224f1f7 remove top margin on first group 2021-04-28 16:17:56 +02:00
Sylvain
3b2f17d6d8 improved style of subscription page titles 2021-04-28 15:43:36 +02:00
Sylvain
c0afe9419e consolidated the payzen process with types 2021-04-13 11:30:30 +02:00
Sylvain
dca2651fb3 process payements with payzen 2021-04-12 17:37:09 +02:00
Sylvain
23032c405b WIP: create the formToken server-side 2021-04-09 17:17:58 +02:00
Sylvain
fe5c4e6233 integrate the payzen form widget into the modal
Also: do not fetch the api from unmounted components
2021-04-09 12:09:54 +02:00
Sylvain
fb2abcc382 integrate payzen logo and other fixes 2021-04-08 17:11:48 +02:00
Sylvain
d70d0dcf7a stripe modal -> generic payment modal 2021-04-08 15:21:24 +02:00
Sylvain
a55dd4dc71 display errors in fab-input 2021-04-08 10:00:19 +02:00
Sylvain
67d0ce24b4 set payzen currency
also: refactored the comments in the react components to fit high quality
2021-04-07 16:21:12 +02:00
Sylvain
94c4d318e1 fix top-margin 2021-04-06 18:05:08 +02:00
Sylvain
0cca08984f use flex-start 2021-04-06 18:00:55 +02:00
Sylvain
36871a0b34 improved display 2021-04-06 18:00:13 +02:00
Sylvain
667f6f6229 show recapitulative of payzen settings 2021-04-06 17:47:47 +02:00
Sylvain
98bb9d082c fix fab-input and payzen-keys-form 2021-04-02 16:02:50 +02:00
Sylvain
69352c07df validate payzen paramaters in the form 2021-03-31 17:58:09 +02:00
Sylvain
54c1a3cfd9 payzen keys configuration form 2021-03-31 16:03:51 +02:00
Sylvain
720328ee92 stripe keys form w/ live keys validation 2021-03-30 11:26:47 +02:00
Sylvain
abd6ecabc3 WIP: fab-input component 2021-03-24 17:31:50 +01:00
Sylvain
5b854ea831 Merge branch 'dev' into payzen 2021-03-24 14:34:24 +01:00
Sylvain
39a7e23881 Improved style of public plans page 2021-03-22 13:13:51 +01:00
Sylvain
18465ee8e9 select gateway modal 2021-03-10 16:46:18 +01:00
Sylvain
2d70a4d07e Do not close login modal when clicking on the backdrop 2021-03-08 14:21:58 +01:00
Sylvain
10fbea9289 Allow writing short rich descriptions for each subscription plan 2021-03-08 14:09:11 +01:00
Sylvain
a74c5d4c95 WIP: plan description 2021-03-03 17:21:11 +01:00
Sylvain
9609d96fc3 adjust payment schedule table to usage by admins & members 2021-02-10 10:03:04 +01:00
Sylvain
d767cf5f85 improve style of plans presentation 2021-02-09 16:40:04 +01:00
Sylvain
b0ef9e097d WIP: stripe update card 2021-02-09 12:09:26 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
d54846c349 UI to confirm check cashing 2021-02-04 17:00:02 +01:00
Sylvain
d22d011a10 show more results for the payment schedules interface 2021-02-04 15:47:11 +01:00
Sylvain
163976b988 WIP: error handling for card payments on later deadlines 2021-01-27 17:24:10 +01:00
Sylvain
8d08100166 WIP: schedules management inerface 2021-01-27 13:59:41 +01:00
Sylvain
39c3164b47 WIP: admin interface to manage payment schedules 2021-01-26 17:31:11 +01:00
Sylvain
5e06de508d interface to filter list of schedules 2021-01-26 11:37:05 +01:00
Sylvain
728ae4310c improved testing of payment schedules + some fixes
TODO: fix the test
rails test test/integration/reservations/create_test.rb
Reservations::CreateTest#test_user_reserves_a_machine_and_renew_a_subscription_with_payment_schedule_and_coupon_and_wallet [test/integration/reservations/create_test.rb:841]
Minitest::Assertion: Expected: "stripe"
  Actual: nil
2020-12-30 18:43:33 +01:00
Sylvain
c3c881d2a8 process the schedule to the stripe subscription
- only for subscriptions for now
- TODO: reservations (see app/services/reservations/reserv.rb:13)
2020-12-09 16:47:51 +01:00
Sylvain
a20be8ecb2 display legal agreement 2020-12-09 12:51:06 +01:00
Sylvain
66c205d0ed API error handling 2020-12-09 11:35:49 +01:00
Sylvain
1e43dc9518 show indicator while the payment is pending 2020-12-07 12:58:15 +01:00
Sylvain
9813c5d27b style payment modal 2020-11-30 16:52:55 +01:00
Sylvain
1e5f7ea1fd WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead) 2020-11-24 13:26:15 +01:00
Sylvain
6abee0cea0 define payment method before validating schedule 2020-11-18 16:01:05 +01:00
Sylvain
0c456b153e use FabModal component to display ful schedule 2020-11-09 15:17:38 +01:00
Sylvain
0fe4f13110 component to display the payment schedule 2020-11-05 17:32:37 +01:00
Sylvain
0e503e734e select-schedule component 2020-11-05 15:30:25 +01:00
Sylvain
7084e88d2d display monthly price for compatible plans 2020-11-02 12:29:08 +01:00
Sylvain
465fe8e913 show link to pdf in component 2020-11-02 11:16:13 +01:00
Sylvain
408531d13a use i18next instead of angular-translate for react components 2020-11-02 11:07:08 +01:00
Sylvain
4f877ab05d react coponent: plan-card + extracted scss from stylesheet.rb into themes/ 2020-10-29 15:53:29 +01:00
Sylvain
79b49778a4 [bug] public cards presenting the plans in the public area, have bogus style 2020-10-28 08:52:42 +01:00
Sylvain
f9f21c1496 fix missing fontAwesome icons 2020-10-20 09:53:05 +02:00
Sylvain
8cc0d30ee9 fix fontawesome left arrows 2020-09-29 14:35:42 +02:00
Sylvain
5764233c67 fix stylesheets compilation with webpack 2020-09-22 09:45:18 +02:00
Sylvain
b760c10414 fix sass for webpack 2020-09-15 12:57:54 +02:00
Sylvain
ec8fe3bf28 fixes import of JS dependencies 2020-09-14 16:08:49 +02:00
Sylvain
4e076c32ee using bootsrap-sass + erb fixes 2020-09-09 16:26:51 +02:00
Sylvain
44ca50b4e1 load template and erb with webpack 2020-09-09 11:54:49 +02:00
Sylvain
e37e368e90 updated links to html assets to use webpacker 2020-09-09 08:45:48 +02:00
Sylvain
75aa90070c moved javascript from sprocket to webpacker 2020-09-09 08:45:02 +02:00