Skip to content

Commit

Permalink
feat(add_ux_sidebar): add ux for sidebar&navbar, resolve merge confli…
Browse files Browse the repository at this point in the history
…ct, refactor components
  • Loading branch information
Minhtuei committed Sep 26, 2023
2 parents a50e800 + a6357a6 commit b034d0f
Show file tree
Hide file tree
Showing 57 changed files with 3,103 additions and 477 deletions.
9 changes: 6 additions & 3 deletions .barrelsby.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"directory": [
"./src/components",
"./src/components/common",
"./src/components/home",
"./src/constants",
"./src/hooks",
"./src/interfaces",
"./src/layouts",
"./src/pages",
"./src/services",
"./src/states",
"./src/services/common",
"./src/services/home",
"./src/states/common",
"./src/states/home",
"./src/utils"
],
"delete": true
Expand Down
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# This file is not allowed to be deleted, because it represents which environment variables to use when the project is open-source.
VITE_BACKEND_URL=
72 changes: 72 additions & 0 deletions __mock-server__/db.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"orders": [
{
"id": "1233-defc",
"status": "progressing",
"location": "Thu Duc, Ho Chi Minh, Viet Nam",
"number": 2,
"fileName": "file1.pdf",
"pageNumber": 10,
"coins": 50,
"paid": "Paid"
},
{
"id": "1245-afce",
"status": "ready",
"location": "Tan Phu, Ho Chi Minh, Viet Nam",
"number": 2,
"fileName": "file2.docx",
"pageNumber": 20,
"coins": 75,
"paid": "Paid"
},
{
"id": "1267-rfce",
"status": "done",
"location": "Tan Phu, Ho Chi Minh, Viet Nam",
"number": 2,
"fileName": "file3.txt",
"pageNumber": 5,
"coins": 30,
"paid": "Not Paid"
},
{
"id": "1267-rfce",
"status": "canceled",
"location": "Tan Phu, Ho Chi Minh, Viet Nam",
"number": 2,
"fileName": "file3.txt",
"pageNumber": 5,
"coins": 30,
"paid": "Not Paid"
},
{
"id": "1267-rfce",
"status": "done",
"location": "Tan Phu, Ho Chi Minh, Viet Nam",
"number": 2,
"fileName": "file3.txt",
"pageNumber": 5,
"coins": 30,
"paid": "Paid"
}
],
"slides": [
{
"src": "https://e-learning.hcmut.edu.vn/theme/boost/images/slbktv.jpg?1695219022292",
"alt": "slide1"
},
{
"src": "https://e-learning.hcmut.edu.vn/theme/boost/images/slbk.jpg?1695219022805",
"alt": "slide2"
},
{
"src": "https://static.tuoitre.vn/tto/i/s626/2016/04/05/dai-hoc-bach-khoa-tp-hcm-cong-bo-phuong-an-tuyen-sinh-2015jpg-1459820200.jpg",
"alt": "slide3"
},
{
"src": "https://we25.vn/media2018/Img_News/2020/06/08/khuon-vien-dh-bach-khoa-tp-hcm-khien-dan-tinh-me-man-voi-nhung-hanh-cay-xanh-tham-toa-bong-mat-quanh-nam-14_20200608150159.jpg",
"alt": "slide4"
}
]
}
12 changes: 12 additions & 0 deletions __mock-server__/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "mock-server",
"version": "1.0.0",
"main": "index.js",
"license": "MIT",
"dependencies": {
"json-server": "^0.17.3"
},
"scripts": {
"start": "node server.js"
}
}
10 changes: 10 additions & 0 deletions __mock-server__/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const jsonServer = require('json-server');
const server = jsonServer.create();
const router = jsonServer.router('db.json');
const middlewares = jsonServer.defaults();
const port = process.env.PORT || 3002;

server.use(middlewares);
server.use(router);

server.listen(port);
Loading

0 comments on commit b034d0f

Please sign in to comment.