M-Labs
/
web2019
5
0
Fork 2
Code Issues 18 Pull Requests Releases Wiki Activity

Add EEM power module to the shop #97

Merged
sb10q merged 2 commits from esavkin/web2019:91-eem-pwr_mod into master 2023-10-10 17:34:53 +08:00
Conversation 3 Commits 2 Files Changed 4
esavkin commented 2023-10-05 15:34:48 +08:00
Collaborator

Closes #91
Waits for #93

Closes #91 Waits for #93
eem_pwr_mod_ac.svg
38 KiB
eem_pwr_mod_ac.svg
esavkin added 35 commits 2023-10-05 15:34:48 +08:00
ae23c18b0c Add basic demo example 
Kinda works, but buggy

Signed-off-by: Egor Savkin <es@m-labs.hk>
7b394c8203 Make it update state 
Signed-off-by: Egor Savkin <es@m-labs.hk>
47d9af400d Fix JSON shop load 
Signed-off-by: Egor Savkin <es@m-labs.hk>
6e54da2c71 Add switch and line 
Signed-off-by: Egor Savkin <es@m-labs.hk>
4c64879fbc Add switchline compact design 
Signed-off-by: Egor Savkin <es@m-labs.hk>
759e41681f Fix add of useless options to JSON 
Signed-off-by: Egor Savkin <es@m-labs.hk>
2eb4bc99dd Adjust styles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
b2250680c9 Make the design more compact 
Signed-off-by: Egor Savkin <es@m-labs.hk>
bd7e39927d Make overlay appear on button click 
And fix options absense for non-carrier cards

Signed-off-by: Egor Savkin <es@m-labs.hk>
712d8664f1 Add popover for cart summary with options data 
Signed-off-by: Egor Savkin <es@m-labs.hk>
a6a6d758e9 Update bundle file 
Add custom options to more cards

Minor design adjustments: add margin-left to icon and optimize the icon

Signed-off-by: Egor Savkin <es@m-labs.hk>
22372116ad Hide popups on clicking outside of them 
Signed-off-by: Egor Savkin <es@m-labs.hk>
9b650b4a2c Remove MAC from options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
a4e7fce0f4 Add icons to options titles 
Signed-off-by: Egor Savkin <es@m-labs.hk>
4e6447c3d2 Add tooltips with hints for the user 
Signed-off-by: Egor Savkin <es@m-labs.hk>
3980ece5b5 Use tips on more cards 
Signed-off-by: Egor Savkin <es@m-labs.hk>
3a6dfef9b7 Fix scroll issue and found another bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
264e583d82 Still fixing the bug 
Signed-off-by: Egor Savkin <es@m-labs.hk>
718a4509f4 Integrate clock/slots configuration into the calculator 
Also adjust sizes

Signed-off-by: Egor Savkin <es@m-labs.hk>
a705feebc2 Remove redundant notifications about connectors and AD9910 
Signed-off-by: Egor Savkin <es@m-labs.hk>
11aac2323d Small duplication removal 
Signed-off-by: Egor Savkin <es@m-labs.hk>
a8e3bae08e Fix not-disappearing warnings and clocker clock slots 
Signed-off-by: Egor Savkin <es@m-labs.hk>
0762572956 Fix cards state being not updated on touchables 
Signed-off-by: Egor Savkin <es@m-labs.hk>
1244ac1775 Update shop bundle 
Signed-off-by: Egor Savkin <es@m-labs.hk>
b412fae177 Change ttl groups to banks and remove green leaf 
Signed-off-by: Egor Savkin <es@m-labs.hk>
9f5fb7606e Leave opt-out option only to the first kasli 
Signed-off-by: Egor Savkin <es@m-labs.hk>
a207d4662f Add HD68 cable options and fix first small cards options 
Signed-off-by: Egor Savkin <es@m-labs.hk>
5b5a2cf230 Add edge counter for the options to TTL 
Signed-off-by: Egor Savkin <es@m-labs.hk>
5f5463f84c Add EEM power module as first item in cart 
Signed-off-by: Egor Savkin <es@m-labs.hk>
sb10q commented 2023-10-05 16:51:20 +08:00
Owner

Please make this independent of the options PR.

Please make this independent of the options PR.
👍 1
sb10q commented 2023-10-05 16:51:44 +08:00
Owner

There shouldn't be 35 commits just to add a card.

There shouldn't be 35 commits just to add a card.
😕 1 👀 1
esavkin force-pushed 91-eem-pwr_mod from 5f5463f84c to 9cf6322672 2023-10-05 16:59:25 +08:00 Compare
sb10q commented 2023-10-05 17:00:30 +08:00
Owner

Remove the handle graphic. Other cards don't have it either.
image

Remove the handle graphic. Other cards don't have it either. ![image](/attachments/b39192d5-e9ab-4ea9-9f0d-e81d66e47839)
image.png
5.4 KiB
sb10q reviewed 2023-10-05 17:02:16 +08:00
static/js/shop_data.js Outdated
@ -892,0 +904,4 @@
"EMC filter",
"LED current indicator",
"6 rear side outputs - 4pin Molex MiniFit (Kasli type)",
"Mains circuit protected with steel cover"
sb10q commented 2023-10-05 17:02:16 +08:00
Owner

Add an item saying it is optional and the crate comes with DC brick(s) if it doesn't have the EEM Power Module.

Add an item saying it is optional and the crate comes with DC brick(s) if it doesn't have the EEM Power Module.
sb10q reviewed 2023-10-05 17:02:38 +08:00
static/js/shop_data.js Outdated
@ -892,0 +899,4 @@
specs: [
"EEM AC power module",
"400W with forced cooling (25CFM), 200W with free air convection",
"80-264V input range",
sb10q commented 2023-10-05 17:02:38 +08:00
Owner

It's commonly called "universal input"

It's commonly called "universal input"
esavkin added 1 commit 2023-10-05 17:12:05 +08:00
7941904f45 Remove handle and update description 
Signed-off-by: Egor Savkin <es@m-labs.hk>
sb10q merged commit 393fc8e3c9 into master 2023-10-10 17:34:53 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
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: M-Labs/web2019#97
There is no content yet.
Delete Branch "esavkin/web2019:91-eem-pwr_mod"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?