Skip to content

Commit

Permalink
chore: upgrade remix spa mode
Browse files Browse the repository at this point in the history
  • Loading branch information
heiso committed Mar 15, 2024
1 parent 35e0476 commit 990339f
Show file tree
Hide file tree
Showing 7 changed files with 438 additions and 898 deletions.
113 changes: 110 additions & 3 deletions kicad/macrolev.kicad_pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"3dviewports": [],
"design_settings": {
"defaults": {
"apply_defaults_to_fp_fields": false,
"apply_defaults_to_fp_shapes": false,
"apply_defaults_to_fp_text": false,
"board_outline_line_width": 0.09999999999999999,
"copper_line_width": 0.19999999999999998,
"copper_text_italic": false,
Expand Down Expand Up @@ -78,6 +81,7 @@
"duplicate_footprints": "warning",
"extra_footprint": "warning",
"footprint": "error",
"footprint_symbol_mismatch": "warning",
"footprint_type_mismatch": "error",
"hole_clearance": "error",
"hole_near_hole": "error",
Expand Down Expand Up @@ -141,9 +145,6 @@
},
"teardrop_options": [
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 5,
"td_on_pad_in_zone": false,
"td_onpadsmd": true,
"td_onroundshapesonly": false,
"td_ontrackend": false,
Expand All @@ -152,29 +153,35 @@
],
"teardrop_parameters": [
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_round_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_rect_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_track_end",
"td_width_to_size_filter_ratio": 0.9
}
Expand All @@ -185,6 +192,32 @@
0.3,
0.5
],
"tuning_pattern_settings": {
"diff_pair_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 1.0
},
"diff_pair_skew_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
},
"single_track_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
}
},
"via_dimensions": [
{
"diameter": 0.0,
Expand All @@ -198,6 +231,13 @@
"zones_allow_external_fillets": false,
"zones_use_no_outline": true
},
"ipc2581": {
"dist": "",
"distpn": "",
"internal_id": "",
"mfg": "",
"mpn": ""
},
"layer_presets": [
{
"activeLayer": -2,
Expand Down Expand Up @@ -618,14 +658,75 @@
"gencad": "macrolev.cad",
"idf": "",
"netlist": "",
"plot": "",
"pos_files": "",
"specctra_dsn": "",
"step": "macrolev.step",
"svg": "",
"vrml": "macrolev.wrl"
},
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"bom_fmt_presets": [],
"bom_fmt_settings": {
"field_delimiter": ",",
"keep_line_breaks": false,
"keep_tabs": false,
"name": "CSV",
"ref_delimiter": ",",
"ref_range_delimiter": "",
"string_delimiter": "\""
},
"bom_presets": [],
"bom_settings": {
"exclude_dnp": false,
"fields_ordered": [
{
"group_by": false,
"label": "Reference",
"name": "Reference",
"show": true
},
{
"group_by": true,
"label": "Value",
"name": "Value",
"show": true
},
{
"group_by": false,
"label": "Datasheet",
"name": "Datasheet",
"show": true
},
{
"group_by": false,
"label": "Footprint",
"name": "Footprint",
"show": true
},
{
"group_by": false,
"label": "Qty",
"name": "${QUANTITY}",
"show": true
},
{
"group_by": true,
"label": "DNP",
"name": "${DNP}",
"show": true
}
],
"filter_string": "",
"group_symbols": true,
"name": "Grouped By Value",
"sort_asc": true,
"sort_field": "Reference"
},
"connection_grid_size": 50.0,
"drawing": {
"dashed_lines_dash_length_ratio": 12.0,
"dashed_lines_gap_length_ratio": 3.0,
Expand All @@ -639,6 +740,11 @@
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.375,
"operating_point_overlay_i_precision": 3,
"operating_point_overlay_i_range": "~A",
"operating_point_overlay_v_precision": 3,
"operating_point_overlay_v_range": "~V",
"overbar_offset_ratio": 1.23,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.15
},
Expand All @@ -664,6 +770,7 @@
"spice_external_command": "spice \"%I\"",
"spice_model_current_sheet_as_root": true,
"spice_save_all_currents": false,
"spice_save_all_dissipations": false,
"spice_save_all_voltages": false,
"subpart_first_id": 65,
"subpart_id_separator": 0
Expand Down
2 changes: 1 addition & 1 deletion web-app/app/components/logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ type LogoSVGProps = SVGProps<SVGSVGElement> & { id: LogoSvg }
function LogoSVG({ id, ...props }: LogoSVGProps) {
return (
<svg width="170" height="120" viewBox="0 0 170 120" {...props}>
<use href={`/logo.svg#${id}`} />
<use href={`logo.svg#${id}`} />
</svg>
)
}
17 changes: 17 additions & 0 deletions web-app/app/entry.server.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { EntryContext } from '@remix-run/node'
import { RemixServer } from '@remix-run/react'
import { renderToString } from 'react-dom/server'

export default function handleRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext,
) {
let html = renderToString(<RemixServer context={remixContext} url={request.url} />)
html = '<!DOCTYPE html>\n' + html
return new Response(html, {
headers: { 'Content-Type': 'text/html' },
status: responseStatusCode,
})
}
2 changes: 1 addition & 1 deletion web-app/app/ui/icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export type IconProps = SVGProps<SVGSVGElement> & { id: IconsSvg }
export function Icon({ id, className, ...props }: IconProps) {
return (
<svg width="15" height="15" viewBox="0 0 15 15" className={`${className}`} {...props}>
<use href={`/icons.svg#${id}`} />
<use href={`icons.svg#${id}`} />
</svg>
)
}
Loading

0 comments on commit 990339f

Please sign in to comment.