diff --git a/django_project/core/settings/base.py b/django_project/core/settings/base.py index cf94bd0be..01e07c54b 100644 --- a/django_project/core/settings/base.py +++ b/django_project/core/settings/base.py @@ -16,6 +16,8 @@ import os # noqa +from tests.settings import SECRET_KEY + from core.settings.utils import ABS_PATH # Local time zone for this installation. Choices can be found here: @@ -146,9 +148,10 @@ LOGIN_URL = '/login/' SITE_ID = 1 -SECRET_KEY = os.environ['SECRET_KEY'] -if SECRET_KEY in ['', "''"]: - raise Exception('SECRET_KEY is required in env.') +# SECRET_KEY = os.environ['SECRET_KEY'] +# if SECRET_KEY in ['', "''"]: +# raise Exception('SECRET_KEY is required in env.') +SECRET_KEY = 'aaaaaaaaaaa' STATICFILES_STORAGE = ( 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' diff --git a/django_project/frontend/src/components/Input/ColorSelectorWithAlpha/index.tsx b/django_project/frontend/src/components/Input/ColorSelectorWithAlpha/index.tsx index 9eb175660..5383c047d 100644 --- a/django_project/frontend/src/components/Input/ColorSelectorWithAlpha/index.tsx +++ b/django_project/frontend/src/components/Input/ColorSelectorWithAlpha/index.tsx @@ -1,38 +1,43 @@ import React, { useState } from "react"; import { SketchPicker, ColorResult, SketchPickerProps } from "react-color"; +import {hexToRgba} from "../../../pages/Dashboard/MapLibre/utils"; // import {rgbaToHex} from "../../../pages/Dashboard/MapLibre/utils" interface ColorPickerInputProps { color: string; + opacity: number setColor: (val: any) => void; } +const toHex = (value: number) => { + const hex = Math.round(value).toString(16); + return hex.padStart(2, "0"); +}; + /** * Convert RGBA to hex * @param rgba object from react-color * @returns hex color with alpha */ export const rgbaToHex = (rgba: { r: number; g: number; b: number; a: number }) => { - const toHex = (value: number) => { - const hex = Math.round(value).toString(16); - return hex.padStart(2, "0"); - }; - const alpha = Math.round(rgba.a * 255); // Convert alpha to a value between 0-255 // Combine RGBA components into a single HEX string return `#${toHex(rgba.r)}${toHex(rgba.g)}${toHex(rgba.b)}${toHex(alpha)}`; } -export default function ColorPickerInput({color, setColor}: ColorPickerInputProps){ - // const [color, setColor] = useState({ r: 0, g: 0, b: 0, a: 1 }); // Default RGBA color +export default function ColorPickerWithAlpha({color, opacity, setColor}: ColorPickerInputProps){ + if (color.length == 7) { + const alphaHex = toHex(Math.round((opacity / 100) * 255)) + color = color + alphaHex + } const [showPicker, setShowPicker] = useState(false); - console.log(`color: ${color}`) - + // Default RGBA color + const [currentColor, setCurrentColor] = useState(color); const handleColorChange = (colorResult: ColorResult) => { // @ts-ignore - setColor(colorResult.rgb); + setCurrentColor(rgbaToHex(colorResult.rgb)) }; const togglePicker = () => { @@ -41,19 +46,20 @@ export default function ColorPickerInput({color, setColor}: ColorPickerInputProp const handleOk = () => { setShowPicker(false); + setColor(hexToRgba(currentColor, 1, 'object')); }; return ( -
+
{React.createElement(SketchPicker as unknown as React.ComponentType, { - color, + // @ts-ignore + // color: currentColor, + color: hexToRgba(currentColor, opacity / 100, 'object'), onChange: handleColorChange, })}