Merge pull request #1520 from Athou/quarkus

Migrate to Quarkus (#1517)

commafeed-client/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.6.0</version>
+		<version>5.0.0-beta</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
@@ -80,7 +80,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<outputDirectory>${project.build.directory}/classes/META-INF/resources</outputDirectory>
 							<resources>
 								<resource>
 									<directory>dist</directory>

commafeed-client/src/app/client.ts

@@ -81,7 +81,17 @@ export const client = {
         },
     },
     user: {
-        login: async (req: LoginRequest) => await axiosInstance.post("user/login", req),
+        login: async (req: LoginRequest) => {
+            const formData = new URLSearchParams()
+            formData.append("j_username", req.name)
+            formData.append("j_password", req.password)
+            return await axiosInstance.post("j_security_check", formData, {
+                baseURL: ".",
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
+            })
+        },
         register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
         passwordReset: async (req: PasswordResetRequest) => await axiosInstance.post("user/passwordReset", req),
         getSettings: async () => await axiosInstance.get<Settings>("user/settings"),

commafeed-client/src/pages/admin/MetricsPage.tsx

@@ -1,20 +1,17 @@
-import { Accordion, Box, Tabs } from "@mantine/core"
+import { Accordion, Box } from "@mantine/core"
 import { client } from "app/client"
 import { Loader } from "components/Loader"
 import { Gauge } from "components/metrics/Gauge"
 import { Meter } from "components/metrics/Meter"
 import { MetricAccordionItem } from "components/metrics/MetricAccordionItem"
-import { Timer } from "components/metrics/Timer"
 import { useEffect } from "react"
 import { useAsync } from "react-async-hook"
-import { TbChartAreaLine, TbClock } from "react-icons/tb"
 
 const shownMeters: Record<string, string> = {
     "com.commafeed.backend.feed.FeedRefreshEngine.refill": "Feed queue refill rate",
     "com.commafeed.backend.feed.FeedRefreshWorker.feedFetched": "Feed fetching rate",
     "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed update rate",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit rate",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryInserted": "Entries inserted",
     "com.commafeed.backend.service.db.DatabaseCleaningService.entriesDeleted": "Entries deleted",
 }
 
@@ -42,46 +39,25 @@ export function MetricsPage() {
     }, [query.execute])
 
     if (!query.result) return <Loader />
-    const { meters, gauges, timers } = query.result.data
+    const { meters, gauges } = query.result.data
     return (
-        <Tabs defaultValue="stats">
-            <Tabs.List>
-                <Tabs.Tab value="stats" leftSection={<TbChartAreaLine size={14} />}>
-                    Stats
-                </Tabs.Tab>
-                <Tabs.Tab value="timers" leftSection={<TbClock size={14} />}>
-                    Timers
-                </Tabs.Tab>
-            </Tabs.List>
+        <>
+            <Accordion variant="contained" chevronPosition="left">
+                {Object.keys(shownMeters).map(m => (
+                    <MetricAccordionItem key={m} metricKey={m} name={shownMeters[m]} headerValue={meters[m].count}>
+                        <Meter meter={meters[m]} />
+                    </MetricAccordionItem>
+                ))}
+            </Accordion>
 
-            <Tabs.Panel value="stats" pt="xs">
-                <Accordion variant="contained" chevronPosition="left">
-                    {Object.keys(shownMeters).map(m => (
-                        <MetricAccordionItem key={m} metricKey={m} name={shownMeters[m]} headerValue={meters[m].count}>
-                            <Meter meter={meters[m]} />
-                        </MetricAccordionItem>
-                    ))}
-                </Accordion>
-
-                <Box pt="xs">
-                    {Object.keys(shownGauges).map(g => (
-                        <Box key={g}>
-                            <span>{shownGauges[g]}:&nbsp;</span>
-                            <Gauge gauge={gauges[g]} />
-                        </Box>
-                    ))}
-                </Box>
-            </Tabs.Panel>
-
-            <Tabs.Panel value="timers" pt="xs">
-                <Accordion variant="contained" chevronPosition="left">
-                    {Object.keys(timers).map(key => (
-                        <MetricAccordionItem key={key} metricKey={key} name={key} headerValue={timers[key].count}>
-                            <Timer timer={timers[key]} />
-                        </MetricAccordionItem>
-                    ))}
-                </Accordion>
-            </Tabs.Panel>
-        </Tabs>
+            <Box pt="xs">
+                {Object.keys(shownGauges).map(g => (
+                    <Box key={g}>
+                        <span>{shownGauges[g]}:&nbsp;</span>
+                        <Gauge gauge={gauges[g]} />
+                    </Box>
+                ))}
+            </Box>
+        </>
     )
 }

commafeed-client/src/pages/auth/RegistrationPage.tsx

@@ -24,12 +24,18 @@ export function RegistrationPage() {
         },
     })
 
-    const register = useAsyncCallback(client.user.register, {
+    const login = useAsyncCallback(client.user.login, {
         onSuccess: () => {
             dispatch(redirectToRootCategory())
         },
     })
 
+    const register = useAsyncCallback(client.user.register, {
+        onSuccess: () => {
+            login.execute(form.values)
+        },
+    })
+
     return (
         <Container size="xs">
             <PageTitle />
@@ -50,6 +56,12 @@ export function RegistrationPage() {
                             </Box>
                         )}
 
+                        {login.error && (
+                            <Box mb="md">
+                                <Alert messages={errorToStrings(login.error)} />
+                            </Box>
+                        )}
+
                         <form onSubmit={form.onSubmit(register.execute)}>
                             <Stack>
                                 <TextInput label="User Name" placeholder="User Name" {...form.getInputProps("name")} size="md" required />
@@ -68,7 +80,7 @@ export function RegistrationPage() {
                                     size="md"
                                     required
                                 />
-                                <Button type="submit" loading={register.loading}>
+                                <Button type="submit" loading={register.loading || login.loading}>
                                     <Trans>Sign up</Trans>
                                 </Button>
                                 <Center>

commafeed-client/vite.config.ts

@@ -32,6 +32,7 @@ export default defineConfig(env => ({
             "/openapi.json": "http://localhost:8083",
             "/custom_css.css": "http://localhost:8083",
             "/custom_js.js": "http://localhost:8083",
+            "/j_security_check": "http://localhost:8083",
             "/logout": "http://localhost:8083",
         },
     },