Merge branch 'release/0.4.0'

GaelGirodon · Nov 2, 2018 · 60b581d · 60b581d
2 parents c47369b + eda6313
commit 60b581d
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -66,6 +66,7 @@ npm run package
 
 - [ ] Auto-complete the directory path
 - [ ] Improve the treemap display
+- [ ] Harmonize folder naming (directory, folder...)
 
 ## License
 

diff --git a/assets/sass/dirstat.scss b/assets/sass/dirstat.scss
@@ -1,20 +1,44 @@
 @import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 
+// Vue.js
 [v-cloak] {
   display: none;
 }
 
+// Page structure
+html {
+  position: relative;
+  min-height: 100%;
+}
 body {
+  margin-bottom: 80px;
   background: #f5f5f5;
 }
 
+// Footer
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+
+  div.container {
+    border-top: solid 1px #e5e5e5;
+    padding: 12px 4px;
+  }
+  .icon {
+    font-size: x-large;
+  }
+}
+
+// Breadcrumb customization
 .breadcrumb {
   background: #ffffff;
   border: solid 1px #ced4da;
   padding-top: 0.4rem !important;
   padding-bottom: 0.4rem !important;
 }
 
+// Alerts customization
 .alert {
   &.alert-warning {
     border-color: darken(#ffeeba, 20%);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "dir-stat",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Simple directory statistics",
   "scripts": {
     "build:assets": "gulp",
+    "build:dev": "npm run build:assets && go build dirstat.go",
     "build": "npm run build:assets && packr build -i -o dirstat.exe .",
     "ensure": "npm install && dep ensure",
-    "start": "npm run build && dirstat",
+    "start": "npm run build:dev && dirstat",
     "package": "powershell.exe ./scripts/package.ps1"
   },
   "repository": {

diff --git a/web/index.html b/web/index.html
@@ -7,6 +7,10 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>DirStat</title>
     <link rel="stylesheet" href="dirstat.min.css">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/brands.css"
+          integrity="sha384-BCEeiNUiLzxxoeYaIu7jJqq0aVVz2O2Ig4WbWEmRQ2Dx/AAxNV1wMDBXyyrxw1Zd" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/fontawesome.css"
+          integrity="sha384-HU5rcgG/yUrsDGWsVACclYdzdCcn5yU8V/3V84zSrPDHwZEdjykadlgI6RHrxGrJ" crossorigin="anonymous">
 </head>
 <body>
 <div id="app" class="container">
@@ -77,6 +81,19 @@ <h1 class="display-5 m-0">&#x1F5C3; DirStat</h1>
     <!-- Tree map -->
     <section v-cloak id="treemap-container"></section>
 </div>
+<!-- Footer -->
+<footer class="footer">
+    <div class="container d-flex justify-content-between align-items-center">
+        <div class="text-muted">
+            <strong>DirStat 0.4.0</strong>
+            <span class="mx-1">🞄</span>
+            2018
+        </div>
+        <a href="https://github.com/GaelGirodon" class="icon mr-2">
+            <i class="fab fa-github"></i>
+        </a>
+    </div>
+</footer>
 <!-- Scripts -->
 <script src="dirstat.min.js"></script>
 </body>