update source code

This commit is contained in:
Duy Dang 2024-06-05 17:39:29 +08:00
parent 4b06fbed96
commit 56fc427eae
11 changed files with 38 additions and 25 deletions

View File

@ -7,7 +7,7 @@
"editor.inlayHints.enabled": "offUnlessPressed",
"javascript.inlayHints.parameterNames.enabled": "all",
"editor.formatOnSaveMode": "modificationsIfAvailable",
"eslint.workingDirectories": ["./fuware-fe"],
"eslint.workingDirectories": ["./frontend"],
"editor.insertSpaces": true,
"editor.tabSize": 2,
"python.analysis.autoImportCompletions": true,
@ -15,11 +15,9 @@
"python.analysis.fixAll": ["source.unusedImports"],
"python.analysis.packageIndexDepths": [
{
"name": "fuware",
"name": "backend",
"depth": 3,
"includeAllSymbols": false
}
]
// "python.analysis.extraPaths": ["./fuware"],
// "python.autoComplete.extraPaths": ["./fuware"]
}

View File

@ -12,7 +12,6 @@ from backend.core.config import get_app_settings
from backend.db.db_setup import session_context
from backend.repos.repository_users import RepositoryUsers
from backend.repos.seeder import default_users_init
# from fuware.db.models import User
PROJECT_DIR = Path(__file__).parent.parent.parent

View File

@ -9,7 +9,7 @@ class SearchType(Enum):
fuzzy = "fuzzy"
tokenized = "tokenized"
class FuwareModel(BaseModel):
class MainModel(BaseModel):
_searchable_properties: ClassVar[list[str]] = []
"""
Searchable properties for the search API.

View File

@ -3,9 +3,9 @@ from uuid import UUID
from pydantic import ConfigDict
from fastapi import Form
from backend.schemas.fuware_model import FuwareModel
from backend.schemas.main_model import MainModel
class UserBase(FuwareModel):
class UserBase(MainModel):
username: str = Form(...)
class UserRequest(UserBase):
@ -34,7 +34,7 @@ class ProfileResponse(UserBase):
updated_at: datetime
model_config = ConfigDict(from_attributes=True)
class LoginResponse(FuwareModel):
class LoginResponse(MainModel):
access_token: str
exp: int
name: str

View File

@ -1,5 +1,12 @@
#root {
margin: 0 auto;
--white: #fff;
--black: #212121;
--primary: #03c9d7;
--green: #05b187;
--orange: #fb9678;
--yellow: #fec90f;
}
* {

View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -1,5 +1,5 @@
import { getProfile } from '@api/user'
import fuwareLogo from '@assets/logo-fuware.svg'
import Logo from '@assets/logo.svg'
import { useSiteContext } from '@context/SiteContext'
import useAuth from '@hooks/useAuth'
import useToast from '@hooks/useToast'
@ -43,7 +43,7 @@ export default function Header() {
<header class="w-full navbar py-3 px-4 items-center justify-between bg-emerald-500">
<div class="flex items-center justify-end">
<A href="/" class="text-white flex items-center hover:text-white">
<img src={fuwareLogo} class="w-8" alt="Fuware logo" />
<img src={Logo} class="w-8" alt="Logo" />
<span class="ml-2 text-2xl">Fuware</span>
</A>
</div>

View File

@ -48,7 +48,7 @@ export default function Navbar() {
<IconTriangle size={30} />
</div>
</Show>
<ul class="scrollnavbar menu p-4 w-80 text-base-content bg-transparent py-6 px-4">
<ul class="scrollnavbar menu p-4 w-80 text-base-content py-6 px-4">
<For each={NAV_ROUTES}>
{(item) =>
item.show && (

View File

@ -1,21 +1,17 @@
$color-white: #fff;
$color-black: #212121;
$primary: #03c9d7;
.menu {
li {
a {
color: $color-black;
color: var(--black);
font-weight: normal;
&:not(ul, .menu-title, details, .btn).active {
background-color: $primary;
color: $color-white;
background-color: var(--primary);
color: var(--white);
}
&:hover {
background-color: rgba($primary, 0.05);
color: $primary;
background-color: rgba(var(--primary), 0.05);
color: var(--primary);
}
}
}

View File

@ -7,7 +7,7 @@ import { Show, onMount } from 'solid-js'
import * as yup from 'yup'
import './login.scss'
import logo from '@assets/logo-fuware.svg'
import Logo from '@assets/logo.svg'
import useAuth from '@hooks/useAuth'
import useToast from '@hooks/useToast'
@ -59,8 +59,8 @@ export default function Login() {
<div class="card glass card-compact login-wrap shadow-xl">
<div class="h-44">
<picture class="logo">
<source srcSet={logo} type="image/png" media="(min-width: 600px)" />
<img src={logo} alt="logo" />
<source srcSet={Logo} type="image/png" media="(min-width: 600px)" />
<img src={Logo} alt="logo" />
</picture>
</div>
<div class="card-body">

View File

@ -1,16 +1,29 @@
import daisyui from 'daisyui'
import themes from 'daisyui/src/theming/themes'
/** @type {import('tailwindcss').Config} */
export default {
content: ['./src/**/*.{js,jsx}'],
theme: {
extend: {},
extend: {
colors: {
fu: {
white: '#fff',
black: '#212121',
primary: '#03c9d7',
green: '#05b187',
orange: '#fb9678',
yellow: '#fec90f',
},
},
},
},
plugins: [daisyui],
daisyui: {
themes: [
{
light: {
...themes['light'],
primary: '#03c9d7',
'primary-content': '#ffff',
secondary: '#fb9678',