Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #58 Replace MUI with Tailwindcss #59

Merged
merged 2 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand Down
21,406 changes: 10,521 additions & 10,885 deletions frontend/package-lock.json

Large diffs are not rendered by default.

26 changes: 12 additions & 14 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,36 @@
"license-checker-windows": "cd scripts && windows_check_licenses.bat"
},
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@hookform/resolvers": "^2.9.11",
"@mui/icons-material": "^5.11.0",
"@mui/material": "^5.11.6",
"@hookform/resolvers": "^3.3.1",
"@vitejs/plugin-react-refresh": "^1.3.6",
"autoprefixer": "^10.4.15",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.43.1",
"react-router-dom": "^6.8.0",
"tailwindcss": "^3.3.3",
"vite": "^4.0.4",
"zod": "^3.20.6"
},
"devDependencies": {
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"@vitest/coverage-v8": "^0.33.0",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"@vitest/coverage-v8": "^0.34.4",
"eslint": "^8.32.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.6.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.32.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-vitest": "^0.2.6",
"eslint-plugin-vitest": "^0.3.1",
"license-checker": "^25.0.1",
"prettier": "^2.8.3",
"typescript": "^4.9.4",
"vitest": "^0.33.0"
"prettier": "^3.0.3",
"typescript": "^5.2.2",
"vitest": "^0.34.4"
}
}
6 changes: 6 additions & 0 deletions frontend/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};
67 changes: 0 additions & 67 deletions frontend/src/App.css

This file was deleted.

28 changes: 13 additions & 15 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
import React from "react";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import { ThemeProvider } from "@mui/material/styles";

import "./App.css";
import darkTheme from "./styles/Styles";
import "./index.css";
import LoginPage from "./pages/Login/LoginPage";
import HomePage from "./pages/Home/HomePage";
import RegisterPage from "./pages/Register/RegisterPage";
import StartPage from "./pages/Start/StartPage";
import RequireAuth from "./helpers/RequireAuth";
import NotFound from "./pages/NotFound/NotFound";

function App(): JSX.Element {
return (
<ThemeProvider theme={darkTheme}>
<BrowserRouter>
<Routes>
<Route index element={<StartPage />} />
<Route element={<RequireAuth />}>
<Route path="home" element={<HomePage />} />
</Route>
<Route path="login" element={<LoginPage />} />
<Route path="register" element={<RegisterPage />} />
</Routes>
</BrowserRouter>
</ThemeProvider>
<BrowserRouter>
<Routes>
<Route index element={<StartPage />} />
<Route element={<RequireAuth />}>
<Route path="home" element={<HomePage />} />
</Route>
<Route path="login" element={<LoginPage />} />
<Route path="register" element={<RegisterPage />} />
<Route path="*" element={<NotFound />} />
</Routes>
</BrowserRouter>
);
}

Expand Down
1 change: 1 addition & 0 deletions frontend/src/assets/icons/CalendarIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/icons/OrganizerIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/icons/ToDoListIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/logos/KsummarizedLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/assets/logos/XLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/src/assets/logos/logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion frontend/src/assets/logos/twitterLogo.svg

This file was deleted.

19 changes: 15 additions & 4 deletions frontend/src/components/Fields/FormInput/CheckboxInput.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
import * as React from "react";
import { useFormContext, Controller } from "react-hook-form";
import { Checkbox, CheckboxProps } from "@mui/material";

type CheckboxInputProps = {
id: string;
name: string;
} & CheckboxProps;
label: string;
};

function CheckboxInput({ name, ...otherProps }: CheckboxInputProps) {
function CheckboxInput({ id, name, label }: CheckboxInputProps) {
const { control } = useFormContext();

return (
<Controller
control={control}
name={name}
defaultValue=""
render={({ field }) => <Checkbox {...field} {...otherProps} />}
render={({ field }) => (
<div>
<input id={id} type="checkbox" {...field} className="form-control" />
<label
htmlFor={id}
className="block text-gray-700 text-sm font-bold mb-2"
>
{label}
</label>
</div>
)}
/>
);
}
Expand Down
44 changes: 33 additions & 11 deletions frontend/src/components/Fields/FormInput/TextFieldInput.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
import * as React from "react";
import { useFormContext, Controller } from "react-hook-form";
import { TextField, TextFieldProps } from "@mui/material";

type TextFieldInputProps = {
id: string;
name: string;
} & TextFieldProps;
type: string;
required: boolean;
label: string;
placeholder: string;
};

function TextFieldInput({ name, ...otherProps }: TextFieldInputProps) {
function TextFieldInput({
id,
name,
type,
required,
label,
placeholder,
}: TextFieldInputProps) {
const {
control,
formState: { errors },
Expand All @@ -18,14 +29,25 @@ function TextFieldInput({ name, ...otherProps }: TextFieldInputProps) {
name={name}
defaultValue=""
render={({ field }) => (
<TextField
{...field}
{...otherProps}
error={!!errors[name]}
helperText={
errors[name] ? (errors[name]?.message as unknown as string) : ""
}
/>
<div>
<label
htmlFor={id}
className="block text-gray-700 text-sm font-bold mb-2"
>
{label}
{required === true ? "*" : ""}
</label>
<input
id={id}
type={type}
placeholder={placeholder}
{...field}
className="form-control w-full px-3 py-1.5 text-gray-700 rounded border border-solid border-gray-300 focus:border-yellow-600 focus:outline-none"
/>
{!!errors[name] && (
<p className="text-red-500 text-xs italic">{`${errors[name]?.message}`}</p>
)}
</div>
)}
/>
);
Expand Down
Loading