diff --git a/server/services/astro/around-list.get.js b/server/services/astro/around-list.get.js index 6c889da..61b0c96 100644 --- a/server/services/astro/around-list.get.js +++ b/server/services/astro/around-list.get.js @@ -6,7 +6,7 @@ const aroundAstroUid = _req.getString("aroundAstroUid"); //_log.info("AroundAstroUid: ", aroundAstroUid); -//DEBUG - simulate slow server - DONT FORGET TO COMMENT +//DEBUG - simulate slow server - DON'T FORGET TO COMMENT //_log.info("Slow server..."); //_exec.sleep(3000); @@ -79,4 +79,4 @@ for (const dbAstro of dbAstros) { _out.json(astros); // DEBUG...COMENTAR DEPOIS! -_log.info('service ended!'); \ No newline at end of file +//_log.info('service ended!'); \ No newline at end of file diff --git a/server/setup/_schema-form-02-astro.js b/server/setup/_schema-form-02-astro.js index 085b9d4..1460ec1 100644 --- a/server/setup/_schema-form-02-astro.js +++ b/server/setup/_schema-form-02-astro.js @@ -25,10 +25,10 @@ _form.createIfNotExists( .set("reorder", 0) .set("report", false) .set("show_id", true) - .set("uid", "6cec90a5-28c5-4522-a919-05b4593b4074") + .set("uid", "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b") ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") @@ -46,7 +46,7 @@ _form.createComponentIfNotExists( .set("tdheight", 0) .set("tdwidth", 0) .set("type", "textfloat") - .set("uid", "b6b79373-13f8-4e7f-ba69-1be15b065939") + .set("uid", "d5f96618-27fc-4098-a25d-39af3fb30c74") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -56,14 +56,14 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 9) + .set("y", 7) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") - .set("displayname", "Orbita astro") + .set("displayname", "Orbita em torno") .set("firebase", "") .set("group_id", 0) .set("height", 0) @@ -72,25 +72,25 @@ _form.createComponentIfNotExists( .set("name", "around_astro_id") .set("notnull", false) .set("primarykey", false) - .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro:name\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") + .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro:name,type_id\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) .set("type", "select") - .set("uid", "9bf61f84-4bd3-4d59-9022-d4b73ea28ccb") + .set("uid", "49505740-7745-435c-9be0-8f0f17c24771") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) .set("whenfilter", true) - .set("whennew", false) - .set("whenresult", false) + .set("whennew", true) + .set("whenresult", true) .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 6) + .set("y", 5) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") @@ -108,7 +108,7 @@ _form.createComponentIfNotExists( .set("tdheight", 0) .set("tdwidth", 0) .set("type", "textfloat") - .set("uid", "95868703-8ed4-475f-ab72-1b1b448d2303") + .set("uid", "5e5ea577-cc20-4b96-a283-1ff4679cbea6") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -121,7 +121,7 @@ _form.createComponentIfNotExists( .set("y", 3) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") @@ -139,22 +139,23 @@ _form.createComponentIfNotExists( .set("tdheight", 0) .set("tdwidth", 0) .set("type", "image") - .set("uid", "4c1fc07d-8c1c-4bbd-8542-0fc4104a8449") + .set("uid", "28e7db35-3f13-45a3-a9d4-f82add80598b") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) - .set("whenfilter", false) + .set("whenfilter", true) .set("whennew", true) .set("whenresult", true) .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 7) + .set("y", 8) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) + .set("description", "") .set("displayname", "Nome") .set("firebase", "") .set("group_id", 0) @@ -163,13 +164,13 @@ _form.createComponentIfNotExists( .set("min", 0) .set("name", "name") .set("notnull", true) - .set("primarykey", false) + .set("primarykey", true) .set("properties", "{\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"},\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) .set("type", "text") - .set("uid", "aa664157-55b2-4d49-a6d4-a37c03f9ed49") + .set("uid", "c24e1156-68fb-448e-9259-ec85c6ada663") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -182,11 +183,11 @@ _form.createComponentIfNotExists( .set("y", 1) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") - .set("displayname", "Periastro") + .set("displayname", "Periastro (km)") .set("firebase", "") .set("group_id", 0) .set("height", 0) @@ -200,24 +201,24 @@ _form.createComponentIfNotExists( .set("tdheight", 0) .set("tdwidth", 0) .set("type", "textfloat") - .set("uid", "42e699da-c882-4803-8602-cc0112b437cc") + .set("uid", "5fcc3479-2935-4ed6-96ea-8208bbec119d") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) - .set("whenfilter", false) + .set("whenfilter", true) .set("whennew", true) - .set("whenresult", false) + .set("whenresult", true) .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 8) + .set("y", 6) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") - .set("displayname", "Velocidade rota\u00E7\u00E3o") + .set("displayname", "Velocidade orbital") .set("firebase", "") .set("group_id", 0) .set("height", 0) @@ -226,12 +227,12 @@ _form.createComponentIfNotExists( .set("name", "rotation_velocity") .set("notnull", false) .set("primarykey", false) - .set("properties", "{\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"},\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}") + .set("properties", "{\"MASK\":{\"default\":\"#.##0,00\",\"type\":\"STRING\",\"value\":\"#.##0,00\"},\"MASK_REVERSE\":{\"default\":\"true\",\"type\":\"BOOLEAN\",\"value\":\"true\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) - .set("type", "text") - .set("uid", "5777bc24-062b-4bd7-a279-bf64150d9357") + .set("type", "textfloat") + .set("uid", "4e3b1d3a-5465-448b-a5b6-e956fd5084e7") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -244,7 +245,7 @@ _form.createComponentIfNotExists( .set("y", 4) ) _form.createComponentIfNotExists( - "6cec90a5-28c5-4522-a919-05b4593b4074", + "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b", _val.init() .set("colspan", 0) .set("description", "") @@ -257,12 +258,12 @@ _form.createComponentIfNotExists( .set("name", "type_id") .set("notnull", true) .set("primarykey", false) - .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro_type:nome,name\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"true\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") + .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro_type:name\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) .set("type", "select") - .set("uid", "1cf40cc0-2798-4a81-a294-a13915958b28") + .set("uid", "cbbf63ac-5b1a-4ab0-8bf1-531a3fcc2ef1") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -272,5 +273,5 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 5) + .set("y", 2) ) diff --git a/server/setup/_schema-form-03-astro_type.js b/server/setup/_schema-form-03-astro_type.js index c7e5aab..45be45a 100644 --- a/server/setup/_schema-form-03-astro_type.js +++ b/server/setup/_schema-form-03-astro_type.js @@ -22,7 +22,7 @@ _form.createIfNotExists( .set("export_xml", true) .set("firebase", "") .set("name", "astro_type") - .set("parent_uid", "6cec90a5-28c5-4522-a919-05b4593b4074") + .set("parent_uid", "c5b31fcf-9b3a-4d39-ad52-fb1000a4f17b") .set("reorder", 0) .set("report", false) .set("show_id", false) diff --git a/server/setup/_schema-form-23-planet.js b/server/setup/_schema-form-23-planet.js index c76b1b9..aacca70 100644 --- a/server/setup/_schema-form-23-planet.js +++ b/server/setup/_schema-form-23-planet.js @@ -27,6 +27,37 @@ _form.createIfNotExists( .set("show_id", true) .set("uid", "5252799b-b5f4-4a99-9c95-cf94e20ad05b") ) +_form.createComponentIfNotExists( + "5252799b-b5f4-4a99-9c95-cf94e20ad05b", + _val.init() + .set("colspan", 0) + .set("description", "") + .set("displayname", "Astro") + .set("firebase", "") + .set("group_id", 0) + .set("height", 0) + .set("max", 0) + .set("min", 0) + .set("name", "astro_id") + .set("notnull", true) + .set("primarykey", false) + .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro:name,type_id\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") + .set("rowspan", 0) + .set("tdheight", 0) + .set("tdwidth", 0) + .set("type", "select") + .set("uid", "c9009e2f-50d8-47dd-87a2-7d32d46482e0") + .set("user_id", 0) + .set("whenedit", true) + .set("whenexport", true) + .set("whenfilter", true) + .set("whennew", true) + .set("whenresult", true) + .set("whenview", true) + .set("width", 0) + .set("x", 1) + .set("y", 1) +) _form.createComponentIfNotExists( "5252799b-b5f4-4a99-9c95-cf94e20ad05b", _val.init() @@ -39,7 +70,7 @@ _form.createComponentIfNotExists( .set("max", 0) .set("min", 0) .set("name", "is_dwarf") - .set("notnull", false) + .set("notnull", true) .set("primarykey", false) .set("properties", "{\"DEFAULT\":{\"default\":\"true\",\"type\":\"BOOLEAN\",\"value\":\"true\"}}") .set("rowspan", 0) @@ -50,13 +81,13 @@ _form.createComponentIfNotExists( .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) - .set("whenfilter", true) + .set("whenfilter", false) .set("whennew", true) .set("whenresult", true) .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 1) + .set("y", 2) ) _form.createComponentIfNotExists( "5252799b-b5f4-4a99-9c95-cf94e20ad05b", @@ -87,5 +118,5 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 2) + .set("y", 3) ) diff --git a/server/setup/_schema-form-24-star.js b/server/setup/_schema-form-24-star.js index 0302fb1..37fe061 100644 --- a/server/setup/_schema-form-24-star.js +++ b/server/setup/_schema-form-24-star.js @@ -25,10 +25,10 @@ _form.createIfNotExists( .set("reorder", 0) .set("report", false) .set("show_id", true) - .set("uid", "1bc12ea0-cd12-4ab1-8262-b516e4424114") + .set("uid", "8e552dde-0d72-4432-99cc-52b10e523dec") ) _form.createComponentIfNotExists( - "1bc12ea0-cd12-4ab1-8262-b516e4424114", + "8e552dde-0d72-4432-99cc-52b10e523dec", _val.init() .set("colspan", 0) .set("description", "") @@ -39,14 +39,14 @@ _form.createComponentIfNotExists( .set("max", 0) .set("min", 0) .set("name", "astro_id") - .set("notnull", false) + .set("notnull", true) .set("primarykey", false) .set("properties", "{\"COLUMN_SEPARATOR\":{\"default\":\" - \",\"type\":\"LINK_SEPARATOR\",\"value\":\" - \"},\"LINK\":{\"default\":\"\",\"type\":\"LINK\",\"value\":\"astro:name,type_id\"},\"MAX_COLUMN_LENGTH\":{\"default\":\"0\",\"type\":\"INTEGER\",\"value\":\"0\"},\"ONLY_ACTIVES\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"SERVICE\":{\"default\":\"com/Select.netuno\",\"type\":\"STRING\",\"value\":\"com/Select.netuno\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) .set("type", "select") - .set("uid", "0795b242-4e57-4900-a2dc-dcffac3dc51e") + .set("uid", "c56c482e-063b-4842-89d0-5b9655a15033") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -56,10 +56,10 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 5) + .set("y", 2) ) _form.createComponentIfNotExists( - "1bc12ea0-cd12-4ab1-8262-b516e4424114", + "8e552dde-0d72-4432-99cc-52b10e523dec", _val.init() .set("colspan", 0) .set("description", "") @@ -70,14 +70,14 @@ _form.createComponentIfNotExists( .set("max", 0) .set("min", 0) .set("name", "system") - .set("notnull", false) - .set("primarykey", false) + .set("notnull", true) + .set("primarykey", true) .set("properties", "{\"MASK\":{\"default\":\"\",\"type\":\"STRING\",\"value\":\"\"},\"MASK_REVERSE\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"},\"MASK_SELECTONFOCUS\":{\"default\":\"false\",\"type\":\"BOOLEAN\",\"value\":\"false\"}}") .set("rowspan", 0) .set("tdheight", 0) .set("tdwidth", 0) .set("type", "text") - .set("uid", "e610350c-d4b5-4798-89d3-c2476aa0ef99") + .set("uid", "14710950-14ac-43d4-8e5b-dfa432ffe7d0") .set("user_id", 0) .set("whenedit", true) .set("whenexport", true) @@ -87,5 +87,5 @@ _form.createComponentIfNotExists( .set("whenview", true) .set("width", 0) .set("x", 1) - .set("y", 2) + .set("y", 1) ) diff --git a/server/setup/data.sql b/server/setup/data.sql index ad80067..abeae81 100644 --- a/server/setup/data.sql +++ b/server/setup/data.sql @@ -7,12 +7,36 @@ INSERT INTO astro_type (id, name) VALUES */ INSERT INTO astro ( - id, name, type_id, equatorial_radius, rotation_velocity, around_astro_id, periapsis, apoapsis, image ) VALUES - (1, 'Sol', 1, 696300, 1997, null, 0, 0, 'sun_small.jpg'), - (2, 'Mercúrio', 2, 2439.7, 47.362, 1, 57909050, 46001200, 'mercurio_small.jpg'), - (3, 'Vénus', 2, 6051.80, 35.02, 1, 107476000, 108942000, 'Venus_small-jBl5UbjV.jpg'), - (4, 'Terra', 2, 6378.10, 29.78, 1, 147098290, 152098232, 'earth_small.jpg'), - (5, 'Lua', 3, 1737.40, 1.022, 4, 363104, 405696, 'moon_small.jpg'), + id, name, type_id, equatorial_radius, rotation_velocity, around_astro_id, periapsis, apoapsis, image ) VALUES + (1, 'Sol', 1, 696300.00, 1997.00, null, 0, 0, 'sun_small-2hRbdhSQ.jpg'), + (2, 'Mercúrio', 2, 2439.70, 7.36, 1, 57909050, 46001200, 'mercurio_small-LJg3bDKi.jpg'), + (3, 'Vénus', 2, 6051.80, 35.02, 1, 107476000.00, 108942000.00, 'Venus_small-w9hVTdly.jpg'), + (4, 'Terra', 2, 6378.10, 29.78, 1, 147098290.00, 152098232.00, 'earth_small-3eJCmyrt.jpg'), + (5, 'Lua', 3, 1737.40, 1.02, 4, 363104.00, 405696.00, 'moon_small-B6Ck8hJF.jpg'), + (6, 'Marte', 2, 3396.20, 24.08, 1, 206669000.00, 249209300.00, 'mars_small-EpbJXroT.jpg'), + (7, 'Fobos', 3, 11.27, 2.14, 6, 9234.42, 9517.58, 'phobos_small-dae67bkQ.jpg'), + (8, 'Deimos', 3, 6.20, 1.35, 6, 23455.50, 23470.90, 'deimos-MfbTM5FL.jpg'), + (9, 'Júpiter', 2, 71492.00, 13.07, 1, 740573600.00, 816520800.00, 'jupiter_small-TAiRB0FO.jpg'), + (10,'Io', 3, 1821.60, 17.33, 9, 420000.00, 423400.00, 'io_small-zhHeM77a.jpg'), + (11,'Europa', 3, 1560.80, 13.74, 9, 664862.00, 676938.00, 'Europa-moon_small-BAXFZKmC.jpg'), + (12,'Ganímedes',3, 2631.20, 10.88, 9, 1069200.00, 1071600.00, 'ganimedes_small-eWPGeTrK.jpg'), + (13,'Calisto', 3, 2410.30, 8.20, 9, 1869000.00, 1897000.00, 'calisto_small-RcGOTSj8.jpg'), + (14,'Saturno', 2, 60268.00, 9.69, 1, 1353572956.00, 1513325783.00, 'saturn_small-Qct5W9Cl.jpg'), + (15,'Mimas', 3, 198.20, 14.32, 14, 181902.00, 189176.00, 'mimas_small-BkHGyJPR.jpg'), + (16,'Encélado', 3, 252.10, 12.64, 14, 237948.00, 237948.00, 'encelado_small-HD2uIZEv.jpg'), + (17,'Tétis', 3, 533.00, 11.35, 14, 294619.00, 294619.00, 'tetis_small-Ktkiv8hs.jpg'), + (18,'Dione', 3, 561.40, 10.03, 14, 377396.00, 377396.00, 'dione_small-Q7n844KC.jpg'), + (19,'Reia', 3, 764.00, 8.49, 14, 527108.00, 527108.00, 'reia_small-Cf75IycX.jpg'), + (20,'Titã', 3, 2575.50, 5.57, 14, 1186680.00, 1257060.00, 'tita_small-5KTY9lwl.jpg'), + (21,'Jápeto', 3, 735.60, 3.27, 14, 3560820.00, 3560820.00, 'japeto_small-eGy31Ngh.jpg'), + (22,'Úrano', 2, 25559.00, 6.81, 1, 2748938461.00, 3004419704.00, 'uranos_small-yJ1Iv5t9.png'), + (23,'Neptuno', 2, 24764.00, 5.43, 1, 4452940833.00, 4553946490.00, 'netune_small-95Prw3V4.jpg'), + (24,'Ceres', 2, 487.30, 17.88, 1, 380995857.10, 446669322.34, 'ceres-2DOcdtzH.jpg'), + (25,'Plutão', 2, 1188.30, 4.67, 1, 4436824613.00, 7375927931.00, 'pluto_small-9PeguW0a.jpg'), + (26,'Éris', 2, 1163.00, 3.44, 1, 5650311576.34, 14594768265.49, 'eris-phTM4A5c.jpg'), + (27,'Disnomia', 3, 350.00, 0.17, 26, 37460.00, 37460.00, 'disnomia-5kAMBnEC.jpg'), + (28,'Makemake' 2, 717.00, 4.42, 1, 5760565207.04, 7939607791.66, 'Makemake-9z8f9CYV.jpg'), + (29,'Haumea', 2, 800.00, 4.48, 1, 5260459525.29, 7708179885.69, 'haumea-zuZyN95s.png') ; diff --git a/website/src/components/Banner/index.less b/website/src/components/Banner/index.less index 3d6514f..652d4b6 100644 --- a/website/src/components/Banner/index.less +++ b/website/src/components/Banner/index.less @@ -115,7 +115,8 @@ color: #c0c5ce; > h1 { margin-bottom: 0; - font-weight: 200; + //font-weight: 200; + font-weight: 1200; font-size: 3.5em; //color: #fff; letter-spacing: .01em; diff --git a/website/src/pages/AstroDetails/OtherAstros/index.jsx b/website/src/pages/AstroDetails/OtherAstros/index.jsx index 9b01c9e..cc0e68d 100644 --- a/website/src/pages/AstroDetails/OtherAstros/index.jsx +++ b/website/src/pages/AstroDetails/OtherAstros/index.jsx @@ -46,7 +46,7 @@ function OtherAstros({aroundAstroUid}) { return ( <>
  • - + {`${astro.name} (${astro.type})`}
    • diff --git a/website/src/pages/AstroDetails/index.jsx b/website/src/pages/AstroDetails/index.jsx index cc40ff5..6a01b51 100644 --- a/website/src/pages/AstroDetails/index.jsx +++ b/website/src/pages/AstroDetails/index.jsx @@ -55,11 +55,11 @@ function AstroDetails() { ); } - //const astroType = astroInfo.type; + const astroType = astroInfo.type; const cluarLanguage = Cluar.currentLanguage().locale; const astroBase = [ - {label: 'Tipo de astro', children: astroInfo.name, key: '1'} + {label: 'Tipo de astro', children: astroType.name, key: '1'} ,{label: 'Raio equatorial (km)', children: astroInfo.equatorialRadius.toLocaleString(cluarLanguage), key: '2'} ,{label: 'Velocidade rotação (km/s)', children: astroInfo.rotationVelocity.toLocaleString(cluarLanguage), key: '3'} ];