Fix formatting; use '/g/<handle>' for groups

opencal-me · Sep 24, 2023 · aa7386e · aa7386e
1 parent 8ad375c
commit aa7386e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/app/components/ActivityCard.tsx b/app/components/ActivityCard.tsx
@@ -79,7 +79,7 @@ const ActivityCard: FC<ActivityCardProps> = ({
       >
         {topSection}
         <Group align="start" noWrap>
-          <Group spacing={8} sx={{ flexGrow: 1 }}>
+          <Group spacing={8} sx={{ flexGrow: 1, rowGap: 0 }}>
             <Text weight={500} lh={1.3} sx={{ textTransform: "none" }}>
               {name}
             </Text>

diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -374,7 +374,7 @@ def save_to_icalendar_event(event)
       event.append_attendee(attendee)
     end
     attachment = Icalendar::Values::Uri.new(
-      join_activity_url(self),
+      join_activity_url(friendly_id),
       "fmttype" => "text/html",
     )
     event.append_attach(attachment)

diff --git a/app/pages/ActivityPage.tsx b/app/pages/ActivityPage.tsx
@@ -89,7 +89,7 @@ const ActivityPage: PageComponent<ActivityPageProps> = ({
       </Alert>
       <Stack>
         <Box>
-          <Group spacing={8}>
+          <Group spacing={8} sx={{ rowGap: 0 }}>
             <Title size="h3" lh={1.3} sx={{ textTransform: "none" }}>
               {name}
             </Title>

diff --git a/app/pages/HomePage.tsx b/app/pages/HomePage.tsx
@@ -83,7 +83,12 @@ const HomePage: PageComponent<HomePageProps> = ({
           <Text>First</Text>
           <CopyButton value={calendarUrl}>
             {({ copy, copied }) => (
-              <Button variant="default" leftIcon={<CopyIcon />} onClick={copy}>
+              <Button
+                variant="default"
+                leftIcon={<CopyIcon />}
+                compact
+                onClick={copy}
+              >
                 {copied ? "Link copied" : "Copy link"}
               </Button>
             )}
@@ -96,6 +101,7 @@ const HomePage: PageComponent<HomePageProps> = ({
             rel="noopener noreferrer nofollow"
             variant="default"
             leftIcon={<OpenExternalIcon />}
+            compact
           >
             Add to Google Calendar
           </Button>

diff --git a/config/routes.rb b/config/routes.rb
@@ -58,7 +58,7 @@
   end
 
   # == Groups
-  resources :groups, only: :show
+  resources :groups, path: "/g", only: :show
 
   # == Activities
   resources :activities, only: :show do