Skip to content

Commit

Permalink
chore: add typescript-plugin-css-modules, cleanup tsconfig (#126)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexgoff authored Aug 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent ab6f5b7 commit 5aec92a
Showing 75 changed files with 345 additions and 117 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
# misc
.DS_Store
*.pem
*.code-workspace

# debug
npm-debug.log*
2 changes: 0 additions & 2 deletions app/[locale]/_styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "abstracts/functions";

// Pages
@forward "tours/styles";
@forward "tours/[tour]/styles";
2 changes: 1 addition & 1 deletion app/[locale]/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "@/styles/styles.scss";
import { FunctionComponent, PropsWithChildren } from "react";
import { Metadata } from "next";
import "@/styles/styles.scss";
import StyledComponentsRegistry from "@/lib/registry";
import { SourceSansPro } from "@/lib/fonts";
import { fallbackLng, languages } from "@/lib/i18n/settings";
2 changes: 1 addition & 1 deletion components/ShareButtons/CopyUrlButton.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import copy from "copy-to-clipboard";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";
import ShareButton from "@/components/ShareButtons/ShareButton";

export default function CopyUrlButton({ showLabel }) {
2 changes: 1 addition & 1 deletion components/ShareButtons/EmailShareButton.jsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import { EmailShareButton } from "react-share";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";

export default function ShareButton({
subject,
2 changes: 1 addition & 1 deletion components/ShareButtons/FacebookShareButton.jsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import { FacebookShareButton } from "react-share";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";

export default function ShareButton({ quote, hashtag, showLabel }) {
return (
2 changes: 1 addition & 1 deletion components/ShareButtons/GetImageButton.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import { useAladin } from "@/contexts/Aladin";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";
import ShareButton from "@/components/ShareButtons/ShareButton";
import { getDownloadLink } from "@/helpers";

2 changes: 1 addition & 1 deletion components/ShareButtons/TwitterShareButton.jsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import { TwitterShareButton } from "react-share";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";

export default function ShareButton({
title,
8 changes: 4 additions & 4 deletions components/explorer/SourceDetails/index.js
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@ import { useEffect, useState, useRef } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import { useAladin } from "@/contexts/Aladin";
import Accordion from "@/primitives/Accordion";
import AccordionGroup from "@/primitives/AccordionGroup";
import Button from "@/primitives/Button";
import Accordion from "@/components/primitives/Accordion";
import AccordionGroup from "@/components/primitives/AccordionGroup";
import Button from "@/components/primitives/Button";
import Buttonish from "@rubin-epo/epo-react-lib/Buttonish";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";
import SourceFilters from "./SourceFilters";
import DetailsSection from "./DetailsSection";
import DetailsSectionValue from "./DetailsSectionValue";
2 changes: 1 addition & 1 deletion components/global/FiltersMenu/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import Menu from "@/primitives/Menu";
import Menu from "@/components/primitives/Menu";

export default function Filters({
menuLabelId,
4 changes: 2 additions & 2 deletions components/global/HtmlHead/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from "prop-types";
import Head from "next/head";
import siteInfoShape from "@/shapes/siteInfo";
import imageShape from "@/shapes/image";
import siteInfoShape from "@/components/shapes/siteInfo";
import imageShape from "@/components/shapes/image";

export default function HtmlHead({
title,
2 changes: 1 addition & 1 deletion components/global/MainMenu/AboutMenu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import Menu from "@/primitives/Menu";
import Menu from "@/components/primitives/Menu";

export default function AboutMenu({ toggleMenuCallback, isOpen }) {
return (
4 changes: 2 additions & 2 deletions components/global/MainMenu/LocaleMenu.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState } from "react";
import PropTypes from "prop-types";
import Button from "@rubin-epo/epo-react-lib/Button";
import Menu from "@/primitives/Menu";
import Radio from "@/primitives/Radio";
import Menu from "@/components/primitives/Menu";
import Radio from "@/components/primitives/Radio";

const DEFAULT = "en";

4 changes: 2 additions & 2 deletions components/global/MainMenu/QuickAccess.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import IconComposer from "@/svg/IconComposer";
import Buttonish from "@/primitives/Buttonish";
import IconComposer from "@/components/svg/IconComposer";
import Buttonish from "@/components/primitives/Buttonish";

export default function QuickAccess({ route }) {
return (
2 changes: 1 addition & 1 deletion components/global/MainMenu/ShareMenu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import Menu from "@/primitives/Menu";
import Menu from "@/components/primitives/Menu";
import ShareButtons from "@/components/ShareButtons";

export default function ShareMenu({ toggleMenuCallback, isOpen }) {
4 changes: 2 additions & 2 deletions components/global/MainMenu/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"use client";
import { useState } from "react";
import PropTypes from "prop-types";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";
import Button from "@rubin-epo/epo-react-lib/Button";
import Buttonish from "@rubin-epo/epo-react-lib/Buttonish";
import Menu from "@/primitives/Menu";
import Menu from "@/components/primitives/Menu";
import AboutMenu from "./AboutMenu.js";
import LocaleMenu from "./LocaleMenu.js";
import ShareMenu from "./ShareMenu.js";
2 changes: 1 addition & 1 deletion components/global/Navigation/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import Link from "next/link";
import internalLinkShape from "@/shapes/link";
import internalLinkShape from "@/components/shapes/link";

export default function Navigation({ items }) {
return (
6 changes: 3 additions & 3 deletions components/global/PrimaryHeader/index.jsx
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@ import MenuContext from "@/contexts/Menu";
import PropTypes from "prop-types";
import classnames from "classnames";
import useResizeObserver from "use-resize-observer";
import Buttonish from "@/primitives/Buttonish";
import MainMenu from "@/global/MainMenu";
import IconComposer from "@/svg/IconComposer";
import Buttonish from "@/components/primitives/Buttonish";
import MainMenu from "@/components/global/MainMenu";
import IconComposer from "@/components/svg/IconComposer";

export default function Header({ closeUrl = "/", backgroundColor, route }) {
const { ref } = useResizeObserver({
6 changes: 3 additions & 3 deletions components/global/SecondaryHeader/Filters.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useState, useContext } from "react";
import PropTypes from "prop-types";
import Checkbox from "@/primitives/Checkbox";
import Checkbox from "@/components/primitives/Checkbox";
import Slider from "@rubin-epo/epo-react-lib/HorizontalSlider";
import IconComposer from "@/svg/IconComposer";
import FiltersMenu from "@/global/FiltersMenu";
import IconComposer from "@/components/svg/IconComposer";
import FiltersMenu from "@/components/global/FiltersMenu";

export default function Filters({ context, defaultFilters }) {
const menuLabelId = "guided-experience-filters-menu-label";
6 changes: 3 additions & 3 deletions components/global/SecondaryHeader/Search.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState, useContext } from "react";
import PropTypes from "prop-types";
import Modal from "@/primitives/Modal";
import TextInput from "@/primitives/TextInput";
import IconComposer from "@/svg/IconComposer";
import Modal from "@/components/primitives/Modal";
import TextInput from "@/components/primitives/TextInput";
import IconComposer from "@/components/svg/IconComposer";
import useDebounce from "@/hooks/useDebounce";

export default function Search({ context }) {
6 changes: 3 additions & 3 deletions components/global/SecondaryHeader/Sort.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState, useContext } from "react";
import PropTypes from "prop-types";
import Menu from "@/primitives/Menu";
import Radio from "@/primitives/Radio";
import IconComposer from "@/svg/IconComposer";
import Menu from "@/components/primitives/Menu";
import Radio from "@/components/primitives/Radio";
import IconComposer from "@/components/svg/IconComposer";

export default function Sort({ context }) {
const menuLabelId = "filters-menu-label";
2 changes: 1 addition & 1 deletion components/guidedExperiences/GuidedExperienceLanding.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import Link from "next/link";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";
import Bubbles from "@/components/Bubbles";

export default function GuidedExperienceLanding({
6 changes: 3 additions & 3 deletions components/molecules/ExplorerControls/Filters/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FunctionComponent, useState } from "react";
import Checkbox from "@/primitives/Checkbox";
import Checkbox from "@/components/primitives/Checkbox";
import Slider from "@rubin-epo/epo-react-lib/HorizontalSlider";
import IconComposer from "@/svg/IconComposer";
import FiltersMenu from "@/global/FiltersMenu";
import IconComposer from "@/components/svg/IconComposer";
import FiltersMenu from "@/components/global/FiltersMenu";
import defaultFilters, {
CharacteristicParams,
} from "@/fixtures/defaultExplorerFilters";
4 changes: 2 additions & 2 deletions components/molecules/ExplorerControls/Orientation/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import Button from "@/primitives/Button";
import IconComposer from "@/svg/IconComposer";
import Button from "@/components/primitives/Button";
import IconComposer from "@/components/svg/IconComposer";

export default function Orientation() {
const [isOpen, setIsOpen] = useState(false);
2 changes: 1 addition & 1 deletion components/molecules/ExplorerControls/Pan/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useAladin } from "@/contexts/Aladin";
import { useKeyDownEvent } from "@/hooks/listeners";
import { getKeyByValue } from "@/helpers";
import Button from "@/primitives/Button";
import Button from "@/components/primitives/Button";

const KEY_MAP = {
left: "ArrowLeft",
4 changes: 2 additions & 2 deletions components/molecules/ExplorerControls/Search/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import Button from "@/primitives/Button";
import IconComposer from "@/svg/IconComposer";
import Button from "@/components/primitives/Button";
import IconComposer from "@/components/svg/IconComposer";

export default function Search() {
const [isOpen, setIsOpen] = useState(false);
4 changes: 2 additions & 2 deletions components/molecules/ExplorerControls/Share/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import IconComposer from "@/svg/IconComposer";
import Modal from "@/primitives/Modal";
import IconComposer from "@/components/svg/IconComposer";
import Modal from "@/components/primitives/Modal";
import ShareButtons from "@/components/ShareButtons";

export default function Share() {
4 changes: 2 additions & 2 deletions components/molecules/ExplorerControls/Zoom/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useAladin } from "@/contexts/Aladin";
import { useKeyDownEvent } from "@/hooks/listeners";
import Button from "@/primitives/Button";
import IconComposer from "@/svg/IconComposer";
import Button from "@/components/primitives/Button";
import IconComposer from "@/components/svg/IconComposer";

export default function Zoom() {
const { aladin, hasFocus } = useAladin();
4 changes: 2 additions & 2 deletions components/organisms/GuidedExperiences/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useState } from "react";
import PropTypes from "prop-types";
import Buttonish from "@rubin-epo/epo-react-lib/Buttonish";
import Header from "@/global/GuidedExperienceHeader";
import SecondaryHeader from "@/global/SecondaryHeader";
import Header from "@/components/global/GuidedExperienceHeader";
import SecondaryHeader from "@/components/global/SecondaryHeader";
import useResizeObserver from "use-resize-observer";

export default function GuidedExperiencesLayout({
2 changes: 1 addition & 1 deletion components/organisms/Primary/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FunctionComponent, PropsWithChildren } from "react";
import { MenuProvider } from "@/contexts/Menu";
import Header from "@/global/PrimaryHeader";
import Header from "@/components/global/PrimaryHeader";

interface PrimaryLayoutProps {
closeUrl?: string;
2 changes: 1 addition & 1 deletion components/primitives/Accordion/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import classnames from "classnames";
import IconComposer from "@/svg/IconComposer";
import IconComposer from "@/components/svg/IconComposer";

export default function Accordion({
id,
6 changes: 3 additions & 3 deletions components/primitives/Menu/index.js
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ import { useEffect, useContext, useState, useRef } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import MenuContext from "@/contexts/Menu";
import Button from "@/primitives/Button";
import ConditionalWrapper from "@/primitives/ConditionalWrapper";
import IconComposer from "@/svg/IconComposer";
import Button from "@/components/primitives/Button";
import ConditionalWrapper from "@/components/primitives/ConditionalWrapper";
import IconComposer from "@/components/svg/IconComposer";
import useFocusTrap from "@/hooks/useFocusTrap";
import { useKeyDownEvent, useOnClickOutside } from "@/hooks/listeners";

4 changes: 2 additions & 2 deletions components/primitives/Modal/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState, useRef } from "react";
import PropTypes from "prop-types";
import classnames from "classnames";
import Button from "@/primitives/Button";
import IconComposer from "@/svg/IconComposer";
import Button from "@/components/primitives/Button";
import IconComposer from "@/components/svg/IconComposer";
import useFocusTrap from "@/hooks/useFocusTrap";
import { useKeyDownEvent, useOnClickOutside } from "@/hooks/listeners";

4 changes: 2 additions & 2 deletions components/shapes/footerContent.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import { linksShape } from "@/shapes/link";
import imageShape from "@/shapes/image";
import { linksShape } from "@/components/shapes/link";
import imageShape from "@/components/shapes/image";

const footerContentShape = PropTypes.shape({
links: linksShape,
4 changes: 2 additions & 2 deletions components/shapes/news.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import { localizedShape } from "@/shapes/locale";
import imageShape from "@/shapes/image";
import { localizedShape } from "@/components/shapes/locale";
import imageShape from "@/components/shapes/image";

const newsShape = PropTypes.shape({
contentBlocks: PropTypes.arrayOf(PropTypes.object),
4 changes: 2 additions & 2 deletions components/shapes/page.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import { localizedShape } from "@/shapes/locale";
import imageShape from "@/shapes/image";
import { localizedShape } from "@/components/shapes/locale";
import imageShape from "@/components/shapes/image";

const pageShape = PropTypes.shape({
id: PropTypes.string,
2 changes: 1 addition & 1 deletion components/shapes/siteInfo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import imageShape from "@/shapes/image";
import imageShape from "@/components/shapes/image";

export const socialInfoInternalShape = {
facebook: PropTypes.string,
4 changes: 2 additions & 2 deletions components/shapes/staff.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from "prop-types";
import imageShape from "@/shapes/image";
import { localizedShape } from "@/shapes/locale";
import imageShape from "@/components/shapes/image";
import { localizedShape } from "@/components/shapes/locale";

const staffShape = PropTypes.shape({
id: PropTypes.string,
2 changes: 1 addition & 1 deletion components/svg/IconComposer/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BaseIconComposer from "@rubin-epo/epo-react-lib/IconComposer";
import customIcons from "@/svg/icons";
import customIcons from "@/components/svg/icons";

const IconComposer = (props) => {
return <BaseIconComposer {...{ ...props, customIcons }} />;
2 changes: 1 addition & 1 deletion components/svg/icons/Compass.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import { svgInternalShape } from "@/shapes/svg";
import { svgInternalShape } from "@/components/shapes/svg";
import defaultProps from "./defaultProps";

export default function Compass({
2 changes: 1 addition & 1 deletion components/svg/icons/Filters.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import { svgInternalShape } from "@/shapes/svg";
import { svgInternalShape } from "@/components/shapes/svg";
import defaultProps from "./defaultProps";

export default function Filters({ className, fill = "currentColor" }) {
2 changes: 1 addition & 1 deletion components/svg/icons/Galaxy.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import { svgInternalShape } from "@/shapes/svg";
import { svgInternalShape } from "@/components/shapes/svg";
import defaultProps from "./defaultProps";

export default function Galaxy({ className, fill = "currentColor" }) {
2 changes: 1 addition & 1 deletion components/svg/icons/Grid.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from "prop-types";
import { svgInternalShape } from "@/shapes/svg";
import { svgInternalShape } from "@/components/shapes/svg";
import defaultProps from "./defaultProps";

export default function Grid({ className, size = 22, fill = "currentColor" }) {
Loading

0 comments on commit 5aec92a

Please sign in to comment.