fixd
This commit is contained in:
parent
cdb0bab8c3
commit
fb6673c3cd
|
|
@ -62,7 +62,7 @@ def upload():
|
|||
print(request.path)
|
||||
print(request.form)
|
||||
print(request.files)
|
||||
img = request.files['file']
|
||||
img = request.files['userpic']
|
||||
if img:
|
||||
# Perform the file upload
|
||||
filename = secure_filename(img.filename)
|
||||
|
|
|
|||
46
package.json
46
package.json
|
|
@ -33,47 +33,49 @@
|
|||
"vercel-build": "astro build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@connorskees/grass": "^0.12.0",
|
||||
"mailgun.js": "^8.0.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@astrojs/solid-js": "^1.2.3",
|
||||
"@astrojs/vercel": "^2.4.0",
|
||||
"@babel/core": "^7.20.12",
|
||||
"@graphql-codegen/cli": "^2.16.3",
|
||||
"@graphql-codegen/cli": "^2.16.4",
|
||||
"@graphql-codegen/typescript": "^2.8.7",
|
||||
"@graphql-codegen/typescript-operations": "^2.5.12",
|
||||
"@graphql-codegen/typescript-urql": "^3.7.3",
|
||||
"@graphql-codegen/urql-introspection": "^2.2.1",
|
||||
"@graphql-tools/url-loader": "^7.16.29",
|
||||
"@graphql-tools/url-loader": "^7.17.3",
|
||||
"@graphql-typed-document-node/core": "^3.1.1",
|
||||
"@nanostores/router": "^0.8.0",
|
||||
"@nanostores/solid": "^0.3.2",
|
||||
"@popperjs/core": "^2.11.6",
|
||||
"@solid-primitives/memo": "^1.1.2",
|
||||
"@solid-primitives/storage": "^1.3.3",
|
||||
"@solid-primitives/memo": "^1.1.3",
|
||||
"@solid-primitives/storage": "^1.3.4",
|
||||
"@solid-primitives/upload": "^0.0.105",
|
||||
"@types/express": "^4.17.15",
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/uuid": "^8.3.4",
|
||||
"@typescript-eslint/eslint-plugin": "^5.48.0",
|
||||
"@typescript-eslint/parser": "^5.48.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.48.2",
|
||||
"@typescript-eslint/parser": "^5.48.2",
|
||||
"@urql/core": "^3.1.1",
|
||||
"@urql/devtools": "^2.0.3",
|
||||
"@urql/exchange-graphcache": "^5.0.8",
|
||||
"astro": "^1.9.1",
|
||||
"astro-eslint-parser": "^0.9.3",
|
||||
"astro": "^1.9.2",
|
||||
"astro-eslint-parser": "^0.9.5",
|
||||
"bcryptjs": "^2.4.3",
|
||||
"bootstrap": "^5.2.3",
|
||||
"clsx": "^1.2.1",
|
||||
"cookie": "^0.5.0",
|
||||
"cookie-signature": "^1.2.0",
|
||||
"cosmiconfig-toml-loader": "^1.0.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^8.31.0",
|
||||
"eslint": "^8.32.0",
|
||||
"eslint-config-stylelint": "^17.1.0",
|
||||
"eslint-import-resolver-typescript": "^3.5.2",
|
||||
"eslint-import-resolver-typescript": "^3.5.3",
|
||||
"eslint-plugin-astro": "^0.21.1",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-jsx-a11y": "^6.6.1",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-jsx-a11y": "^6.7.1",
|
||||
"eslint-plugin-promise": "^6.1.1",
|
||||
"eslint-plugin-solid": "^0.8.0",
|
||||
"eslint-plugin-sonarjs": "^0.16.0",
|
||||
|
|
@ -82,7 +84,7 @@
|
|||
"graphql-sse": "^1.3.2",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"graphql-ws": "^5.11.2",
|
||||
"hast-util-select": "^5.0.3",
|
||||
"hast-util-select": "^5.0.4",
|
||||
"husky": "^8.0.3",
|
||||
"idb": "^7.1.1",
|
||||
"jest": "^29.3.1",
|
||||
|
|
@ -98,7 +100,7 @@
|
|||
"orderedmap": "^2.1.0",
|
||||
"postcss": "^8.4.21",
|
||||
"postcss-modules": "5.0.0",
|
||||
"prettier": "^2.8.2",
|
||||
"prettier": "^2.8.3",
|
||||
"prettier-eslint": "^15.0.1",
|
||||
"prosemirror-commands": "^1.5.0",
|
||||
"prosemirror-dropcursor": "^1.6.1",
|
||||
|
|
@ -109,17 +111,17 @@
|
|||
"prosemirror-keymap": "^1.2.0",
|
||||
"prosemirror-markdown": "^1.10.1",
|
||||
"prosemirror-menu": "^1.2.1",
|
||||
"prosemirror-model": "^1.18.3",
|
||||
"prosemirror-model": "^1.19.0",
|
||||
"prosemirror-schema-list": "^1.2.2",
|
||||
"prosemirror-state": "^1.4.2",
|
||||
"prosemirror-view": "^1.29.1",
|
||||
"prosemirror-view": "^1.30.0",
|
||||
"rollup": "^2.79.1",
|
||||
"rollup-plugin-visualizer": "^5.9.0",
|
||||
"sass": "1.32.13",
|
||||
"solid-js": "^1.6.8",
|
||||
"solid-js-form": "^0.1.7",
|
||||
"solid-js": "^1.6.9",
|
||||
"solid-js-form": "^0.1.8",
|
||||
"solid-jsx": "^0.9.1",
|
||||
"solid-social": "^0.9.5",
|
||||
"solid-social": "^0.9.6",
|
||||
"solid-utils": "^0.8.1",
|
||||
"sort-package-json": "^2.1.0",
|
||||
"stylelint": "^14.16.1",
|
||||
|
|
@ -128,17 +130,17 @@
|
|||
"stylelint-config-standard-scss": "^6.1.0",
|
||||
"stylelint-order": "^5.0.0",
|
||||
"stylelint-scss": "^4.3.0",
|
||||
"swiper": "^8.4.5",
|
||||
"swiper": "^8.4.6",
|
||||
"ts-node": "^10.9.1",
|
||||
"typescript": "^4.9.4",
|
||||
"undici": "^5.14.0",
|
||||
"undici": "^5.15.1",
|
||||
"unique-names-generator": "^4.7.1",
|
||||
"uuid": "^9.0.0",
|
||||
"vite": "^3.2.5",
|
||||
"ws": "^8.12.0",
|
||||
"y-prosemirror": "^1.2.0",
|
||||
"y-protocols": "^1.0.5",
|
||||
"y-webrtc": "^10.2.3",
|
||||
"y-webrtc": "^10.2.4",
|
||||
"yjs": "^13.5.44"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1302
pnpm-lock.yaml
1302
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -7,14 +7,14 @@ import { For, createSignal, Show, onMount } from 'solid-js'
|
|||
import { clsx } from 'clsx'
|
||||
import styles from './Settings.module.scss'
|
||||
import { useProfileForm } from '../../../context/profile'
|
||||
import { createFileUploader } from '@solid-primitives/upload'
|
||||
import validateUrl from '../../../utils/validateUrl'
|
||||
|
||||
export const ProfileSettingsPage = (props: PageProps) => {
|
||||
const [addLinkForm, setAddLinkForm] = createSignal<boolean>(false)
|
||||
const [incorrectUrl, setIncorrectUrl] = createSignal<boolean>(false)
|
||||
const { form, updateFormField, submit, slugError } = useProfileForm()
|
||||
const handleChangeSocial = (value) => {
|
||||
let updateForm: HTMLFormElement
|
||||
const handleChangeSocial = (value: string) => {
|
||||
if (validateUrl(value)) {
|
||||
updateFormField('links', value)
|
||||
setAddLinkForm(false)
|
||||
|
|
@ -26,28 +26,30 @@ export const ProfileSettingsPage = (props: PageProps) => {
|
|||
event.preventDefault()
|
||||
submit(form)
|
||||
}
|
||||
|
||||
const { files, selectFiles: selectFilesAsync } = createFileUploader({ accept: 'image/*' })
|
||||
|
||||
const handleUpload = () => {
|
||||
selectFilesAsync(async ([{ source, name, size, file }]) => {
|
||||
const image = { source, name, size, file }
|
||||
try {
|
||||
const formData = new FormData()
|
||||
formData.append('type', file.type)
|
||||
formData.append('name', image.source.split('/').pop())
|
||||
formData.append('ext', image.name.split('.').pop())
|
||||
// formData.append('data', image.file)
|
||||
const resp = await fetch('/api/upload', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
const url = await resp.json()
|
||||
updateFormField('userpic', url)
|
||||
} catch (error) {
|
||||
console.error('[upload] error', error)
|
||||
let userpicFile: HTMLInputElement
|
||||
const handleUserpicUpload = async (ev) => {
|
||||
// TODO: show progress
|
||||
try {
|
||||
console.debug('handleUserpicUpload trigger')
|
||||
const f = ev.target.files[0]
|
||||
if (f) {
|
||||
const reader = new FileReader()
|
||||
reader.onloadend = () => {
|
||||
f.fileData = reader.result
|
||||
const data = new FormData()
|
||||
data.append('file', f)
|
||||
fetch('/api/upload', {
|
||||
method: 'POST',
|
||||
body: data
|
||||
}).then((resp) => {
|
||||
resp.json().then((url) => updateFormField('userpic', url))
|
||||
})
|
||||
}
|
||||
reader.readAsDataURL(f)
|
||||
}
|
||||
})
|
||||
} catch (error) {
|
||||
console.error('[upload] error', error)
|
||||
}
|
||||
}
|
||||
const [hostname, setHostname] = createSignal('new.discours.io')
|
||||
onMount(() => setHostname(window?.location.host))
|
||||
|
|
@ -66,12 +68,24 @@ export const ProfileSettingsPage = (props: PageProps) => {
|
|||
<div class="col-md-10 col-lg-9 col-xl-8">
|
||||
<h1>{t('Profile settings')}</h1>
|
||||
<p class="description">{t('Here you can customize your profile the way you want.')}</p>
|
||||
<form onSubmit={handleSubmit}>
|
||||
<form ref={updateForm} onSubmit={handleSubmit} enctype="multipart/form-data">
|
||||
<h4>{t('Userpic')}</h4>
|
||||
<div class="pretty-form__item">
|
||||
<div class={styles.avatarContainer}>
|
||||
<img class={styles.avatar} src={form.userpic} alt={form.name} />
|
||||
<input type="button" class={styles.avatarInput} onClick={handleUpload} />
|
||||
<img
|
||||
class={styles.avatar}
|
||||
src={form.userpic}
|
||||
alt={form.name}
|
||||
onClick={() => userpicFile.click()}
|
||||
/>
|
||||
<input
|
||||
ref={userpicFile}
|
||||
type="file"
|
||||
name="userpic"
|
||||
value="userpic"
|
||||
hidden
|
||||
onChange={handleUserpicUpload}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<h4>{t('Name')}</h4>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@ const excludes = [
|
|||
'topics',
|
||||
'welcome',
|
||||
'confirm',
|
||||
'feed'
|
||||
'feed',
|
||||
'api/upload',
|
||||
'api/feedback',
|
||||
'api/newsletter'
|
||||
]
|
||||
|
||||
const slug = Astro.params.slug?.toString()
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user