Forker/fluxscape
1
0
Fork 0
mirror of https://github.com/fluxscape/fluxscape.git synced 2026-01-11 14:52:54 +01:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into feature/store-cloudservices-in-project-folder

Browse Source
This commit is contained in:
Eric Tuvesson
2024-06-03 10:29:29 +02:00
parent 851dbc98d3 2ebd57b29a
commit 5d8b2d5bba
21 changed files with 201 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
README.md
View File

@@ -1,21 +1,21 @@
# Noodl
# Fluxscape
[Noodl](https://noodl.net) is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.
Fluxscape is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.
## Documentation
Documentation for how to use Noodl can be found here:
[https://noodlapp.github.io/noodl-docs/](https://noodlapp.github.io/noodl-docs/)
Documentation for how to use Fluxscape can be found here:
[Fluxscape Documentation](https://docs.fluxscape.io)
## Community
Main support channel is Discord: [https://www.noodl.net/community](https://www.noodl.net/community)
Main support channel is Discord: [Fluxscape Discord](https://discord.gg/fXNW9EXa6A)
## Download releases
Pre-built binaries can be [downloaded from Github](https://github.com/noodlapp/noodl/releases)
Pre-built binaries can be [downloaded from Github](https://github.com/fluxscape/fluxscape/releases)
## Note for users who are migrating from the deprecated closed source version
- [Migrating the project files and workspaces to a Git provider](https://noodlapp.github.io/noodl-docs/docs/guides/collaboration/migrating-from-noodl-hosted-git)
- [Migrate backend and database](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/using-an-external-backend#migrating-from-a-noodl-cloud-service)
- [Self-host frontend](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/hosting-frontend)
- [Migrating the project files and workspaces to a Git provider](https://docs.fluxscape.io/docs/guides/collaboration/migrating-from-noodl-hosted-git/)
- [Migrate backend and database](https://docs.fluxscape.io/docs/guides/deploy/using-an-external-backend/#migrating-from-a-noodl-cloud-service)
- [Self-host frontend](https://docs.fluxscape.io/docs/guides/deploy/hosting-frontend/)
## Building from source
@@ -23,24 +23,24 @@ Pre-built binaries can be [downloaded from Github](https://github.com/noodlapp/n
# Install all dependencies
$ npm install
# Start the Noodl Editor and build a production version of the cloud and react runtime (useful when running Noodl from source but want to deploy to production)
# Start the Fluxscape Editor and build a production version of the cloud and react runtime (useful when running Fluxscape from source but want to deploy to production)
$ npm start
# Start the Noodl Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
# Start the Fluxscape Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
# This is ideal for a quick workflow when doing changes on the runtimes.
$ npm run dev
# Start Noodl Editor test runner
# Start Fluxscape Editor test runner
$ npm run test:editor
```
## Licenses
This repository contains two different licenses for different parts of the Noodl platform.
This repository contains two different licenses for different parts of the Fluxscape platform.
- Components related to the editor, used to edit Noodl projects, are under GPLv3
- Components related to the end applications, used by the applications Noodl deploys, are under MIT
- Components related to the editor, used to edit Fluxscape projects, are under GPLv3
- Components related to the end applications, used by the applications Fluxscape deploys, are under MIT
All of the source code of applications created with Noodl are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.
All of the source code of applications created with Fluxscape are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.
Packaged licensed under MIT:
- `noodl-runtime`

4
package.json
View File

@@ -2,8 +2,8 @@
"private": true,
"name": "@noodl/repo",
"description": "Low-code for when experience matter",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net",
"author": "Fluxscape <contact@fluxcsape.io>",
"homepage": "https://fluxscape.io",
"version": "1.0.0",
"workspaces": [
"packages/*"

16
packages/noodl-core-ui/src/components/popups/Tooltip/Tooltip.tsx
View File

@@ -11,7 +11,7 @@ import css from './Tooltip.module.scss';
export interface TooltipProps extends UnsafeStyleProps {
content: SingleSlot;
fineType?: string;
fineType?: string | string[];
children: Slot;
showAfterMs?: number;
@@ -79,9 +79,17 @@ export function Tooltip({
{fineType && (
<div className={css['FineType']}>
<Label size={LabelSize.Small} variant={TextType.Secondary}>
{fineType}
</Label>
{Array.isArray(fineType) ? (
fineType.map((x) => (
<Label size={LabelSize.Small} variant={TextType.Secondary}>
{x}
</Label>
))
) : (
<Label size={LabelSize.Small} variant={TextType.Secondary}>
{fineType}
</Label>
)}
</div>
)}
</BaseDialog>

2
packages/noodl-editor/src/editor/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Noodl</title>
<title>Fluxscape</title>
<link href="../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="../assets/css/style.css" rel="stylesheet" />

5
packages/noodl-editor/src/editor/src/constants/Keybindings.ts
View File

@@ -2,6 +2,11 @@ import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
export namespace Keybindings {
export const SEARCH = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F);
export const CLOUD_SERVICE_OPEN_DASHBOARD = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_P);
export const CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_P);
export const REFRESH_PREVIEW = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_R);
export const OPEN_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_D);
export const OPEN_CLOUD_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_R);

5
packages/noodl-editor/src/editor/src/router.setup.ts
View File

@@ -1,7 +1,6 @@
import { AppRegistry } from '@noodl-models/app_registry';
import { SidebarModel } from '@noodl-models/sidebar';
import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
import { Keybindings } from '@noodl-constants/Keybindings';
import { IconName } from '@noodl-core-ui/components/common/Icon';
@@ -69,7 +68,7 @@ export function installSidePanel({ isLesson }: SetupEditorOptions) {
SidebarModel.instance.register({
id: 'search',
name: 'Search',
fineType: new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F).label,
fineType: Keybindings.SEARCH.label,
order: 2,
icon: IconName.Search,
panel: SearchPanel

2
packages/noodl-editor/src/editor/src/utils/compilation/build/processors/html-processor.ts
View File

@@ -41,7 +41,7 @@ export class HtmlProcessor {
baseUrl = baseUrl + '/';
}
const title = parameters.title || settings.htmlTitle || 'Noodl Viewer';
const title = parameters.title || settings.htmlTitle || 'Fluxscape Viewer';
let headCode = settings.headCode || '';
if (parameters.headCode) {

24
packages/noodl-editor/src/editor/src/views/panels/CloudServicePanel/CloudServiceCard/CloudServiceCard.tsx
View File

@@ -1,13 +1,16 @@
import classNames from 'classnames';
import React, { useEffect, useRef, useState } from 'react';
import { Keybindings } from '@noodl-constants/Keybindings';
import { Environment } from '@noodl-models/CloudServices';
import ParseDashboardServer from '@noodl-utils/parsedashboardserver';
import { Icon, IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
import { IconButton, IconButtonState, IconButtonVariant } from '@noodl-core-ui/components/inputs/IconButton';
import { PrimaryButton, PrimaryButtonSize, PrimaryButtonVariant } from '@noodl-core-ui/components/inputs/PrimaryButton';
import { DialogRenderDirection } from '@noodl-core-ui/components/layout/BaseDialog';
import { Collapsible } from '@noodl-core-ui/components/layout/Collapsible';
import { Tooltip } from '@noodl-core-ui/components/popups/Tooltip';
import { Label, LabelSpacingSize } from '@noodl-core-ui/components/typography/Label';
import { Text, TextType } from '@noodl-core-ui/components/typography/Text';
@@ -118,12 +121,21 @@ export function CloudServiceCard({
</div>
{isEditorEnvironment && (
<PrimaryButton
label="Open dashboard"
size={PrimaryButtonSize.Small}
onClick={onDashboardClicked}
isGrowing
/>
<Tooltip
content="Open the Parse Dashboard"
fineType={[
`In Window: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD.label}`,
`In Browser: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER.label}`
]}
renderDirection={DialogRenderDirection.Below}
>
<PrimaryButton
label="Open dashboard"
size={PrimaryButtonSize.Small}
onClick={onDashboardClicked}
isGrowing
/>
</Tooltip>
)}
</div>
</div>

2
packages/noodl-editor/src/frames/viewer-frame/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Noodl Viewer</title>
<title>Fluxscape Viewer</title>
<link href="../../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet">
<link href="assets/style.css" rel="stylesheet">
<script type="text/javascript" src="../../assets/lib/jquery-min.js"></script>

2
packages/noodl-editor/src/main/src/web-server.js
View File

@@ -67,7 +67,7 @@ function startServer(app, projectGetSettings, projectGetInfo, projectGetComponen
ProjectModules.instance.injectIntoHtml(info.projectDirectory, data, '/', function (injected) {
projectGetSettings((settings) => {
settings = settings || {};
injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Noodl Viewer');
injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Fluxscape Viewer');
injected = injected.replace('{{#customHeadCode#}}', settings.headCode || '');
response.writeHead(200, {

4
packages/noodl-git/package.json
View File

@@ -3,8 +3,8 @@
"version": "2.7.0",
"main": "src/index.ts",
"description": "",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net",
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io",
"dependencies": {
"desktop-trampoline": "https://github.com/desktop/desktop-trampoline/archive/refs/tags/v0.9.8.tar.gz",
"dugite": "^1.106.0",

4
packages/noodl-platform-electron/package.json
View File

@@ -3,8 +3,8 @@
"version": "2.7.0",
"main": "src/index.ts",
"description": "Cross platform implementation of platform specific features.",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net",
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io",
"dependencies": {
"@noodl/platform": "file:../noodl-platform",
"@noodl/platform-node": "file:../noodl-platform-node"

4
packages/noodl-platform-node/package.json
View File

@@ -3,8 +3,8 @@
"version": "2.7.0",
"main": "src/index.ts",
"description": "Cross platform implementation of platform specific features.",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net",
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io",
"scripts": {
"test": "jest",
"test:coverage": "jest --coverage"

4
packages/noodl-platform/package.json
View File

@@ -3,6 +3,6 @@
"version": "2.7.0",
"main": "src/index.ts",
"description": "Cross platform implementation of platform specific features.",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net"
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io"
}

10
packages/noodl-runtime/src/nodes/std-library/data/setdbmodelpropertiesnode.js
View File

@@ -75,12 +75,12 @@ var SetDbModelPropertiedNodeDefinition = {
_this.setError('Missing Record Id');
return;
}
var model = internal.model;
for (var i in internal.inputValues) {
model.set(i, internal.inputValues[i], { resolve: true });
const model = internal.model;
for (const key in internal.inputValues) {
model.set(key, internal.inputValues[key], { resolve: true });
}
CloudStore.forScope(_this.nodeScope.modelScope).save({
collection: internal.collectionId,
objectId: model.getId(), // Get the objectId part of the model id

2
packages/noodl-runtime/src/nodes/std-library/datetostring.js
View File

@@ -59,6 +59,7 @@ const DateToStringNode = {
const month = ('0' + (t.getMonth() + 1)).slice(-2);
const monthShort = new Intl.DateTimeFormat('en-US', { month: 'short' }).format(t);
const year = t.getFullYear();
const yearShort = year.toString().substring(2);
const hours = ('0' + t.getHours()).slice(-2);
const minutes = ('0' + t.getMinutes()).slice(-2);
const seconds = ('0' + t.getSeconds()).slice(-2);
@@ -68,6 +69,7 @@ const DateToStringNode = {
.replace(/\{month\}/g, month)
.replace(/\{monthShort\}/g, monthShort)
.replace(/\{year\}/g, year)
.replace(/\{yearShort\}/g, yearShort)
.replace(/\{hours\}/g, hours)
.replace(/\{minutes\}/g, minutes)
.replace(/\{seconds\}/g, seconds);

4
packages/noodl-types/package.json
View File

@@ -3,6 +3,6 @@
"version": "2.7.0",
"main": "src/index.d.ts",
"description": "",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net"
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io"
}

4
packages/noodl-viewer-cloud/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@noodl/cloud-runtime",
"author": "Noodl <info@noodl.net>",
"homepage": "https://noodl.net",
"author": "Fluxscape <contact@fluxscape.io>",
"homepage": "https://fluxscape.io",
"version": "0.6.3",
"license": "MIT",
"main": "dist/main.js",

67
packages/noodl-viewer-cloud/static/viewer/global.d.ts.keep
View File

@@ -74,6 +74,59 @@ declare namespace Noodl {
*/
const Object: any;
type RecordQuery<T> =
{
lessThan: T
} |
{
lessThanOrEqualTo: T
} |
{
greaterThan: T
} |
{
greaterThanOrEqualTo: T
} |
{
equalTo: T
} |
{
notEqualTo: T
} |
{
containedIn: T
} |
{
notContainedIn : T
} |
{
exists: T
} |
{
matchesRegex: T
} |
{
text: T
} |
{
idEqualTo: T
} |
{
idContainedIn: T
} |
{
pointsTo: T
} |
{
relatedTo: T
};
type RecordQueryField<T> = T extends RecordQuery<any> ?
{ [K in keyof T]: { [P in K]: T[P] } & Partial<Record<Exclude<keyof T, K>, never>> }[keyof T]
: never;
type RecordSortKey<T extends string> = (`${T}` | `-${T}`)[];
interface RecordsApi {
/**
* This is an async function that will query the database using the query
@@ -115,15 +168,17 @@ declare namespace Noodl {
* })
* ```
*/
query(
className: RecordClassName,
query?: any,
query<TClassName extends RecordClassName>(
className: TClassName,
query?:
RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }> |
{ and: RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }>[] },
options?: {
limit?: number;
skip?: number;
sort?: string[];
include?: any;
select?: any;
sort?: string | RecordSortKey<keyof DatabaseSchema[TClassName]>;
include?: string | (keyof DatabaseSchema[TClassName])[];
select?: string | (keyof DatabaseSchema[TClassName])[];
}
): Promise<any>;

2
packages/noodl-viewer-react/src/project-settings.js
View File

@@ -6,7 +6,7 @@ export default {
group: 'General',
plug: 'input',
type: 'string',
default: 'Noodl Viewer',
default: 'Fluxscape Viewer',
tooltip: 'The title that web browsers show',
ignoreInExport: true
},

67
packages/noodl-viewer-react/static/viewer/global.d.ts.keep
View File

@@ -131,6 +131,59 @@ declare namespace Noodl {
*/
const Events: EventsApi;
type RecordQuery<T> =
{
lessThan: T
} |
{
lessThanOrEqualTo: T
} |
{
greaterThan: T
} |
{
greaterThanOrEqualTo: T
} |
{
equalTo: T
} |
{
notEqualTo: T
} |
{
containedIn: T
} |
{
notContainedIn : T
} |
{
exists: T
} |
{
matchesRegex: T
} |
{
text: T
} |
{
idEqualTo: T
} |
{
idContainedIn: T
} |
{
pointsTo: T
} |
{
relatedTo: T
};
type RecordQueryField<T> = T extends RecordQuery<any> ?
{ [K in keyof T]: { [P in K]: T[P] } & Partial<Record<Exclude<keyof T, K>, never>> }[keyof T]
: never;
type RecordSortKey<T extends string> = (`${T}` | `-${T}`)[];
interface RecordsApi {
/**
* This is an async function that will query the database using the query
@@ -172,15 +225,17 @@ declare namespace Noodl {
* })
* ```
*/
query(
className: RecordClassName,
query?: any,
query<TClassName extends RecordClassName>(
className: TClassName,
query?:
RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }> |
{ and: RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }>[] },
options?: {
limit?: number;
skip?: number;
sort?: string[];
include?: any;
select?: any;
sort?: string | RecordSortKey<keyof DatabaseSchema[TClassName]>;
include?: string | (keyof DatabaseSchema[TClassName])[];
select?: string | (keyof DatabaseSchema[TClassName])[];
}
): Promise<any>;