Skip to content

Commit

Permalink
Merge pull request #2875 from scotthallock/master
Browse files Browse the repository at this point in the history
WIP(5): Component folder structure
  • Loading branch information
scotthallock authored Apr 3, 2023
2 parents 5def52f + 28f6eb6 commit 2a45405
Show file tree
Hide file tree
Showing 14 changed files with 9 additions and 6 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState } from 'react'
import { Button } from './theme/Button'
import { Button } from '../theme/Button'
import { AlertIcon, CheckIcon, CopyIcon } from '@primer/octicons-react'
import * as Sentry from '@sentry/react'
import { ColorTypes } from './theme/colors'
import { ColorTypes } from '../theme/colors'

enum State {
NotCopied,
Expand Down
1 change: 1 addition & 0 deletions components/CopyButton/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './CopyButton'
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react'
import styles from '../scss/discordBar.module.scss'
import styles from './discordBar.module.scss'
type Member = {
id: string
username: string
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions components/DiscordBar/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './DiscordBar'
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react'
import Dropdown from 'react-bootstrap/Dropdown'
import styles from '../scss/dropDown.module.scss'
import styles from './dropdownMenu.module.scss'
import { DropDirection } from 'react-bootstrap/esm/DropdownContext'
import { ChevronRightIcon } from '@primer/octicons-react'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:color';
@use '_variables.module.scss';
@import 'colors.module.scss';
@use '../../scss/variables.module.scss';
@import '../../scss/colors.module.scss';

.dropdown {
display: flex;
Expand Down
1 change: 1 addition & 0 deletions components/DropdownMenu/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { type Item, DropdownMenu } from './DropdownMenu'

1 comment on commit 2a45405

@vercel
Copy link

@vercel vercel bot commented on 2a45405 Apr 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.