Skip to content

Commit

Permalink
config mail
Browse files Browse the repository at this point in the history
  • Loading branch information
BearKg committed Oct 10, 2024
1 parent f42e62a commit ece024f
Show file tree
Hide file tree
Showing 45 changed files with 1,092 additions and 558 deletions.
1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"axios": "^1.7.2",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"dateformat": "^5.0.3",
"dayjs": "^1.11.13",
"dotenv": "^16.4.5",
"mdb-react-ui-kit": "^9.0.0",
Expand Down
19 changes: 14 additions & 5 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
Order,
UserInfo,
Manager,
SingleOrder
SingleOrder,
} from './pages/main'
import VerifyEmail from './pages/VerifyEmail'
import { ProtectedRoute, Error } from './pages'
Expand All @@ -24,8 +24,9 @@ import { loader as libraryLoader } from './pages/main/Library'
import { loader as verifyEmailLoader } from './pages/VerifyEmail'
import { loader as singleBookLoader } from './pages/main/SingleBook'
import { loader as singleAuthorLoader } from './pages/main/SingleAuthor'
import { loader as newBookLoader} from './pages/main/Home'
import { loader as newBookLoader } from './pages/main/Home'
import { loader as singleUserOrder } from './pages/main/SingleOrder'
import store from './store'

const queryClient = new QueryClient({
defaultOptions: {
Expand Down Expand Up @@ -84,7 +85,7 @@ const router = createBrowserRouter([
<SingleOrder />
</ProtectedRoute>
),
loader: singleUserOrder(queryClient),
loader: singleUserOrder(store, queryClient),
},
{
path: 'author/:id',
Expand All @@ -93,11 +94,19 @@ const router = createBrowserRouter([
},
{
path: 'user',
element: <UserInfo />,
element: (
<ProtectedRoute>
<UserInfo />
</ProtectedRoute>
),
},
{
path: 'manager',
element: <Manager />,
element: (
<ProtectedRoute>
<Manager />
</ProtectedRoute>
),
},
],
},
Expand Down
119 changes: 119 additions & 0 deletions client/src/assets/css/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/* để import css trong bootstrap */
@import 'bootstrap/dist/css/bootstrap.min.css';
@import url('https://fonts.googleapis.com/css2?family=Cabin&family=Roboto+Condensed:wght@400;700&display=swap');
:root {
/* color variables */
--text-color: #822b2b; /* darken(#973131, 10%) */
--bold-text-color: #6d2323; /* darken(#973131, 20%) */

/* colors */
--primary-bg-color: #973131;
--primary-bg-color-hover: #822b2b; /* darken(#973131, 10%) */

--secondary-bg-color: #e0a75e;
--secondary-bg-color-hover: #c88f51; /* darken(#e0a75e, 10%) */

--tertiary-bg-color: #f9d689;
--tertiary-bg-color-hover: #e6c279; /* darken(#f9d689, 10%) */

--quaternary-bg-color: #f5e7b2;
--quaternary-bg-color-hover: #e2d29f; /* darken(#f5e7b2, 10%) */
--quaternary-bg-color-light: #fff5cc; /* lighten(#f5e7b2, 10%) */

/* fonts */
--heading-font: 'Roboto Condensed', Sans-Serif;
--body-font: 'Cabin', Sans-Serif;
--small-text: 0.875rem;
--extra-small-text: 0.7em;
--textColor: #102a43;

/* box shadows */
--shadow-1: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
--shadow-2: 0 4px 6px -1px rgba(0, 0, 0, 0.1),
0 2px 4px -1px rgba(0, 0, 0, 0.06);
--shadow-3: 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
--shadow-4: 0 20px 25px -5px rgba(0, 0, 0, 0.1),
0 10px 10px -5px rgba(0, 0, 0, 0.04);
}

body {
margin-top: 4rem;
font-size: 1rem;
font-weight: 400;
line-height: 1.75;
background-color: var(--quaternary-bg-color);
color: var(--text-color);
position: relative;
}

p {
margin-bottom: 1.5rem;
max-width: 40em;
color: var(--text-color);
}

h1, h2, h3, h4, h5 {
color: var(--text-color);
}

.divider {
color: var(--primary-bg-color);
width: 100%;
font-size: 3rem;
text-align: center;
text-shadow: 2px 2px 3px rgb(180, 176, 176);
height: 60px;
line-height: 2rem;
top: 28.75rem;
}

.segment {
padding-top: 30px;
padding-bottom: 80px;
}

.segmentX {
padding: 80px 0;
background-color: var(--quaternary-bg-color-light);
}

.segmentX .segment-heading {
margin-bottom: 3.5rem;
text-transform: uppercase;
letter-spacing: 0.25rem;
font-weight: bold;
color: var(--primary-bg-color);
}

.segmentX .segment-heading .badge {
background-color: var(--primary-bg-color) !important;
color: var(--quaternary-bg-color-light);
}

.segment-heading {
color: var(--primary-bg-color);
font-family: var(--bodyFont);
font-weight: 500;
text-shadow: 2px 2px 3px rgb(180, 176, 176);
font-size: 2rem;
letter-spacing: 1px;
}

.breadcrumb {
margin: 5rem 5rem 2rem;
}

.breadcrumb .breadcrumb-item {
font-size: 2rem;
font-weight: bold;
}

.breadcrumb .active {
color: var(--bold-text-color);
}

.breadcrumb a {
text-decoration: none;
color: var(--text-color);
}
36 changes: 36 additions & 0 deletions client/src/assets/css/Variables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@import url('https://fonts.googleapis.com/css2?family=Cabin&family=Roboto+Condensed:wght@400;700&display=swap');
:root {
/* color variables */
--text-color: #822b2b; /* darken(#973131, 10%) */
--bold-text-color: #6d2323; /* darken(#973131, 20%) */

/* colors */
--primary-bg-color: #973131;
--primary-bg-color-hover: #822b2b; /* darken(#973131, 10%) */

--secondary-bg-color: #e0a75e;
--secondary-bg-color-hover: #c88f51; /* darken(#e0a75e, 10%) */

--tertiary-bg-color: #f9d689;
--tertiary-bg-color-hover: #e6c279; /* darken(#f9d689, 10%) */

--quaternary-bg-color: #f5e7b2;
--quaternary-bg-color-hover: #e2d29f; /* darken(#f5e7b2, 10%) */
--quaternary-bg-color-light: #fff5cc; /* lighten(#f5e7b2, 10%) */

/* fonts */
--heading-font: 'Roboto Condensed', Sans-Serif;
--body-font: 'Cabin', Sans-Serif;
--small-text: 0.875rem;
--extra-small-text: 0.7em;
--textColor: #102a43;

/* box shadows */
--shadow-1: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
--shadow-2: 0 4px 6px -1px rgba(0, 0, 0, 0.1),
0 2px 4px -1px rgba(0, 0, 0, 0.06);
--shadow-3: 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
--shadow-4: 0 20px 25px -5px rgba(0, 0, 0, 0.1),
0 10px 10px -5px rgba(0, 0, 0, 0.04);
}
102 changes: 0 additions & 102 deletions client/src/assets/scss/About.scss

This file was deleted.

Loading

2 comments on commit ece024f

@vercel
Copy link

@vercel vercel bot commented on ece024f Oct 10, 2024

Choose a reason for hiding this comment

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

@vercel
Copy link

@vercel vercel bot commented on ece024f Oct 10, 2024

Choose a reason for hiding this comment

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

Please sign in to comment.