From a09c2523815d8efed5a67403b67e872923886eef Mon Sep 17 00:00:00 2001 From: Lance Tan Date: Fri, 26 Jan 2024 23:37:58 -0800 Subject: [PATCH 1/5] Create nav bar --- frontend/package-lock.json | 8 +-- .../{public => src/assets}/microvan_logo.svg | 0 frontend/src/components/NavBar.jsx | 71 +++++++++++++++++++ frontend/src/globals.css | 10 +++ frontend/src/pages/ContactUsPage.jsx | 10 +++ frontend/src/pages/HomePage.jsx | 17 +---- frontend/src/pages/ListingsPage.jsx | 10 +++ frontend/src/routers/Routers.jsx | 4 ++ frontend/tailwind.config.js | 1 + 9 files changed, 112 insertions(+), 19 deletions(-) rename frontend/{public => src/assets}/microvan_logo.svg (100%) create mode 100644 frontend/src/components/NavBar.jsx create mode 100644 frontend/src/pages/ContactUsPage.jsx create mode 100644 frontend/src/pages/ListingsPage.jsx diff --git a/frontend/package-lock.json b/frontend/package-lock.json index ea33a6a..52c1548 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -17683,16 +17683,16 @@ } }, "node_modules/typescript": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", - "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/unbox-primitive": { diff --git a/frontend/public/microvan_logo.svg b/frontend/src/assets/microvan_logo.svg similarity index 100% rename from frontend/public/microvan_logo.svg rename to frontend/src/assets/microvan_logo.svg diff --git a/frontend/src/components/NavBar.jsx b/frontend/src/components/NavBar.jsx new file mode 100644 index 0000000..9a1c863 --- /dev/null +++ b/frontend/src/components/NavBar.jsx @@ -0,0 +1,71 @@ +import React, { useState } from 'react'; +import { NavLink, useLocation } from 'react-router-dom'; +import NotificationsIcon from '@mui/icons-material/Notifications'; +import NotificationsOutlinedIcon from '@mui/icons-material/NotificationsOutlined'; +import PersonIcon from '@mui/icons-material/Person'; +import PersonOutlinedIcon from '@mui/icons-material/PersonOutlined'; +import logo from '../assets/microvan_logo.svg'; + +export default function NavBar() { + const [notificationHover, setNotificationHover] = useState(false); + const [personHover, setPersonHover] = useState(false); + + const location = useLocation(); + const isHomePage = location.pathname === '/'; + const isListingsPage = location.pathname === '/listings'; + const isTutorialPage = location.pathname === '/tutorial'; + const isContactUsPage = location.pathname === '/contact'; + + return ( +
+ logo +
+ + Home + + + Listings + + + Tutorial + + + Contact Us + +
setNotificationHover(true)} + onMouseLeave={() => setNotificationHover(false)} + > + {notificationHover ? ( + + ) : ( + + )} +
+
setPersonHover(true)} + onMouseLeave={() => setPersonHover(false)} + > + {personHover ? ( + + ) : ( + + )} +
+
+
+ ); +} diff --git a/frontend/src/globals.css b/frontend/src/globals.css index 2223443..7214932 100644 --- a/frontend/src/globals.css +++ b/frontend/src/globals.css @@ -2,6 +2,16 @@ @tailwind components; @tailwind utilities; +@layer utilities { + .inactive-navbar-text { + @apply text-mv-black font-medium text-base hover:text-mv-green; + } + + .active-navbar-text { + @apply text-mv-green font-medium text-base; + } +} + body { margin: 0; -webkit-font-smoothing: antialiased; diff --git a/frontend/src/pages/ContactUsPage.jsx b/frontend/src/pages/ContactUsPage.jsx new file mode 100644 index 0000000..06a7374 --- /dev/null +++ b/frontend/src/pages/ContactUsPage.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import NavBar from '../components/NavBar'; + +export default function ContactUsPage() { + return ( +
+ +
+ ); +} diff --git a/frontend/src/pages/HomePage.jsx b/frontend/src/pages/HomePage.jsx index 877c152..414e684 100644 --- a/frontend/src/pages/HomePage.jsx +++ b/frontend/src/pages/HomePage.jsx @@ -1,23 +1,10 @@ import React from 'react'; -import logo from '../assets/logo.svg'; +import NavBar from '../components/NavBar'; export default function HomePage() { return (
-
- logo -

- Edit src/App.js and save to reload. -

- - Learn React - -
+
); } diff --git a/frontend/src/pages/ListingsPage.jsx b/frontend/src/pages/ListingsPage.jsx new file mode 100644 index 0000000..9660f03 --- /dev/null +++ b/frontend/src/pages/ListingsPage.jsx @@ -0,0 +1,10 @@ +import React from 'react'; +import NavBar from '../components/NavBar'; + +export default function ListingsPage() { + return ( +
+ +
+ ); +} diff --git a/frontend/src/routers/Routers.jsx b/frontend/src/routers/Routers.jsx index e90ae88..b78485a 100644 --- a/frontend/src/routers/Routers.jsx +++ b/frontend/src/routers/Routers.jsx @@ -1,12 +1,16 @@ import React from 'react'; import { Routes, Route } from 'react-router-dom'; import Home from '../pages/HomePage'; +import Listings from '../pages/ListingsPage'; +import ContactUs from '../pages/ContactUsPage'; export default function Routers() { return (
} /> + } /> + } />
); diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 4078ffe..297a755 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -18,6 +18,7 @@ module.exports = { }, boxShadow: { buttonShadow: '0px 4px 16px 0px rgba(22, 22, 22, 0.10)', + navBarShadow: '0px 2px 4px 0px rgba(22, 22, 22, 0.10)', }, }, }, From 1602963d9415369bb69b254b393431cd99149f40 Mon Sep 17 00:00:00 2001 From: Lance Tan Date: Fri, 26 Jan 2024 23:38:33 -0800 Subject: [PATCH 2/5] Update README.md logo path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ebaf27..e9015fa 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Logo + Logo

Microvan Inc.

From 35618f7a551edd406b931061edde4b70c4a1c132 Mon Sep 17 00:00:00 2001 From: Lance Tan Date: Fri, 26 Jan 2024 23:42:30 -0800 Subject: [PATCH 3/5] Make eslint not fail auto-reload --- frontend/config/env.js | 104 + frontend/config/getHttpsConfig.js | 66 + frontend/config/jest/babelTransform.js | 29 + frontend/config/jest/cssTransform.js | 14 + frontend/config/jest/fileTransform.js | 40 + frontend/config/modules.js | 134 + frontend/config/paths.js | 77 + frontend/config/webpack.config.js | 755 + .../persistentCache/createEnvironmentHash.js | 9 + frontend/config/webpackDevServer.config.js | 127 + frontend/package-lock.json | 37585 ++++++++-------- frontend/package.json | 243 +- frontend/scripts/build.js | 217 + frontend/scripts/start.js | 154 + frontend/scripts/test.js | 52 + 15 files changed, 20658 insertions(+), 18948 deletions(-) create mode 100644 frontend/config/env.js create mode 100644 frontend/config/getHttpsConfig.js create mode 100644 frontend/config/jest/babelTransform.js create mode 100644 frontend/config/jest/cssTransform.js create mode 100644 frontend/config/jest/fileTransform.js create mode 100644 frontend/config/modules.js create mode 100644 frontend/config/paths.js create mode 100644 frontend/config/webpack.config.js create mode 100644 frontend/config/webpack/persistentCache/createEnvironmentHash.js create mode 100644 frontend/config/webpackDevServer.config.js create mode 100644 frontend/scripts/build.js create mode 100644 frontend/scripts/start.js create mode 100644 frontend/scripts/test.js diff --git a/frontend/config/env.js b/frontend/config/env.js new file mode 100644 index 0000000..ffa7e49 --- /dev/null +++ b/frontend/config/env.js @@ -0,0 +1,104 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const paths = require('./paths'); + +// Make sure that including paths.js after env.js will read .env variables. +delete require.cache[require.resolve('./paths')]; + +const NODE_ENV = process.env.NODE_ENV; +if (!NODE_ENV) { + throw new Error( + 'The NODE_ENV environment variable is required but was not specified.' + ); +} + +// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use +const dotenvFiles = [ + `${paths.dotenv}.${NODE_ENV}.local`, + // Don't include `.env.local` for `test` environment + // since normally you expect tests to produce the same + // results for everyone + NODE_ENV !== 'test' && `${paths.dotenv}.local`, + `${paths.dotenv}.${NODE_ENV}`, + paths.dotenv, +].filter(Boolean); + +// Load environment variables from .env* files. Suppress warnings using silent +// if this file is missing. dotenv will never modify any environment variables +// that have already been set. Variable expansion is supported in .env files. +// https://github.com/motdotla/dotenv +// https://github.com/motdotla/dotenv-expand +dotenvFiles.forEach(dotenvFile => { + if (fs.existsSync(dotenvFile)) { + require('dotenv-expand')( + require('dotenv').config({ + path: dotenvFile, + }) + ); + } +}); + +// We support resolving modules according to `NODE_PATH`. +// This lets you use absolute paths in imports inside large monorepos: +// https://github.com/facebook/create-react-app/issues/253. +// It works similar to `NODE_PATH` in Node itself: +// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders +// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. +// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims. +// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 +// We also resolve them to make sure all tools using them work consistently. +const appDirectory = fs.realpathSync(process.cwd()); +process.env.NODE_PATH = (process.env.NODE_PATH || '') + .split(path.delimiter) + .filter(folder => folder && !path.isAbsolute(folder)) + .map(folder => path.resolve(appDirectory, folder)) + .join(path.delimiter); + +// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be +// injected into the application via DefinePlugin in webpack configuration. +const REACT_APP = /^REACT_APP_/i; + +function getClientEnvironment(publicUrl) { + const raw = Object.keys(process.env) + .filter(key => REACT_APP.test(key)) + .reduce( + (env, key) => { + env[key] = process.env[key]; + return env; + }, + { + // Useful for determining whether we’re running in production mode. + // Most importantly, it switches React into the correct mode. + NODE_ENV: process.env.NODE_ENV || 'development', + // Useful for resolving the correct path to static assets in `public`. + // For example, . + // This should only be used as an escape hatch. Normally you would put + // images into the `src` and `import` them in code to get their paths. + PUBLIC_URL: publicUrl, + // We support configuring the sockjs pathname during development. + // These settings let a developer run multiple simultaneous projects. + // They are used as the connection `hostname`, `pathname` and `port` + // in webpackHotDevClient. They are used as the `sockHost`, `sockPath` + // and `sockPort` options in webpack-dev-server. + WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, + WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, + WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, + // Whether or not react-refresh is enabled. + // It is defined here so it is available in the webpackHotDevClient. + FAST_REFRESH: process.env.FAST_REFRESH !== 'false', + } + ); + // Stringify all values so we can feed into webpack DefinePlugin + const stringified = { + 'process.env': Object.keys(raw).reduce((env, key) => { + env[key] = JSON.stringify(raw[key]); + return env; + }, {}), + }; + + return { raw, stringified }; +} + +module.exports = getClientEnvironment; diff --git a/frontend/config/getHttpsConfig.js b/frontend/config/getHttpsConfig.js new file mode 100644 index 0000000..013d493 --- /dev/null +++ b/frontend/config/getHttpsConfig.js @@ -0,0 +1,66 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const crypto = require('crypto'); +const chalk = require('react-dev-utils/chalk'); +const paths = require('./paths'); + +// Ensure the certificate and key provided are valid and if not +// throw an easy to debug error +function validateKeyAndCerts({ cert, key, keyFile, crtFile }) { + let encrypted; + try { + // publicEncrypt will throw an error with an invalid cert + encrypted = crypto.publicEncrypt(cert, Buffer.from('test')); + } catch (err) { + throw new Error( + `The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}` + ); + } + + try { + // privateDecrypt will throw an error with an invalid key + crypto.privateDecrypt(key, encrypted); + } catch (err) { + throw new Error( + `The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${ + err.message + }` + ); + } +} + +// Read file and throw an error if it doesn't exist +function readEnvFile(file, type) { + if (!fs.existsSync(file)) { + throw new Error( + `You specified ${chalk.cyan( + type + )} in your env, but the file "${chalk.yellow(file)}" can't be found.` + ); + } + return fs.readFileSync(file); +} + +// Get the https config +// Return cert files if provided in env, otherwise just true or false +function getHttpsConfig() { + const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env; + const isHttps = HTTPS === 'true'; + + if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) { + const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE); + const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE); + const config = { + cert: readEnvFile(crtFile, 'SSL_CRT_FILE'), + key: readEnvFile(keyFile, 'SSL_KEY_FILE'), + }; + + validateKeyAndCerts({ ...config, keyFile, crtFile }); + return config; + } + return isHttps; +} + +module.exports = getHttpsConfig; diff --git a/frontend/config/jest/babelTransform.js b/frontend/config/jest/babelTransform.js new file mode 100644 index 0000000..5b391e4 --- /dev/null +++ b/frontend/config/jest/babelTransform.js @@ -0,0 +1,29 @@ +'use strict'; + +const babelJest = require('babel-jest').default; + +const hasJsxRuntime = (() => { + if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') { + return false; + } + + try { + require.resolve('react/jsx-runtime'); + return true; + } catch (e) { + return false; + } +})(); + +module.exports = babelJest.createTransformer({ + presets: [ + [ + require.resolve('babel-preset-react-app'), + { + runtime: hasJsxRuntime ? 'automatic' : 'classic', + }, + ], + ], + babelrc: false, + configFile: false, +}); diff --git a/frontend/config/jest/cssTransform.js b/frontend/config/jest/cssTransform.js new file mode 100644 index 0000000..8f65114 --- /dev/null +++ b/frontend/config/jest/cssTransform.js @@ -0,0 +1,14 @@ +'use strict'; + +// This is a custom Jest transformer turning style imports into empty objects. +// http://facebook.github.io/jest/docs/en/webpack.html + +module.exports = { + process() { + return 'module.exports = {};'; + }, + getCacheKey() { + // The output is always the same. + return 'cssTransform'; + }, +}; diff --git a/frontend/config/jest/fileTransform.js b/frontend/config/jest/fileTransform.js new file mode 100644 index 0000000..aab6761 --- /dev/null +++ b/frontend/config/jest/fileTransform.js @@ -0,0 +1,40 @@ +'use strict'; + +const path = require('path'); +const camelcase = require('camelcase'); + +// This is a custom Jest transformer turning file imports into filenames. +// http://facebook.github.io/jest/docs/en/webpack.html + +module.exports = { + process(src, filename) { + const assetFilename = JSON.stringify(path.basename(filename)); + + if (filename.match(/\.svg$/)) { + // Based on how SVGR generates a component name: + // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6 + const pascalCaseFilename = camelcase(path.parse(filename).name, { + pascalCase: true, + }); + const componentName = `Svg${pascalCaseFilename}`; + return `const React = require('react'); + module.exports = { + __esModule: true, + default: ${assetFilename}, + ReactComponent: React.forwardRef(function ${componentName}(props, ref) { + return { + $$typeof: Symbol.for('react.element'), + type: 'svg', + ref: ref, + key: null, + props: Object.assign({}, props, { + children: ${assetFilename} + }) + }; + }), + };`; + } + + return `module.exports = ${assetFilename};`; + }, +}; diff --git a/frontend/config/modules.js b/frontend/config/modules.js new file mode 100644 index 0000000..d63e41d --- /dev/null +++ b/frontend/config/modules.js @@ -0,0 +1,134 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const paths = require('./paths'); +const chalk = require('react-dev-utils/chalk'); +const resolve = require('resolve'); + +/** + * Get additional module paths based on the baseUrl of a compilerOptions object. + * + * @param {Object} options + */ +function getAdditionalModulePaths(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return ''; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + // We don't need to do anything if `baseUrl` is set to `node_modules`. This is + // the default behavior. + if (path.relative(paths.appNodeModules, baseUrlResolved) === '') { + return null; + } + + // Allow the user set the `baseUrl` to `appSrc`. + if (path.relative(paths.appSrc, baseUrlResolved) === '') { + return [paths.appSrc]; + } + + // If the path is equal to the root directory we ignore it here. + // We don't want to allow importing from the root directly as source files are + // not transpiled outside of `src`. We do allow importing them with the + // absolute path (e.g. `src/Components/Button.js`) but we set that up with + // an alias. + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return null; + } + + // Otherwise, throw an error. + throw new Error( + chalk.red.bold( + "Your project's `baseUrl` can only be set to `src` or `node_modules`." + + ' Create React App does not support other values at this time.' + ) + ); +} + +/** + * Get webpack aliases based on the baseUrl of a compilerOptions object. + * + * @param {*} options + */ +function getWebpackAliases(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return {}; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return { + src: paths.appSrc, + }; + } +} + +/** + * Get jest aliases based on the baseUrl of a compilerOptions object. + * + * @param {*} options + */ +function getJestAliases(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return {}; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return { + '^src/(.*)$': '/src/$1', + }; + } +} + +function getModules() { + // Check if TypeScript is setup + const hasTsConfig = fs.existsSync(paths.appTsConfig); + const hasJsConfig = fs.existsSync(paths.appJsConfig); + + if (hasTsConfig && hasJsConfig) { + throw new Error( + 'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.' + ); + } + + let config; + + // If there's a tsconfig.json we assume it's a + // TypeScript project and set up the config + // based on tsconfig.json + if (hasTsConfig) { + const ts = require(resolve.sync('typescript', { + basedir: paths.appNodeModules, + })); + config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config; + // Otherwise we'll check if there is jsconfig.json + // for non TS projects. + } else if (hasJsConfig) { + config = require(paths.appJsConfig); + } + + config = config || {}; + const options = config.compilerOptions || {}; + + const additionalModulePaths = getAdditionalModulePaths(options); + + return { + additionalModulePaths: additionalModulePaths, + webpackAliases: getWebpackAliases(options), + jestAliases: getJestAliases(options), + hasTsConfig, + }; +} + +module.exports = getModules(); diff --git a/frontend/config/paths.js b/frontend/config/paths.js new file mode 100644 index 0000000..f0a6cd9 --- /dev/null +++ b/frontend/config/paths.js @@ -0,0 +1,77 @@ +'use strict'; + +const path = require('path'); +const fs = require('fs'); +const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath'); + +// Make sure any symlinks in the project folder are resolved: +// https://github.com/facebook/create-react-app/issues/637 +const appDirectory = fs.realpathSync(process.cwd()); +const resolveApp = relativePath => path.resolve(appDirectory, relativePath); + +// We use `PUBLIC_URL` environment variable or "homepage" field to infer +// "public path" at which the app is served. +// webpack needs to know it to put the right