Skip to content

Commit

Permalink
Merge pull request #3731 from signalco-io/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
AleksandarDev authored Oct 27, 2023
2 parents bac0480 + 744cc67 commit 2da0d9c
Show file tree
Hide file tree
Showing 59 changed files with 1,304 additions and 353 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/web-nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,13 @@ jobs:
workflowName: 'web-nextjs_bundle_analysis.yml'
name: 'slco'
path: 'web/apps/slco'
secrets: inherit

analyze_doprocess:
name: "[doprocess] Next.js Bundle Analysis"
uses: ./.github/workflows/nextjs_bundle_analysis_reusable.yml
with:
workflowName: 'web-nextjs_bundle_analysis.yml'
name: 'doprocess'
path: 'web/apps/doprocess.app'
secrets: inherit
1 change: 1 addition & 0 deletions cloud/infrastructure/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ export = async () => {
dnsRecord('vercel-ui-docs', 'ui', 'cname.vercel-dns.com', 'CNAME', false);
dnsRecord('vercel-brandgrab', 'brandgrab', 'cname.vercel-dns.com', 'CNAME', false);
dnsRecord('vercel-slco', 'slco', 'cname.vercel-dns.com', 'CNAME', false);
dnsRecord('vercel-doprocess', 'doprocess', 'cname.vercel-dns.com', 'CNAME', false);

return {
signalrUrl: signalr.signalr.hostName,
Expand Down
8 changes: 6 additions & 2 deletions web/apps/app/app/channels/[channelName]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ function ChannelConnectPartial(props: { channelName: string }) {
return <ChannelPartialSlack />;

return (
<NoDataPlaceholder content="Connect action not availble" />
<NoDataPlaceholder>
Connect action not availble
</NoDataPlaceholder>
);
}

Expand Down Expand Up @@ -71,7 +73,9 @@ export default function AppChannelPage({ params }: { params: { channelName: stri
))}
</List>
) : (
<NoDataPlaceholder content="No items" />
<NoDataPlaceholder>
No items
</NoDataPlaceholder>
)}
</Loadable>
</Stack>
Expand Down
20 changes: 12 additions & 8 deletions web/apps/app/components/dashboards/Dashboards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useLocale from '../../src/hooks/useLocale';
import useSaveDashboard from '../../src/hooks/dashboards/useSaveDashboard';
import useDashboard from '../../src/hooks/dashboards/useDashboard';
import { WidgetModel } from '../../src/dashboards/DashboardsRepository';
import { SpacesEditingBackground } from './SpacesEditingBackground';
import DashboardView from './DashboardView';
import DashboardSettings from './DashboardSettings';

Expand Down Expand Up @@ -83,14 +84,17 @@ function Dashboards() {
return (
<>
{isEditing && (
<Row>
<div className="xs:w-full px-2">
<Row spacing={1}>
<Button onClick={() => setShowWidgetStore(true)}>{t('AddWidget')}</Button>
<Button onClick={handleEditDone} fullWidth>{t('Save')}</Button>
</Row>
</div>
</Row>
<>
<SpacesEditingBackground />
<Row>
<div className="xs:w-full px-2">
<Row spacing={1}>
<Button onClick={() => setShowWidgetStore(true)}>{t('AddWidget')}</Button>
<Button onClick={handleEditDone} fullWidth>{t('Save')}</Button>
</Row>
</div>
</Row>
</>
)}
<Stack spacing={1}>
<Loadable isLoading={selectedDashboard.isLoading} loadingLabel="Loading dashboards..." error={selectedDashboard.error}>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export function SpacesEditingBackground() {
return (
<svg className="pointer-events-none fixed inset-0 -z-50 h-full w-full">
<pattern id="pattern-heroundefined" x="0" y="0" width="43" height="43" patternUnits="userSpaceOnUse" patternTransform="translate(-0.5,-0.5)"><circle cx="0.5" cy="0.5" r="0.5" fill="#91919a" /></pattern>
<rect x="0" y="0" width="100%" height="100%" fill="url(#pattern-heroundefined)" />
</svg>
);
}
2 changes: 1 addition & 1 deletion web/apps/app/components/graphs/Graph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ function Graph({ isLoading, error, data, label, discrete, ...rest }: GraphProps)
{!!label && <Typography>{label}</Typography>}
<Loadable isLoading={isLoading} loadingLabel="Loading data" error={error} width={100}>
{!data || data.length <= 0
? <NoDataPlaceholder content={t('NoData')} />
? <NoDataPlaceholder>{t('NoData')}</NoDataPlaceholder>
: <GraphComponent data={data} {...rest} />}
</Loadable>
</Row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ export default function EntityContactSelection(props: EntityContactSelectionProp
};

if (!isLoading && !error && !contacts.length) {
return <div className="p-2"><NoDataPlaceholder content={'No applicable contacts available'} /></div>;
return (
<div className="p-2">
<NoDataPlaceholder>No applicable contacts available</NoDataPlaceholder>
</div>
);
}

return (
Expand Down
4 changes: 3 additions & 1 deletion web/apps/app/components/views/Entity/EntityDetailsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export default function EntityDetailsView({ id }: EntityDetailsViewProps) {

if (!isLoading && !error && entity == null) {
return (
<NoDataPlaceholder content={'Not Found'} />
<NoDataPlaceholder>
Not Found
</NoDataPlaceholder>
);
}
return (
Expand Down
4 changes: 3 additions & 1 deletion web/apps/app/components/widgets/parts/WidgetChecklist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ function WidgetChecklist(props: WidgetSharedProps<ConfigProps>) {
? items.map(item => <ChecklistItem key={item.id} item={item} onChange={handleItemChanged} onRemove={handleItemRemoved} />)
: (
<div className="flex h-full items-center justify-center">
<NoDataPlaceholder content={placeholders.t('NoItems')} />
<NoDataPlaceholder>
{placeholders.t('NoItems')}
</NoDataPlaceholder>
</div>
)}
</Stack>
Expand Down
4 changes: 3 additions & 1 deletion web/apps/app/components/widgets/parts/WidgetFinanceStock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ export default function WidgetFinanceStock(props: WidgetSharedProps<ConfigProps>
</Stack>
<Stack>
{!price?.item ? (
<NoDataPlaceholder content={'No data'} />
<NoDataPlaceholder>
No data
</NoDataPlaceholder>
) : (
<>
<Typography level="h4" bold lineHeight={0.9}>${closePrice}</Typography>
Expand Down
2 changes: 1 addition & 1 deletion web/apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": "18.x"
},
"scripts": {
"dev": "next -p 3001 --turbo",
"dev": "next -p 3001",
"build": "next build",
"build:analyze": "cross-env ANALYZE=true pnpm build",
"postinstall": "node ./tools/post-install.mjs",
Expand Down
3 changes: 2 additions & 1 deletion web/apps/development/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const apps: AppItemType[] = [

const uSaas: AppItemType[] = [
{ label: 'slco', href: 'http://localhost:4002' },
{ label: 'brandgrab', href: 'http://localhost:4001' }
{ label: 'brandgrab', href: 'http://localhost:4001' },
{ label: 'DoProcess.app', href: 'http://localhost:4003' },
];

function App() {
Expand Down
10 changes: 10 additions & 0 deletions web/apps/doprocess.app/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true

[*.{js,ts,json,yml}]
charset = utf-8
indent_style = space
indent_size = 4
4 changes: 4 additions & 0 deletions web/apps/doprocess.app/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: ['@signalco/eslint-config-signalco'],
};
Loading

6 comments on commit 2da0d9c

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-blog – ./web/apps/blog

signalco-blog.vercel.app
signalco-blog-git-main-signalco.vercel.app
blog.signalco.io
signalco-blog-signalco.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-app – ./web/apps/app

signalco-app-git-main-signalco.vercel.app
signalco-app-signalco.vercel.app
signalco-app.vercel.app
app.signalco.io

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-slco – ./web/apps/slco

signalco-slco-signalco.vercel.app
signalco-slco.vercel.app
signalco-slco-git-main-signalco.vercel.app
slco.io
slco.signalco.io

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

signalco-ui-docs – ./web/apps/ui-docs

signalco-ui-docs-git-main-signalco.vercel.app
ui.signalco.io
signalco-ui-docs-signalco.vercel.app
signalco-ui-docs.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 2da0d9c Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.