Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
order-management-react
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
order-management-react
Commits
bfab959a
Commit
bfab959a
authored
May 13, 2021
by
Shanelle Valencia
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'styling' into 'dev'
Fix search bar styling See merge request
!16
parents
86b509ea
2d0ba0a3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
29 deletions
+60
-29
Nav.tsx
src/components/Nav.tsx
+2
-2
index.css
src/index.css
+28
-1
AccountPage.tsx
src/pages/AccountPage.tsx
+1
-1
OrderIndexPage.tsx
src/pages/OrderIndexPage.tsx
+29
-25
No files found.
src/components/Nav.tsx
View file @
bfab959a
...
...
@@ -17,7 +17,7 @@ const Nav = () => {
return
(
<
Flex
className=
"header"
>
<
Box
className=
"left-nav"
>
<
Link
to=
"/"
><
Image
src=
{
Logo
}
alt=
"project logo"
height=
"90%"
width=
"80%"
/></
Link
>
<
Link
to=
"/"
><
Image
src=
{
Logo
}
alt=
"project logo"
height=
"90%"
width=
"80%"
/></
Link
>
</
Box
>
<
Spacer
/>
<
Flex
className=
"right-nav"
>
...
...
@@ -41,7 +41,7 @@ const Nav = () => {
borderRadius=
"sm"
bgGradient=
"linear(to-r, teal.500,blue.500)"
_hover=
{
{
bgGradient
:
"linear(to-r,
yellow.500, blue
.500)"
,
bgGradient
:
"linear(to-r,
blue.500, yellow
.500)"
,
}
}
onClick=
{
handleAuth
}
>
{
authLinkText
}
</
Button
>
</
Flex
>
...
...
src/index.css
View file @
bfab959a
...
...
@@ -62,9 +62,30 @@ code {
/* body */
.body-div
{
padding-top
:
50px
;
}
.search-div
{
padding
:
5px
;
}
.searchbar
{
width
:
300px
;
margin-right
:
150px
;
border
:
1px
solid
blue
;
border-radius
:
2px
;
}
.searchbar
:focus
{
outline
:
none
;
}
.table-div
{
padding
:
150px
;
padding-top
:
8
0px
;
padding-top
:
2
0px
;
}
.index-table
{
...
...
@@ -72,6 +93,7 @@ code {
padding
:
0
10px
15px
10px
;
border-radius
:
2px
;
box-shadow
:
0
4px
8px
0
rgba
(
0
,
0
,
0
,
0.2
),
0
6px
20px
0
rgba
(
0
,
0
,
0
,
0.19
);
padding-top
:
10px
;
}
.show-div
{
...
...
@@ -92,6 +114,11 @@ code {
}
.account
{
padding
:
250px
0
;
}
/* footer */
...
...
src/pages/AccountPage.tsx
View file @
bfab959a
...
...
@@ -3,7 +3,7 @@ import {useGoogleAuth} from 'hooks'
const
AccountPage
=
()
=>
{
const
{
manager
}
=
useGoogleAuth
();
return
(
<
Center
>
<
Center
className=
"account"
>
<
Box
>
<
Box
>
<
Avatar
name=
{
manager
.
firstName
+
" "
+
manager
.
lastName
}
size=
"2xl"
src=
{
manager
.
imageUrl
}
alt=
"profile"
/>
...
...
src/pages/OrderIndexPage.tsx
View file @
bfab959a
...
...
@@ -43,7 +43,7 @@ const OrderIndexPage = () => {
useEffect
(()
=>
{
const
newArray
:
Order
[]
=
[]
for
(
const
ele
of
allOrders
)
{
if
(
ele
.
id
.
includes
(
searchInput
))
{
if
(
ele
.
id
.
includes
(
searchInput
.
toLowerCase
()
))
{
newArray
.
push
(
ele
)
}
}
...
...
@@ -56,16 +56,19 @@ const OrderIndexPage = () => {
}
return
(
<
div
className=
"body-div"
>
<
div
className=
"table-div"
>
<
Input
<
div
className=
"search-div"
>
<
input
type=
"text"
placeholder=
"Search by Order Number"
focusBorderColor=
"telegram.400"
placeholder=
" Search by Order Number"
value=
{
searchInput
}
onChange=
{
handleChange
}
onKeyDown=
{
handleChange
}
className=
"searchbar"
>
</
Input
>
</
input
>
</
div
>
<
br
/>
<
div
className=
"index-table"
>
<
Table
variant=
"striped"
colorScheme=
"messenger"
size=
"sm"
>
...
...
@@ -82,6 +85,7 @@ const OrderIndexPage = () => {
</
Table
>
</
div
>
</
div
>
</
div
>
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment