build: use remix

client/.eslintignore

@@ -1,11 +1,12 @@
 *.css
 *.svg
 # Generated files should not be linted
-src/features/dataConnectorsV2/api/data-connectors.api.ts
-src/features/dataConnectorsV2/api/doiResolver.generated-api.ts
-src/features/project/components/cloudStorage/api/projectCloudStorage.generated-api.ts
-src/features/projectsV2/api/projectV2.api.ts
-src/features/sessionsV2/api/sessionLaunchersV2.generated-api.ts
-src/features/sessionsV2/api/sessionsV2.generated-api.ts
-src/features/usersV2/api/users.generated-api.ts
-src/features/searchV2/api/searchV2Api.generated-api.ts
+app/old-src/features/dataConnectorsV2/api/data-connectors.api.ts
+app/old-src/features/dataConnectorsV2/api/doiResolver.generated-api.ts
+app/old-src/features/project/components/cloudStorage/api/projectCloudStorage.generated-api.ts
+app/old-src/features/projectsV2/api/projectV2.api.ts
+app/old-src/features/projectsV2/api/storagesV2.api.ts
+app/old-src/features/searchV2/api/searchV2Api.generated-api.ts
+app/old-src/features/sessionsV2/api/sessionLaunchersV2.generated-api.ts
+app/old-src/features/sessionsV2/api/sessionsV2.generated-api.ts
+app/old-src/features/usersV2/api/users.generated-api.ts

client/.storybook/main.ts

@@ -1,7 +1,7 @@
 import type { StorybookConfig } from "@storybook/react-vite";
 
 const config: StorybookConfig = {
-  stories: ["../src/**/*.stories.@(js|jsx|ts|tsx)"],
+  stories: ["../app/old-src/**/*.stories.@(js|jsx|ts|tsx)"],
   staticDirs: ["../public"],
   addons: [
     "@storybook/addon-essentials",
@@ -12,7 +12,11 @@ const config: StorybookConfig = {
 
   framework: {
     name: "@storybook/react-vite",
-    options: {},
+    options: {
+      builder: {
+        viteConfigPath: "vite.storybook.config.ts",
+      },
+    },
   },
   typescript: {
     reactDocgen: "react-docgen-typescript",

client/.storybook/preview.tsx

@@ -3,13 +3,13 @@ import React from "react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router";
 
-import type { AppContextType } from "../src/utils/context/appContext";
-import AppContext from "../src/utils/context/appContext";
-import { DEFAULT_APP_PARAMS } from "../src/utils/context/appParams.constants";
-import { createStore } from "../src/utils/helpers/EnhancedState";
-import { createCoreApiVersionedUrlConfig } from "../src/utils/helpers/url";
+import type { AppContextType } from "../app/old-src/utils/context/appContext";
+import AppContext from "../app/old-src/utils/context/appContext";
+import { DEFAULT_APP_PARAMS } from "../app/old-src/utils/context/appParams.constants";
+import { createStore } from "../app/old-src/utils/helpers/EnhancedState";
+import { createCoreApiVersionedUrlConfig } from "../app/old-src/utils/helpers/url";
 
-import "../src/styles/renku_bootstrap.scss";
+import "../app/old-src/styles/renku_bootstrap.scss";
 
 // This how the documentation recommends introducing the store into storybook
 // https://storybook.js.org/addons/@dreamworld/addon-redux/

client/Dockerfile

@@ -10,53 +10,57 @@ RUN npm ci
 
 COPY index.html tsconfig.json tsconfig.node.json vite.config.ts /app/
 COPY public /app/public
-COPY src /app/src/
+COPY app /app/app/
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
 RUN npm run-script build
 
+COPY vite.storybook.config.ts /app/
 COPY .storybook /app/.storybook
 
 RUN npm run storybook-build -- -o storybook-static
 
-FROM nginxinc/nginx-unprivileged:1.27-alpine
+FROM node:22-alpine
+
+WORKDIR /app
+
+COPY --from=builder /app/build /app/build
+COPY --from=builder /app/node_modules /app/node_modules
+COPY --from=builder /app/package.json /app/package.json
 
-COPY --from=builder /app/build /usr/share/nginx/html
-COPY --from=builder /app/storybook-static /usr/share/nginx/html/storybook
-COPY nginx.vh.default.conf /etc/nginx/conf.d/default.conf
 COPY docker-entrypoint.sh /app/docker-entrypoint.sh
 COPY scripts/generate_sitemap.sh /app/scripts/generate_sitemap.sh
 
 # Set up the config files written by docker-entrypoint
 USER root
-RUN touch /usr/share/nginx/html/config.json
-RUN chmod a+r /usr/share/nginx/html/config.json
-RUN chown nginx /usr/share/nginx/html/config.json
+RUN touch /app/build/client/config.json
+RUN chmod a+r /app/build/client/config.json
+RUN chown node /app/build/client/config.json
 
-RUN touch /usr/share/nginx/html/robots.txt
-RUN chmod a+r /usr/share/nginx/html/robots.txt
-RUN chown nginx /usr/share/nginx/html/robots.txt
+RUN touch /app/build/client/robots.txt
+RUN chmod a+r /app/build/client/robots.txt
+RUN chown node /app/build/client/robots.txt
 
-RUN touch /usr/share/nginx/html/sitemap.xml
-RUN chmod a+r /usr/share/nginx/html/sitemap.xml
-RUN chown nginx /usr/share/nginx/html/sitemap.xml
+RUN touch /app/build/client/sitemap.xml
+RUN chmod a+r /app/build/client/sitemap.xml
+RUN chown node /app/build/client/sitemap.xml
 
-RUN touch /usr/share/nginx/html/privacy-statement.md
-RUN chmod a+r /usr/share/nginx/html/privacy-statement.md
-RUN chown nginx /usr/share/nginx/html/privacy-statement.md
+RUN touch /app/build/client/privacy-statement.md
+RUN chmod a+r /app/build/client/privacy-statement.md
+RUN chown node /app/build/client/privacy-statement.md
 
-RUN touch /usr/share/nginx/html/terms-of-use.md
-RUN chmod a+r /usr/share/nginx/html/terms-of-use.md
-RUN chown nginx /usr/share/nginx/html/terms-of-use.md
+RUN touch /app/build/client/terms-of-use.md
+RUN chmod a+r /app/build/client/terms-of-use.md
+RUN chown node /app/build/client/terms-of-use.md
 
-USER nginx
-
-
-HEALTHCHECK --interval=20s --timeout=10s --retries=5 CMD test -e /var/run/nginx.pid
+USER node
 
 ARG SHORT_SHA
 ENV RENKU_UI_SHORT_SHA=$SHORT_SHA
 
+ARG PORT="3000"
+ENV PORT=$PORT
+
 ENTRYPOINT ["/bin/sh", "/app/docker-entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["npm", "run-script", "serve", "/app/build/server/index.js"]

client/src/components/buttons/Buttons.module.scss → client/app/old-src/components/buttons/Buttons.module.scss

@@ -1,4 +1,4 @@
-@import "/src/styles/bootstrap/_custom_bootstrap_variables2.0.scss";
+@import "/app/old-src/styles/bootstrap/_custom_bootstrap_variables2.0.scss";
 .LinkUnderline {
   border-bottom: solid 1px var(--bs-rk-text-light);
 

client/src/components/commandCopy/CommandCopy.module.scss → client/app/old-src/components/commandCopy/CommandCopy.module.scss

@@ -1,4 +1,4 @@
-@import "/src/styles/bootstrap/_custom_bootstrap_variables.scss";
+@import "/app/old-src/styles/bootstrap/_custom_bootstrap_variables.scss";
 
 .main {
   background: $rk-background-1;

client/src/components/templateSelector/TemplateSelector.module.scss → client/app/old-src/components/templateSelector/TemplateSelector.module.scss

@@ -1,4 +1,4 @@
-@import "/src/styles/bootstrap/_custom_bootstrap_variables.scss";
+@import "/app/old-src/styles/bootstrap/_custom_bootstrap_variables.scss";
 
 .templateLabel {
   .templateCardImage {

client/src/error-boundary/ErrorBoundary.tsx → client/app/old-src/error-boundary/ErrorBoundary.tsx

@@ -19,9 +19,10 @@
 import * as Sentry from "@sentry/react";
 import cx from "classnames";
 import { ReactNode, useCallback } from "react";
-import { useLocation } from "react-router";
 import { ArrowLeft } from "react-bootstrap-icons";
-import { StyleHandler } from "../index";
+import { useLocation } from "react-router";
+
+import { StyleHandler } from "../oldIndex";
 import rkOopsImg from "../styles/assets/oops.svg";
 import rkOopsV2Img from "../styles/assets/oopsV2.svg";
 import useLegacySelector from "../utils/customHooks/useLegacySelector.hook";