Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: Introduce unified survey UI package @formbricks/surveys #698

Merged
merged 55 commits into from
Sep 10, 2023
Merged

chore: Introduce unified survey UI package @formbricks/surveys #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
cd500a2
add vite survey package
mattinannt Aug 7, 2023
b3103c8
add renderSurvey method
mattinannt Aug 10, 2023
1d3206c
Merge branch 'main' of github.com:formbricks/formbricks into feature/…
mattinannt Aug 10, 2023
e1f3c42
add all survey components
mattinannt Aug 10, 2023
e53c386
First working version of renderSurvey
mattinannt Aug 15, 2023
539b737
merge latest changes from main
mattinannt Aug 15, 2023
14c9683
integrate survey package into survey preview
mattinannt Aug 15, 2023
09c7d7f
add survey modal functionality to formbricks-surveys
mattinannt Aug 15, 2023
7fcee39
fix build errors and add new template types
mattinannt Aug 15, 2023
8a9cdcc
Merge branch 'main' of github.com:formbricks/formbricks into feature/…
mattinannt Aug 16, 2023
0d9ce27
add response queue
mattinannt Aug 16, 2023
43f269d
add simple formbricks-js integration
mattinannt Aug 16, 2023
1b6910e
add local state management for surveys
mattinannt Aug 18, 2023
d395a65
add local storage to multiple choice and open text questions
mattinannt Aug 20, 2023
affb30e
add local state to other question types, layout fixes
mattinannt Aug 20, 2023
4abf1f3
Fix modal close button, clean js package code
mattinannt Aug 22, 2023
b8ab71d
add new calculate progress function
mattinannt Aug 22, 2023
3b16eb1
merge latest changes into main
mattinannt Aug 22, 2023
09f8e34
fix progressbar on thankyou card
mattinannt Aug 22, 2023
5b836cb
fix churn survey branching in demo product
jobenjada Aug 22, 2023
fe35457
Merge branch 'feature/FOR-836' of github.com:formbricks/formbricks in…
jobenjada Aug 22, 2023
fbf4cff
use tsup to bundle @formbricks/js
mattinannt Aug 22, 2023
1266bfb
Merge branch 'feature/FOR-836' of github.com:formbricks/formbricks in…
mattinannt Aug 22, 2023
4404546
Merge branch 'main' of github.com:formbricks/formbricks into feature/…
mattinannt Aug 22, 2023
b12e883
update survey positioning in link surveys
mattinannt Aug 22, 2023
a543e61
fix preview reset button in link survey
mattinannt Aug 22, 2023
f0f8b92
merge latest changes, solve merge conflicts
mattinannt Sep 1, 2023
b3ce061
change logic for progress bar
mattinannt Sep 1, 2023
f248772
update progressbar logic
mattinannt Sep 1, 2023
c7ea55f
update spacing
mattinannt Sep 1, 2023
748d02e
add conditional autofocus / disable for iframe
mattinannt Sep 1, 2023
26b35b0
add userId to link survey
mattinannt Sep 1, 2023
16c1a56
Merge branch 'main' of https://github.com/Dhruwang/formbricks into fe…
Dhruwang Sep 4, 2023
2b3ad55
integrated email verification
Dhruwang Sep 4, 2023
1aa3382
moved token verification and reading to server component
Dhruwang Sep 4, 2023
f6e2d27
ran pnpm format
Dhruwang Sep 4, 2023
cb699b7
resolved merge conflict
Dhruwang Sep 4, 2023
6cbbae7
added question prefilling
Dhruwang Sep 4, 2023
ac206b8
Merge branch 'main' of https://github.com/Dhruwang/formbricks into fe…
Dhruwang Sep 4, 2023
014aa03
added backButton label
Dhruwang Sep 6, 2023
ae52808
ran pnpm format
Dhruwang Sep 6, 2023
22a2039
Merge branch 'main' of github.com:formbricks/formbricks into feature/…
mattinannt Sep 6, 2023
0dc7036
Merge branch 'main' of https://github.com/Dhruwang/formbricks into fe…
Dhruwang Sep 6, 2023
86a7b59
Moved question prefilling logic to Link Survey
Dhruwang Sep 6, 2023
bea5600
Merge commit 'refs/pull/698/head' of https://github.com/formbricks/fo…
Dhruwang Sep 6, 2023
dcfe261
Refactor types
mattinannt Sep 7, 2023
9326e58
centralize survey package props, fix build errors
mattinannt Sep 7, 2023
31dba1f
fix userId in link survey
mattinannt Sep 7, 2023
380e2b5
fix survey closed message
mattinannt Sep 7, 2023
7837310
add redirect on complete, fix bugs
mattinannt Sep 7, 2023
4fde3fe
smaller bugfixes
mattinannt Sep 9, 2023
e07f3ba
smaller bugfixes
mattinannt Sep 9, 2023
70f565d
fix bugs
mattinannt Sep 10, 2023
65829c6
fix build errors
mattinannt Sep 10, 2023
8fe9d75
remove logs
mattinannt Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/web/app/(app)/environments/[environmentId]/people/[personId]/DeletePersonButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function DeletePersonButton({ environmentId, personId }: DeletePersonButt
try {
setIsDeletingPerson(true);
await deletePersonAction(personId);
router.refresh();
router.push(`/environments/${environmentId}/people`);
toast.success("Person deleted successfully.");
} catch (error) {
Expand Down
7 changes: 4 additions & 3 deletions apps/web/app/(app)/environments/[environmentId]/people/[personId]/loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { ArrowsUpDownIcon, TrashIcon } from "@heroicons/react/24/outline";
import {
ActivityItemPopover,
ActivityItemIcon,
ActivityItemPopover,
} from "@/app/(app)/environments/[environmentId]/people/[personId]/(activitySection)/ActivityItemComponents";
import { BackIcon } from "@formbricks/ui";
import { TActivityFeedItem } from "@formbricks/types/v1/activity";
import { BackIcon } from "@formbricks/ui";
import { ArrowsUpDownIcon } from "@heroicons/react/24/outline";
import { TrashIcon } from "lucide-react";

export default function Loading() {
const unifiedList: TActivityFeedItem[] = [
Expand Down