Merge pull request #685 from cornell-dti/rwq3/tailwind

style

Author: mjaydenkim

README.md

@@ -26,12 +26,15 @@ If you have a disability that prevents you from walking around campus, getting a
 ### Current Contributors
 
 #### Technical Project Manager
+
 - Matthew Kim
 
 ### Designer
+
 - Ryan Qiu
 
 #### Software Developers
+
 - Anika Chandra
 - Emir Icyer
 
@@ -40,6 +43,7 @@ If you have a disability that prevents you from walking around campus, getting a
 ### Past Contributors
 
 #### Product Managers
+
 - Andrew Choi
 - Bryan Graeser
 - Kathy Lim
@@ -49,6 +53,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Stephy Chen
 
 #### Technical Project Managers
+
 - Christopher Hansen
 - Desmond Atikpui
 - Daniel Wei
@@ -59,6 +64,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Selena Liu
 
 #### Software Developers
+
 - Aaron Kang
 - Aiden Kim
 - Andrew Choi
@@ -90,6 +96,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Zack Ashen
 
 #### Designers
+
 - Aiden Kim
 - Chelsea Wang
 - Joanne Lee

frontend/package.json

@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "@carriage-web/shared": "workspace:*"
+    "@carriage-web/shared": "workspace:*",
+    "@tailwindcss/vite": "^4.2.2"
   },
   "scripts": {
     "dev": "vite",
@@ -72,7 +73,7 @@
     "react-router-hash-link": "^2.4.3",
     "react-select": "^5.8.1",
     "reactjs-popup": "^2.0.6",
-    "tailwindcss": "^3.4.17",
+    "tailwindcss": "^4.0.0",
     "typescript": "catalog:",
     "uuid": "^13.0.0",
     "vite": "^7.2.7",

frontend/postcss.config.js

@@ -1,6 +1,5 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
   },
 };

frontend/src/components/Sidebar/Sidebar.tsx

@@ -142,13 +142,13 @@ const Sidebar = ({ type, children }: SidebarProps) => {
           ))}
         </div>
         <div className={styles.logout}>
-          {(isAdmin || isDriver) && (
+          {/* {(isAdmin || isDriver) && (
             <img
               alt="profile_picture"
               className={styles.profile}
               src={photoLink ? `${photoLink}?t=${new Date().getTime()}` : blank}
             />
-          )}
+          )} */}
           <button className={styles.logoutLink} onClick={authContext.logout}>
             Log out
           </button>

frontend/src/styles/App.css

@@ -1,6 +1,4 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
 
 body {
   margin: 0;

frontend/vite.config.ts

@@ -1,9 +1,10 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import tailwindcss from '@tailwindcss/vite';
 
 export default defineConfig({
-  plugins: [tsconfigPaths(), react()],
+  plugins: [tsconfigPaths(), react(), tailwindcss()],
   build: {
     outDir: 'build', // CRA's default build output
   },