feat: sync plans between devices #103

qamarq · 2024-11-29T20:18:12Z

This pull request includes various changes across multiple files to enhance the functionality and performance of the application. The most significant changes are related to the SchedulesController, validation schemas, and frontend components for handling plans. Below is a summary of the most important changes:

Backend Changes:

SchedulesController Enhancements:
- Added synchronization logic for groups, registrations, and courses in the create method (backend/app/controllers/schedules_controller.ts).
- Included additional schedule attributes (id, userId, createdAt, updatedAt) in the transformed schedule object (backend/app/controllers/schedules_controller.ts).
- Wrapped the update method in a try-catch block to handle errors more gracefully and updated the updatedAt field with the current timestamp (backend/app/controllers/schedules_controller.ts) [1] [2].
Validation Schema Updates:
- Added optional arrays for groups, courses, and registrations to the createScheduleValidator (backend/app/validators/schedule.ts).
- Changed the updatedAt field type from date to string in the updateScheduleValidator (backend/app/validators/schedule.ts).

Frontend Changes:

Plan Management:
- Implemented new functions for creating, updating, deleting, and fetching plans in plans.ts (frontend/src/actions/plans.ts).
- Added NEXT_PUBLIC_API_URL to the environment variables in the CI workflow (.github/workflows/ci.yaml).
UI Enhancements:
- Introduced a Toaster component for notifications in the root layout (frontend/src/app/layout.tsx) [1] [2].
- Created the PlansPage component to manage and display plans with Jotai state management (frontend/src/app/plans/_components/PlansPage.tsx).
Refactoring and Optimization:
- Renamed and refactored the CreateNewPlanPage component to handle both creation and editing of plans (frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsx) (frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsxR4-R11, frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsxR34-R36, frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsxR67-R151, frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsxL72-R160, frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsxR171-R197).
- Updated the logout.ts to call the API for user logout (frontend/src/actions/logout.ts) [1] [2].

These changes collectively improve the robustness and user experience of the application by ensuring data consistency, enhancing error handling, and providing a more interactive UI.

…uth status

Rei-x · 2024-12-07T12:29:02Z

frontend/src/lib/auth/index.ts

+  }
+
+  try {
+    const response = await fetch("https://planer.solvro.pl/api/v1/user/login", {


czemu ten adres jest na sztywno wpisany

a czm nie, pozniej bede sie bawic w zmienne

no o to chodzi, żebyś nie musiał mergować zmian na maina, żeby testować backend 😭

tylko odpalasz sobie oba lokalnie i lecisz

Rei-x · 2024-12-08T21:17:22Z

popraw nazwy commitów i je zesquashuj

qamarq · 2024-12-08T21:22:27Z

Przyszedł pan maruda niszczyciel dobrej zabawy

Rei-x

super, że Ci się udało zrobić pierwszą wersje, teraz czas na trochę refactoru i poprawek

backend/app/controllers/schedules_controller.ts

frontend/package.json

Rei-x · 2024-12-08T21:19:03Z

frontend/src/actions/logout.ts

+  cookies.delete({
+    name: "adonis-session",
+    path: "/",
+  });
+  cookies.delete({
+    name: "token",
+    path: "/",
+  });


dlaczego to nie jest obsługiwane przez adonisa

bo to jest po serverside, i to sie automatycznie nie ogarnia, tak samo jak musze recznie je ustawic i przekazywac

ale jeszcze sie przyjrze

no, ustawilem credentials include i nie przypisuje autmoayucznie cookiesow wiec musze recznie ustawiac i usuwac

adonis powinien to ogarnąć, tylko w auth_controller jest tylko response.clearCookie('token'). Jest w to w destroy() w auth_controller.

przykład z docsów adonisa: import router from '@adonisjs/core/services/router'

router.delete('cart', async ({ request, response }) => { response.clearCookie('cart_items') })

frontend/src/actions/logout.ts

frontend/src/actions/plans.ts

Rei-x · 2024-12-08T21:29:55Z

frontend/src/app/plans/page.tsx

-      </div>
-    </div>
-  );
+  return <PlansPage plans={Array.isArray(data) ? data : []} />;


dziwne, że data nie może być arrayem, plus brak error handlingu tutaj

nie dziwne tylko to jest z twoim glupim lintem najlepszy i najkrotszy sposob, zeby sprawdzic czy dostalem tablice czy obiekt {error:bool, mess:string} (ktory jest bledem)

dodaj error handling

no ale po co, w sensie jak error czyli jesli nie jestes zalogowany to ma zwrocic pusty array, i tyle

jest trochę wiecej rodzajów błędów niż to jak nie jesteś zalogowany 😭

Rei-x · 2024-12-08T21:30:31Z

frontend/src/components/PlanItem.tsx


-export const PlanItem = ({ id, name }: { id: string; name: string }) => {
+export const PlanItem = ({


ten komponent nadaje się już bardzo do refactoru 😭

dobra dobra, jeszcze nie jest caly na czerwono xd

Rei-x · 2024-12-08T21:31:55Z

frontend/src/components/ui/signout-button.tsx

@@ -16,6 +16,7 @@ export function SignOutButton({
  if (asChild) {
    const signOut = async () => {
      await signOutFunction();
+      localStorage.clear();


odważne, żeby wipeować wszystko 😭

wiem, ale chce usuwac wszystkie plany, bo sa one i tak online, moze dalej robic se lokalnie. i chcialem usuwac te plany ale jedyne co moglem to z plansv2 usunac a wszystkie plany i tak zostaja wiec uznalem ze na przyszlosc lepiej czyscic wszystko

pytanie czy masz lepszy pomysl

frontend/src/lib/auth/index.ts

backend: simple array front: - logout req - React.useState -> useState - better error response in plans functions

wiem bartus ze ci sie pewnie nie spodoba i chcialbys po prostu zrobic caly middleware w try catch i sama funkcja auth() jak w poprzednich tylko problem jest taki ze musze tak czy siak wykonac auth() zeby se uswierzytelnic za kazdym razem usera czy ma sesje a po tym doperio wykonac reszte logiki taka jak next jesli nie jest protected, wiec musialem tak zrobic

Rei-x · 2024-12-09T20:08:35Z

frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsx

+        // List update logic:
+        // Add unique registrations to the updatedRegistrations array
+        // r - current registration
+        // i - current index
+        // a - array of registrations


krócej by Ci wyszło zmienić nazwy zmiennych 😭

mozeeee, ale to jest takie ladneeeeeee

🥺🥺🥺🥺🥺🥺🥺

olekszczepanowski · 2024-12-10T10:06:15Z

backend/app/controllers/schedules_controller.ts

+    if (payload.groups !== undefined) {
+      await schedule.related('groups').sync(payload.groups.map((group) => group.id))
+    }
+
+    if (payload.registrations !== undefined) {
+      await schedule.related('registrations').sync(payload.registrations.map((group) => group.id))
+    }
+
+    if (payload.courses !== undefined) {
+      await schedule.related('courses').sync(payload.courses.map((group) => group.id))
+    }
+


Czemu już tutaj dodajemy groupsy, rejegistrations i courses do planu? Zamysł miałem taki, zeby po kliknięciu dodania planu na froncie szedł request po prostu z domyślną nazwą. Czemu trzeba było to zmienić?

z prostego powodu, jak mam plan lokalny i chce stworzyc jego online wersje po zalogowaniu od razu moge to zrobic a nie robic dwa requesty

olekszczepanowski · 2024-12-10T10:13:52Z

frontend/src/actions/logout.ts

+  cookies.delete({
+    name: "adonis-session",
+    path: "/",
+  });
+  cookies.delete({
+    name: "token",
+    path: "/",
+  });


adonis powinien to ogarnąć, tylko w auth_controller jest tylko response.clearCookie('token'). Jest w to w destroy() w auth_controller.

olekszczepanowski · 2024-12-10T10:21:13Z

frontend/src/actions/logout.ts

+  cookies.delete({
+    name: "adonis-session",
+    path: "/",
+  });
+  cookies.delete({
+    name: "token",
+    path: "/",
+  });


przykład z docsów adonisa: import router from '@adonisjs/core/services/router'

router.delete('cart', async ({ request, response }) => { response.clearCookie('cart_items') })

qamarq · 2024-12-10T10:37:22Z

@olekszczepanowski i ja bardzo bym chcial zeby to bylo automatyczne ale niestety nie dodaje tego autmatycznie po wyslaniu requesta login (idk czemu, dalem credentials inlucde i wgl) ale server side do server side nie dziala i nie ustawia wiec robie to recznie, wiec adonis nie moze tego tez automatycznie usunac bo to ja dodaje jakby swoje cookiesy, i ja je przekazuje manulanie w requestach, meczylem sie pare godzin z tym zeby to bylo autmaotcyzne ale nie chcialo za nic dzialac wiec zrobilem recznie i tyle

D0dii

Looks good to me, merge it

unewMe · 2024-12-10T11:18:46Z

Looks good to me, merge it

Great! Thanks for your review! Let's go 🚀 🚀 🚀

Copilot reviewed 15 out of 30 changed files in this pull request and generated no suggestions.

Files not reviewed (15)

frontend/package.json: Language not supported
frontend/src/app/plans/edit/[id]/_components/SyncedButton.tsx: Evaluated as low risk
frontend/src/actions/plans.ts: Evaluated as low risk
frontend/src/app/api/callback/route.ts: Evaluated as low risk
frontend/src/app/layout.tsx: Evaluated as low risk
frontend/src/app/plans/_components/PlansPage.tsx: Evaluated as low risk
frontend/src/app/plans/edit/[id]/_components/CreateNewPlanPage.tsx: Evaluated as low risk
frontend/src/app/plans/edit/[id]/_components/SyncErrorAlert.tsx: Evaluated as low risk
frontend/src/atoms/planFamily.ts: Evaluated as low risk
frontend/src/components/ui/button.tsx: Evaluated as low risk
.github/workflows/ci.yaml: Evaluated as low risk
frontend/src/app/plans/preview/[id]/_components/SharePlanPage.tsx: Evaluated as low risk
frontend/src/app/plans/edit/[id]/page.tsx: Evaluated as low risk
backend/app/validators/schedule.ts: Evaluated as low risk
frontend/src/components/PlanItem.tsx: Evaluated as low risk

Comments skipped due to low confidence (1)

backend/app/controllers/schedules_controller.ts:198

The 'updatedAt' field is being updated with the current timestamp without checking if the new timestamp is different from the previous one. Ensure that 'updatedAt' is only updated if there is a significant change.

currSchedule.updatedAt = DateTime.fromISO(new Date().toISOString())

qamarq and others added 5 commits November 29, 2024 21:17

feat: logout function & middleware with API & new function to check a…

f22c947

…uth status

fix: format

8f32c2b

Merge branch 'main' into feat/sync-schedules-between-devices

a52d3dd

feat: honestly idk, too many things

14011ec

feat: integration with offline

4ce566b

qamarq changed the title ~~feat: logout function & middleware with API & function auth~~ feat: sync plans between devices Dec 3, 2024

qamarq added 2 commits December 7, 2024 10:18

feat: continue with sync (save progress)

b5690b5

feat: save progress

c48ffb9

Rei-x reviewed Dec 7, 2024

View reviewed changes

qamarq and others added 8 commits December 7, 2024 13:40

Merge branch 'main' into feat/sync-schedules-between-devices

cc45133

feat: new env var with api url

dc3f5d4

feat: save progress

e8174d2

feat: save progress

0c48dbd

feat: save progress

1950db3

fix: lint & code fix & delete crypto from runtime edge

d696106

fix: almost done i think

97f6d7d

fix: better logout

0bd6143

qamarq marked this pull request as ready for review December 7, 2024 21:15

qamarq self-assigned this Dec 7, 2024

qamarq requested review from unewMe, D0dii and olekszczepanowski December 7, 2024 21:15

Rei-x requested changes Dec 8, 2024

View reviewed changes

qamarq added 5 commits December 9, 2024 07:56

fix: minor fixes in backend and frontend

ec7b260

backend: simple array front: - logout req - React.useState -> useState - better error response in plans functions

fix: error handlingn fix

cc95e13

feat: rewrite auth() function

fac586d

fix: better comments

428a039

Rei-x reviewed Dec 9, 2024

View reviewed changes

olekszczepanowski reviewed Dec 10, 2024

View reviewed changes

D0dii approved these changes Dec 10, 2024

View reviewed changes

unewMe merged commit bca2ef2 into main Dec 10, 2024
2 checks passed

unewMe deleted the feat/sync-schedules-between-devices branch December 10, 2024 11:19

simon-the-shark requested a review from Copilot December 11, 2024 21:31

Copilot AI reviewed Dec 11, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: sync plans between devices #103

feat: sync plans between devices #103

qamarq commented Nov 29, 2024 •

edited

Loading

Rei-x Dec 7, 2024

qamarq Dec 7, 2024

Rei-x Dec 7, 2024

Rei-x commented Dec 8, 2024

qamarq commented Dec 8, 2024

Rei-x left a comment

Rei-x Dec 8, 2024

qamarq Dec 9, 2024

qamarq Dec 9, 2024

qamarq Dec 9, 2024

olekszczepanowski Dec 10, 2024

olekszczepanowski Dec 10, 2024

Rei-x Dec 8, 2024

qamarq Dec 9, 2024

Rei-x Dec 9, 2024

qamarq Dec 9, 2024

Rei-x Dec 9, 2024

Rei-x Dec 8, 2024

qamarq Dec 9, 2024

Rei-x Dec 8, 2024

qamarq Dec 9, 2024

qamarq Dec 9, 2024

Rei-x Dec 9, 2024

qamarq Dec 9, 2024

qamarq Dec 9, 2024

olekszczepanowski Dec 10, 2024

qamarq Dec 10, 2024

olekszczepanowski Dec 10, 2024

olekszczepanowski Dec 10, 2024

qamarq commented Dec 10, 2024

D0dii left a comment

unewMe commented Dec 10, 2024


		export const PlanItem = ({ id, name }: { id: string; name: string }) => {
		export const PlanItem = ({

feat: sync plans between devices #103

feat: sync plans between devices #103

Conversation

qamarq commented Nov 29, 2024 • edited Loading

Backend Changes:

Frontend Changes:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Rei-x commented Dec 8, 2024

qamarq commented Dec 8, 2024

Rei-x left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

qamarq commented Dec 10, 2024

D0dii left a comment

Choose a reason for hiding this comment

unewMe commented Dec 10, 2024

Choose a reason for hiding this comment

qamarq commented Nov 29, 2024 •

edited

Loading