Commit ff206a69 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

Manual Routes

See merge request !93
parents 81f2692e a9de9fdb

backend/src/visited/templates/visit_template.ts

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ export const visit_template = (places: string[]) => ` 
        position: relative;

        display: flex;

        flex-direction: row;

        justify-content: center;

        align-items: center;

        height: 300px;

        width: 450px;

        gap: 10px;
@@ -29,7 +31,7 @@ export const visit_template = (places: string[]) => ` 
      }

      .container .image {

        flex-grow: 1;

        max-width: 100%;

        max-width: 50%;

        height: 90%;

        border-radius: 10px;

        overflow: hidden;

mobile/app/_layout.tsx

+16 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import { 
  useSetUp,

} from "../src/common/contexts/set_up_context";

import { useEffect } from "react";

import { LANG_CONSTANTS } from "../src/lang/lang";



export default function Root() {

  return (
@@ -128,6 +129,21 @@ const MainLayout = () => { 
          statusBarColor: LIGHT_THEME.color.primary,

        }}

      />

      <Stack.Screen

        name="generate_route_manual"

        options={{

          title: t(LANG_CONSTANTS.generateManualRouteScreenTitle),

          headerStyle: {

            backgroundColor: LIGHT_THEME.color.primary,

          },

          headerTitleStyle: {

            color: LIGHT_THEME.color.white,

          },

          headerTitleAlign: "center",

          headerTintColor: LIGHT_THEME.color.white,

          statusBarColor: LIGHT_THEME.color.primary,

        }}

      />

      <Stack.Screen

        name="routes/generate_route_form"

        options={{

mobile/app/generate_route_manual.tsx

0 → 100644
+10 −0
Original line number Diff line number Diff line 
import { useLocalSearchParams } from "expo-router";

import { GenerateManualRoute } from "../src/route/screens/generate_manual_route_screen";



export default function GenerateManualRoutePage() {

  const { townId } = useLocalSearchParams<{ townId: string }>();

  if (!townId) {

    return null;

  }

  return <GenerateManualRoute townId={+townId} />;

}

mobile/app/state/[stateId]/town/_layout.tsx

+3 −1
Original line number Diff line number Diff line 
import { Stack } from "expo-router";

import { router, Stack } from "expo-router";

import { LIGHT_THEME } from "../../../../src/common/const/theme";

import { useTranslation } from "react-i18next";

import React from "react";

import { MaterialCommunityIcons } from "@expo/vector-icons";



export default function Layout() {

  const { t } = useTranslation();

mobile/assets/GPLv3_Logo-removebg-preview.png

0 → 100644
+200 KiB
Loading image diff...