조민지

feat: 사용자 편의 UI 추가

...@@ -219,7 +219,7 @@ input:focus { ...@@ -219,7 +219,7 @@ input:focus {
219 background-size: cover; 219 background-size: cover;
220 background-position: center center; } 220 background-position: center center; }
221 .sidebar .logo { 221 .sidebar .logo {
222 - padding: 10px 30px; 222 + padding: 12px 30px;
223 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 223 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
224 position: relative; 224 position: relative;
225 z-index: 4; } 225 z-index: 4; }
......
1 +export const empty = require('./empty.png');
2 +export const mate_logo = require('./mate_logo.png');
3 +export const search_user = require('./search_user.png');
1 -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32" fill="white">
2 - <circle transform="translate(8 0)" cx="0" cy="16" r="0">
3 - <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0"
4 - keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
5 - </circle>
6 - <circle transform="translate(16 0)" cx="0" cy="16" r="0">
7 - <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0.3"
8 - keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
9 - </circle>
10 - <circle transform="translate(24 0)" cx="0" cy="16" r="0">
11 - <animate attributeName="r" values="0; 4; 0; 0" dur="1.2s" repeatCount="indefinite" begin="0.6"
12 - keytimes="0;0.2;0.7;1" keySplines="0.2 0.2 0.4 0.8;0.2 0.6 0.4 0.8;0.2 0.6 0.4 0.8" calcMode="spline" />
13 - </circle>
14 -</svg>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 } 33 }
34 34
35 .logo{ 35 .logo{
36 - padding: 10px 30px; 36 + padding: 12px 30px;
37 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 37 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
38 position: relative; 38 position: relative;
39 z-index: 4; 39 z-index: 4;
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
148 .sidebar, 148 .sidebar,
149 body > .navbar-collapse{ 149 body > .navbar-collapse{
150 .logo{ 150 .logo{
151 - padding: 10px 30px; 151 + padding: 12px 30px;
152 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 152 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
153 153
154 p{ 154 p{
......
...@@ -18,12 +18,7 @@ ...@@ -18,12 +18,7 @@
18 /*eslint-disable*/ 18 /*eslint-disable*/
19 import React, { Component } from "react"; 19 import React, { Component } from "react";
20 import Toggle from "react-toggle"; 20 import Toggle from "react-toggle";
21 - 21 +``
22 -import imagine1 from "assets/img/sidebar-1.jpg";
23 -import imagine2 from "assets/img/sidebar-2.jpg";
24 -import imagine3 from "assets/img/sidebar-3.jpg";
25 -import imagine4 from "assets/img/sidebar-4.jpg";
26 -
27 class FixedPlugin extends Component { 22 class FixedPlugin extends Component {
28 constructor(props) { 23 constructor(props) {
29 super(props); 24 super(props);
......
...@@ -3,7 +3,8 @@ import { NavLink } from "react-router-dom"; ...@@ -3,7 +3,8 @@ import { NavLink } from "react-router-dom";
3 3
4 import AdminNavbarLinks from "../Navbars/AdminNavbarLinks.jsx"; 4 import AdminNavbarLinks from "../Navbars/AdminNavbarLinks.jsx";
5 5
6 -import logo from "assets/img/reactlogo.png"; 6 +// import logo from "../../assets/img/mate_logo.png";
7 +import {mate_logo} from '../../assets/img'
7 8
8 class Sidebar extends Component { 9 class Sidebar extends Component {
9 constructor(props) { 10 constructor(props) {
...@@ -32,20 +33,11 @@ class Sidebar extends Component { ...@@ -32,20 +33,11 @@ class Sidebar extends Component {
32 id="sidebar" 33 id="sidebar"
33 className="sidebar" 34 className="sidebar"
34 > 35 >
35 - <div className="logo"> 36 + <div className="logo" style={{display: 'flex',justifyContent: 'center', alignItems: 'center'}}>
36 <a 37 <a
37 href="https://www.creative-tim.com?ref=lbd-sidebar" 38 href="https://www.creative-tim.com?ref=lbd-sidebar"
38 - className="simple-text logo-mini"
39 > 39 >
40 - <div className="logo-img"> 40 + <img src={mate_logo} alt="logo_image" style={{width: '135px'}}/>
41 - <img src={logo} alt="logo_image" />
42 - </div>
43 - </a>
44 - <a
45 - href="https://www.creative-tim.com?ref=lbd-sidebar"
46 - className="simple-text logo-normal"
47 - >
48 - Creative Tim
49 </a> 41 </a>
50 </div> 42 </div>
51 <div className="sidebar-wrapper"> 43 <div className="sidebar-wrapper">
......
...@@ -2,6 +2,7 @@ import React, {useRef} from "react"; ...@@ -2,6 +2,7 @@ import React, {useRef} from "react";
2 import styled from "styled-components"; 2 import styled from "styled-components";
3 import {Col, Row} from "react-bootstrap"; 3 import {Col, Row} from "react-bootstrap";
4 import Card from "components/Card/Card.jsx"; 4 import Card from "components/Card/Card.jsx";
5 +import {search_user, empty} from '../../assets/img'
5 6
6 const Wrapper = styled.div` 7 const Wrapper = styled.div`
7 display: flex; 8 display: flex;
...@@ -17,12 +18,16 @@ const EmptyImage = styled.img` ...@@ -17,12 +18,16 @@ const EmptyImage = styled.img`
17 `; 18 `;
18 19
19 const SearchButton = (props) => { 20 const SearchButton = (props) => {
21 + const fallbackImg = Number(props.userId)<0
22 + ? empty
23 + : search_user;
24 +
20 return ( 25 return (
21 <Card 26 <Card
22 content={ 27 content={
23 <Row> 28 <Row>
24 <Col md={8} mdOffset={2} sm={8} smOffset={2} xs={8} xsOffset={2} style={{display: 'flex', justifyContent: 'center'}}> 29 <Col md={8} mdOffset={2} sm={8} smOffset={2} xs={8} xsOffset={2} style={{display: 'flex', justifyContent: 'center'}}>
25 - <EmptyImage src="https://raw.githubusercontent.com/devSoyoung/whale-extension-keycrab/master/images/empty.png" alt="empty"/> 30 + <EmptyImage src={fallbackImg} alt="empty"/>
26 </Col> 31 </Col>
27 <Col md={12} sm={12} xs={12}> 32 <Col md={12} sm={12} xs={12}>
28 <Wrapper> 33 <Wrapper>
......
...@@ -15,7 +15,7 @@ ReactDOM.render( ...@@ -15,7 +15,7 @@ ReactDOM.render(
15 <BrowserRouter> 15 <BrowserRouter>
16 <Switch> 16 <Switch>
17 <Route path="/admin" render={props => <AdminLayout {...props} />} /> 17 <Route path="/admin" render={props => <AdminLayout {...props} />} />
18 - <Redirect from="/" to="/admin/dashboard" /> 18 + <Redirect from="/" to="/admin/kickboard" />
19 </Switch> 19 </Switch>
20 </BrowserRouter>, 20 </BrowserRouter>,
21 document.getElementById("root") 21 document.getElementById("root")
......
...@@ -28,13 +28,12 @@ import { style } from "variables/Variables.jsx"; ...@@ -28,13 +28,12 @@ import { style } from "variables/Variables.jsx";
28 28
29 import routes from "routes.js"; 29 import routes from "routes.js";
30 30
31 -import image from "assets/img/sidebar-3.jpg";
32 31
33 class Admin extends Component { 32 class Admin extends Component {
34 constructor(props) { 33 constructor(props) {
35 super(props); 34 super(props);
36 this.state = { 35 this.state = {
37 - image: image, 36 + image: '',
38 color: "black", 37 color: "black",
39 hasImage: true, 38 hasImage: true,
40 fixedClasses: "dropdown show-dropdown open" 39 fixedClasses: "dropdown show-dropdown open"
......
...@@ -30,7 +30,6 @@ import { FormInputs } from "components/FormInputs/FormInputs.jsx"; ...@@ -30,7 +30,6 @@ import { FormInputs } from "components/FormInputs/FormInputs.jsx";
30 import { UserCard } from "components/UserCard/UserCard.jsx"; 30 import { UserCard } from "components/UserCard/UserCard.jsx";
31 import Button from "components/CustomButton/CustomButton.jsx"; 31 import Button from "components/CustomButton/CustomButton.jsx";
32 32
33 -import avatar from "assets/img/faces/face-3.jpg";
34 33
35 class UserProfile extends Component { 34 class UserProfile extends Component {
36 render() { 35 render() {
...@@ -152,7 +151,7 @@ class UserProfile extends Component { ...@@ -152,7 +151,7 @@ class UserProfile extends Component {
152 <Col md={4}> 151 <Col md={4}>
153 <UserCard 152 <UserCard
154 bgImage="https://ununsplash.imgix.net/photo-1431578500526-4d9613015464?fit=crop&fm=jpg&h=300&q=75&w=400" 153 bgImage="https://ununsplash.imgix.net/photo-1431578500526-4d9613015464?fit=crop&fm=jpg&h=300&q=75&w=400"
155 - avatar={avatar} 154 + avatar={''}
156 name="Mike Andrew" 155 name="Mike Andrew"
157 userName="michael24" 156 userName="michael24"
158 description={ 157 description={
......