Add sounds to bundle

RubixML · Jan 10, 2021 · c326fdf · c326fdf
1 parent 337bb9d
commit c326fdf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/assets/app.js b/assets/app.js
diff --git a/assets/app.js.gz b/assets/app.js.gz
diff --git a/ui/App.vue b/ui/App.vue
@@ -8,6 +8,6 @@
         <app-update-available></app-update-available>
         <communication-error></communication-error>
         <dataset-import-failure></dataset-import-failure>
-        <audio id="sharp" src="/sounds/sharp.ogg" crossOrigin="anonymous"></audio>
+        <audio id="sharp" src="./sounds/sharp.ogg" crossOrigin="anonymous"></audio>
     </div>
 </template>
diff --git a/ui/components/ProcessInfo.vue b/ui/components/ProcessInfo.vue
@@ -53,7 +53,7 @@ export default Vue.extend({
     },
     computed: {
         upSince() : string {
-            return moment.unix(this.info.start).format('MMM. Do, YYYY [@] h:mmA');
+            return moment.unix(this.info.start).format('MMM. Do, YYYY [at] h:mmA');
         },
     },
     methods: {

diff --git a/webpack.config.js b/webpack.config.js
@@ -66,7 +66,7 @@ module.exports = [{
                 ],
             },
             {
-                test: /\.png$/,
+                test: /\.(png|webp)$/,
                 loader: 'file-loader',
                 options: {
                     name: '[name].[ext]',
@@ -88,6 +88,16 @@ module.exports = [{
                     publicPath: '/fonts/',
                 },
             },
+            {
+                test: /\.ogg$/,
+                loader: 'file-loader',
+                options: {
+                    name: '[name].[ext]',
+                    outputPath: '/sounds/',
+                    publicPath: '/sounds/',
+                    esModule: false,
+                },
+            },
         ],
     },
     plugins: [
@@ -103,7 +113,6 @@ module.exports = [{
                 { from: 'ui/images/app-icon-apple-touch.png', to: 'images/' },
                 { from: 'ui/images/app-icon-medium.png', to: 'images/' },
                 { from: 'ui/images/app-icon-large.png', to: 'images/' },
-                { from: 'ui/sounds/sharp.ogg', to: 'sounds/' },
             ],
         }),
         new CompressionPlugin({