-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat-mvp' of github.com:Mississippi-Labs/mississippi in…
…to feat-mvp
- Loading branch information
Showing
18 changed files
with
350 additions
and
85 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| import React from 'react'; | ||
| import './styles.scss'; | ||
| import UserPackage from '@/components/UserPackage'; | ||
| import userImg from '@/assets/img/duck_default.png'; | ||
|
|
||
| const UserInfo = () => { | ||
| return ( | ||
| <div className={'mi-userinfo-wrapper'}> | ||
| <div className="left-main-content"> | ||
| <h3>User info</h3> | ||
| <div className="user-detail-wrapper"> | ||
| <div className="user-appearance-wrapper"> | ||
| <img src={userImg} alt="" className={'user-appearance'}/> | ||
| </div> | ||
| <div className="loot-wrapper"> | ||
| <div className="loot-detail"> | ||
|
|
||
| </div> | ||
| <div className="loot-detail"> | ||
|
|
||
| </div> | ||
| </div> | ||
| <div className="user-attr-wrapper"> | ||
| <dl> | ||
| <dt>HP</dt> | ||
| <dd><span className="base-attr">100</span><span className="extra-attr">100</span></dd> | ||
| </dl> | ||
| <dl> | ||
| <dt>Attack</dt> | ||
| <dd><span className="base-attr">20</span><span className="extra-attr">1</span></dd> | ||
| </dl> | ||
| <dl> | ||
| <dt>AttackRange</dt> | ||
| <dd><span className="base-attr">5</span><span className="extra-attr">1</span></dd> | ||
| </dl> | ||
| <dl> | ||
| <dt>Speed</dt> | ||
| <dd><span className="base-attr">2</span><span className="extra-attr">2</span></dd> | ||
| </dl> | ||
| <dl> | ||
| <dt>Strength</dt> | ||
| <dd><span className="base-attr">20</span><span className="extra-attr">1</span></dd> | ||
| </dl> | ||
| <dl> | ||
| <dt>Space</dt> | ||
| <dd><span className="base-attr">10</span><span className="extra-attr">1</span></dd> | ||
| </dl> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div className="right-main-content"> | ||
| <UserPackage | ||
| title={'User Package'} | ||
| /> | ||
| <UserPackage | ||
| title={'Season Package'} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default UserInfo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| .mi-userinfo-wrapper { | ||
| display: flex; | ||
| justify-content: space-between; | ||
|
|
||
| h3 { | ||
| font-size: 28px; | ||
| margin-bottom: 8px; | ||
| } | ||
|
|
||
| .left-main-content { | ||
| width: 768px; | ||
| } | ||
|
|
||
| .user-detail-wrapper { | ||
| height: 378px; | ||
| } | ||
|
|
||
| .user-detail-wrapper { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| .user-appearance-wrapper { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| width: 338px; | ||
| height: 100%; | ||
| background: url("../../assets/img/user_bg.png") no-repeat center / 100% 100%; | ||
|
|
||
| .user-appearance { | ||
| width: 222px; | ||
| } | ||
| } | ||
|
|
||
| .loot-wrapper { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| flex-direction: column; | ||
| height: 100%; | ||
| } | ||
|
|
||
| .loot-detail { | ||
| width: 180px; | ||
| height: 180px; | ||
| border: 1px solid #FFF5E9; | ||
| background: #000; | ||
| color: #FFF5E9; | ||
| } | ||
|
|
||
| .user-attr-wrapper { | ||
| width: 213px; | ||
| font-size: 26px; | ||
|
|
||
| dl { | ||
| display: flex; | ||
| } | ||
|
|
||
| dt { | ||
| margin-right: 10px; | ||
| } | ||
|
|
||
| .base-attr { | ||
| margin-right: 10px; | ||
| color: #fff; | ||
| } | ||
|
|
||
| .extra-attr { | ||
| color: red; | ||
|
|
||
| &::before { | ||
| content: '+'; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .mi-user-package { | ||
| margin-bottom: 24px; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import React from 'react'; | ||
| import './styles.scss'; | ||
|
|
||
| interface IProps { | ||
| title: string; | ||
| } | ||
|
|
||
| const arr = new Array(10).fill(10); | ||
|
|
||
| const UserPackage = (props: IProps) => { | ||
| return ( | ||
| <div className="mi-user-package"> | ||
| <h3>{props.title}</h3> | ||
| <div className="package-items-wrapper"> | ||
| { | ||
| arr.map(() => { | ||
| return ( | ||
| <div className='package-item'> | ||
|
|
||
| </div> | ||
| ) | ||
| }) | ||
| } | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default UserPackage; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| .mi-user-package { | ||
| width: 366px; | ||
|
|
||
| .package-items-wrapper { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| flex-wrap: wrap; | ||
| } | ||
|
|
||
| .package-item { | ||
| margin-bottom: 14px; | ||
| width: 62px; | ||
| height: 62px; | ||
| background: #FFF5E9; | ||
| border: 6px solid transparent; | ||
|
|
||
| &:nth-child(-n+3) { | ||
| border-color: #DCC7AF; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,8 @@ | |
| } | ||
|
|
||
| .play-btn { | ||
| width: 214px; | ||
| height: 72px; | ||
| width: 210px; | ||
| height: 66px; | ||
| font-size: 24px; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.