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.

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

chore(profile): sortable links #1392

Merged
merged 13 commits into from
Jan 14, 2023
4 changes: 4 additions & 0 deletions apps/profile/app/assets/warning.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions apps/profile/app/components/accounts/SaveButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button } from '@kubelt/design-system'
import { Button } from '@kubelt/design-system/src/atoms/buttons/Button'

const SaveButton = ({ isFormChanged, discardFn }: any) => {
const SaveButton = ({ isFormChanged, discardFn, size = 'xl' }: any) => {
return (
<>
{/* Form where this button is used should have
Expand All @@ -19,7 +19,7 @@ const SaveButton = ({ isFormChanged, discardFn }: any) => {
<Button
type="reset"
btnType={'secondary'}
btnSize={'xl'}
btnSize={size}
className="!text-gray-600 border-none mb-4 lg:mb-0"
onClick={discardFn}
>
Expand All @@ -29,7 +29,7 @@ const SaveButton = ({ isFormChanged, discardFn }: any) => {
<Button
isSubmit
btnType={'primary'}
btnSize={'xl'}
btnSize={size}
className="mb-4 lg:mb-0"
>
Save
Expand All @@ -40,7 +40,7 @@ const SaveButton = ({ isFormChanged, discardFn }: any) => {
<Button
isSubmit
btnType={'primary'}
btnSize={'xl'}
btnSize={size}
className="mb-4 lg:mb-0"
disabled
>
Expand Down
37 changes: 37 additions & 0 deletions apps/profile/app/components/accounts/UnsavedChangesModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from 'react'
import { Modal } from '@kubelt/design-system/src/molecules/modal/Modal'
import SaveButton from './SaveButton'
import { Text } from '@kubelt/design-system'

import warn from '~/assets/warning.svg'

const UnsavedChangesModal = ({ isOpen, handleClose }) => {
return (
<Modal isOpen={isOpen} handleClose={handleClose}>
<div className="relative bg-white lg:w-[32rem] rounded-xl pb-3 pr-6">
<div className="relative bg-white rounded-xl pl-6 pt-6">
<div className="mb-[53px] flex flex-row items-start">
<img src={warn} alt="warning" className="mr-4" />
<div className="flex flex-col items-start">
<Text size="lg" className="text-gray-900 mb-2">
You have Unsaved Changes
</Text>
<Text size="sm" className="text-gray-500 text-left">
You have made some changes. Do you want to discard or save them?
</Text>
</div>
</div>
<SaveButton
size="l"
isFormChanged={true}
discardFn={() => {
console.log('hey')
}}
/>
</div>
</div>
</Modal>
)
}

export default UnsavedChangesModal
5 changes: 2 additions & 3 deletions apps/profile/app/components/conditional-tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ type ConditionalTooltipProps = {
children: any
condition: boolean
content: string
placement: string
trigger?: 'hover' | 'click'
}

Expand All @@ -18,10 +17,10 @@ const ConditionalTooltip = ({
return condition ? (
<Tooltip
content={content}
placement={placement}
// placement=
// without `text-black` text gets white on white bg
// ¯\_(ツ)_/¯
className="text-black"
className="text-black bg-white !font-mono"
trigger={trigger}
>
{children}
Expand Down
2 changes: 1 addition & 1 deletion apps/profile/app/routes/$profile[.]json.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LoaderFunction } from '@remix-run/cloudflare'
import type { LoaderFunction } from '@remix-run/cloudflare'
import { loader as profileLoader } from '~/routes/$profile.json'

export const loader: LoaderFunction = profileLoader
10 changes: 0 additions & 10 deletions apps/profile/app/routes/account/gallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,6 @@ const Nft = forwardRef(
* It re-renders this small component quite often
* every time user changes screen size
*/
const [width, setWidth] = useState(0)
useLayoutEffect(() => {
function updateSize() {
setWidth(window.innerWidth)
}
window.addEventListener('resize', updateSize)
updateSize()
return () => window.removeEventListener('resize', updateSize)
}, [])

const inlineStyles = {
opacity: faded ? '0.2' : isDragging ? '0' : '1',
Expand All @@ -138,7 +129,6 @@ const Nft = forwardRef(
* Don't know how to write it better so keep it for now
*/
height: '100%',

...style,
}
return (
Expand Down
2 changes: 0 additions & 2 deletions apps/profile/app/routes/account/settings/integrations.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


export default function AccountSettingsIntegrations() {
return (
<>Connection Integrations</>
Expand Down