diff --git a/.idea/dictionaries/User.xml b/.idea/dictionaries/User.xml index 2f96b2b..30a058c 100644 --- a/.idea/dictionaries/User.xml +++ b/.idea/dictionaries/User.xml @@ -1,7 +1,10 @@ + codefrog + deregister versioning + webp \ No newline at end of file diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 7d2f3f1..043ae4d 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -313,6 +313,13 @@ module.exports = { // Ignores URLs starting from /__ (useful for Firebase): // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219 navigateFallbackWhitelist: [/^(?!\/__).*/], + staticFileGlobs: [ + 'public/css/**.*', + 'public/lib/**.*', + 'public/Template/**.*', + ], + stripPrefix: 'src/static/', // stripPrefixMulti is also supported + mergeStaticsConfig: true, // if you don't set this to true, you won't see any webpack-emitted assets in your serviceworker config // Don't precache sourcemaps (they're large) and build asset manifest: staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/], }), diff --git a/package.json b/package.json index 2620880..5d13d35 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "eslint-plugin-jsx-a11y": "5.1.1", "eslint-plugin-react": "7.1.0", "extract-text-webpack-plugin": "3.0.0", + "fbjs": "^0.8.16", "file-loader": "0.11.2", "fs-extra": "3.0.1", "gh-pages": "^1.0.0", diff --git a/public/Template/Application.html.tpl b/public/Template/Application.html.tpl index b6353b2..c590e3e 100644 --- a/public/Template/Application.html.tpl +++ b/public/Template/Application.html.tpl @@ -5,7 +5,7 @@
menu Time Tracker
@@ -13,12 +13,17 @@
-

Hello World!

+
+
+ Page: {this.state.history.page}
+ Component: {this.state.currentComponent} +
diff --git a/public/Template/Menu/Main.html.tpl b/public/Template/Menu/Main.html.tpl index 045153a..4572aa1 100644 --- a/public/Template/Menu/Main.html.tpl +++ b/public/Template/Menu/Main.html.tpl @@ -1,14 +1,14 @@ - +