⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
reposition account deletion forms
daniel31x138f16e1e94137
diff --git a/apps/mobile/components/ActionSheets/DeleteAccountSheet.tsx b/apps/mobile/components/ActionSheets/DeleteAccountSheet.tsxindex 18dd5bff..a4ec205d 100644--- a/apps/mobile/components/ActionSheets/DeleteAccountSheet.tsx+++ b/apps/mobile/components/ActionSheets/DeleteAccountSheet.tsx@@ -108,59 +108,15 @@ export default function DeleteAccountSheet() {/><View className="px-8 pb-5">- <Text className="text-base-content">+ <Text>This will permanently delete all the Links, Collections, Tags, andarchived data you own. It will also log you out. This action isirreversible!</Text>- <Text className="text-neutral text-sm mt-5 mb-2">- Reason for cancellation (optional, but it really helps us improve!)- </Text>- <View className="flex-row flex-wrap gap-2">- {FEEDBACK_OPTIONS.map((option) => {- const isSelected = feedback === option.value;- return (- <TouchableOpacity- key={option.value}- activeOpacity={0.7}- onPress={() =>- setFeedback(isSelected ? undefined : option.value)- }- className="rounded-full border px-3 py-1.5"- style={{- borderColor: isSelected- ? theme.accent- : theme["neutral-content"],- backgroundColor: isSelected ? theme.accent : "transparent",- }}- >- <Text- className="text-sm"- style={{- color: isSelected ? "#FFFFFF" : theme["base-content"],- }}- >- {option.label}- </Text>- </TouchableOpacity>- );- })}- </View>-- <Input- placeholder="More information (optional)"- placeholderTextColor={theme.neutral}- className="mt-4 bg-base-200 min-h-20"- multiline- textAlignVertical="top"- value={comment}- onChangeText={setComment}- />-{user?.hasPassword ? (<>- <Text className="text-base-content mt-5 mb-2">+ <Text className="text-base-content mt-5 mb-2 font-semibold">Confirm password</Text><Input@@ -176,7 +132,7 @@ export default function DeleteAccountSheet() {</>) : (<>- <Text className="text-base-content mt-5 mb-2">+ <Text className="text-base-content mt-5 mb-2 font-semibold">Type "confirm" below to delete your account</Text><Input@@ -191,6 +147,53 @@ export default function DeleteAccountSheet() {</>)}+ <View className="border border-neutral-content p-2 rounded-md mt-5 mb-2">+ <Text className="italic font-semibold mb-2">+ Optional (but it really helps us improve!)+ </Text>+ <Text className="mb-2">Reason for cancellation</Text>+ <View className="flex-row flex-wrap gap-2">+ {FEEDBACK_OPTIONS.map((option) => {+ const isSelected = feedback === option.value;+ return (+ <TouchableOpacity+ key={option.value}+ activeOpacity={0.7}+ onPress={() =>+ setFeedback(isSelected ? undefined : option.value)+ }+ className="rounded-full border px-3 py-1.5"+ style={{+ borderColor: isSelected+ ? theme.accent+ : theme["neutral-content"],+ backgroundColor: isSelected ? theme.accent : "transparent",+ }}+ >+ <Text+ className="text-sm"+ style={{+ color: isSelected ? "#FFFFFF" : theme["base-content"],+ }}+ >+ {option.label}+ </Text>+ </TouchableOpacity>+ );+ })}+ </View>++ <Input+ placeholder="More information (optional)"+ placeholderTextColor={theme.neutral}+ className="mt-4 bg-base-200 min-h-20"+ multiline+ textAlignVertical="top"+ value={comment}+ onChangeText={setComment}+ />+ </View>+<ButtononPress={handleDelete}isLoading={loading}diff --git a/apps/web/components/ModalContent/DeleteOwnAccountModal.tsx b/apps/web/components/ModalContent/DeleteOwnAccountModal.tsxindex 3eb7d6ac..55201a8a 100644--- a/apps/web/components/ModalContent/DeleteOwnAccountModal.tsx+++ b/apps/web/components/ModalContent/DeleteOwnAccountModal.tsx@@ -68,6 +68,30 @@ export default function DeleteOwnAccountModal({ onClose }: Props) {<div className="flex flex-col gap-3"><p>{t("delete_warning")}</p>+ {user?.hasPassword ? (+ <div>+ <p className="mb-2 font-semibold">{t("confirm_password")}</p>+ <TextInput+ value={password}+ onChange={(e) => setPassword(e.target.value)}+ placeholder="••••••••••••••"+ className="bg-base-100"+ type="password"+ />+ </div>+ ) : (+ <div>+ <p className="mb-2 font-semibold">{t("type_confirm_to_delete")}</p>+ <TextInput+ value={confirmation}+ onChange={(e) => setConfirmation(e.target.value)}+ placeholder="confirm"+ className="bg-base-100"+ autoComplete="off"+ />+ </div>+ )}+<fieldset className="border rounded-md p-2 border-primary"><legend className="px-3 py-1 text-sm sm:text-base border rounded-md border-primary"><b>{t("optional")}</b> <i>{t("feedback_help")}</i>@@ -101,30 +125,6 @@ export default function DeleteOwnAccountModal({ onClose }: Props) {</div></fieldset>- {user?.hasPassword ? (- <div>- <p className="mb-2">{t("confirm_password")}</p>- <TextInput- value={password}- onChange={(e) => setPassword(e.target.value)}- placeholder="••••••••••••••"- className="bg-base-100"- type="password"- />- </div>- ) : (- <div>- <p className="mb-2">{t("type_confirm_to_delete")}</p>- <TextInput- value={confirmation}- onChange={(e) => setConfirmation(e.target.value)}- placeholder="confirm"- className="bg-base-100"- autoComplete="off"- />- </div>- )}-<ButtonclassName="ml-auto"variant="destructive"