Merge branch 'tdjsnelling:master' into master

Klaiment · Jan 24, 2024 · ccf97db · ccf97db
2 parents 9f320c9 + dc73537
commit ccf97db
Show file tree

Hide file tree

Showing 20 changed files with 450 additions and 136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,6 @@
 client/.next
 data/
 config.js
-config.example.js
-yarn.lock
 .DS_Store
 dist/
 letsencrypt/

diff --git a/README.md b/README.md
@@ -118,13 +118,14 @@ The best place to start is to copy the `en.json` file and work through it, trans
 
 ### Existing translations
 
-| Language           | Complete (estimate) | Contributed by                             |
-|--------------------|---------------------|--------------------------------------------|
-| English            | 100%                |                                            |
-| Russian            | 100%                | [@smlinux](https://github.com/smlinux)     |
-| Esperanto          | 100%                | [@smlinux](https://github.com/smlinux)     |
-| German             | 15%                 | [@MikeMatau](https://github.com/MikeMatau) |
-| Simplified Chinese | 95%                 | [@0EAC](https://github.com/0EAC)           |
+| Language           | Complete (estimate) | Contributed by                                     |
+|--------------------|---------------------|----------------------------------------------------|
+| English            | 100%                |                                                    |
+| Russian            | 100%                | [@smlinux](https://github.com/smlinux)             |
+| Esperanto          | 100%                | [@smlinux](https://github.com/smlinux)             |
+| German             | 100%                | [@EchterAlsFake](https://github.com/EchterAlsFake) |
+| Simplified Chinese | 95%                 | [@0EAC](https://github.com/0EAC)                   |
+| French             | 100%                | [@Klaiment](https://github.com/Klaiment)           |
 
 ## Screenshots
 

diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,9 +1,9 @@
 FROM node:16-alpine
-ENV NODE_ENV=development
+ENV NODE_ENV=production
 ENV SENTRY_DSN="https://[email protected]/4504645996576768"
 LABEL org.opencontainers.image.source=https://github.com/tdjsnelling/sqtracker
 WORKDIR /sqtracker/app
 COPY . .
 RUN yarn install
 EXPOSE 3001
-CMD yarn start
+CMD yarn start
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sqtracker/api",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {

diff --git a/api/src/controllers/torrent.js b/api/src/controllers/torrent.js
@@ -508,7 +508,6 @@ export const getTorrentsPage = async ({
         created: 1,
         freeleech: 1,
         tags: 1,
-        poster: 1,
         confidenceScore: 1,
       },
     },

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:16-alpine AS builder
 ARG SENTRY_AUTH_TOKEN
-ENV NODE_ENV=development
+ENV NODE_ENV=production
 ENV SENTRY_ORG=tdjsnelling
 ENV SENTRY_PROJECT=sqtracker-frontend
 ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
@@ -11,7 +11,7 @@ RUN echo "{}" > /config.js
 RUN ./node_modules/.bin/next build
 
 FROM node:16-alpine
-ENV NODE_ENV=development
+ENV NODE_ENV=production
 ENV SENTRY_DSN="https://[email protected]/4504646040616960"
 LABEL org.opencontainers.image.source=https://github.com/tdjsnelling/sqtracker
 WORKDIR /sqtracker/client

diff --git a/client/components/Input.js b/client/components/Input.js
@@ -56,18 +56,40 @@ export const WrapLabel = ({ label, children, as = "label", ...rest }) =>
     children
   );
 
-const Input = ({ label, rows, my, mt, mb, width, forwardedRef, ...rest }) => {
+const Input = ({
+  label,
+  rows,
+  my,
+  mt,
+  mb,
+  width,
+  forwardedRef,
+  required,
+  ...rest
+}) => {
   return (
-    <WrapLabel label={label} my={my} mt={mt} mb={mb} width={width}>
+    <WrapLabel
+      label={label && required ? `${label} *` : label}
+      my={my}
+      mt={mt}
+      mb={mb}
+      width={width}
+    >
       {rows ? (
         <StyledTextarea
           ref={forwardedRef}
           rows={rows}
           width={width}
+          required={required}
           {...rest}
         />
       ) : (
-        <StyledInput ref={forwardedRef} width={width} {...rest} />
+        <StyledInput
+          ref={forwardedRef}
+          width={width}
+          required={required}
+          {...rest}
+        />
       )}
     </WrapLabel>
   );

diff --git a/client/components/Select.js b/client/components/Select.js
@@ -31,11 +31,11 @@ const StyledSelect = styled.select(
   typography
 );
 
-const Select = ({ label, fRef, ...rest }) => {
+const Select = ({ label, required, fRef, ...rest }) => {
   return (
-    <WrapLabel label={label}>
+    <WrapLabel label={label && required ? `${label} *` : label}>
       <Box position="relative" display="inline-block">
-        <StyledSelect {...rest} ref={fRef} />
+        <StyledSelect {...rest} ref={fRef} required={required} />
         <Box
           position="absolute"
           top="7px"