Stage to production changes

.eslintrc.json

@@ -1,6 +1,7 @@
 {
   "extends": "next",
   "rules": {
-    "no-unused-vars": "warn"
+    "no-unused-vars": "warn",
+    "react/display-name": "off"
   }
 }

.github/workflows/push_registry.yaml

@@ -22,7 +22,7 @@ jobs:
       run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin ${{ secrets.DOCKER_REGISTRY }}
 
     - name: Build Docker Image
-      run: docker build -t ${{ secrets.DOCKER_USERNAME }}/menuroo-admin:${{ env.SHORT_SHA }} .
+      run: docker build --build-arg NEXT_PUBLIC_API_URL="https://api.menuroo.cz/query" -t ${{ secrets.DOCKER_USERNAME }}/menuroo-admin:${{ env.SHORT_SHA }} .
 
     - name: Tag Docker Image
       run: docker tag ${{ secrets.DOCKER_USERNAME }}/menuroo-admin:${{ env.SHORT_SHA }} ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_USERNAME }}/menuroo-admin:${{ env.SHORT_SHA }}

.github/workflows/push_registry_dev.yaml

@@ -0,0 +1,31 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - stage
+
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Get SHA for last commit
+      run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+
+
+    - name: Login to Docker Registry
+      run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin ${{ secrets.DOCKER_REGISTRY }}
+
+    - name: Build Docker Image
+      run: docker build --build-arg NEXT_PUBLIC_API_URL="https://api.dev.menuroo.cz/query" -t ${{ secrets.DOCKER_USERNAME }}/menuroo-admin-dev:${{ env.SHORT_SHA }} .
+
+    - name: Tag Docker Image
+      run: docker tag ${{ secrets.DOCKER_USERNAME }}/menuroo-admin-dev:${{ env.SHORT_SHA }} ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_USERNAME }}/menuroo-admin-dev:${{ env.SHORT_SHA }}
+
+    - name: Push Docker Image
+      run: docker push ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_USERNAME }}/menuroo-admin-dev:${{ env.SHORT_SHA }}

.gitignore

@@ -40,3 +40,5 @@ jspm_packages
 .node_repl_history
 .next
 .vercel
+
+.DS_Store

Dockerfile

@@ -1,6 +1,10 @@
 FROM node:18-alpine
 
-ARG NEXT_PUBLIC_API_URL="https://api.menuroo.com/query"
+# Declare a build argument with a default value
+ARG NEXT_PUBLIC_API_URL="https://api.dev.menuroo.com/query"
+
+# Set the environment variable with the build argument value
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
 
 RUN mkdir -p /app
 WORKDIR /app

jest.config.ts

@@ -0,0 +1,13 @@
+import type { Config } from "jest";
+import nextJest from "next/jest.js";
+
+const createJestConfig = nextJest({
+  dir: "./",
+});
+
+const config: Config = {
+  coverageProvider: "v8",
+  testEnvironment: "jsdom",
+};
+
+export default createJestConfig(config);

package.json

@@ -7,32 +7,41 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "analyze": "ANALYZE=true next build"
+    "analyze": "ANALYZE=true next build",
+    "test": "jest",
+    "test:watch": "jest --watch"
   },
   "dependencies": {
     "@ant-design/cssinjs": "^1.17.0",
     "@apollo/client": "latest",
-    "@apollo/experimental-nextjs-app-support": "^0.4.2",
+    "@apollo/experimental-nextjs-app-support": "^0.5.2",
     "@next/bundle-analyzer": "^14.0.3",
     "@vercel/analytics": "^1.0.2",
     "antd": "^5.9.0",
+    "classnames": "^2.3.2",
     "dayjs": "^1.11.9",
     "dayjs-plugin-utc": "^0.1.2",
     "graphql": "^16.8.0",
     "install": "^0.13.0",
-    "next": "13.5.4",
+    "next": "14.0.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/react": "^14.1.2",
+    "@types/jest": "^29.5.11",
     "@types/node": "20.6.0",
     "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",
-    "eslint": "8.49.0",
-    "eslint-config-next": "13.5.4",
     "autoprefixer": "10.4.15",
+    "eslint": "8.49.0",
+    "eslint-config-next": "14.0.4",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "postcss": "8.4.29",
-    "tailwindcss": "3.3.3",
+    "ts-jest": "^29.1.1",
+    "ts-node-dev": "^2.0.0",
     "typescript": "5.2.2"
   }
 }

postcss.config.js

@@ -1,6 +1,5 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
   },
 };

src/app/(admin)/[date]/page.tsx

@@ -0,0 +1,46 @@
+"use server";
+
+import CreateMenu from "@/modules/CreateMenu/CreateMenu";
+import getToken from "@/utils/getToken";
+import getMenusByDate from "@/queries/getMenusByDate";
+import { getClient } from "@/lib/ssrApolloClient";
+import getTime from "@/lib/getTime";
+
+const CreateMenuPage = async ({ params }: { params: { date: string } }) => {
+  const token = getToken();
+
+  const { data: menusByDate } = await getClient()
+    .query({
+      query: getMenusByDate,
+      variables: {
+        dateFrom: getTime({
+          date: params.date,
+          day: "middle",
+        }),
+        dateTo: getTime({
+          date: params.date,
+          day: "middle",
+        }),
+      },
+      context: {
+        headers: {
+          Authorization: getToken(),
+        },
+        fetchOptions: {
+          next: { tags: ["menusByDate"] },
+        },
+      },
+      fetchPolicy: "network-only",
+    })
+    .catch((err) => err);
+
+  return (
+    <CreateMenu
+      params={params}
+      token={token}
+      menus={menusByDate?.getMenusByDate ?? []}
+    />
+  );
+};
+
+export default CreateMenuPage;

src/app/(admin)/finance/page.tsx

@@ -0,0 +1,7 @@
+import { Fragment } from "react";
+
+const Page = async () => {
+  return <Fragment />;
+};
+
+export default Page;

src/app/(admin)/jidelni-listek/page.tsx

@@ -0,0 +1,12 @@
+"use server";
+
+import AdminPage from "@/modules/AdminPage/AdminPage";
+import getMenus from "@/modules/AdminPage/actions/getMenus";
+
+const Page = async () => {
+  const menusByDate = await getMenus();
+
+  return <AdminPage menusByDate={menusByDate || []} />;
+};
+
+export default Page;

src/app/(admin)/layout.tsx

@@ -0,0 +1,54 @@
+import React from "react";
+import type { Metadata } from "next";
+import { ApolloWrapper } from "../ApolloWrapper";
+import { Analytics } from "@vercel/analytics/react";
+import { redirect } from "next/navigation";
+import { cookies } from "next/headers";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import updateLocale from "dayjs/plugin/updateLocale";
+import { AdminLayout } from "@/components/AdminLayout";
+
+import "../globals.css";
+
+export const metadata: Metadata = {
+  title: "Menuroo",
+  description: "Menuroo administrace",
+};
+
+const Layout = ({ children }: { children: React.ReactNode }) => {
+  dayjs.extend(updateLocale, utc);
+  dayjs.updateLocale("en", {
+    weekStart: 1,
+  });
+
+  const cookieStore = cookies();
+
+  const isAdmin = () => {
+    const jwt = cookieStore.get("token")?.value;
+    if (jwt) {
+      const decodedToken = JSON.parse(atob(jwt.split(".")[1]));
+      return decodedToken.role === "admin";
+    }
+
+    return false;
+  };
+
+  if (!isAdmin()) {
+    return redirect("/");
+  }
+
+  return (
+    <html lang="en">
+      <body>
+        <ApolloWrapper>
+          <AdminLayout>
+            {children} <Analytics />
+          </AdminLayout>
+        </ApolloWrapper>
+      </body>
+    </html>
+  );
+};
+
+export default Layout;

src/app/(admin)/nastaveni/page.tsx

@@ -0,0 +1,9 @@
+"use server";
+
+import SettingsPage from "@/modules/Settings/SettingsPage";
+
+const Page = async () => {
+  return <SettingsPage />;
+};
+
+export default Page;

src/app/(admin)/not-found.tsx

@@ -0,0 +1,11 @@
+import { cookies } from "next/headers";
+import Link from "next/link";
+import React from "react";
+
+const RootNotFound = () => {
+  const redirectUrl = cookies().get("token") ? "/jidelni-listek" : "/";
+
+  return <Link href={redirectUrl}>Domů</Link>;
+};
+
+export default RootNotFound;

src/app/(admin)/objednavky/page.tsx

@@ -0,0 +1,12 @@
+"use server";
+
+import MenuOrdersPage from "@/modules/MenuOrdersPage/MenuOrdersPage";
+import getMenuOrders from "@/modules/MenuOrdersPage/actions/getOrders";
+
+const Page = async () => {
+  const menuOrders = await getMenuOrders();
+
+  return <MenuOrdersPage menuOrders={menuOrders || []} />;
+};
+
+export default Page;