浏览代码

Dashboard completed

master
kj1352 5 年前
父节点
当前提交
5e5d7df59e
共有 6 个文件被更改,包括 103 次插入41 次删除
  1. +2
    -2
      src/app/custom-selector/custom-selector.component.html
  2. +27
    -21
      src/app/dashboard/dashboard.component.html
  3. +55
    -15
      src/app/dashboard/dashboard.component.scss
  4. +4
    -2
      src/app/widgets-holder/widgets-holder.component.scss
  5. +1
    -1
      src/app/widgets-holder/widgets-holder.component.ts
  6. +14
    -0
      src/styles.scss

+ 2
- 2
src/app/custom-selector/custom-selector.component.html 查看文件

@@ -1,9 +1,9 @@
<div class="selector" [ngStyle]="{'width.px' : 200 }"> <div class="selector" [ngStyle]="{'width.px' : 200 }">
<div class="container">
<div class="container" (click)="showDropdown = !showDropdown">
<div class="selected-value"> <div class="selected-value">
{{ header }}: <span *ngIf="selectedOption"> {{ selectedOption.name }} </span> {{ header }}: <span *ngIf="selectedOption"> {{ selectedOption.name }} </span>
</div> </div>
<button (click)="showDropdown = !showDropdown">
<button>
<i class="icon" [ngClass]="{'ion-md-arrow-dropdown': !showDropdown, 'ion-md-arrow-dropup': showDropdown}"></i> <i class="icon" [ngClass]="{'ion-md-arrow-dropdown': !showDropdown, 'ion-md-arrow-dropup': showDropdown}"></i>
</button> </button>
</div> </div>


+ 27
- 21
src/app/dashboard/dashboard.component.html 查看文件

@@ -8,13 +8,15 @@


<ul> <ul>
<li> <li>
<div class="column">
<header> Pending </header>
<p> Waiting for confirmation </p>
</div>

<div class="column">
<div class="count"> 2 </div> Nos
<div class="column-holder">
<div class="column">
<header> Pending </header>
<p> Waiting for confirmation </p>
</div>

<div class="column">
<div class="count"> 2 </div> Nos
</div>
</div> </div>


<div class="column"> <div class="column">
@@ -23,13 +25,15 @@
</li> </li>


<li> <li>
<div class="column">
<header> Confirmed </header>
<p> To be Packed </p>
</div>

<div class="column">
<div class="count"> 5 </div> Nos
<div class="column-holder">
<div class="column">
<header> Confirmed </header>
<p> To be Packed </p>
</div>

<div class="column">
<div class="count"> 5 </div> Nos
</div>
</div> </div>


<div class="column"> <div class="column">
@@ -38,13 +42,15 @@
</li> </li>


<li> <li>
<div class="column">
<header> Ready to Pick </header>
<p> Waiting for the Customer </p>
</div>

<div class="column">
<div class="count"> 10 </div> Nos
<div class="column-holder">
<div class="column">
<header> Ready to Pick </header>
<p> Waiting for the Customer </p>
</div>

<div class="column">
<div class="count"> 10 </div> Nos
</div>
</div> </div>


<div class="column"> <div class="column">


+ 55
- 15
src/app/dashboard/dashboard.component.scss 查看文件

@@ -8,6 +8,10 @@
.order-stats { .order-stats {
width: 70%; width: 70%;


@media screen and (max-width: 1023px) {
width: 100%;
}

ul { ul {
list-style: none; list-style: none;
} }
@@ -22,6 +26,42 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;


@media screen and (max-width: 1023px) {
align-items: flex-end;
}

.column-holder {
display: flex;
flex-grow: 1;

@media screen and (max-width: 1023px) {
flex-direction: column;
}

.column {
&:nth-child(1) {
width: 60%;

@media screen and (max-width: 1023px) {
width: 100%;
}
}

&:nth-child(2) {
width: 100px;
color: var(--grey);
font-size: 14px;

.count {
font-size: 36px;
font-weight: 700;
color: var(--dark-grey);
display: inline-block;
}
}
}
}

.column { .column {
letter-spacing: 0.5px; letter-spacing: 0.5px;


@@ -29,33 +69,29 @@
font-weight: 500; font-weight: 500;
color: var(--dark-grey); color: var(--dark-grey);
font-size: 16px; font-size: 16px;

@media screen and (max-width: 1023px) {
font-size: 14px;
}
} }


p { p {
font-size: 14px; font-size: 14px;
color: var(--grey); color: var(--grey);
margin-top: 10px; margin-top: 10px;
}

&:nth-child(1) {
width: 40%;
}

&:nth-child(2) {
width: 100px;
color: var(--grey);
font-size: 14px;


.count {
font-size: 36px;
font-weight: 700;
color: var(--dark-grey);
display: inline-block;
@media screen and (max-width: 1023px) {
font-size: 12px;
margin-top: 5px;
} }
} }


button { button {
width: 100px; width: 100px;

@media screen and (max-width: 1023px) {
width: 80px;
}
} }
} }
} }
@@ -69,6 +105,10 @@
height: calc(100vh - 70px); height: calc(100vh - 70px);
overflow: auto; overflow: auto;


@media screen and (max-width: 1023px) {
display: none;
}

&:hover { &:hover {
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: block; display: block;


+ 4
- 2
src/app/widgets-holder/widgets-holder.component.scss 查看文件

@@ -79,7 +79,7 @@


@media screen and (max-width: 1023px) { @media screen and (max-width: 1023px) {
width: 100%; width: 100%;
height: 70px;
height: 60px;
box-shadow: 0px 0px 5px var(--grey); box-shadow: 0px 0px 5px var(--grey);
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@@ -173,7 +173,7 @@
@media screen and (max-width: 1023px) { @media screen and (max-width: 1023px) {
display: block; display: block;
margin-right: 0; margin-right: 0;
font-size: 22px;
font-size: 24px;
} }
} }


@@ -237,5 +237,7 @@


@media screen and (max-width: 1023px) { @media screen and (max-width: 1023px) {
width: 100%; width: 100%;
height: calc(100vh - 60px);
overflow: auto;
} }
} }

+ 1
- 1
src/app/widgets-holder/widgets-holder.component.ts 查看文件

@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./widgets-holder.component.scss'] styleUrls: ['./widgets-holder.component.scss']
}) })
export class WidgetsHolderComponent implements OnInit { export class WidgetsHolderComponent implements OnInit {
selected_nav: string = 'dashboard';
selected_nav: string = 'orders';


constructor() { } constructor() { }




+ 14
- 0
src/styles.scss 查看文件

@@ -38,6 +38,12 @@ button {
font-size: 16px; font-size: 16px;
padding: 0 15px; padding: 0 15px;
letter-spacing: 0.5px; letter-spacing: 0.5px;

@media screen and (max-width: 1023px) {
font-size: 14px;
height: 35px;
padding: 0 10px;
}
} }


.round-button { .round-button {
@@ -58,11 +64,19 @@ button {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;


@media screen and (max-width: 1023px) {
flex-direction: column;
}

header { header {
font-size: 20px; font-size: 20px;
color: var(--dark-grey); color: var(--dark-grey);
font-weight: 500; font-weight: 500;
letter-spacing: 0.5px; letter-spacing: 0.5px;

@media screen and (max-width: 1023px) {
margin-bottom: 30px;
}
} }
} }




正在加载...
取消
保存