Skip to content
Open
Show file tree
Hide file tree
Changes from 6 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this. Use nextjs development server.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok done

}
41 changes: 36 additions & 5 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
},
"dependencies": {
"@ant-design/nextjs-registry": "^1.0.1",
"@heroicons/react": "^2.1.5",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@shadcn/ui": "^0.0.4",
"antd": "^5.20.2",
"antd": "^5.20.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ant design shouldn't be installed. Make sure you took a pull from development.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, pull from development

"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"dayjs": "^1.11.13",
Expand Down
Binary file added server/public/log-file.png
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 server/public/login.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
231 changes: 166 additions & 65 deletions server/src/app/index.css
Original file line number Diff line number Diff line change
@@ -1,69 +1,170 @@
/* Tailwind CSS styles for the login page */

@tailwind base;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--background: 0 0% 100%;
--foreground: 0 0% 3.9%;
--card: 0 0% 100%;
--card-foreground: 0 0% 3.9%;
--popover: 0 0% 100%;
--popover-foreground: 0 0% 3.9%;
--primary: 0 0% 9%;
--primary-foreground: 0 0% 98%;
--secondary: 0 0% 96.1%;
--secondary-foreground: 0 0% 9%;
--muted: 0 0% 96.1%;
--muted-foreground: 0 0% 45.1%;
--accent: 0 0% 96.1%;
--accent-foreground: 0 0% 9%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 0 0% 98%;
--border: 0 0% 89.8%;
--input: 0 0% 89.8%;
--ring: 0 0% 3.9%;
--radius: 0.5rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}

.dark {
--background: 0 0% 3.9%;
--foreground: 0 0% 98%;
--card: 0 0% 3.9%;
--card-foreground: 0 0% 98%;
--popover: 0 0% 3.9%;
--popover-foreground: 0 0% 98%;
--primary: 0 0% 98%;
--primary-foreground: 0 0% 9%;
--secondary: 0 0% 14.9%;
--secondary-foreground: 0 0% 98%;
--muted: 0 0% 14.9%;
--muted-foreground: 0 0% 63.9%;
--accent: 0 0% 14.9%;
--accent-foreground: 0 0% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 0 0% 98%;
--border: 0 0% 14.9%;
--input: 0 0% 14.9%;
--ring: 0 0% 83.1%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
}
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
/* Custom styles for the layout */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove all of these and use tailwindcss classes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok done

.bg-gradient-to-b {
background: linear-gradient(to bottom, var(--tw-gradient-stops));
}

.bg-blue-100 {
background-color: #ebf8ff;
}

.bg-blue-200 {
background-color: #cbd5e0;
}

.bg-blue-500 {
background-color: #3b82f6;
}

.text-white {
color: #ffffff;
}

.text-gray-700 {
color: #4a5568;
}

.text-gray-600 {
color: #718096;
}

.text-gray-500 {
color: #6b7280;
}

.text-gray-800 {
color: #1f2937;
}

.bg-white {
background-color: #ffffff;
}

.shadow-md {
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
}

.shadow-lg {
box-shadow: 0 10px 15px rgba(0, 0, 0, 0.1);
}

.rounded-md {
border-radius: 0.375rem;
}

.rounded-lg {
border-radius: 0.5rem;
}

.p-8 {
padding: 2rem;
}

.p-6 {
padding: 1.5rem;
}

.mt-8 {
margin-top: 2rem;
}

.mb-4 {
margin-bottom: 1rem;
}

.w-full {
width: 100%;
}

.max-w-md {
max-width: 28rem;
}

.h-screen {
height: 100vh;
}

.flex {
display: flex;
}

.items-center {
align-items: center;
}

.justify-center {
justify-content: center;
}

.bg-blue-600 {
background-color: #2563eb;
}

.py-2 {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}

.px-4 {
padding-left: 1rem;
padding-right: 1rem;
}

.py-2 {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}

.px-8 {
padding-left: 2rem;
padding-right: 2rem;
}

.text-2xl {
font-size: 1.5rem;
}

.font-bold {
font-weight: 700;
}

.font-semibold {
font-weight: 600;
}

.text-sm {
font-size: 0.875rem;
}

.sm\:text-sm {
font-size: 0.875rem;
}

.focus\:outline-none:focus {
outline: 0;
}

.focus\:ring-blue-500:focus {
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.5);
}

.focus\:border-blue-500:focus {
border-color: #3b82f6;
}

.border-gray-300 {
border-color: #d1d5db;
}

.border {
border-width: 1px;
}

.rounded-md {
border-radius: 0.375rem;
}
Loading