From cac49df6c40277cc130ba6a061b99021b21d8246 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Fri, 21 Dec 2018 13:14:00 +1100 Subject: [PATCH 1/5] testing branching --- feature-test.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature-test.html diff --git a/feature-test.html b/feature-test.html new file mode 100644 index 0000000..1050001 --- /dev/null +++ b/feature-test.html @@ -0,0 +1 @@ +asd \ No newline at end of file From c36cc3c62befeaed1d8c5f52053d9e1295bc8f04 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Fri, 11 Jan 2019 10:22:25 +1100 Subject: [PATCH 2/5] ui index - francesca --- feature-test.html | 1 - src/assets/static/images/nomit-logo.png | Bin 0 -> 25411 bytes .../static/images/wisp_logo_horizontal.svg | 122 +++ .../images/wisp_logo_white_vertical.svg | 120 +++ .../styles/spec/components/pageContainer.scss | 7 + .../styles/spec/components/sidebar.scss | 37 +- src/assets/styles/spec/components/topbar.scss | 56 +- .../styles/spec/settings/baseColors.scss | 5 +- .../styles/spec/utils/layout/utils/peers.scss | 4 +- src/datatable.html | 616 ++++------- src/index.html | 974 ++++++------------ 11 files changed, 838 insertions(+), 1104 deletions(-) delete mode 100644 feature-test.html create mode 100644 src/assets/static/images/nomit-logo.png create mode 100644 src/assets/static/images/wisp_logo_horizontal.svg create mode 100644 src/assets/static/images/wisp_logo_white_vertical.svg diff --git a/feature-test.html b/feature-test.html deleted file mode 100644 index 1050001..0000000 --- a/feature-test.html +++ /dev/null @@ -1 +0,0 @@ -asd \ No newline at end of file diff --git a/src/assets/static/images/nomit-logo.png b/src/assets/static/images/nomit-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4f7b5c4fbb2a87b71e23be62cc4a935fda20cd09 GIT binary patch literal 25411 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 literal 0 HcmV?d00001 diff --git a/src/assets/static/images/wisp_logo_horizontal.svg b/src/assets/static/images/wisp_logo_horizontal.svg new file mode 100644 index 0000000..51a801a --- /dev/null +++ b/src/assets/static/images/wisp_logo_horizontal.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/static/images/wisp_logo_white_vertical.svg b/src/assets/static/images/wisp_logo_white_vertical.svg new file mode 100644 index 0000000..46b8833 --- /dev/null +++ b/src/assets/static/images/wisp_logo_white_vertical.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/styles/spec/components/pageContainer.scss b/src/assets/styles/spec/components/pageContainer.scss index 1c632e3..705f7b9 100755 --- a/src/assets/styles/spec/components/pageContainer.scss +++ b/src/assets/styles/spec/components/pageContainer.scss @@ -25,6 +25,13 @@ } } +.content-title{ + font-weight: bolder; + font-size: 20pt; + color: $default-dark-wisp; + margin-top: 20px; +} + // --------------------------------------------------------- // @Main Content // --------------------------------------------------------- diff --git a/src/assets/styles/spec/components/sidebar.scss b/src/assets/styles/spec/components/sidebar.scss index 838c16d..79d8c92 100755 --- a/src/assets/styles/spec/components/sidebar.scss +++ b/src/assets/styles/spec/components/sidebar.scss @@ -13,7 +13,8 @@ // --------------------------------------------------------- .sidebar { - background-color: $default-white; + //background-color: $default-white; +background-image: linear-gradient(#fe4cb8, #793fcc); bottom: 0; overflow: hidden; position: fixed; @@ -75,7 +76,7 @@ .sidebar-inner { .sidebar-logo { border-bottom: 1px solid $border-color; - padding: 0 20px; + padding: 0 40px; } .sidebar-menu { @@ -125,10 +126,10 @@ // --------------------------------------------------------- .sidebar-logo { - border-bottom: 1px solid $border-color; border-right: 1px solid $border-color; line-height: 0; - padding: 0 20px; + + padding: 0 35%; transition: all 0.2s ease; a { @@ -136,12 +137,13 @@ width: 100%; .logo { - background-position: center left; + background-position: center; + margin-top: 30px; background-repeat: no-repeat; - display: inline-block; + display: block; min-height: calc(#{$header-height} - 1px); width: 100%; - width: 70px; + width: 80px; } .logo-text { @@ -178,18 +180,20 @@ border-right: 1px solid $border-color; height: calc(100vh - #{$header-height}); list-style: none; - margin: 0; + margin: 0px; overflow: auto; - padding: 0; + padding: 10px; position: relative; .dropdown-toggle::after { display: none; } + //cerchietto vicino la voce selezionata .sidebar-link { &.active::before { background: $md-blue-500; + background: white; border-radius: 50%; content: ''; display: block; @@ -245,16 +249,18 @@ } a { - color: $default-text-color; + color: $default-white; transition: all 0.3s ease; - + font-weight: normal; &:hover, &:focus { - color: $default-dark; + color: $default-white; text-decoration: none; - + font-weight: bold; + .icon-holder { color: $default-info; + font-weight: bold; } } } @@ -334,6 +340,9 @@ .sidebar-logo { border-bottom: 1px solid transparent; padding: 0; + margin-left: auto; + margin-right: auto; + } .sidebar-menu { @@ -370,6 +379,8 @@ .sidebar-logo { border-bottom: 1px solid $border-color; padding: 0 20px; + margin-left: auto; + margin-right: auto; } .sidebar-menu { diff --git a/src/assets/styles/spec/components/topbar.scss b/src/assets/styles/spec/components/topbar.scss index 996acc6..3b385bf 100755 --- a/src/assets/styles/spec/components/topbar.scss +++ b/src/assets/styles/spec/components/topbar.scss @@ -68,6 +68,7 @@ .notifications { position: relative; + font-size: 20px; .counter { background-color: $default-danger; @@ -77,8 +78,14 @@ line-height: 1; padding: 3px 5.5px; position: absolute; - right: 6px; - top: 12px; + right: 2px; + top: 20px; + z-index: 1; + } + .top-notification{ + z-index: 4; + position: relative; + background-color: $default-white; } .dropdown-menu { @@ -144,6 +151,8 @@ } .search-box { + + .search-icon-close { display: none; } @@ -168,13 +177,16 @@ input { background-color: transparent; - border: 0; + border: 1; + border-color: #501db9; + border-radius: 50px; box-shadow: none; - font-size: 18px; + font-size: 13px; height: 40px; - margin-top: 12px; + width: 350px; + margin-top: calc((#{$header-height} - 40px)/2); outline: none; - padding: 5px; + padding: 10px; @include to($breakpoint-sm) { width: 85px; @@ -186,6 +198,38 @@ } } } + .btn-gradient { + color: #fff; + background-image: linear-gradient(to right,#ee38a4, #501db9); + border-radius: 50px; + border: none; + height: 40px; + width: 180px; + margin-top: calc((#{$header-height} - 40px)/2); + margin-left: 15px; + outline: none; + padding: 5px; + } + + .nomit-logo-top{ + width: 60px ; + margin-right: 0px; + } + + .verticalLine{ + border-left:1.5px solid $grey-400; + height:30px; + margin-top: calc((#{$header-height} - 30px)/2); + margin-left: 12px; + margin-right: 12px; + } + + .logo-top-bar{ + width: 70px; + margin-top: calc((#{$header-height} - 20px)/2); + margin-right: 55px; + margin-left: 16px; + } } // --------------------------------------------------------- diff --git a/src/assets/styles/spec/settings/baseColors.scss b/src/assets/styles/spec/settings/baseColors.scss index 70947ca..23f4cb3 100755 --- a/src/assets/styles/spec/settings/baseColors.scss +++ b/src/assets/styles/spec/settings/baseColors.scss @@ -67,6 +67,9 @@ $default-text-color : #72777a; $default-warning : #fc0; $default-white : #fff; +$default-dark-wisp : #501db9; +$default-light-wisp : #ee38a4; + // --------------------------------------------------------- // @Inverted Colors // --------------------------------------------------------- @@ -83,7 +86,7 @@ $inverse-warning : lighten($default-warning, 45%); $border-color : #e6ecf5; $collapsed-size : 70px; -$header-height : 65px; +$header-height : 80px; $offscreen-size : 280px; $side-nav-dark : #313644; $side-nav-dark-border : rgba(120, 130, 140, 0.3); diff --git a/src/assets/styles/spec/utils/layout/utils/peers.scss b/src/assets/styles/spec/utils/layout/utils/peers.scss index 1f08616..917564e 100755 --- a/src/assets/styles/spec/utils/layout/utils/peers.scss +++ b/src/assets/styles/spec/utils/layout/utils/peers.scss @@ -21,8 +21,8 @@ // overflow: hidden; } -.peers-greed > .peer, -.peers-greed > .peers { +.-greed > .peer, +.-greed > .peers { flex: 1 1 auto; } diff --git a/src/datatable.html b/src/datatable.html index 2b3e759..7b31a89 100755 --- a/src/datatable.html +++ b/src/datatable.html @@ -462,7 +462,7 @@ - +
  • @@ -516,494 +516,276 @@
    -

    Data Tables

    +

    Tables - Nomit

    -

    Bootstrap Data Table

    +

    Table of users

    + - - - - - + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + +
    ID NamePositionOfficeAgeStart dateSalaryFamily NameEmailStatusShearing data with NOMIT
    ID NamePositionOfficeAgeStart dateSalaryFamily NameEmailStatusShearing data with NOMIT
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500001TigerNixontiger@gmail.comonyes
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000002GarrettWintersgarret@gmail.comonyes
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500003GraceWhitegrace@gmail.comonyes
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000004CharlieChiucharlie@gmail.comonyes
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500005MohammedTantawymohammed@gmail.comonyes
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000006DavideBragagnolodavide@gmail.comonyes
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000007AshlyBlackashly@gmail.comonyes
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450008WillyHamweakwilly@gmail.comonyes
    Doris WilderSales AssistantSidney232010/09/20$85,600009SymonBottlessymon@gmail.comonyes
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000010FionaLegginsfiona@gmail.comonyes
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575011MyriamWhitesmyriam@gmail.comonyes
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500012LillieWanglillie@gmail.comonyes
    +
    +
    +
    + + +
    +
    +
    +

    Complete table of users

    + + - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + +
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575IDStatusNameMiddle NameFamily NameEmailAddressAgeGenderStatusVisaArriving dateReason to leaveGenderStatusVisa
    Thor WaltonDeveloperNew York612013/08/11$98,540IDNameFamily NameEmailStatusShearing data with NOMIT
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500001TigerNixontiger@gmail.comonyes
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575002GarrettWintersgarret@gmail.comonyes
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250003GraceWhitegrace@gmail.comonyes
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000004CharlieChiucharlie@gmail.comonyes
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650005MohammedTantawymohammed@gmail.comonyes
    Cara StevensSales AssistantNew York462011/12/06$145,600006DavideBragagnolodavide@gmail.comonyes
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250007AshlyBlackashly@gmail.comonyes
    Lael GreerSystems AdministratorLondon212009/02/27$103,500008WillyHamweakwilly@gmail.comonyes
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500009SymonBottlessymon@gmail.comonyes
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000010FionaLegginsfiona@gmail.comonyes
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000011MyriamWhitesmyriam@gmail.comonyes
    Donna SniderCustomer SupportNew York272011/01/25$112,000012LillieWanglillie@gmail.comonyes
    + + +
    diff --git a/src/index.html b/src/index.html index bc39c0a..1a954d2 100755 --- a/src/index.html +++ b/src/index.html @@ -87,6 +87,19 @@
    + + + + + + + + + + + + +
    @@ -98,12 +111,9 @@
    -
    -
    Adminator
    -
    @@ -122,176 +132,106 @@
  • - + Dashboard
  • - + - + - Email + Ads
    • -
  • - +
  • + - + - Compose + Profile
  • - + - + - Calendar + Users
  • - + - + - Chat + Companies
    • -
  • - +
  • + - + - Charts + Referees
    • -
  • +
  • - + - Forms - -
    • -
  • - - - - - UI Elements + Reviews
    • -
  • - +
  • + - - - Tables - - + + Reports -
    • -
  • - +
  • + - - - Maps - - - + + + History -
    • -
  • - +
  • + - - - Pages - - + + Settings - -
    • -
  • - - - - - Multiple Levels - - - - -
    • + + + + + + + + + + + + +
    +
      + +
    • - 3 + 3 - +
      • - - Notifications + + Emails
        • @@ -328,14 +276,19 @@
    - - John Doe - liked your post +
    +
    +
    +

    John Doe

    +
    +
    + 5 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 5 mins ago -

    +
    @@ -345,14 +298,19 @@
    - - Moo Doe - liked your cover image +
    +
    +
    +

    Moo Doe

    +
    +
    + 15 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 7 mins ago -

    +
    @@ -362,14 +320,19 @@
    - - Lee Doe - commented on your video +
    +
    +
    +

    Lee Doe

    +
    +
    + 25 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 10 mins ago -

    +
    @@ -377,21 +340,21 @@
  • - View All Notifications + View All Email
    • +
  • - 3 + 3 - + -
    • - - Emails + + Notifications
      • @@ -401,19 +364,14 @@
        -
        -
        -
        -

        John Doe

        -
        -
        - 5 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + John Doe + liked your post -
        + +

        + 5 mins ago +

        @@ -423,19 +381,14 @@
        -
        -
        -
        -

        Moo Doe

        -
        -
        - 15 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + Moo Doe + liked your cover image -
        + +

        + 7 mins ago +

        @@ -445,19 +398,14 @@
        -
        -
        -
        -

        Lee Doe

        -
        -
        - 25 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + Lee Doe + commented on your video -
        + +

        + 10 mins ago +

        @@ -465,19 +413,26 @@
      • - View All Email + View All Notifications
      • +
    • + +
      +
      • + +
    • -
      - -
      - John Doe + Nomit Admin +
      +
      +
      +
      • @@ -507,22 +462,60 @@
      • +
    • + +
      +
      • +
    • + +
      + +
      +
    + + + + + + + + + + + + + + + + + + + + + + + -
    -
    -
    +
    +
    +
    +
    + Dashboard +
    +
    +
    -
    +
    - -
    + +
    -
    Total Visits
    +
    Total Ads Views
    @@ -537,11 +530,11 @@
    - -
    + +
    -
    Total Page Views
    +
    Successful Matches
    @@ -556,11 +549,11 @@
    - -
    + +
    -
    Unique Visitor
    +
    New Ads (last month)
    @@ -574,113 +567,14 @@
    - - -
    -
    -
    -
    Bounce Rate
    -
    -
    -
    -
    - -
    -
    - 33% -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    Site Visits
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    100k
    - Visitors From USA - 50% -
    -
    50% Complete
    -
    -
    -
    -
    1M
    - Visitors From Europe - 80% -
    -
    80% Complete
    -
    -
    -
    -
    450k
    - Visitors From Australia - 40% -
    -
    40% Complete
    -
    -
    -
    -
    1B
    - Visitors From India - 90% -
    -
    90% Complete
    -
    -
    -
    - - -
    -
    -
    - -
    -
    New Users
    -
    -
    -
    - -
    -
    New Purchases
    -
    -
    -
    - -
    -
    Bounce Rate
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - +
    -
    Monthly Stats
    +
    New Registered Users
    @@ -708,387 +602,138 @@
    -
    - -
    -
    -
    -
    Todo List
    -
    -
    -
      -
    • -
      - - -
      -
      • -
    • -
      - - -
      -
      • -
    • -
      - - -
      -
      • -
    • -
      - - -
      -
      • -
    • -
      - - -
      -
      • -
    • -
      - - -
      -
      • -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    Sales Report
    -
    -
    -
    -
    -
    -
    November 2017
    -

    Sales Report

    -
    -
    -

    $6,000

    + +
    +
    +
    + +
    +
    +
    +
    Successful Mathches
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    NameStatusDatePrice
    Item #1 NameUnavailable Nov 18$12
    Item #2 NameNewNov 19$34
    Item #3 NameNewNov 20-$45
    Item #4 NameUnavailableNov 21$65
    Item #5 NameUsedNov 22$78
    Item #6 NameUsed Nov 23-$88
    Item #7 NameOldNov 22$56
    -
    -
    -
    -
    - Check all the sales -
    -
    -
    -
    - -
    -
    - -
    -
    Weather
    -
    - - -
    -
    -
    -
    - -
    -
    -
    -

    32°F

    -
    -
    - + +
    +
    +
    +
    +
    Matched
    - - -
    - Partly Clouds -
    -
    -
    -
    -
    -
    -
    Monday
    -
    -
    - Nov, 01 2017 -
    -
    -
    - - -
    -
    -
    -
    -
    - Wind -
    -
    - 10km/h -
    -
    -
    -
    -
    -
    - Sunrise -
    -
    - 05:00 AM +
    +
    + +
    +
    +
    +
    +
    +
    Nationality
    +
    +
    +
    +
    -
    -
    -
    -
    - Pressure -
    -
    - 1B +
    +
    +
    + +
    +
    +
    100k
    + Visitors From USA + 50% +
    +
    50% Complete
    +
    +
    +
    +
    1M
    + Visitors From Europe + 80% +
    +
    80% Complete
    +
    +
    +
    +
    450k
    + Visitors From Australia + 40% +
    +
    40% Complete
    +
    +
    +
    +
    1B
    + Visitors From India + 90% +
    +
    90% Complete
    +
    +
    +
    +
    -
    - - -
    -
    -
    -
    MON
    - - 32°F -
    -
    -
    TUE
    - - 30°F -
    -
    -
    WED
    - - 28°F -
    -
    -
    THR
    - - 32°F -
    -
    -
    FRI
    - - 24°F -
    -
    -
    SAT
    - - 28°F -
    -
    -
    SUN
    - - 32°F -
    -
    -
    + +
    - -
    -
    -
    -
    Quick Chat
    +
    +
    Visitors
    +
    +
    -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - 10:00 AM -
    -
    - Lorem Ipsum is simply dummy text of -
    -
    -
    -
    -
    -
    - 10:00 AM -
    -
    - the printing and typesetting industry. -
    -
    -
    -
    -
    -
    - 10:00 AM -
    -
    - Lorem Ipsum has been the industry's -
    -
    -
    -
    -
    -
    +
    +
    - -
    -
    - -
    -
    -
    -
    -
    -
    - 10:00 AM -
    -
    - Heloo -
    -
    -
    -
    -
    -
    - 10:00 AM -
    -
    - ?? -
    +
    + +
    +
    +
    +
    Visa Types
    +
    + +
    +
    + +
    +
    +
    Matched
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    +
    +
    + + +
    + + + + + + + + + + + +
    @@ -1097,4 +742,5 @@ + From 315f8fbea2edc201549bebe35d9f2273db4cec93 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Fri, 11 Jan 2019 10:24:55 +1100 Subject: [PATCH 3/5] just a test --- src/charts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/charts.html b/src/charts.html index 6bd6c99..2c3d30f 100755 --- a/src/charts.html +++ b/src/charts.html @@ -613,7 +613,7 @@
    -
    New Users
    +
    New Users
    From 6b90799b4ecb1fe02493f1c3d40402df4a2859d5 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Fri, 11 Jan 2019 11:13:53 +1100 Subject: [PATCH 4/5] autodeploy --- package.json | 10 +++++----- server.js | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 server.js diff --git a/package.json b/package.json index 1b660d6..4d67b95 100755 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "description": "HTML Admin Template", "scripts": { - "start": "webpack-dev-server", + "start": "npm run build && node server.js", "dev": "webpack-dashboard -t 'Project' -- webpack-dev-server", "clean": "shx rm -rf ./build", "build": "npm run clean && cross-env NODE_ENV=\"production\" webpack", @@ -14,6 +14,8 @@ "lint": "npm run lint:js && npm run lint:scss" }, "devDependencies": { + }, + "dependencies": { "babel-core": "^6.26.0", "babel-eslint": "^8.0.1", "babel-loader": "^7.1.2", @@ -43,9 +45,7 @@ "stylelint-config-standard": "^17.0.0", "webpack": "^3.8.1", "webpack-dashboard": "^1.0.0", - "webpack-dev-server": "^2.9.3" - }, - "dependencies": { + "webpack-dev-server": "^2.9.3", "babel-polyfill": "^6.26.0", "bootstrap": "^4.0.0", "bootstrap-datepicker": "^1.7.1", @@ -65,4 +65,4 @@ "popper.js": "^1.12.6", "skycons": "^1.0.0" } -} +} \ No newline at end of file diff --git a/server.js b/server.js new file mode 100644 index 0000000..ef986bd --- /dev/null +++ b/server.js @@ -0,0 +1,12 @@ +const express = require('express'); + +const app = express(); + +app.use(express.static('public')); + +// start the server with the build folder. +app.use('/', express.static(__dirname + '/build')); + +const server = app.listen(process.env.PORT || 3000, function () { + console.log('Server started at http://localhost:%s', server.address().port); +}); \ No newline at end of file From bb758ed116e0a43f31245271bf9d66c0f9f5910d Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Sat, 12 Jan 2019 18:26:06 +1100 Subject: [PATCH 5/5] adjusting size of boxes --- src/assets/scripts/charts/chartJS/index.js | 12 +- .../scripts/charts/easyPieChart/index.js | 4 + src/assets/scripts/charts/sparkline/index.js | 8 +- src/assets/scripts/vectorMaps/index.js | 2 +- src/charts.html | 561 +++++++-------- src/charts_.html | 651 ++++++++++++++++++ src/index.html | 88 +-- src/sidebar.html | 123 ++++ src/topbar.html | 247 +++++++ 9 files changed, 1327 insertions(+), 369 deletions(-) mode change 100755 => 100644 src/charts.html create mode 100755 src/charts_.html create mode 100644 src/sidebar.html create mode 100644 src/topbar.html diff --git a/src/assets/scripts/charts/chartJS/index.js b/src/assets/scripts/charts/chartJS/index.js index 58e0de1..1d02273 100755 --- a/src/assets/scripts/charts/chartJS/index.js +++ b/src/assets/scripts/charts/chartJS/index.js @@ -15,19 +15,19 @@ export default (function () { new Chart(lineCtx, { type: 'line', data: { - labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'], + labels: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul'], datasets: [{ label : 'Series A', backgroundColor : 'rgba(237, 231, 246, 0.5)', borderColor : COLORS['deep-purple-500'], - pointBackgroundColor : COLORS['deep-purple-700'], + pointBackgroundColor : COLORS['white'], borderWidth : 2, - data : [60, 50, 70, 60, 50, 70, 60], + data : [60, 50, 70, 85, 50, 70, 60], }, { label : 'Series B', - backgroundColor : 'rgba(232, 245, 233, 0.5)', - borderColor : COLORS['blue-500'], - pointBackgroundColor : COLORS['blue-700'], + backgroundColor : 'rgba(189, 225, 242, 0.5)', + borderColor : COLORS['cyan-200'], + pointBackgroundColor : COLORS['white'], borderWidth : 2, data : [70, 75, 85, 70, 75, 85, 70], }], diff --git a/src/assets/scripts/charts/easyPieChart/index.js b/src/assets/scripts/charts/easyPieChart/index.js index 4eea285..4a76898 100755 --- a/src/assets/scripts/charts/easyPieChart/index.js +++ b/src/assets/scripts/charts/easyPieChart/index.js @@ -4,6 +4,10 @@ import 'easy-pie-chart/dist/jquery.easypiechart.min.js'; export default (function () { if ($('.easy-pie-chart').length > 0) { $('.easy-pie-chart').easyPieChart({ + lineWidth:7, + lineCap:"square", + scaleColor:false, + animate: 2500, onStep(from, to, percent) { this.el.children[0].innerHTML = `${Math.round(percent)} %`; }, diff --git a/src/assets/scripts/charts/sparkline/index.js b/src/assets/scripts/charts/sparkline/index.js index 6ef99d3..7d2abdd 100755 --- a/src/assets/scripts/charts/sparkline/index.js +++ b/src/assets/scripts/charts/sparkline/index.js @@ -10,7 +10,7 @@ export default (function () { const drawSparklines = () => { if ($('#sparklinedash').length > 0) { - $('#sparklinedash').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -21,7 +21,7 @@ export default (function () { } if ($('#sparklinedash2').length > 0) { - $('#sparklinedash2').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash2').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -32,7 +32,7 @@ export default (function () { } if ($('#sparklinedash3').length > 0) { - $('#sparklinedash3').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash3').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -43,7 +43,7 @@ export default (function () { } if ($('#sparklinedash4').length > 0) { - $('#sparklinedash4').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash4').sparkline([0, 5, 15, 10, 9, 1, 4, 9, 3, 12, 7,3, 9, 5], { type: 'bar', height: '20', barWidth: '3', diff --git a/src/assets/scripts/vectorMaps/index.js b/src/assets/scripts/vectorMaps/index.js index f8d4426..c583916 100755 --- a/src/assets/scripts/vectorMaps/index.js +++ b/src/assets/scripts/vectorMaps/index.js @@ -15,7 +15,7 @@ export default (function () {
    - Charts + Dashboard + + + + + + @@ -88,7 +92,20 @@ - + + + + + + +
    +
      + +
    • - 3 + 3 - +
      • - - Notifications + + Emails
        • @@ -329,14 +275,19 @@
    - - John Doe - liked your post +
    +
    +
    +

    John Doe

    +
    +
    + 5 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 5 mins ago -

    +
    • @@ -346,14 +297,19 @@
    - - Moo Doe - liked your cover image +
    +
    +
    +

    Moo Doe

    +
    +
    + 15 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 7 mins ago -

    +
    @@ -363,14 +319,19 @@
    - - Lee Doe - commented on your video +
    +
    +
    +

    Lee Doe

    +
    +
    + 25 mins ago +
    +
    + + Want to create your own customized data generator for your app... - -

    - 10 mins ago -

    +
    @@ -378,21 +339,21 @@
  • - View All Notifications + View All Email
    • +
  • - 3 + 3 - + -
    • - - Emails + + Notifications
      • @@ -402,19 +363,14 @@
        -
        -
        -
        -

        John Doe

        -
        -
        - 5 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + John Doe + liked your post -
        + +

        + 5 mins ago +

        @@ -424,19 +380,14 @@
        -
        -
        -
        -

        Moo Doe

        -
        -
        - 15 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + Moo Doe + liked your cover image -
        + +

        + 7 mins ago +

        @@ -446,19 +397,14 @@
        -
        -
        -
        -

        Lee Doe

        -
        -
        - 25 mins ago -
        -
        - - Want to create your own customized data generator for your app... + + Lee Doe + commented on your video -
        + +

        + 10 mins ago +

        @@ -466,19 +412,26 @@
      • - View All Email + View All Notifications
      • +
    • + +
      +
      • + +
    • -
      - -
      - John Doe + Nomit Admin +
      +
      +
      +
      • @@ -508,144 +461,118 @@
      • +
    • + +
      +
      • +
    • + +
      + +
      +
    - + + + + + + + + + + + -
    -
    -
    -
    -
    -
    -
    Line Chart
    -
    - -
    -
    -
    -
    -
    -
    Area Chart
    -
    - -
    -
    -
    -
    -
    -
    Scatter Chart
    -
    - -
    -
    -
    -
    -
    -
    Bar Chart
    -
    - -
    -
    -
    -
    -
    -
    jQuery Sparkline
    -
    -
    -
    - Spark Line -
    -
    -   -
    -
    -
    -
    - Spark Bar -
    -
    -   -
    -
    -
    -
    - Spark Tristate -
    -
    -   -
    -
    -
    -
    - Spark Discrete -
    -
    -   -
    -
    -
    -
    - Spark Bullet -
    -
    -   -
    -
    -
    -
    - Spark Box +
    +
    +
    +
    + Dashboard +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    Total Ads Views
    -
    -   +
    +
    +
    + +
    +
    + 24K +
    +
    -
    -
    -
    -
    -
    Easy Pie Charts
    -
    -
    -
    -
    - -
    -
    New Users
    + + +
    +
    +
    +
    Successful Matches
    -
    -
    - +
    +
    +
    + +
    +
    + 127 +
    -
    New Purchases
    -
    -
    - -
    -
    New Customers
    +
    +
    + + +
    +
    +
    +
    New Ads (last month)
    -
    -
    - +
    +
    +
    + +
    +
    + 79 +
    -
    Bounce Rate
    -
    -
    -
    + +
    +
    +
    + + + + + + + +
    Copyright © 2017 Designed by Colorlib. All rights reserved.
    - - + diff --git a/src/charts_.html b/src/charts_.html new file mode 100755 index 0000000..2c3d30f --- /dev/null +++ b/src/charts_.html @@ -0,0 +1,651 @@ + + + + + + Charts + + + + + + + + + +
    + +
    + + + + + +
    + +
    +
    + + + + + +
    +
    + + +
    + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    Line Chart
    +
    + +
    +
    +
    +
    +
    +
    Area Chart
    +
    + +
    +
    +
    +
    +
    +
    Scatter Chart
    +
    + +
    +
    +
    +
    +
    +
    Bar Chart
    +
    + +
    +
    +
    +
    +
    +
    jQuery Sparkline
    +
    +
    +
    + Spark Line +
    +
    +   +
    +
    +
    +
    + Spark Bar +
    +
    +   +
    +
    +
    +
    + Spark Tristate +
    +
    +   +
    +
    +
    +
    + Spark Discrete +
    +
    +   +
    +
    +
    +
    + Spark Bullet +
    +
    +   +
    +
    +
    +
    + Spark Box +
    +
    +   +
    +
    +
    +
    +
    +
    +
    +
    Easy Pie Charts
    +
    +
    +
    +
    + +
    +
    New Users
    +
    +
    +
    + +
    +
    New Purchases
    +
    +
    +
    + +
    +
    New Customers
    +
    +
    +
    + +
    +
    Bounce Rate
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    + Copyright © 2017 Designed by Colorlib. All rights reserved. +
    +
    +
    + + diff --git a/src/index.html b/src/index.html index 1a954d2..b9d4899 100755 --- a/src/index.html +++ b/src/index.html @@ -500,10 +500,10 @@ -
    +
    -
    -
    +
    +
    Dashboard
    @@ -519,11 +519,11 @@
    -
    - -
    +
    + +
    - +10% + 24K
    @@ -542,7 +542,7 @@
    - -7% + 127
    @@ -561,7 +561,7 @@
    - ~12% + 79
    @@ -605,17 +605,17 @@
    -
    +
    -
    +
    Successful Mathches
    -
    +
    -
    +
    Matched
    @@ -624,9 +624,9 @@
    -
    +
    -
    +
    @@ -685,40 +685,46 @@
    - -
    -
    -
    Visitors
    -
    - -
    +
    +
    + +
    +
    +
    Visitors
    +
    + +
    +
    -
    -
    - -
    -
    -
    -
    Visa Types
    -
    - -
    -
    - -
    - -
    -
    Matched
    +
    + +
    +
    +
    +
    Visa Types
    + +
    +
    + +
    + +
    +
    Matched
    +
    +
    -
    -
    +
    +
    +
    -
    + + +
    diff --git a/src/sidebar.html b/src/sidebar.html new file mode 100644 index 0000000..7b798a7 --- /dev/null +++ b/src/sidebar.html @@ -0,0 +1,123 @@ + +
    +
    + + + + + +
    +
    + + + + + + + + + + diff --git a/src/topbar.html b/src/topbar.html new file mode 100644 index 0000000..504db6b --- /dev/null +++ b/src/topbar.html @@ -0,0 +1,247 @@ + +
    +
    + + + +
    +
    \ No newline at end of file