diff --git a/.github/workflows/build-noodl-editor.yml b/.github/workflows/build-noodl-editor.yml index d647115..00b3981 100644 --- a/.github/workflows/build-noodl-editor.yml +++ b/.github/workflows/build-noodl-editor.yml @@ -27,9 +27,9 @@ jobs: - node: 16 os: macos-latest platform: darwin-x64 - # - node: 16 - # os: ubuntu-latest - # platform: linux-x64 + - node: 16 + os: ubuntu-latest + platform: linux-x64 steps: - if: ${{ matrix.platform == 'darwin-arm64' }} @@ -65,6 +65,7 @@ jobs: env: WORKSPACE_PATH: . TARGET_PLATFORM: ${{ matrix.platform }} + DISABLE_SIGNING: true # disable for now - run: npm run build:editor:pack diff --git a/package-lock.json b/package-lock.json index b772432..e696805 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@noodl/repo", + "name": "@thelowcodefoundation/repo", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "@noodl/repo", + "name": "@thelowcodefoundation/repo", "version": "1.0.0", "workspaces": [ "packages/*" diff --git a/package.json b/package.json index 4106b0f..ce05dea 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "private": true, - "name": "@noodl/repo", + "name": "@thelowcodefoundation/repo", "description": "Low-code for when experience matter", - "author": "Noodl ", - "homepage": "https://noodl.net", + "author": "The Low Code Foundation ", + "homepage": "https://code-crusher.com", "version": "1.0.0", "workspaces": [ "packages/*" diff --git a/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg b/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg index 97d7a1a..c1a57ad 100644 --- a/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg +++ b/packages/noodl-core-ui/src/assets/icons/icon-component/logo.svg @@ -1,4 +1,175 @@ - - - + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + diff --git a/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx b/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx index c244a5c..872a863 100644 --- a/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx +++ b/packages/noodl-core-ui/src/components/common/Logo/Logo.tsx @@ -59,53 +59,377 @@ export function Logo({ const DefaultIcon = React.memo(function () { return ( - - - - - + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + ); }); const InvertedIcon = React.memo(function () { return ( - - - - - + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + + ); }); const GrayscaleIcon = React.memo(function () { return ( - - - - + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + + ); }); diff --git a/packages/noodl-editor/build/icon.icns b/packages/noodl-editor/build/icon.icns index 1fccd82..ba40e09 100644 Binary files a/packages/noodl-editor/build/icon.icns and b/packages/noodl-editor/build/icon.icns differ diff --git a/packages/noodl-editor/build/icon.ico b/packages/noodl-editor/build/icon.ico index 3091afd..6c0b898 100644 Binary files a/packages/noodl-editor/build/icon.ico and b/packages/noodl-editor/build/icon.ico differ diff --git a/packages/noodl-editor/build/icons/1024x1024.png b/packages/noodl-editor/build/icons/1024x1024.png index 657ea96..54bc32a 100644 Binary files a/packages/noodl-editor/build/icons/1024x1024.png and b/packages/noodl-editor/build/icons/1024x1024.png differ diff --git a/packages/noodl-editor/build/icons/128x128.png b/packages/noodl-editor/build/icons/128x128.png index 9114883..19a3b02 100644 Binary files a/packages/noodl-editor/build/icons/128x128.png and b/packages/noodl-editor/build/icons/128x128.png differ diff --git a/packages/noodl-editor/build/icons/256x256.png b/packages/noodl-editor/build/icons/256x256.png index 1219efc..f647ed8 100644 Binary files a/packages/noodl-editor/build/icons/256x256.png and b/packages/noodl-editor/build/icons/256x256.png differ diff --git a/packages/noodl-editor/build/icons/32x32.png b/packages/noodl-editor/build/icons/32x32.png index 75f1884..63f8d70 100644 Binary files a/packages/noodl-editor/build/icons/32x32.png and b/packages/noodl-editor/build/icons/32x32.png differ diff --git a/packages/noodl-editor/build/icons/48x48.png b/packages/noodl-editor/build/icons/48x48.png index 206fc89..72d89d4 100644 Binary files a/packages/noodl-editor/build/icons/48x48.png and b/packages/noodl-editor/build/icons/48x48.png differ diff --git a/packages/noodl-editor/build/icons/512x512.png b/packages/noodl-editor/build/icons/512x512.png index 3f124d0..98c3051 100644 Binary files a/packages/noodl-editor/build/icons/512x512.png and b/packages/noodl-editor/build/icons/512x512.png differ diff --git a/packages/noodl-editor/build/icons/64x64.png b/packages/noodl-editor/build/icons/64x64.png index 56512d6..71b0f6b 100644 Binary files a/packages/noodl-editor/build/icons/64x64.png and b/packages/noodl-editor/build/icons/64x64.png differ diff --git a/packages/noodl-editor/build/macos-notarize.js b/packages/noodl-editor/build/macos-notarize.js index af13542..2b12e67 100644 --- a/packages/noodl-editor/build/macos-notarize.js +++ b/packages/noodl-editor/build/macos-notarize.js @@ -1,6 +1,5 @@ const fs = require('fs'); const path = require('path'); -var electron_notarize = require('electron-notarize'); module.exports = async function (params) { if (process.platform !== 'darwin') { @@ -12,7 +11,7 @@ module.exports = async function (params) { return; } - const appId = 'noodl.net.noodl'; + const appId = 'com.code-crusher.app'; const appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`); if (!fs.existsSync(appPath)) { @@ -22,6 +21,7 @@ module.exports = async function (params) { console.log(`Notarizing ${appId} found at ${appPath}`); try { + const electron_notarize = require('electron-notarize'); await electron_notarize.notarize({ appBundleId: appId, appPath: appPath, diff --git a/packages/noodl-editor/package.json b/packages/noodl-editor/package.json index f9b13d6..1865d13 100644 --- a/packages/noodl-editor/package.json +++ b/packages/noodl-editor/package.json @@ -15,17 +15,30 @@ "test:ci": "webpack-cli --config=webpackconfigs/webpack.test-ci.js && electron test.js" }, "build": { - "appId": "noodl.net.noodl-editor", + "appId": "com.code-crusher.app", + "afterSign": "./build/macos-notarize.js", + "mac": { + "hardenedRuntime": true, + "entitlements": "build/entitlements.mac.plist", + "extendInfo": { + "LSMultipleInstancesProhibited": true, + "NSMicrophoneUsageDescription": "Allow Code-Crusher apps that you create and run to access the microphone?", + "NSCameraUsageDescription": "Allow Code-Crusher apps that you create and run to access the camera?" + } + }, "win": { "target": "nsis" }, "nsis": { - "guid": "noodl.net.noodl-editor" + "guid": "com.code-crusher.app" + }, + "linux": { + "target": "deb" }, "protocols": { - "name": "noodl", + "name": "code-crusher", "schemes": [ - "noodl" + "code-crusher" ] }, "npmRebuild": false, diff --git a/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg b/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg index 97d7a1a..c1a57ad 100644 --- a/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg +++ b/packages/noodl-editor/src/assets/icons/core-ui-temp/logo.svg @@ -1,4 +1,175 @@ - - - + + +Created by potrace 1.10, written by Peter Selinger 2001-2011 + + + + diff --git a/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts b/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts index 2eebdc3..fe2efca 100644 --- a/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts +++ b/packages/noodl-editor/src/editor/src/utils/getDocsEndpoint.ts @@ -2,5 +2,5 @@ const remote = require('@electron/remote'); export default function getDocsEndpoint() { const localDocs = remote.getGlobal('useLocalDocs'); - return localDocs ? 'http://localhost:3000' : 'https://noodlapp.github.io/noodl-docs/'; + return localDocs ? 'http://localhost:3000' : 'https://the-low-code-foundation.github.io/code-crusher-docs'; } diff --git a/scripts/noodl-editor/build-editor.ts b/scripts/noodl-editor/build-editor.ts index 778bfcb..3e4f1ed 100644 --- a/scripts/noodl-editor/build-editor.ts +++ b/scripts/noodl-editor/build-editor.ts @@ -70,6 +70,14 @@ import { getCurrentPlatform } from '../helper'; // NOTE: Getting error "Cannot set properties of null (setting 'dev')" here, // It basically means that some package is not relative to this path. console.log("--- Run 'npm install' ..."); + + if (platform === "darwin") { + execSync(`npm install electron-notarize`, { + stdio: 'inherit', + env: process.env + }) + } + execSync(`npm install --arch=${arch} --scope noodl-editor`, { stdio: 'inherit', env: process.env