diff --git a/assets/package-lock.json b/assets/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/assets/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/frontend/.prettierrc b/frontend/.prettierrc new file mode 100644 index 0000000..9c32fcd --- /dev/null +++ b/frontend/.prettierrc @@ -0,0 +1,9 @@ +{ + "printWidth": 80, + "bracketSpacing": true, + "semi": true, + "singleQuote": true, + "trailingComma": "es5", + "tabWidth": 2, + "useTabs": false + } \ No newline at end of file diff --git a/frontend/components/Navbar/MobileNav.tsx b/frontend/components/Navbar/MobileNav.tsx new file mode 100644 index 0000000..f91b0c9 --- /dev/null +++ b/frontend/components/Navbar/MobileNav.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import { + CogIcon, + GalleryIcon, + HomeIcon, + PlusCircleIcon, + UserIcon, +} from '../icons'; + +export default function MobileNav() { + return ( +
+
+ + + + + +
+
+ ); +} diff --git a/frontend/components/SearchBar.tsx b/frontend/components/SearchBar.tsx new file mode 100644 index 0000000..502f5c0 --- /dev/null +++ b/frontend/components/SearchBar.tsx @@ -0,0 +1,19 @@ +import React from 'react'; +import { SearchIcon } from './icons'; + +export default function SearchBar() { + return ( +
+
+ + +
+
+ ); +} diff --git a/frontend/components/icons/CogIcon.tsx b/frontend/components/icons/CogIcon.tsx new file mode 100644 index 0000000..e7f6497 --- /dev/null +++ b/frontend/components/icons/CogIcon.tsx @@ -0,0 +1,29 @@ +import React from 'react'; + +export default function CogIcon({ + className, + ...props +}: React.SVGProps) { + return ( + + + + + ); +} diff --git a/frontend/components/icons/CopyIcon.tsx b/frontend/components/icons/CopyIcon.tsx deleted file mode 100644 index 5b4a182..0000000 --- a/frontend/components/icons/CopyIcon.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; - -function CopyIcon({ className, ...props }: React.SVGProps) { - return ( - - - - ); -} - -export default CopyIcon; diff --git a/frontend/components/icons/CashIcon.tsx b/frontend/components/icons/GalleryIcon.tsx similarity index 62% rename from frontend/components/icons/CashIcon.tsx rename to frontend/components/icons/GalleryIcon.tsx index 89ad4f7..6762175 100644 --- a/frontend/components/icons/CashIcon.tsx +++ b/frontend/components/icons/GalleryIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; -export default function CashIcon({ +export default function GalleryIcon({ className, ...props }: React.SVGProps) { @@ -12,12 +12,12 @@ export default function CashIcon({ fill="none" viewBox="0 0 24 24" stroke="currentColor" + strokeWidth={2} > ); diff --git a/frontend/components/icons/CheckIcon.tsx b/frontend/components/icons/HomeIcon.tsx similarity index 63% rename from frontend/components/icons/CheckIcon.tsx rename to frontend/components/icons/HomeIcon.tsx index 606d727..99ddaaf 100644 --- a/frontend/components/icons/CheckIcon.tsx +++ b/frontend/components/icons/HomeIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; -export default function CheckIcon({ +export default function HomeIcon({ className, ...props }: React.SVGProps) { @@ -12,12 +12,12 @@ export default function CheckIcon({ fill="none" viewBox="0 0 24 24" stroke="currentColor" + strokeWidth={2} > ); diff --git a/frontend/components/icons/BackIcon.tsx b/frontend/components/icons/PlusCircleIcon.tsx similarity index 73% rename from frontend/components/icons/BackIcon.tsx rename to frontend/components/icons/PlusCircleIcon.tsx index 1e94aa6..bf1449f 100644 --- a/frontend/components/icons/BackIcon.tsx +++ b/frontend/components/icons/PlusCircleIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; -export default function BackIcon({ +export default function PlusCircleIcon({ className, ...props }: React.SVGProps) { @@ -12,12 +12,12 @@ export default function BackIcon({ fill="none" viewBox="0 0 24 24" stroke="currentColor" + strokeWidth={2} > ); diff --git a/frontend/components/icons/SearchIcon.tsx b/frontend/components/icons/SearchIcon.tsx new file mode 100644 index 0000000..21c9a30 --- /dev/null +++ b/frontend/components/icons/SearchIcon.tsx @@ -0,0 +1,23 @@ +import React from 'react'; + +function SearchIcon({ className, ...props }: React.SVGProps) { + return ( + + + + ); +} + +export default SearchIcon; diff --git a/frontend/components/icons/TruckIcon.tsx b/frontend/components/icons/TruckIcon.tsx deleted file mode 100644 index f622142..0000000 --- a/frontend/components/icons/TruckIcon.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; - -export default function TruckIcon({ - className, - ...props -}: React.SVGProps) { - return ( - - - - - ); -} diff --git a/frontend/components/icons/CheckCircleIcon.tsx b/frontend/components/icons/UserIcon.tsx similarity index 73% rename from frontend/components/icons/CheckCircleIcon.tsx rename to frontend/components/icons/UserIcon.tsx index 0e709e0..8af8e7b 100644 --- a/frontend/components/icons/CheckCircleIcon.tsx +++ b/frontend/components/icons/UserIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; -export default function CheckCircleIcon({ +export default function UserIcon({ className, ...props }: React.SVGProps) { @@ -12,12 +12,12 @@ export default function CheckCircleIcon({ fill="none" viewBox="0 0 24 24" stroke="currentColor" + strokeWidth={2} > ); diff --git a/frontend/components/icons/index.tsx b/frontend/components/icons/index.tsx index 9883fc1..6ccd271 100644 --- a/frontend/components/icons/index.tsx +++ b/frontend/components/icons/index.tsx @@ -1,31 +1,8 @@ -import EditIcon from './EditIcon'; -import BackIcon from './BackIcon'; -import CheckIcon from './CheckIcon'; -import TrashIcon from './TrashIcon'; -import UploadIcon from './UploadIcon'; -import CloseIcon from './CloseIcon'; -import PageIcon from './PageIcon'; -import CopyIcon from './CopyIcon'; -import StarIcon from './StarIcon'; -import LogOutIcon from './LogOutIcon'; -import LoginIcon from './LoginIcon'; -import TruckIcon from './TruckIcon'; -import TagIcon from './TagIcon'; -import HeartIcon from './HeartIcon'; +import HomeIcon from './HomeIcon'; +import GalleryIcon from './GalleryIcon'; +import PlusCircleIcon from './PlusCircleIcon'; +import UserIcon from './UserIcon'; +import CogIcon from './CogIcon'; +import SearchIcon from './SearchIcon'; -export { - EditIcon, - BackIcon, - CheckIcon, - TrashIcon, - UploadIcon, - CloseIcon, - PageIcon, - CopyIcon, - StarIcon, - LogOutIcon, - LoginIcon, - TruckIcon, - TagIcon, - HeartIcon, -}; +export { HomeIcon, GalleryIcon, PlusCircleIcon, UserIcon, CogIcon, SearchIcon }; diff --git a/frontend/pages/app/index.tsx b/frontend/pages/app/index.tsx new file mode 100644 index 0000000..9ddf01b --- /dev/null +++ b/frontend/pages/app/index.tsx @@ -0,0 +1,20 @@ +import React from 'react'; +import MobileNav from '../../components/Navbar/MobileNav'; +import SearchBar from '../../components/SearchBar'; + +export default function Landing() { + return ( +
+
+

Welcome

+ logo +
+
+ +
+
+ +
+
+ ); +} diff --git a/frontend/public/logo.png b/frontend/public/logo.png new file mode 100644 index 0000000..62016c9 Binary files /dev/null and b/frontend/public/logo.png differ diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 31433d3..6b29054 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,7 +1,7 @@ module.exports = { content: [ - "./pages/**/*.{js,ts,jsx,tsx}", - "./components/**/*.{js,ts,jsx,tsx}", + './pages/**/*.{js,ts,jsx,tsx}', + './components/**/*.{js,ts,jsx,tsx}', './context/**/*.{js,jsx,ts,tsx}', ], theme: { @@ -14,7 +14,7 @@ module.exports = { extend: { colors: { primary: { - 50: '#4C5564', + 50: '#4C5564', 100: '#787878', 200: '#5E5E5E', 300: '#454545', @@ -29,12 +29,18 @@ module.exports = { 500: '#15F974', }, test: { - 50: '#232f35' - } + 50: '#232f35', + }, + figma: { + 100: '#473EA8', + 200: '#F9F9F9', + 300: '#F2F2F2', + 400: '#333333', + 500: '#FEFEFE', + 600: '#828282', + }, }, }, }, - plugins: [ - require('tailwind-scrollbar-hide') - ], -} \ No newline at end of file + plugins: [require('tailwind-scrollbar-hide')], +};