diff --git a/app/web/config/tailwind.config.js b/app/web/config/tailwind.config.js
index 31d4d2b..1089e04 100644
--- a/app/web/config/tailwind.config.js
+++ b/app/web/config/tailwind.config.js
@@ -13,6 +13,9 @@ module.exports = {
borderRadius: {
half: '50%',
},
+ boxShadow: {
+ ch: '0 4px 4px 0 rgba(0, 0, 0, 0.25), 0 4px 4px 0 rgba(13, 13, 19, 0.15)',
+ },
colors: {
'ch-gray': {
900: '#0D0D13',
@@ -35,9 +38,10 @@ module.exports = {
200: '#DBDBEC',
},
'ch-blue': {
- 600: '#79B2F8',
+ 700: '#08466F',
+ 650: '#0958BA',
500: '5098F1',
- 300: '#08466F'
+ 400: '#79B2F8',
},
'ch-pink': {
800: '#93064F',
diff --git a/app/web/src/components/CadPackage/CadPackage.tsx b/app/web/src/components/CadPackage/CadPackage.tsx
index 4354690..f05cd9e 100644
--- a/app/web/src/components/CadPackage/CadPackage.tsx
+++ b/app/web/src/components/CadPackage/CadPackage.tsx
@@ -1,11 +1,17 @@
import { ideTypeNameMap } from 'src/helpers/hooks/useIdeContext'
+import type { CadPackage as CadPackageType } from 'src/helpers/hooks/useIdeState'
interface CadPackageProps {
- cadPackage: string
+ cadPackage: CadPackageType
className?: string
+ dotClass?: string
}
-const CadPackage = ({ cadPackage, className = '' }: CadPackageProps) => {
+const CadPackage = ({
+ cadPackage,
+ className = '',
+ dotClass = 'w-5 h-5',
+}: CadPackageProps) => {
const cadName = ideTypeNameMap[cadPackage] || ''
const isOpenScad = cadPackage === 'openscad'
const isCadQuery = cadPackage === 'cadquery'
@@ -14,13 +20,13 @@ const CadPackage = ({ cadPackage, className = '' }: CadPackageProps) => {
className={
`grid grid-flow-col-dense items-center gap-2 cursor-default text-gray-100 ${
isOpenScad && 'bg-yellow-800'
- } ${isCadQuery && 'bg-ch-blue-300'} bg-opacity-30 ` + className
+ } ${isCadQuery && 'bg-ch-blue-700'} bg-opacity-30 ` + className
}
>
{cadName}
diff --git a/app/web/src/components/Customizer/Customizer.tsx b/app/web/src/components/Customizer/Customizer.tsx
index e6cd428..733a444 100644
--- a/app/web/src/components/Customizer/Customizer.tsx
+++ b/app/web/src/components/Customizer/Customizer.tsx
@@ -222,7 +222,7 @@ function ChoiceParam({
className={({ active }) =>
`${
active
- ? 'text-ch-blue-600 bg-ch-gray-700'
+ ? 'text-ch-blue-400 bg-ch-gray-700'
: 'text-ch-gray-300'
}
cursor-default select-none relative py-2 pl-10 pr-4`
@@ -241,7 +241,7 @@ function ChoiceParam({
{selected ? (
diff --git a/app/web/src/components/Footer/Footer.stories.js b/app/web/src/components/Footer/Footer.stories.js
deleted file mode 100644
index f53294a..0000000
--- a/app/web/src/components/Footer/Footer.stories.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Footer from './Footer'
-
-export const generated = () => {
- return
-}
-
-export default { title: 'Components/Footer' }
diff --git a/app/web/src/components/Footer/Footer.test.js b/app/web/src/components/Footer/Footer.test.js
deleted file mode 100644
index 07e1732..0000000
--- a/app/web/src/components/Footer/Footer.test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { render } from '@redwoodjs/testing'
-
-import Footer from './Footer'
-
-describe('Footer', () => {
- it('renders successfully', () => {
- expect(() => {
- render()
- }).not.toThrow()
- })
-})
diff --git a/app/web/src/components/Footer/Footer.js b/app/web/src/components/Footer/Footer.tsx
similarity index 92%
rename from app/web/src/components/Footer/Footer.js
rename to app/web/src/components/Footer/Footer.tsx
index 25c5b0d..af36dc6 100644
--- a/app/web/src/components/Footer/Footer.js
+++ b/app/web/src/components/Footer/Footer.tsx
@@ -3,7 +3,7 @@ import OutBound from 'src/components/OutBound'
const Footer = () => {
return (
-
+
Github
diff --git a/app/web/src/components/IdeConsole/IdeConsole.tsx b/app/web/src/components/IdeConsole/IdeConsole.tsx
index a85ce5e..c459535 100644
--- a/app/web/src/components/IdeConsole/IdeConsole.tsx
+++ b/app/web/src/components/IdeConsole/IdeConsole.tsx
@@ -18,7 +18,7 @@ const IdeConsole = () => {
className="font-mono text-sm text-gray-400"
key={`${message} ${index}`}
>
-
+
{time?.toLocaleString()}
diff --git a/app/web/src/components/IdeEditor/IdeEditor.tsx b/app/web/src/components/IdeEditor/IdeEditor.tsx
index 7a196fc..9c1d0ae 100644
--- a/app/web/src/components/IdeEditor/IdeEditor.tsx
+++ b/app/web/src/components/IdeEditor/IdeEditor.tsx
@@ -5,7 +5,6 @@ import Editor, { useMonaco } from '@monaco-editor/react'
import { theme } from 'src/../config/tailwind.config'
import { useSaveCode } from 'src/components/IdeWrapper/useSaveCode'
import type { CadPackage as CadPackageType } from 'src/helpers/hooks/useIdeState'
-import CadPackage from '../CadPackage/CadPackage'
const colors = theme.extend.colors
diff --git a/app/web/src/components/ProjectProfile/ProjectProfile.tsx b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
index 4ffac27..d04835d 100644
--- a/app/web/src/components/ProjectProfile/ProjectProfile.tsx
+++ b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
@@ -36,7 +36,7 @@ const KeyValue = ({
if (!children || hide) return null
return (
-
+
{keyName}
{canEdit &&
(isEditable ? (
@@ -246,7 +246,7 @@ const ProjectProfile = ({
/>
{user?.userName}
-
+
{new Date(createdAt).toDateString()}
diff --git a/app/web/src/components/Projects/Projects.tsx b/app/web/src/components/Projects/Projects.tsx
index 50b61bc..3a67a50 100644
--- a/app/web/src/components/Projects/Projects.tsx
+++ b/app/web/src/components/Projects/Projects.tsx
@@ -1,5 +1,7 @@
import { useMemo } from 'react'
import { Link, routes } from '@redwoodjs/router'
+import Svg from 'src/components/Svg/Svg'
+import CadPackage from 'src/components/CadPackage/CadPackage'
import { countEmotes } from 'src/helpers/emote'
import ImageUploader from 'src/components/ImageUploader'
@@ -11,6 +13,8 @@ const ProjectsList = ({
// temporary filtering projects that don't have images until some kind of search is added and there are more things on the website
// it helps avoid the look of the website just being filled with dumby data.
// related issue-104
+
+ // note to self the projectCard is hardcoded directly into this component will not be hard the extract later when we need it elsewhere.
const filteredProjects = useMemo(
() =>
(shouldFilterProjectsWithoutImage
@@ -24,67 +28,68 @@ const ProjectsList = ({
),
[projects, shouldFilterProjectsWithoutImage]
)
+
return (
-
+
- {filteredProjects.map(({ title, mainImage, user, Reaction }) => (
-
- (
+
-
-
-
-
- {countEmotes(Reaction).map(({ emoji, count }) => (
-
-
{emoji}
-
- {count}
-
+
-
-
- ))}
+
+
{title}
+
{user?.userName}
+
+
+
+
+
+ {countEmotes(Reaction).reduce(
+ (prev, { count }) => prev + count,
+ 0
+ )}
+
+
+ 0
+
+
+
+
+ )
+ )}
)
diff --git a/app/web/src/components/ProjectsCell/ProjectsCell.tsx b/app/web/src/components/ProjectsCell/ProjectsCell.tsx
index 96cf8c2..83d221a 100644
--- a/app/web/src/components/ProjectsCell/ProjectsCell.tsx
+++ b/app/web/src/components/ProjectsCell/ProjectsCell.tsx
@@ -7,6 +7,7 @@ export const QUERY = gql`
projects {
id
title
+ cadPackage
mainImage
createdAt
updatedAt
diff --git a/app/web/src/pages/HomePage/HomePage.js b/app/web/src/pages/HomePage/HomePage.tsx
similarity index 79%
rename from app/web/src/pages/HomePage/HomePage.js
rename to app/web/src/pages/HomePage/HomePage.tsx
index 6243db4..7920a4e 100644
--- a/app/web/src/pages/HomePage/HomePage.js
+++ b/app/web/src/pages/HomePage/HomePage.tsx
@@ -12,7 +12,9 @@ const ProjectsPage = () => {
lang="en-US"
/>
-
+
)
}