Merge pull request #14 from ConducereIT/dev

update: move from aws to genezio runtime

Author: cristim67

.github/workflows/main.yaml

@@ -8,21 +8,21 @@ jobs:
   deploy-backend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - uses: Genez-io/genezio-github-action@v1
+      - uses: Genez-io/genezio-github-action@v2
         with:
           token: ${{ secrets.GENEZIO_TOKEN }}
       - name: install pg
         working-directory: ./server
         run: npm install pg
       - name: prisma
         working-directory: ./server
-        run : npx prisma generate
+        run: npx prisma generate
       - name: Deploy
         working-directory: ./
         run: genezio deploy
         env:
-          CI: false
+          CI: false

client/package.json

@@ -7,17 +7,16 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "lint": "eslint  --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview",
-    "install-prod-sdk": "npm install @genezio-sdk/camin_eu-central-1@^1.0.0-prod"
+    "preview": "vite preview"
   },
   "dependencies": {
     "@fullcalendar/core": "^6.1.11",
     "@fullcalendar/daygrid": "^6.1.11",
     "@fullcalendar/interaction": "^6.1.11",
     "@fullcalendar/react": "^6.1.11",
     "@fullcalendar/timegrid": "^6.1.11",
-    "@genezio-sdk/camin-runtime": "^1.0.0-prod",
-    "@genezio/auth": "^2.1.1",
+    "@genezio-sdk/spalatorie-camin": "^1.0.0-prod",
+    "@genezio/auth": "^2.1.2",
     "@genezio/vite-plugin-genezio": "^1.0.4",
     "@react-oauth/google": "^0.12.1",
     "bootstrap": "^5.3.3",

client/src/components/calendar.component.tsx

@@ -3,9 +3,9 @@ import FullCalendar from "@fullcalendar/react";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
-import { BackendService } from "@genezio-sdk/camin-runtime";
+import { BackendService } from "@genezio-sdk/spalatorie-camin";
 import { Modal, Button, Toast, ToastContainer, Spinner } from "react-bootstrap";
-import {AuthService} from "@genezio/auth";
+import { AuthService } from "@genezio/auth";
 
 interface RenderCalendarProps {
   dayCalendar: string;
@@ -14,9 +14,9 @@ interface RenderCalendarProps {
 }
 
 const RenderCalendar: React.FC<RenderCalendarProps> = ({
-                                                         dayCalendar,
-                                                         eventsDate,
-                                                       }) => {
+  dayCalendar,
+  eventsDate,
+}) => {
   const [notification, setNotification] = useState<string | null>(null);
   const [hoveredEvent, setHoveredEvent] = useState<any | null>(null);
   const [showModal, setShowModal] = useState(false);
@@ -83,7 +83,10 @@ const RenderCalendar: React.FC<RenderCalendarProps> = ({
     try {
       const startDate = event.event.startStr;
       const endDate = event.event.endStr;
-      const deleteEvents = await BackendService.deletePerson(startDate, endDate);
+      const deleteEvents = await BackendService.deletePerson(
+        startDate,
+        endDate
+      );
 
       if (deleteEvents.status) {
         showNotification(deleteEvents.message);
@@ -118,9 +121,22 @@ const RenderCalendar: React.FC<RenderCalendarProps> = ({
     <div className="calendar" ref={calendarRef}>
       <ToastContainer
         position="top-end"
-        style={{ position: "fixed", top: 10, right: 10, zIndex: 1000, paddingTop: "6.5rem", paddingRight: "1rem" }}
+        style={{
+          position: "fixed",
+          top: 10,
+          right: 10,
+          zIndex: 1000,
+          paddingTop: "6.5rem",
+          paddingRight: "1rem",
+        }}
       >
-        <Toast show={showToast} onClose={() => setShowToast(false)} delay={5000} autohide style={{ background: "white" }}>
+        <Toast
+          show={showToast}
+          onClose={() => setShowToast(false)}
+          delay={5000}
+          autohide
+          style={{ background: "white" }}
+        >
           <Toast.Header>
             <strong className="me-auto">Notificare</strong>
           </Toast.Header>
@@ -199,7 +215,11 @@ const RenderCalendar: React.FC<RenderCalendarProps> = ({
           <Button variant="secondary" onClick={() => setShowModal(false)}>
             Anulează
           </Button>
-          <Button variant="secondary" onClick={handleConfirmReservation} disabled={loading}>
+          <Button
+            variant="secondary"
+            onClick={handleConfirmReservation}
+            disabled={loading}
+          >
             {loading ? (
               <>
                 <Spinner

client/src/components/calendar.mobile.component.tsx

@@ -3,7 +3,7 @@ import FullCalendar from "@fullcalendar/react";
 import dayGridPlugin from "@fullcalendar/daygrid";
 import interactionPlugin from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
-import { BackendService } from "@genezio-sdk/camin-runtime";
+import { BackendService } from "@genezio-sdk/spalatorie-camin";
 import { Modal, Button, Toast, ToastContainer, Spinner } from "react-bootstrap";
 import { AuthService } from "@genezio/auth";
 
@@ -14,9 +14,9 @@ interface RenderCalendarProps {
 }
 
 const RenderCalendarMobile: React.FC<RenderCalendarProps> = ({
-                                                               dayCalendar,
-                                                               eventsDate,
-                                                             }) => {
+  dayCalendar,
+  eventsDate,
+}) => {
   const [notification, setNotification] = useState<string | null>(null);
   const [showToast, setShowToast] = useState(false);
   const [showModal, setShowModal] = useState(false);
@@ -120,9 +120,22 @@ const RenderCalendarMobile: React.FC<RenderCalendarProps> = ({
     <div className="calendar" ref={calendarRef}>
       <ToastContainer
         position="top-end"
-        style={{ position: "fixed", top: 10, right: 10, zIndex: 1000, paddingTop: "6.5rem", paddingRight: "1rem" }}
+        style={{
+          position: "fixed",
+          top: 10,
+          right: 10,
+          zIndex: 1000,
+          paddingTop: "6.5rem",
+          paddingRight: "1rem",
+        }}
       >
-        <Toast show={showToast} onClose={() => setShowToast(false)} delay={5000} autohide style={{ background: "white" }}>
+        <Toast
+          show={showToast}
+          onClose={() => setShowToast(false)}
+          delay={5000}
+          autohide
+          style={{ background: "white" }}
+        >
           <Toast.Header>
             <strong className="me-auto">Notificare</strong>
           </Toast.Header>
@@ -179,7 +192,11 @@ const RenderCalendarMobile: React.FC<RenderCalendarProps> = ({
           <Button variant="secondary" onClick={() => setShowModal(false)}>
             Anulează
           </Button>
-          <Button variant="secondary" onClick={handleConfirmReservation} disabled={loading}>
+          <Button
+            variant="secondary"
+            onClick={handleConfirmReservation}
+            disabled={loading}
+          >
             {loading ? (
               <>
                 <Spinner
@@ -201,4 +218,4 @@ const RenderCalendarMobile: React.FC<RenderCalendarProps> = ({
   );
 };
 
-export default RenderCalendarMobile;
+export default RenderCalendarMobile;

client/src/main.tsx

@@ -1,26 +1,26 @@
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import ReactDOM from "react-dom/client";
-import {createBrowserRouter, RouterProvider} from "react-router-dom";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import "./index.css";
 import Calendar from "./routes/calendar";
 import Login from "./routes/login";
-import {GoogleOAuthProvider} from "@react-oauth/google";
-import {AuthService} from "@genezio/auth";
+import { GoogleOAuthProvider } from "@react-oauth/google";
+import { AuthService } from "@genezio/auth";
 import "bootstrap/dist/css/bootstrap.min.css";
 // @ts-ignore
-import('bootstrap/dist/js/bootstrap.bundle.min.js');
+import("bootstrap/dist/js/bootstrap.bundle.min.js");
 
 import Account from "./routes/account.tsx";
 import Admin from "./routes/admin.tsx";
 import MyAppointments from "./routes/myAppointments.tsx";
-import {PreloaderProvider} from "./components/PreloaderProvider.component.tsx";
+import { PreloaderProvider } from "./components/PreloaderProvider.component.tsx";
 import Preloader from "./components/Preloader.component.tsx";
 import Register from "./routes/register.tsx";
 import Mentenanta from "./routes/mentenanta.tsx";
-import {BackendService} from "@genezio-sdk/camin-runtime";
+import { BackendService } from "@genezio-sdk/spalatorie-camin";
 
 AuthService.getInstance().setTokenAndRegion(
-  "0-bxx7kwvdg2nszdm3cqhdk7xgsu0oumje",
+  "1-a3036f2f-8a7c-495c-8d24-06695b1ad57f",
   "eu-central-1"
 );
 
@@ -43,42 +43,42 @@ const App = () => {
   const router = createBrowserRouter([
     {
       path: "*",
-      element: isMentenanta ? <Mentenanta/> : <Calendar/>,
+      element: isMentenanta ? <Mentenanta /> : <Calendar />,
     },
     {
       path: "/login",
-      element: isMentenanta ? <Mentenanta/> : <Login/>,
+      element: isMentenanta ? <Mentenanta /> : <Login />,
     },
     {
       path: "/signup",
-      element: isMentenanta ? <Mentenanta/> : <Register/>,
+      element: isMentenanta ? <Mentenanta /> : <Register />,
     },
     {
       path: "/account",
-      element: isMentenanta ? <Mentenanta/> : <Account/>,
+      element: isMentenanta ? <Mentenanta /> : <Account />,
     },
     {
       path: "/admin",
-      element: isMentenanta ? <Mentenanta/> : <Admin/>,
+      element: isMentenanta ? <Mentenanta /> : <Admin />,
     },
     {
       path: "/myappointments",
-      element: isMentenanta ? <Mentenanta/> : <MyAppointments/>,
+      element: isMentenanta ? <Mentenanta /> : <MyAppointments />,
     },
   ]);
 
   return (
     <PreloaderProvider>
-      <Preloader/>
-      <GoogleOAuthProvider clientId="1062295332779-684ijgeeas6721n2ekoe71nkcpcqcu7s.apps.googleusercontent.com">
-        <RouterProvider router={router}/>
+      <Preloader />
+      <GoogleOAuthProvider clientId="886547719913-k21ok74kivm5ej2cop7ua8pvb1bh8p2e.apps.googleusercontent.com">
+        <RouterProvider router={router} />
       </GoogleOAuthProvider>
     </PreloaderProvider>
   );
 };
 
 ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
-    <App/>
+    <App />
   </React.StrictMode>
 );

client/src/routes/account.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import NavbarComponent from "../components/navbar.component.tsx";
-import { BackendService } from "@genezio-sdk/camin-runtime";
+import { BackendService } from "@genezio-sdk/spalatorie-camin";
 import { AuthService } from "@genezio/auth";
 import { useNavigate } from "react-router-dom";
 
@@ -107,10 +107,15 @@ const Account: React.FC = () => {
         <NavbarComponent />
         <div className="container mt-5">
           <div className="bg-white p-4 rounded shadow">
-            <h1 style={{ color: "#212529" }}>Account Settings - {user?.name}</h1>
+            <h1 style={{ color: "#212529" }}>
+              Account Settings - {user?.name}
+            </h1>
             <form onSubmit={handleSubmit} className="mt-2">
               {error && (
-                <p className="text-danger alert alert-danger mt-4" style={{ marginBottom: "-2rem;" }}>
+                <p
+                  className="text-danger alert alert-danger mt-4"
+                  style={{ marginBottom: "-2rem;" }}
+                >
                   {error}
                 </p>
               )}
@@ -138,7 +143,11 @@ const Account: React.FC = () => {
                   onChange={(e) => setCameraModel(e.target.value)}
                 />
               </div>
-              <button type="submit" className="btn btn-primary bg-hover-primary" style={{border:"1px solid black"}}>
+              <button
+                type="submit"
+                className="btn btn-primary bg-hover-primary"
+                style={{ border: "1px solid black" }}
+              >
                 {loading ? "Loading..." : editMode ? "Update" : "Submit"}
               </button>
             </form>