diff --git a/src/renderer/index.html b/src/renderer/index.html index 01407305..bdb23bca 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -6,6 +6,7 @@ Platformatic Meraki + Platformatic Meraki diff --git a/src/renderer/public/fonts/Roboto_Mono/LICENSE.txt b/src/renderer/public/fonts/Roboto_Mono/LICENSE.txt new file mode 100644 index 00000000..75b52484 --- /dev/null +++ b/src/renderer/public/fonts/Roboto_Mono/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/renderer/public/fonts/Roboto_Mono/README.txt b/src/renderer/public/fonts/Roboto_Mono/README.txt new file mode 100644 index 00000000..de632747 --- /dev/null +++ b/src/renderer/public/fonts/Roboto_Mono/README.txt @@ -0,0 +1,77 @@ +Roboto Mono Variable Font +========================= + +This download contains Roboto Mono as both variable fonts and static fonts. + +Roboto Mono is a variable font with this axis: + wght + +This means all the styles are contained in these files: + RobotoMono-VariableFont_wght.ttf + RobotoMono-Italic-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Roboto Mono: + static/RobotoMono-Thin.ttf + static/RobotoMono-ExtraLight.ttf + static/RobotoMono-Light.ttf + static/RobotoMono-Regular.ttf + static/RobotoMono-Medium.ttf + static/RobotoMono-SemiBold.ttf + static/RobotoMono-Bold.ttf + static/RobotoMono-ThinItalic.ttf + static/RobotoMono-ExtraLightItalic.ttf + static/RobotoMono-LightItalic.ttf + static/RobotoMono-Italic.ttf + static/RobotoMono-MediumItalic.ttf + static/RobotoMono-SemiBoldItalic.ttf + static/RobotoMono-BoldItalic.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (LICENSE.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/src/renderer/public/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf b/src/renderer/public/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf new file mode 100644 index 00000000..fc02de43 Binary files /dev/null and b/src/renderer/public/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf differ diff --git a/src/renderer/src/App.css b/src/renderer/src/App.css index 9f9c02a8..5f3f5f84 100644 --- a/src/renderer/src/App.css +++ b/src/renderer/src/App.css @@ -21,6 +21,12 @@ body { font-weight: 100 200 300 400 500 600 700 800 900; } +@font-face { + font-family: 'Roboto_Mono'; + src: url('/fonts/Roboto_Mono/RobotoMono-VariableFont_wght.ttf') format('truetype'); + font-weight: 100 200 300 400 500 600 700 800 900; +} + /* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) diff --git a/src/renderer/src/components/steps/PrepareFolder.jsx b/src/renderer/src/components/steps/PrepareFolder.jsx index 6e0e22c9..7bbcd63e 100644 --- a/src/renderer/src/components/steps/PrepareFolder.jsx +++ b/src/renderer/src/components/steps/PrepareFolder.jsx @@ -4,8 +4,8 @@ import PropTypes from 'prop-types' import styles from './PrepareFolder.module.css' import commonStyles from '~/styles/CommonStyles.module.css' import typographyStyles from '~/styles/Typography.module.css' -import { WHITE, RICH_BLACK } from '@platformatic/ui-components/src/components/constants' -import { Button } from '@platformatic/ui-components' +import { WHITE, RICH_BLACK, TRANSPARENT, OPACITY_30 } from '@platformatic/ui-components/src/components/constants' +import { BorderedBox, Button } from '@platformatic/ui-components' import useStackablesStore from '~/useStackablesStore' import EditableTitle from '~/components/ui/EditableTitle' import '~/components/component.animation.css' @@ -15,6 +15,8 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => { const globalState = useStackablesStore() const { formData, addFormData, services, setTemplate } = globalState const [folderPrepared, setFolderPrepared] = useState(false) + const [folderPreparedError, setFolderPreparedError] = useState(false) + const [folderPreparedSuccess, setFolderPreparedSuccess] = useState(false) const [npmLogs, setNpmLogs] = useState([]) const [logValue, setLogValue] = useState(null) @@ -31,9 +33,12 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => { envVars = response[tmpTemplate.name] || [] setTemplate(service.name, { ...tmpTemplate, envVars }) }) - setFolderPrepared(true) + setFolderPreparedSuccess(true) } catch (error) { console.error(`Error on prepareFolder ${error}`) + setFolderPreparedError(true) + } finally { + setFolderPrepared(true) } } prepareFolder() @@ -41,14 +46,11 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => { useEffect(() => { if (logValue) { - setNpmLogs([...npmLogs, { ...logValue }]) + const str = [new Date().toISOString(), logValue.level.toUpperCase(), logValue.message] + setNpmLogs([...npmLogs, { level: logValue.level, message: str.join(' - ') }]) } }, [logValue]) - useEffect(() => { - // call your increment function here - }, []) - function onClickConfigureServices () { onNext() } @@ -65,9 +67,19 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => { function renderLog (log, index) { let className = `${typographyStyles.desktopOtherCliTerminalSmall} ` - const str = [new Date().toISOString(), log.level.toUpperCase(), log.message] className += log.level === 'info' ? `${typographyStyles.textWhite}` : `${typographyStyles.textErrorRed}` - return

{str.join(' - ')}

+ return

{log.message}

+ } + + function onClickCloseApp () { + // TODO: implement it + console.log('onClickCloseApp') + } + + function onClickCopyLogs () { + let str = '' + npmLogs.forEach(log => (str += `${log.message}\r\n`)) + navigator.clipboard.writeText(str) } return ( @@ -83,20 +95,39 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => { />

Select a template and plugins for your service from our Stackables Marketplace. Once you have chosen a template you can add another Service.

-
- {npmLogs.map((log, index) => renderLog(log, index))} -
+ +
+ {npmLogs.map((log, index) => renderLog(log, index))} +
+
) diff --git a/src/renderer/src/components/steps/PrepareFolder.module.css b/src/renderer/src/components/steps/PrepareFolder.module.css index 07523139..2fe773bb 100644 --- a/src/renderer/src/components/steps/PrepareFolder.module.css +++ b/src/renderer/src/components/steps/PrepareFolder.module.css @@ -2,7 +2,7 @@ @apply flex flex-col min-h-[80vH] overflow-y-scroll justify-between } .buttonContainer { - @apply flex justify-end; + @apply flex justify-between; } .content { diff --git a/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx b/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx index 5e9d5709..006b2bbf 100644 --- a/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx +++ b/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx @@ -57,6 +57,7 @@ function ConfigureEnvVarsTemplateAndPlugins ({ return (
{ tmpObj.validations = { ...tmpTemplateValidations } tmpObj.validForm = tmpTemplateValidForm tmpObj.updatedAt = new Date().toISOString() + tmpObj.plugins = [] }) setConfiguredServices([...configuredServices, tmpObj]) } diff --git a/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.jsx b/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.jsx index 4988ad54..47520f97 100644 --- a/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.jsx +++ b/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.jsx @@ -1,23 +1,27 @@ 'use strict' import React, { useState } from 'react' import PropTypes from 'prop-types' -import { MEDIUM, SMALL, TRANSPARENT, WHITE } from '@platformatic/ui-components/src/components/constants' +import { ERROR_RED, MAIN_GREEN, MEDIUM, SMALL, TRANSPARENT, WHITE } from '@platformatic/ui-components/src/components/constants' import Icons from '@platformatic/ui-components/src/components/icons' import typographyStyles from '~/styles/Typography.module.css' import styles from './TemplateAndPluginTreeSelector.module.css' import commonStyles from '~/styles/CommonStyles.module.css' import { BorderedBox, PlatformaticIcon } from '@platformatic/ui-components' -import useStackablesStore from '~/useStackablesStore' function TemplateSelector ({ onTemplateSelected, service, serviceSelected }) { let className = `${typographyStyles.desktopHeadline5} ${typographyStyles.textWhite} ${styles.ellipsisTemplate}` - if (serviceSelected?.template !== service.template.name) { + if (serviceSelected?.template !== service.template) { className += ` ${typographyStyles.opacity70}` } return ( -
onTemplateSelected(service)}> +
onTemplateSelected(service)} + data-cy='template-selector' + >
{service.name}
+ {service.validForm ? : }
) } @@ -58,17 +62,17 @@ function PluginSelector ({ onPluginSelected, service, plugin, pluginSelected })
onPluginSelected(service, plugin)} + data-cy='plugin-selector' > {plugin.name} + {plugin.validForm ? : } +
) } -function TemplateAndPluginTreeSelector ({ onTemplateSelected, onPluginSelected, serviceSelected, pluginSelected }) { - const globalState = useStackablesStore() - const { services } = globalState - +function TemplateAndPluginTreeSelector ({ configuredServices, onTemplateSelected, onPluginSelected, serviceSelected, pluginSelected }) { function handlePluginSelected (service, plugin) { onPluginSelected(service, plugin) } @@ -76,10 +80,10 @@ function TemplateAndPluginTreeSelector ({ onTemplateSelected, onPluginSelected, return (
- {services.map(service => ( -
- - {service.plugins.length > 0 && } + {configuredServices.map(configuredService => ( +
+ + {configuredService.plugins.length > 0 && }
))}
@@ -88,6 +92,11 @@ function TemplateAndPluginTreeSelector ({ onTemplateSelected, onPluginSelected, } TemplateAndPluginTreeSelector.propTypes = { + /** + * configuredServices + */ + configuredServices: PropTypes.array.isRequired, + /** /** * onTemplateSelected */ diff --git a/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.module.css b/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.module.css index 82ad7bf6..031f222b 100644 --- a/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.module.css +++ b/src/renderer/src/components/template-and-plugins/TemplateAndPluginTreeSelector.module.css @@ -10,7 +10,7 @@ } .ellipsisTemplate { @apply truncate; - width: 12rem; + max-width: 10rem; } .ellipsisPlugin { @apply truncate; diff --git a/src/renderer/src/styles/Typography.module.css b/src/renderer/src/styles/Typography.module.css index 3972afb3..e1042f83 100644 --- a/src/renderer/src/styles/Typography.module.css +++ b/src/renderer/src/styles/Typography.module.css @@ -45,7 +45,8 @@ } .desktopOtherCliTerminalSmall { - @apply font-inter font-normal text-[0.875rem] leading-[1.313rem]; + @apply font-normal text-[0.875rem] leading-[1.313rem]; + font-family: 'Roboto_Mono'; }