Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
5e7ff78
Setting up basic structure and components for the new Templates
samejr Feb 9, 2023
c927342
Added basic grid layout
D-K-P Feb 9, 2023
7060248
Added the marketing site header to the app template page
samejr Feb 9, 2023
7d12d32
Added toxic and acid colours to the app
samejr Feb 9, 2023
a347e55
Added placeholder image
D-K-P Feb 9, 2023
c34a28b
Added toxic and acid colours and button to the app
samejr Feb 10, 2023
94154bd
Pricing link goes to the correct URL
samejr Feb 10, 2023
ddfce4e
GitHub app installation
ericallam Feb 10, 2023
ad1f934
Removed un-used tailwind config values
samejr Feb 10, 2023
038d53c
Added templates data file
samejr Feb 10, 2023
9539138
WIP creating template repos in github accounts
ericallam Feb 10, 2023
cc6a37b
Add a specific template, and remove installations when getting the in…
ericallam Feb 10, 2023
431079c
Exported the step numbers
samejr Feb 10, 2023
0193327
Added a new Overview page
samejr Feb 10, 2023
1bb2ebc
Created a Template step by step guide page
samejr Feb 10, 2023
b2290e3
Get deploy to render working with the templates with the button point…
ericallam Feb 10, 2023
ef8431b
Step numbers now have an active green state
samejr Feb 10, 2023
c4ba591
Copy update to fix step 2
samejr Feb 10, 2023
ffcdc76
Added a cloud coming soon message
samejr Feb 11, 2023
1ca8760
Improved wording and styling
samejr Feb 11, 2023
fce24cc
Previous steps now links
samejr Feb 11, 2023
eb27417
Button tweak
samejr Feb 11, 2023
f178629
WIP adding new steps for the existing repo journey
samejr Feb 11, 2023
952e584
Full workflow for existing repo
samejr Feb 12, 2023
ed4d684
Merged installing the packages into 1 step and added a new step 6
samejr Feb 12, 2023
c41c2e8
Turned the old templates page into a placeholder for now
samejr Feb 13, 2023
90a582f
Improved the tertiary link colour
samejr Feb 13, 2023
b98bae8
‘Choose an example’ now shows all the options styled into cards
samejr Feb 13, 2023
a7eac27
Added a blank example as the first option in the list
samejr Feb 13, 2023
6595535
Added template grid and updated data
D-K-P Feb 13, 2023
2e28bd0
Layout for template overview
D-K-P Feb 13, 2023
a020dfa
Added @trigger.dev/sdk to the required packages
samejr Feb 13, 2023
1c9be1e
Moved misplaced imports up to the top
samejr Feb 13, 2023
bf5621b
Added a basic modal to existing repo step 3
samejr Feb 13, 2023
e1fb69f
Removed close button
D-K-P Feb 13, 2023
6117bcf
Used the existing diaglog component and added a close icon
samejr Feb 13, 2023
d6c6c71
Added markdown to templatesoverview
D-K-P Feb 13, 2023
4b0d03f
Passing in template data
samejr Feb 13, 2023
36e25a8
Blank ExampleOverview file
samejr Feb 13, 2023
030844d
Live update created org templates using SSE and useRevalidator. Updat…
ericallam Feb 13, 2023
ba868cb
Pushed markdown in the templatesdata file
D-K-P Feb 13, 2023
007dc2d
Removed styling around templateoverview
samejr Feb 13, 2023
c27bdf6
Added markdownDocs to Template
ericallam Feb 13, 2023
c091bc3
Added a modal to the template cards
samejr Feb 13, 2023
fb0ecb8
Added overflow-scrolling and fixed side bar
D-K-P Feb 13, 2023
8a1517b
Removed old step
samejr Feb 13, 2023
c4a4411
modal and grid updates
D-K-P Feb 13, 2023
460e8aa
Fixed layout issues and added a max height
samejr Feb 13, 2023
4ed486e
Styled the template overview button
D-K-P Feb 13, 2023
179afbb
More work on the org template page (added workflows list)
ericallam Feb 13, 2023
2424de0
Added typography and forms tailwind packages
samejr Feb 13, 2023
721a32a
Moved modal into the examples component
samejr Feb 13, 2023
7f2c968
Created an examples overview with modal
samejr Feb 13, 2023
cdbae93
Exported types from sample data
samejr Feb 13, 2023
1be2af9
Example modal update
samejr Feb 13, 2023
710003e
Added modals for the webhook, custom event etc cards
samejr Feb 13, 2023
0fee3ce
Blank example now has a modal
samejr Feb 13, 2023
da155d1
Added a modal for the cloud hosting option
samejr Feb 13, 2023
bf9e269
Changed the error to a panel warning
samejr Feb 14, 2023
16d89c4
added optional classname to input component
samejr Feb 14, 2023
8e5938c
Styling for the github configuration forms
samejr Feb 14, 2023
d67ab54
WIP on the “New Repo” side of the workflows/new flow
ericallam Feb 14, 2023
abc1137
Fixed styling on the grid and overview pages
D-K-P Feb 14, 2023
f2a96a1
tweaked styles
samejr Feb 14, 2023
08c7a04
Updated layout for ready to deploy state
samejr Feb 14, 2023
056bab7
Fixed padding issue on the grid
D-K-P Feb 14, 2023
805f675
Padding now fixed if there are / aren’t API logos
D-K-P Feb 14, 2023
f0a05ab
Moved the integration icons to the bottom
D-K-P Feb 14, 2023
967b8b0
Updated the deployed state
samejr Feb 14, 2023
103f772
margins adjustment
samejr Feb 14, 2023
fa47046
Implement the “existing repo” flow
ericallam Feb 14, 2023
047b011
Run db:seed when deploying (so needs to be safe in prod)
ericallam Feb 14, 2023
9388b5b
Added markdown syntax highlighting for the template documentation
ericallam Feb 14, 2023
1f3eb45
Added runLocalDocs for templates
ericallam Feb 14, 2023
60ac029
Added a disabled button state
samejr Feb 14, 2023
f6363ab
Added a deploy skeleton state
samejr Feb 14, 2023
7f6e03b
Improvements to the deploy state
samejr Feb 14, 2023
8f32446
Added a modal to the deploy section
samejr Feb 14, 2023
af29669
Fill out some github-stars-to-slack template data
ericallam Feb 14, 2023
d489311
Run locally, not self host (WIP run local docs)
ericallam Feb 14, 2023
1f672d9
Made classNames available on the WorkflowList
samejr Feb 14, 2023
a46b93e
Updated to the deploy state
samejr Feb 14, 2023
b88eaa2
Import cleanup
samejr Feb 14, 2023
88ff526
Added blank deploy state to configure github state
samejr Feb 14, 2023
7af88c3
Made the fields all consistently styled
samejr Feb 14, 2023
727ec22
Styled the examples overview modal
D-K-P Feb 14, 2023
a47a9b4
Styled the start from scratch modal
D-K-P Feb 14, 2023
e58b7ad
Filled in the run local docs
ericallam Feb 14, 2023
803b279
Fill in actual data to the configured github state
ericallam Feb 15, 2023
02499a0
Add the template card to template.add and template.id
ericallam Feb 15, 2023
81debee
Added a Github connected first step
samejr Feb 15, 2023
1df18b3
Better handle errors when trying to add a template to github account
ericallam Feb 15, 2023
9386e19
Fill in the ConnectedToGithub stuff
ericallam Feb 15, 2023
10ae560
Added the floating template card
samejr Feb 15, 2023
6a3f264
Small style tweaks
samejr Feb 15, 2023
54c5c82
Adding template list and template slug page to public pages
ericallam Feb 15, 2023
ba0a472
Moved the button to the top and fixed the padding
D-K-P Feb 15, 2023
98cf9af
Made the deployed workflow item more clickable
samejr Feb 15, 2023
187c027
Margin tweak
samejr Feb 15, 2023
2ede12c
Step numbers now have a complete state so they can show numbers in fu…
samejr Feb 15, 2023
6b05b84
Added a step number to the configure github step
samejr Feb 15, 2023
544b9b9
Implement “use this template” from the public page (either logged in …
ericallam Feb 15, 2023
4a72aff
Render the app header when logged in __public pages
ericallam Feb 15, 2023
bfd8a4f
Template card sits on the right and new states for login and configure
samejr Feb 15, 2023
7530400
Removed old template card
samejr Feb 15, 2023
77124bb
Sorted out connected to github
ericallam Feb 15, 2023
f2cfa17
Added Poppins for the titles
D-K-P Feb 15, 2023
039f652
Add another github connection button
ericallam Feb 15, 2023
4a00abe
Add import code step to existing repo
ericallam Feb 15, 2023
a1535df
Added title and sub to the templates page
D-K-P Feb 15, 2023
b480fa2
All dangerouslySetInnerHTML elements should not be p tags
ericallam Feb 15, 2023
76737ca
Remove basic starter title in desc
ericallam Feb 15, 2023
91ed853
Updated the login page with new template card style
samejr Feb 15, 2023
feafa69
Updated the viewing runs image link in the readme
D-K-P Feb 15, 2023
78ecfb6
Hopful fix for google fonts not working
samejr Feb 15, 2023
8ef434e
Added a toxic style A button
samejr Feb 15, 2023
3538754
Updated the links in the marketing header
samejr Feb 15, 2023
8dc5bba
Reduced top margins on the templates page
D-K-P Feb 15, 2023
0955a51
Added bottom padding
D-K-P Feb 15, 2023
22c8a16
Moved the image to the top left and sorted scrolling
D-K-P Feb 15, 2023
016cf05
Added templates copy
D-K-P Feb 15, 2023
d583e2a
Added primary button to templateoverview
D-K-P Feb 15, 2023
3c7f6cf
Added primary buttons to the examples
D-K-P Feb 15, 2023
f20b295
Padding / breathing space tweaks
D-K-P Feb 15, 2023
fbc1b86
Added ability to pass in a size to the buttons - currently only suppo…
samejr Feb 15, 2023
2c780c9
Added resend welcome drip campaign template
ericallam Feb 15, 2023
7a6968d
Merge branch 'dev' into features/workflow-hosting
ericallam Feb 15, 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
5 changes: 5 additions & 0 deletions .changeset/spotty-walls-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@trigger.dev/sdk": patch
---

Automatically pickup on the TRIGGER_WSS_URL for the wss endpoint
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ new Trigger({

One of the most powerful features of Trigger.dev is the [runs page](https://docs.trigger.dev/viewing-runs). All of the steps in a workflow, including the initial event, can be viewed in detail. See the status / output of each step, the logs, rich previews, errors and much more.

![Viewing runs](https://mintlify.s3-us-west-1.amazonaws.com/api-hero/images/run-succeeded.png)
![Viewing runs](https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/7343f3b2-2342-493b-5007-78f60ba5b700/public)


 
Expand Down
1 change: 1 addition & 0 deletions apps/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ENV NODE_ENV production
RUN pnpm run generate
RUN pnpm run build --filter=webapp...
RUN pnpx prisma migrate deploy --schema apps/webapp/prisma/schema.prisma
RUN pnpm run db:seed --filter=webapp

# Runner
FROM node:16-bullseye AS runner
Expand Down
140 changes: 86 additions & 54 deletions apps/webapp/app/components/LoginPromoPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,99 @@ import {
CloudArrowUpIcon,
WrenchScrewdriverIcon,
} from "@heroicons/react/24/outline";
import { TemplateListItem } from "~/presenters/templateListPresenter.server";
import { Panel } from "./layout/Panel";
import { Body } from "./primitives/text/Body";
import { Header2, Header3 } from "./primitives/text/Headers";

export function LoginPromoPanel() {
export function LoginPromoPanel({ template }: { template?: TemplateListItem }) {
return (
<div className="hidden h-full max-w-[30vw] flex-col justify-center border-r border-black/20 bg-slate-950 p-12 lg:flex">
<ul>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<WrenchScrewdriverIcon className="h-8 w-8 text-toxic" />
<div className="h-full w-0.5 bg-toxic/50"></div>
</div>
{template ? (
<div className="flex max-w-md flex-col">
<Header2
size="extra-large"
className="mb-5 bg-gradient-to-r from-indigo-400 to-pink-500 bg-clip-text font-semibold text-transparent"
>
Login to continue setting up your template
</Header2>
<Panel className="border border-slate-800 bg-slate-800/40 !p-6">
<div className="h-fit w-full overflow-hidden rounded object-cover">
<img src={template.imageUrl} />
</div>
<div className="mt-5 flex flex-col gap-2 border-t border-slate-600/50 pt-4">
<Header3
size="extra-small"
className="font-semibold text-slate-400"
>
{template.title}
</Header3>
<Body size="small" className="text-slate-400">
{template.description}
</Body>
</div>
</Panel>
</div>
) : (
<ul>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<WrenchScrewdriverIcon className="text-toxic h-8 w-8" />
<div className="bg-toxic/50 h-full w-0.5"></div>
</div>

<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Create</h2>
<p className="mb-10 text-white/60">
Write workflows by creating triggers directly in your code. These
can be 3rd-party integrations, custom events or on a schedule.
</p>
</div>
</li>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<BoltIcon className="h-8 w-8 text-toxic" />
<div className="h-full w-0.5 bg-toxic/50"></div>
</div>
<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Create</h2>
<p className="mb-10 text-white/60">
Write workflows by creating triggers directly in your code.
These can be 3rd-party integrations, custom events or on a
schedule.
</p>
</div>
</li>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<BoltIcon className="text-toxic h-8 w-8" />
<div className="bg-toxic/50 h-full w-0.5"></div>
</div>

<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Run</h2>
<p className="mb-10 text-white/60">
When your server runs, your workflow will be registered and you
can authenticate with any APIs you’re using.
</p>
</div>
</li>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<BeakerIcon className="h-8 w-8 text-toxic" />
<div className="h-full w-0.5 bg-toxic/50"></div>
</div>
<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Test</h2>
<p className="mb-10 text-white/60">
Test your workflow by triggering them manually in your dashboard.
Follow it as it runs step-by-step.
</p>
</div>
</li>
<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Run</h2>
<p className="mb-10 text-white/60">
When your server runs, your workflow will be registered and you
can authenticate with any APIs you’re using.
</p>
</div>
</li>
<li className="flex gap-2 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<BeakerIcon className="text-toxic h-8 w-8" />
<div className="bg-toxic/50 h-full w-0.5"></div>
</div>
<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Test</h2>
<p className="mb-10 text-white/60">
Test your workflow by triggering them manually in your
dashboard. Follow it as it runs step-by-step.
</p>
</div>
</li>

<li className="flex gap-3 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<CloudArrowUpIcon className="ml-0.5 h-7 w-7 text-toxic" />
</div>
<li className="flex gap-3 text-white">
<div className="mt-1.5 flex flex-col items-center gap-2">
<CloudArrowUpIcon className="text-toxic ml-0.5 h-7 w-7" />
</div>

<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Deploy</h2>
<p className="mb-10 text-white/60">
Deploy your new workflow as you would any other code commit and
inspect each workflow run in real time.
</p>
</div>
</li>
</ul>
<div className="mb-1">
<h2 className="mb-2 text-2xl font-semibold">Deploy</h2>
<p className="mb-10 text-white/60">
Deploy your new workflow as you would any other code commit and
inspect each workflow run in real time.
</p>
</div>
</li>
</ul>
)}
</div>
);
}
8 changes: 4 additions & 4 deletions apps/webapp/app/components/integrations/AddApiKeyButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ export function AddApiKeyButton({
<StyledDialog.Title>
Add your {integration.name} API keys
</StyledDialog.Title>
<div className="overflow-hidden overflow-y-auto max-h-40 mb-3 mt-4 bg-slate-700/50 rounded px-4 pb-3 pt-4">
<div className="flex gap-0.5 items-center -m-0.5 mb-1 text-slate-400">
<div className="mb-3 mt-4 max-h-40 overflow-hidden overflow-y-auto rounded bg-slate-700/50 px-4 pb-3 pt-4">
<div className="-m-0.5 mb-1 flex items-center gap-0.5 text-slate-400">
<InformationCircleIcon className="h-5 w-5" />
<Body size="small" className="uppercase tracking-wide">
Instructions
</Body>
</div>
<p
<div
className="prose prose-sm prose-invert"
dangerouslySetInnerHTML={{
__html: marked(authentication.documentation),
Expand All @@ -99,7 +99,7 @@ export function AddApiKeyButton({
<img
src={integration.icon}
alt={integration.icon}
className="flex pointer-events-none z-10 -mr-7 ml-2.5 mt-2.5 w-5 h-5"
className="pointer-events-none z-10 -mr-7 ml-2.5 mt-2.5 flex h-5 w-5"
/>
<Input
id="title"
Expand Down
8 changes: 8 additions & 0 deletions apps/webapp/app/components/layout/AppLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ export function AppLayout({
);
}

export function PublicAppLayout({ children }: { children: React.ReactNode }) {
return (
<div className="grid h-full w-full grid-rows-[5rem_auto_2rem]">
{children}
</div>
);
}

export function AppBody({
children,
className = "bg-slate-850",
Expand Down
12 changes: 10 additions & 2 deletions apps/webapp/app/components/layout/List.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import classNames from "classnames";

export type ListProps = {
children: React.ReactNode;
className?: string;
};

export function List({ children }: { children: React.ReactNode }) {
export function List({ children, className }: ListProps) {
return (
<div className="bg-slate-800 shadow-md sm:rounded-md mb-4">
<div
className={classNames(
className,
"mb-4 bg-slate-800 shadow-md sm:rounded-md"
)}
>
<ul className="divide-y divide-slate-850">{children}</ul>
</div>
);
Expand Down
Loading