Skip to content

Commit

Permalink
V2 Settings Shell - Add Teams Section & UI fixes (#4347)
Browse files Browse the repository at this point in the history
* Add teams to sidebar and fix UI

* Clean up

* V2 Multi-select (Team Select) (#4324)

* --init

* design improved

* further fine tuning

* more fixes

* removed extra JSX tag

* added story

* NIT

* revert to use of CheckedTeamSelect

* Removes comments

Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* fix: toggle alligment (#4361)

* fix: add checked tranform for switch (#4357)

* fixed input size on mobile, fixed settings (#4360)

* fixing type errors

* Mobile fixes

* Tests fixes

Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: zomars <zomars@me.com>
  • Loading branch information
6 people committed Sep 13, 2022
1 parent f3cee7f commit 3ca6570
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions apps/web/public/static/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,8 @@
"form_description": "Create your form to route a booker",
"copy_link_to_form": "Copy link to form",
<<<<<<< HEAD
"add_a_team": "Add a team",
"saml_config": "SAML Config",
"add_a_team": "Add a team",
"saml_config": "SAML Config",
"add_webhook_description": "Receive meeting data in real-time when something happens in Cal.com",
Expand Down
4 changes: 1 addition & 3 deletions packages/ui/v2/core/layouts/SettingsLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@radix-ui/react-collapsible";
import { useSession } from "next-auth/react";
import Link from "next/link";
import React, { ComponentProps, useState, useEffect } from "react";
import React, { ComponentProps, useEffect, useState } from "react";

import { classNames } from "@calcom/lib";
import { WEBAPP_URL } from "@calcom/lib/constants";
Expand Down Expand Up @@ -106,7 +105,6 @@ const SettingsSidebarContainer = ({ className = "" }) => {
useEffect(() => {
if (teams) {
const teamStates = teams?.map((team) => ({ teamId: team.id, teamMenuOpen: false }));

setTeamMenuState(teamStates);
}
}, [teams]);
Expand Down

0 comments on commit 3ca6570

Please sign in to comment.