Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Adding lowcoder logo #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8f02a47
rebrand API server
ludomikula May 10, 2023
ea88857
refactor: rename openlocks-core to lowcoder-core
falnyr May 11, 2023
6d89a13
refactor: rename openblocks-dev-utils to lowcoder-dev-utils
falnyr May 11, 2023
e0ecb33
refactor: rename openblocks-design to lowcoder-design
falnyr May 11, 2023
0c119ad
refactor: rename openblocks-comps to lowcoder-comps
falnyr May 11, 2023
cf0a870
refactor: rename openblocks-sdk to lowcoder-sdk
falnyr May 11, 2023
dec2350
refactor: rename openblocks-ee to lowcoder-sdk
falnyr May 11, 2023
18aaffc
refactor: rename openblocks- lowcoder-
falnyr May 11, 2023
b04b0ff
refactor: rename /openblocks to /lowcoder
falnyr May 11, 2023
f75715f
refactor: rename openblocks. to lowcoder.
falnyr May 11, 2023
c1a25c5
refactor: rename openblocks to lowcoder
falnyr May 11, 2023
2f5a085
refactor: rename Openblocks to Lowcoder
falnyr May 11, 2023
7130095
refactor: rename OpenBlocks to Lowcoder
falnyr May 11, 2023
c6f85fc
refactor: rename openBlocks to lowcoder
falnyr May 11, 2023
3a58d5f
refactor: renamed folders
falnyr May 11, 2023
a1c5c16
refactor: renamed folders and files
falnyr May 13, 2023
54dd179
Merge branch 'main' into feat/rebrand
falnyr May 13, 2023
30adab5
refactor: replaced openblocks references with lowcoder
falnyr May 13, 2023
ee73078
refactor: renamed folders for sonarcloud
falnyr May 13, 2023
dc9b82c
chore: bumped versions and pushed to npm registry
falnyr May 13, 2023
784c8e0
refactor: updated dependencies, switched to lowcoder folder
falnyr May 16, 2023
ec58b27
Merge branch 'main' into feat/rebrand
falnyr May 17, 2023
bca8247
feat: lowcoder logos
falnyr May 17, 2023
840df83
chore: removed unused import
falnyr May 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: rename /openblocks to /lowcoder
  • Loading branch information
falnyr committed May 11, 2023
commit b04b0ff59e508d4b3a5b2ba27368fe1d0ee22bf6
4 changes: 2 additions & 2 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# production
/build
/packages/openblocks/build
/packages/lowcoder/build

# misc
.DS_Store
Expand Down Expand Up @@ -52,4 +52,4 @@ TODO
/ossutil_output
package-lock.json

op.mjs
op.mjs
6 changes: 3 additions & 3 deletions client/config/test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ export default {
"\\.md\\?url$": path.resolve(dirname, "./mocks/markdown-url-module.js"),
"^@lowcoder-ee(.*)$": path.resolve(
dirname,
isEE ? "../../packages/openblocks/src/ee/$1" : "../../packages/openblocks/src/$1"
isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1"
),
"lowcoder-sdk": path.resolve(dirname, "../../packages/openblocks/src/index.sdk"),
"lowcoder-sdk": path.resolve(dirname, "../../packages/lowcoder/src/index.sdk"),
},
globals,
// roots: ["<rootDir>/src"],
modulePaths: [
"<rootDir>/src",
path.resolve(dirname, "../../packages/openblocks/src"),
path.resolve(dirname, "../../packages/lowcoder/src"),
path.resolve(dirname, "../../packages/lowcoder-comps/src"),
path.resolve(dirname, "../../packages/lowcoder-design/src"),
],
Expand Down
2 changes: 1 addition & 1 deletion client/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export default {
projects: ["<rootDir>/packages/openblocks", "<rootDir>/packages/lowcoder-core"],
projects: ["<rootDir>/packages/lowcoder", "<rootDir>/packages/lowcoder-core"],
};
2 changes: 1 addition & 1 deletion client/packages/openblocks-comps/src/global.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import "../../openblocks/src/global";
import "../../lowcoder/src/global";
2 changes: 1 addition & 1 deletion client/packages/openblocks-design/src/app-env.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/// <reference path="../../openblocks/src/app-env.d.ts" />
/// <reference path="../../lowcoder/src/app-env.d.ts" />
8 changes: 4 additions & 4 deletions client/packages/openblocks-plugin-demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"baseUrl": "src",
"paths": {
"lowcoder-sdk": [
"../../openblocks/src/index.sdk.ts",
"../node_modules/lowcoder-sdk/src/openblocks/index.sdk.ts"
"../../lowcoder/src/index.sdk.ts",
"../node_modules/lowcoder-sdk/src/lowcoder/index.sdk.ts"
],
"*": [
"*",
"../../openblocks/src/*",
"../../lowcoder/src/*",
"../../lowcoder-sdk/src/*",
"../node_modules/lowcoder-sdk/src/openblocks/*"
"../node_modules/lowcoder-sdk/src/lowcoder/*"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion client/packages/openblocks-sdk/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-nocheck
import "../../openblocks/src/index.less";
import "../../lowcoder/src/index.less";
import "virtual:globals";
import * as sdk from "openblocks";
export * from "openblocks";
Expand Down
8 changes: 4 additions & 4 deletions client/packages/openblocks-sdk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
"paths": {
"*": [
"*",
"../../openblocks/src/*",
"../../lowcoder/src/*",
"../../lowcoder-comps/src/*",
"../../lowcoder-design/src/*"
],
"@lowcoder-ee/*": ["../../openblocks/src/*"]
"@lowcoder-ee/*": ["../../lowcoder/src/*"]
}
},
"exclude": ["../openblocks/src/ee/*"],
"exclude": ["../lowcoder/src/ee/*"],
"include": [
"src",
"index.tsx",
"../openblocks/src",
"../lowcoder/src",
"../lowcoder-comps/src",
"../lowcoder-design/src"
]
Expand Down
6 changes: 3 additions & 3 deletions client/packages/openblocks-sdk/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const viteConfig: UserConfig = {
resolve: {
extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"],
alias: {
"lowcoder-sdk": path.resolve(__dirname, "../openblocks/src/index.sdk"),
"@lowcoder-ee": path.resolve(__dirname, "../openblocks/src"),
"lowcoder-sdk": path.resolve(__dirname, "../lowcoder/src/index.sdk"),
"@lowcoder-ee": path.resolve(__dirname, "../lowcoder/src"),
},
},
base: ensureLastSlash(process.env.PUBLIC_URL),
Expand Down Expand Up @@ -83,7 +83,7 @@ export const viteConfig: UserConfig = {
}),
viteTsconfigPaths({
projects: [
"../openblocks/tsconfig.json",
"../lowcoder/tsconfig.json",
"../lowcoder-comps/tsconfig.json",
"../lowcoder-design/tsconfig.json",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ function getFile(path: string) {

test("test resolveParsedValue", async () => {
const files = await Promise.all([
getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.csv"),
getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.json"),
getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.png"),
getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.txt"),
getFile("packages/openblocks/src/comps/comps/fileComp/fileComp.test.xlsx"),
getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.csv"),
getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.json"),
getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.png"),
getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.txt"),
getFile("packages/lowcoder/src/comps/comps/fileComp/fileComp.test.xlsx"),
]);
const parsedValue = await resolveParsedValue(files as any);
expect(parsedValue[0]).toMatchObject(expectParseValue);
Expand Down
2 changes: 1 addition & 1 deletion client/packages/openblocks/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ export const en = {
cloneUrl: "/apps/template-import/",
},
openBlocksUrl: {
createIssue: "https://github.com/lowcoder-dev/openblocks/issues",
createIssue: "https://github.com/lowcoder-dev/lowcoder/issues",
discord: "https://discord.com/invite/z5W2YHXdtt",
},
componentDoc: {
Expand Down
2 changes: 1 addition & 1 deletion client/packages/openblocks/src/i18n/locales/enObj.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const enObj: I18nObjects = {
],
},
editorTutorials: {
mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/openblocks/users",
mockDataUrl: "https://63621db87521369cd06514c2.mockapi.io/api/lowcoder/users",
data: (code) => (
<>
The component and query data are listed here, which can be referenced through
Expand Down
4 changes: 2 additions & 2 deletions client/packages/openblocks/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const viteConfig: UserConfig = {
alias: {
"@lowcoder-ee": path.resolve(
__dirname,
isEE ? `../openblocks/src/${isEEGlobal ? "ee-global" : "ee"}` : "../openblocks/src"
isEE ? `../lowcoder/src/${isEEGlobal ? "ee-global" : "ee"}` : "../lowcoder/src"
),
},
},
Expand Down Expand Up @@ -124,7 +124,7 @@ export const viteConfig: UserConfig = {
},
}),
viteTsconfigPaths({
projects: ["../openblocks/tsconfig.json", "../lowcoder-design/tsconfig.json"],
projects: ["../lowcoder/tsconfig.json", "../lowcoder-design/tsconfig.json"],
}),
svgrPlugin({
svgrOptions: {
Expand Down
6 changes: 3 additions & 3 deletions client/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function downloadBuiltinPlugin(name) {
const packageRes = await axios.get(`https://registry.npmjs.com/${name}/latest`);
const tarball = packageRes.data.dist.tarball;
const tarballFileName = `${name}.tgz`;
const targetDir = `./packages/openblocks/build/${name}/latest`;
const targetDir = `./packages/lowcoder/build/${name}/latest`;

console.log(chalk.blue`tarball: ${tarball}`);

Expand All @@ -52,7 +52,7 @@ async function buildBuiltinPlugin(name) {
console.log();
console.log(chalk.cyan`plugin ${name} building...`);

const targetDir = `./packages/openblocks/build/${name}/latest`;
const targetDir = `./packages/lowcoder/build/${name}/latest`;
shell.mkdir("-p", targetDir);

shell.exec(`yarn workspace ${name} build_only`, { fatal: true });
Expand Down Expand Up @@ -96,7 +96,7 @@ if (process.argv.includes("--internal-deploy")) {
const deployDir = shell.env["DEPLOY_DIR"];
console.log();
console.log(chalk.cyan`deploying...`);
shell.exec("docker cp ./packages/openblocks/build lowcoder-fe:/var/www/", { fatal: true });
shell.exec("docker cp ./packages/lowcoder/build lowcoder-fe:/var/www/", { fatal: true });
shell.exec(
`docker exec lowcoder-fe /bin/sh -c "cd /var/www/ && rm -rf ${deployDir} && mv build ${deployDir}"`,
{ fatal: true }
Expand Down
4 changes: 2 additions & 2 deletions client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14457,9 +14457,9 @@ __metadata:
languageName: unknown
linkType: soft

"openblocks@workspace:packages/openblocks":
"openblocks@workspace:packages/lowcoder":
version: 0.0.0-use.local
resolution: "openblocks@workspace:packages/openblocks"
resolution: "openblocks@workspace:packages/lowcoder"
dependencies:
"@ant-design/icons": ^4.7.0
"@ant-design/pro-form": ^1.52.9
Expand Down