diff --git a/Dockerfile b/Dockerfile index 3c10ad4b..d2e3ff71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,10 @@ RUN rm /usr/local/etc/php-fpm.conf \ && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \ && mkdir -p /var/run/php /var/run/nginx -COPY .github/docker/default.conf /etc/nginx/http.d/default.conf -COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf -COPY .github/docker/supervisord.conf /etc/supervisord.conf +COPY .forgejo/docker/default.conf /etc/nginx/http.d/default.conf +COPY .forgejo/docker/www.conf /usr/local/etc/php-fpm.conf +COPY .forgejo/docker/supervisord.conf /etc/supervisord.conf EXPOSE 80 443 -ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ] +ENTRYPOINT [ "/bin/ash", ".forgejo/docker/entrypoint.sh" ] CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ] diff --git a/public/assets/svgs/logo.png b/public/assets/svgs/logo.png index 99f01643..56da947c 100644 Binary files a/public/assets/svgs/logo.png and b/public/assets/svgs/logo.png differ diff --git a/public/favicons/apple-touch-icon.png b/public/favicons/apple-touch-icon.png index 5ec6cfcc..cc279030 100644 Binary files a/public/favicons/apple-touch-icon.png and b/public/favicons/apple-touch-icon.png differ diff --git a/public/favicons/browserconfig.xml b/public/favicons/browserconfig.xml index c5541482..b3930d0f 100644 --- a/public/favicons/browserconfig.xml +++ b/public/favicons/browserconfig.xml @@ -1,2 +1,9 @@ -#ffffff \ No newline at end of file + + + + + #da532c + + + diff --git a/public/favicons/favicon-48x48.png b/public/favicons/favicon-48x48.png new file mode 100644 index 00000000..0cff0a9b Binary files /dev/null and b/public/favicons/favicon-48x48.png differ diff --git a/public/favicons/favicon.ico b/public/favicons/favicon.ico index bc222883..969a263b 100644 Binary files a/public/favicons/favicon.ico and b/public/favicons/favicon.ico differ diff --git a/public/favicons/favicon.svg b/public/favicons/favicon.svg new file mode 100644 index 00000000..c3dd8b89 --- /dev/null +++ b/public/favicons/favicon.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/public/favicons/web-app-manifest-192x192.png b/public/favicons/web-app-manifest-192x192.png new file mode 100644 index 00000000..f7b001c3 Binary files /dev/null and b/public/favicons/web-app-manifest-192x192.png differ diff --git a/public/favicons/web-app-manifest-512x512.png b/public/favicons/web-app-manifest-512x512.png new file mode 100644 index 00000000..02e9c680 Binary files /dev/null and b/public/favicons/web-app-manifest-512x512.png differ diff --git a/resources/scripts/components/Avatar.tsx b/resources/scripts/components/Avatar.tsx index 4d9d254d..d55e9623 100644 --- a/resources/scripts/components/Avatar.tsx +++ b/resources/scripts/components/Avatar.tsx @@ -1,6 +1,7 @@ import React from 'react'; import BoringAvatar, { AvatarProps } from 'boring-avatars'; import { useStoreState } from '@/state/hooks'; +import crypto from 'crypto'; const palette = ['#FFAD08', '#EDD75A', '#73B06F', '#0C8F8F', '#587291']; @@ -11,9 +12,9 @@ const _Avatar = ({ variant = 'beam', ...props }: AvatarProps) => ( ); const _UserAvatar = ({ variant = 'beam', ...props }: Omit) => { - const uuid = useStoreState((state) => state.user.data?.uuid); + const avatar = useStoreState((state) => `https://www.gravatar.com/avatar/${crypto.createHash('md5').update(state.user.data!.email).digest('hex')}?s=512`); - return ; + return User Image; }; _Avatar.displayName = 'Avatar'; diff --git a/resources/scripts/components/auth/LoginFormContainer.tsx b/resources/scripts/components/auth/LoginFormContainer.tsx index 17287a3c..761b3bca 100644 --- a/resources/scripts/components/auth/LoginFormContainer.tsx +++ b/resources/scripts/components/auth/LoginFormContainer.tsx @@ -29,17 +29,17 @@ const Container = styled.div` `; export default forwardRef(({ title, ...props }, ref) => ( - - {title &&

{title}

} - -
-
-
- -
-
{props.children}
+ + {title &&

{title}

} + + +
+
+
- +
{props.children}
+
+

© 2015 - {new Date().getFullYear()}  { - const TERMINAL_PRELUDE = `\u001b[1m\u001b[38;2;153;0;255m${NookConfig.TERMINAL_PRELUDE} \u001b[0m`; + const TERMINAL_PRELUDE = `\u001b[1m\u001b[38;2;255;0;47m${NookConfig.TERMINAL_PRELUDE}\u001b[0m`; const ref = useRef(null); const terminal = useMemo(() => new Terminal({ ...terminalProps }), []); const fitAddon = new FitAddon(); @@ -87,11 +87,12 @@ export default () => { const handleDaemonErrorOutput = (line: string) => terminal.writeln( - '\u001b[1m\u001b[38;2;153;0;255m' + NookConfig.TERMINAL_PRELUDE + '\u001b[0m' + + `\u001b[38;2;153;0;255m${NookConfig.TERMINAL_PRELUDE}\u001b[0m` + '\u001b[41m' + line.replace(/(?:\r\n|\r|\n)$/im, '') + '\u001b[0m' ); + const handlePowerChangeEvent = (state: string) => terminal.writeln(TERMINAL_PRELUDE + 'Server marked as ' + state + '...\u001b[0m');