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

Skip to content

Dev -> Main v2.4.5 #1094

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 59 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
caa36ff
Style Control CHanges
MenamAfzal Jul 25, 2024
3159fc0
Add line Height in Said Components
MenamAfzal Jul 25, 2024
0cf5abd
Improved Translations
MenamAfzal Jul 25, 2024
470afcb
initial code
MenamAfzal Jul 25, 2024
4c8dd4e
Push for debug
MenamAfzal Jul 26, 2024
fb4f140
Increasing Version Numbers to release new SDK and Lowcoder Comps
Jul 26, 2024
9b4dedd
Increasing Version Number to release new SDK
Jul 26, 2024
6a1b7cc
double click handled
MenamAfzal Jul 26, 2024
c5640ad
added lineHeight as css property
MenamAfzal Jul 27, 2024
0bc663b
lineHeight icon added in right panel
MenamAfzal Jul 27, 2024
7459f78
lineHeight icon added in right panel
MenamAfzal Jul 27, 2024
32dc4ec
pull from origin
MenamAfzal Jul 27, 2024
1db61e7
pull from origin
MenamAfzal Jul 27, 2024
52305fe
latest changes
MenamAfzal Jul 27, 2024
35088b8
margin right added
MenamAfzal Jul 27, 2024
4c316ea
Merge branch 'dev' into fix/table-styles
MenamAfzal Jul 27, 2024
8288a82
Updating Stripe and introducing Lowcoder API as Datasource
Jul 27, 2024
d267998
finnal tweaks
MenamAfzal Jul 29, 2024
d52ac6f
Merge branch 'dev' into add/doubleClick
MenamAfzal Jul 29, 2024
4ab618b
Merge branch 'dev' into fix/table-styles
raheeliftikhar5 Jul 29, 2024
1828fba
Merge pull request #1070 from MenamAfzal/add/doubleClick
raheeliftikhar5 Jul 29, 2024
ecc5c8d
Merge branch 'dev' into fix/table-styles
raheeliftikhar5 Jul 29, 2024
df4df7d
Merge pull request #1071 from MenamAfzal/fix/table-styles
raheeliftikhar5 Jul 29, 2024
f8f2872
added app header settings in advanced settings
raheeliftikhar5 Jul 29, 2024
3e4fa6f
Merge branch 'dev' into add/lineHeight
raheeliftikhar5 Jul 29, 2024
7e3b1a9
Merge pull request #1069 from MenamAfzal/add/lineHeight
raheeliftikhar5 Jul 29, 2024
75a9714
fix: javascript queries not executing on page load
raheeliftikhar5 Jul 29, 2024
476943c
Renaming of old Strapi Specs file
Jul 29, 2024
fb90fe3
remove Console Logs in Node Server
Jul 29, 2024
4140a71
table expansion issue resolved
MenamAfzal Jul 30, 2024
fab46dd
shadow issue resolved
MenamAfzal Jul 30, 2024
a4bf6a9
added horizontalGridCells property in inner-grid based comps
raheeliftikhar5 Jul 30, 2024
acb1cb1
Merge branch 'dev' into fix/table
raheeliftikhar5 Jul 30, 2024
0069cbc
Merge pull request #1076 from MenamAfzal/fix/table
raheeliftikhar5 Jul 30, 2024
3ef0e4f
increase debounce time for input changes to avoid jumping cursor
raheeliftikhar5 Jul 31, 2024
4cd85cc
added dropdown type column in table
raheeliftikhar5 Jul 31, 2024
a739e2e
added tooltip option for table header
raheeliftikhar5 Jul 31, 2024
7129ccf
line height removed from single liner input fields
MenamAfzal Aug 1, 2024
e76fd45
added column separator option for downloaded table's csv
raheeliftikhar5 Aug 1, 2024
2ef23dd
added column tooltip in table
raheeliftikhar5 Aug 1, 2024
4e21471
removed tooltip from column types and placed in abstract level for al…
raheeliftikhar5 Aug 2, 2024
1bf4a84
Merge pull request #1083 from lowcoder-org/table-column-tooltip
FalkWolsky Aug 2, 2024
a62f1f2
Merge pull request #1082 from MenamAfzal/remove/lineHeight
FalkWolsky Aug 3, 2024
dfd71b5
Supabase Management API as Data Source
Aug 3, 2024
1c3716c
Cleaning up Data Sources Display
Aug 3, 2024
6043e8f
Sorting Database and Big Data
Aug 3, 2024
78dd346
Fixing Table Column Display Selector & Naming
Aug 3, 2024
11f4073
Reorganized icons - old icons to v1 folder
Aug 3, 2024
ee70a49
Fixing iframely Tag
Aug 3, 2024
6e98446
Fixing iframely Tag for Componet Display
Aug 3, 2024
c7f2c54
fix table scroll behaviour
raheeliftikhar5 Aug 5, 2024
a8f49d0
added horizontal/vertical scrollbar switches
raheeliftikhar5 Aug 6, 2024
f3e96ac
remove commented code
raheeliftikhar5 Aug 6, 2024
575755d
fix select input styles not applying
raheeliftikhar5 Aug 6, 2024
72e7419
fix tree select input styles not applying
raheeliftikhar5 Aug 6, 2024
23149c6
Merge pull request #1093 from lowcoder-org/table-scrollbars
FalkWolsky Aug 6, 2024
1a887bb
Setting Version for 2.4.5 and renaming local storage namespace
Aug 6, 2024
0e04061
fixed table scrollbar issues
raheeliftikhar5 Aug 6, 2024
c000da1
Increasing Versions for v2.4.5
Aug 6, 2024
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
Fixing iframely Tag
  • Loading branch information
FalkWolsky committed Aug 3, 2024
commit ee70a49aaff6617e6c11cf60cb1ee2c8ccd5d22e
3 changes: 2 additions & 1 deletion client/packages/lowcoder/index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title data-react-helmet="true">Lowcoder | rapid App & VideoMeeting builder for everyone.</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no viewport-fit=cover"/>
<meta lang="en" name="description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />
<meta lang="en" name="description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." data-react-helmet="true"/>
<meta name="theme-color" content="#000000" />
<style>
html,
Expand Down
78 changes: 78 additions & 0 deletions client/packages/lowcoder/src/api/subscriptionApi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import Api from "api/api";
import axios, { AxiosInstance, AxiosRequestConfig } from "axios";

export interface CustomerAddress {
line1: string;
line2: string;
city: string;
state: string;
country: string;
postalCode: string;
}

export interface Customer {
hostname: string;
email: string;
orgId: string;
userId: string;
userName: string;
type: string;
companyName: string;
address: CustomerAddress;
}

export type ResponseType = {
response: any;
};

const apiUrl = "https://flow.lowcoder.cloud/webhook/secure";
const authHeader = "96a99c7b-3758-4c48-b4b1-a8cbf59e7d6c";

const currentPage = 1;
const currentQuery = '';
const currentData = [];

let axiosIns: AxiosInstance | null = null;

const getAxiosInstance = (clientSecret?: string) => {
if (axiosIns && !clientSecret) {
return axiosIns;
}

const headers: Record<string, string> = {
"Content-Type": "application/json",
"Lowcoder-Token": authHeader,
}

const apiRequestConfig: AxiosRequestConfig = {
baseURL: `${apiUrl}`,
headers,
};

axiosIns = axios.create(apiRequestConfig);
return axiosIns;
}

class SubscriptionApi extends Api {

static async createCustomer(body: Customer): Promise<any> {
console.log("createCustomerCall", body);

let response;
try {
response = await getAxiosInstance().request({
url: '/create-customer',
method: "POST",
withCredentials: true,
data: body,
});
} catch (error) {
console.error("Error creating customer:", error);
throw error;
}
return response;
}

}

export default SubscriptionApi;
12 changes: 8 additions & 4 deletions client/packages/lowcoder/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
ADMIN_APP_URL,
ORG_AUTH_FORGOT_PASSWORD_URL,
ORG_AUTH_RESET_PASSWORD_URL,
API_DOCS_URL,
} from "constants/routesURL";
import React from "react";
import { createRoot } from "react-dom/client";
Expand Down Expand Up @@ -253,7 +252,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
{/* }<meta key="msapplication-config" name="msapplication-config" content="https://www.yourdomain.com/path/to/browserconfig.xml" />, */}

<link rel="canonical" href={window.location.href} />
{isLowCoderDomain && [
{isLowCoderDomain || isLocalhost && [
// Adding Support for iframely to be able to embedd the component explorer in the docu
<meta
key="iframely:title"
Expand All @@ -265,6 +264,12 @@ class AppIndex extends React.Component<AppIndexProps, any> {
property="iframely:description"
content={trans('productDesc')}
/>,
<link
rel="iframely"
type="text/html"
href={window.location.href}
media="(aspect-ratio: 1280/720)"
/>,

<link
key="preconnect-googleapis"
Expand Down Expand Up @@ -320,8 +325,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
TRASH_URL,
SETTING,
MARKETPLACE_URL,
ADMIN_APP_URL,
API_DOCS_URL,
ADMIN_APP_URL
]}
// component={ApplicationListPage}
component={LazyApplicationHome}
Expand Down
5 changes: 3 additions & 2 deletions client/packages/lowcoder/src/constants/routesURL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const OAUTH_PROVIDER_DETAIL = "/setting/oauth-provider/detail";

export const PERMISSION_SETTING_DETAIL = `${PERMISSION_SETTING}/:groupId`;
export const ORGANIZATION_SETTING_DETAIL = `${ORGANIZATION_SETTING}/:orgId`;
export const SUBSCRIPTION_SETTING_DETAIL = `${SUBSCRIPTION_SETTING}/:subscriptionId`;
export const SUBSCRIPTION_DETAIL = `${SUBSCRIPTION_SETTING}/:subscriptionId`;

export const ALL_APPLICATIONS_URL = "/apps";
export const ADMIN_APP_URL = "/ee/:applicationId/:viewMode";
Expand All @@ -34,7 +34,6 @@ export const DATASOURCE_URL = `/datasource`;
export const DATASOURCE_CREATE_URL = `${DATASOURCE_URL}/new/:datasourceType`;
export const DATASOURCE_EDIT_URL = `${DATASOURCE_URL}/:datasourceId`;
export const QUERY_LIBRARY_URL = `/query-library`;
export const API_DOCS_URL = `/lowcoder-api`;
export const FOLDER_URL_PREFIX = `/folder`;
export const FOLDER_URL = `${FOLDER_URL_PREFIX}/:folderId`;
export const FOLDERS_URL = `/folders`;
Expand Down Expand Up @@ -102,3 +101,5 @@ export function preview(applicationId: string) {
export const buildGroupId = (groupId: string) => `${PERMISSION_SETTING}/${groupId}`;

export const buildOrgId = (orgId: string) => `${ORGANIZATION_SETTING}/${orgId}`;

export const buildSubscriptionId = (subscriptionId: string) => `${SUBSCRIPTION_SETTING}/${subscriptionId}`;
150 changes: 0 additions & 150 deletions client/packages/lowcoder/src/pages/ApplicationV2/ApiDocLayout.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions client/packages/lowcoder/src/pages/ApplicationV2/ApiDocView.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
QUERY_LIBRARY_URL,
SETTING,
TRASH_URL,
API_DOCS_URL,
// ADMIN_APP_URL,
NEWS_URL,
ORG_HOME_URL,
Expand All @@ -22,13 +21,11 @@ import {
EllipsisTextCss,
FolderIcon,
HomeDataSourceIcon,
HomeIcon,
NewsIcon,
WorkspacesIcon,
HomeModuleIcon,
HomeQueryLibraryIcon,
HomeSettingIcon,
InviteUserIcon,
PlusIcon,
PointIcon,
RecyclerIcon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const IconWrapper = styled.div`
export default function PageInfo(props: IProps) {
const { compInfo } = props;
const Icon = compInfo.icon;
console.log("Icon", compInfo);
return (
<Wrapper>
<div className="title">
Expand Down
Loading
Loading