Refactor + align project structure with Angular 2 conventions. (googl…

…e#415) * Add Angular 5.0.0-beta.5 dependency from npm. * Remove IIFEs that wrap typescript code. * Rewrite all "var" to "let" and "const" in typescript code. * Replace per-file AngularJS modules with ES6 exports and imports. * Wire up AngularJS modules using imports/exports instead of names. * Add .module suffix to angular module files. * Remove "components" directory. * Replace @ultimate/aot-loader with @ngtools/webpack * Load AngularJS templates with webpack raw-loader. * Move templates out of timesketch/ui folder. * Move views out of timesketch/ui folder. * Move fonts and images to timesketch/static. * Update configs to reflect recent moving of files. * Align file names with Angular 2 convention. * Move to manual angular bootstrap process.
jbaptperez · Sep 1, 2017 · 44c4c23 · 44c4c23
1 parent b5d875a
commit 44c4c23
Show file tree

Hide file tree

Showing 101 changed files with 2,356 additions and 2,283 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # Ignore frontend build related files
 node_modules
-timesketch/ui/static/dist
+timesketch/static/dist
 
 # Ignore data files
 *.plaso

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
-recursive-include timesketch/ui/static *
-recursive-include timesketch/ui/templates *
+recursive-include timesketch/static *
+recursive-include timesketch/templates *
 include timesketch.conf
 include requirements.txt
 include requirements.in
diff --git a/package.json b/package.json
@@ -15,6 +15,14 @@
     "lint:watch": ""
   },
   "dependencies": {
+    "@angular/common": "5.0.0-beta.5",
+    "@angular/compiler": "5.0.0-beta.5",
+    "@angular/compiler-cli": "5.0.0-beta.5",
+    "@angular/core": "5.0.0-beta.5",
+    "@angular/platform-browser": "5.0.0-beta.5",
+    "@angular/platform-browser-dynamic": "5.0.0-beta.5",
+    "@angular/upgrade": "5.0.0-beta.5",
+    "@ngtools/webpack": "^1.6.2",
     "angular": "1.3.5",
     "brace": "^0.10.0",
     "chart.js": "2.2.2",
@@ -28,12 +36,15 @@
     "moment": "2.10.3",
     "node-sass": "^4.5.3",
     "numeral": "2.0.6",
+    "raw-loader": "^0.5.1",
+    "rxjs": "^5.4.3",
     "sass-loader": "^6.0.6",
     "style-loader": "^0.18.2",
     "ts-loader": "^2.3.3",
     "twitter-bootstrap-3.0.0": "^3.0.0",
     "typescript": "^2.4.2",
     "url-loader": "^0.5.9",
-    "webpack": "^3.5.5"
+    "webpack": "^3.5.5",
+    "zone.js": "^0.8.17"
   }
 }
diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def check_before_upload():
     """
     this_dir = os.path.dirname(__file__)
     frontend_dist_dir = os.path.join(
-        this_dir, 'timesketch', 'ui', 'static', 'dist',
+        this_dir, 'timesketch', 'static', 'dist',
     )
     js = os.path.join(frontend_dist_dir, 'bundle.js')
     css = os.path.join(frontend_dist_dir, 'bundle.css')

diff --git a/timesketch/__init__.py b/timesketch/__init__.py
@@ -49,10 +49,10 @@
 from timesketch.models import init_db
 from timesketch.models.sketch import Sketch
 from timesketch.models.user import User
-from timesketch.ui.views.home import home_views
-from timesketch.ui.views.sketch import sketch_views
-from timesketch.ui.views.story import story_views
-from timesketch.ui.views.user import user_views
+from timesketch.views.home import home_views
+from timesketch.views.sketch import sketch_views
+from timesketch.views.story import story_views
+from timesketch.views.user import user_views
 
 
 def create_app(config=None):
@@ -67,7 +67,7 @@ def create_app(config=None):
     """
     # Setup the Flask app and load the config.
     app = Flask(
-        __name__, template_folder=u'ui/templates', static_folder=u'ui/static')
+        __name__, template_folder=u'templates', static_folder=u'static')
 
     if not config:
         config = u'/etc/timesketch.conf'

diff --git a/...sketch/ui/static/fonts/Roboto/LICENSE.txt → timesketch/static/fonts/Roboto/LICENSE.txt b/...sketch/ui/static/fonts/Roboto/LICENSE.txt → timesketch/static/fonts/Roboto/LICENSE.txt
diff --git a/...h/ui/static/fonts/Roboto/Roboto-Black.ttf → ...etch/static/fonts/Roboto/Roboto-Black.ttf b/...h/ui/static/fonts/Roboto/Roboto-Black.ttf → ...etch/static/fonts/Roboto/Roboto-Black.ttf
diff --git a/...tatic/fonts/Roboto/Roboto-BlackItalic.ttf → ...tatic/fonts/Roboto/Roboto-BlackItalic.ttf b/...tatic/fonts/Roboto/Roboto-BlackItalic.ttf → ...tatic/fonts/Roboto/Roboto-BlackItalic.ttf
diff --git a/...ch/ui/static/fonts/Roboto/Roboto-Bold.ttf → ...ketch/static/fonts/Roboto/Roboto-Bold.ttf b/...ch/ui/static/fonts/Roboto/Roboto-Bold.ttf → ...ketch/static/fonts/Roboto/Roboto-Bold.ttf
diff --git a/...static/fonts/Roboto/Roboto-BoldItalic.ttf → ...static/fonts/Roboto/Roboto-BoldItalic.ttf b/...static/fonts/Roboto/Roboto-BoldItalic.ttf → ...static/fonts/Roboto/Roboto-BoldItalic.ttf
diff --git a/.../ui/static/fonts/Roboto/Roboto-Italic.ttf → ...tch/static/fonts/Roboto/Roboto-Italic.ttf b/.../ui/static/fonts/Roboto/Roboto-Italic.ttf → ...tch/static/fonts/Roboto/Roboto-Italic.ttf
diff --git a/...h/ui/static/fonts/Roboto/Roboto-Light.ttf → ...etch/static/fonts/Roboto/Roboto-Light.ttf b/...h/ui/static/fonts/Roboto/Roboto-Light.ttf → ...etch/static/fonts/Roboto/Roboto-Light.ttf
diff --git a/...tatic/fonts/Roboto/Roboto-LightItalic.ttf → ...tatic/fonts/Roboto/Roboto-LightItalic.ttf b/...tatic/fonts/Roboto/Roboto-LightItalic.ttf → ...tatic/fonts/Roboto/Roboto-LightItalic.ttf
diff --git a/.../ui/static/fonts/Roboto/Roboto-Medium.ttf → ...tch/static/fonts/Roboto/Roboto-Medium.ttf b/.../ui/static/fonts/Roboto/Roboto-Medium.ttf → ...tch/static/fonts/Roboto/Roboto-Medium.ttf
diff --git a/...atic/fonts/Roboto/Roboto-MediumItalic.ttf → ...atic/fonts/Roboto/Roboto-MediumItalic.ttf b/...atic/fonts/Roboto/Roboto-MediumItalic.ttf → ...atic/fonts/Roboto/Roboto-MediumItalic.ttf
diff --git a/...ui/static/fonts/Roboto/Roboto-Regular.ttf → ...ch/static/fonts/Roboto/Roboto-Regular.ttf b/...ui/static/fonts/Roboto/Roboto-Regular.ttf → ...ch/static/fonts/Roboto/Roboto-Regular.ttf
diff --git a/...ch/ui/static/fonts/Roboto/Roboto-Thin.ttf → ...ketch/static/fonts/Roboto/Roboto-Thin.ttf b/...ch/ui/static/fonts/Roboto/Roboto-Thin.ttf → ...ketch/static/fonts/Roboto/Roboto-Thin.ttf
diff --git a/...static/fonts/Roboto/Roboto-ThinItalic.ttf → ...static/fonts/Roboto/Roboto-ThinItalic.ttf b/...static/fonts/Roboto/Roboto-ThinItalic.ttf → ...static/fonts/Roboto/Roboto-ThinItalic.ttf
diff --git a/timesketch/ui/static/img/favicon.ico → timesketch/static/img/favicon.ico b/timesketch/ui/static/img/favicon.ico → timesketch/static/img/favicon.ico
diff --git a/timesketch/ui/static/img/logo.png → timesketch/static/img/logo.png b/timesketch/ui/static/img/logo.png → timesketch/static/img/logo.png
diff --git a/timesketch/ui/templates/base.html → timesketch/templates/base.html b/timesketch/ui/templates/base.html → timesketch/templates/base.html
@@ -15,7 +15,7 @@
 limitations under the License.
 -->
 
-<html lang="en" ng-app="timesketch">
+<html lang="en">
 
 <head>
     <title>Timesketch</title>

diff --git a/timesketch/ui/templates/home/home.html → timesketch/templates/home/home.html b/timesketch/ui/templates/home/home.html → timesketch/templates/home/home.html
diff --git a/timesketch/ui/templates/sketch/explore.html → timesketch/templates/sketch/explore.html b/timesketch/ui/templates/sketch/explore.html → timesketch/templates/sketch/explore.html
diff --git a/timesketch/ui/templates/sketch/overview.html → timesketch/templates/sketch/overview.html b/timesketch/ui/templates/sketch/overview.html → timesketch/templates/sketch/overview.html
diff --git a/timesketch/ui/templates/sketch/stories.html → timesketch/templates/sketch/stories.html b/timesketch/ui/templates/sketch/stories.html → timesketch/templates/sketch/stories.html
diff --git a/timesketch/ui/templates/sketch/timeline.html → timesketch/templates/sketch/timeline.html b/timesketch/ui/templates/sketch/timeline.html → timesketch/templates/sketch/timeline.html
diff --git a/...sketch/ui/templates/sketch/timelines.html → timesketch/templates/sketch/timelines.html b/...sketch/ui/templates/sketch/timelines.html → timesketch/templates/sketch/timelines.html
diff --git a/timesketch/ui/templates/sketch/views.html → timesketch/templates/sketch/views.html b/timesketch/ui/templates/sketch/views.html → timesketch/templates/sketch/views.html
diff --git a/timesketch/ui/templates/user/login.html → timesketch/templates/user/login.html b/timesketch/ui/templates/user/login.html → timesketch/templates/user/login.html
diff --git a/timesketch/ui/__init__.py b/timesketch/ui/__init__.py
diff --git a/...sketch/ui/static/angularjs-for-webpack.ts → timesketch/ui/angularjs-for-webpack.ts b/...sketch/ui/static/angularjs-for-webpack.ts → timesketch/ui/angularjs-for-webpack.ts
diff --git a/...ketch/ui/static/components/story/story.ts → timesketch/ui/api/api.module.ts b/...ketch/ui/static/components/story/story.ts → timesketch/ui/api/api.module.ts
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import angular from 'angularjs-for-webpack'
+import {timesketchApiImplementation} from './api.service'
 
-(function() {
-    var module = angular.module('timesketch.story', [
-        'timesketch.story.directive'
-    ]);
-})();
+export const tsApiModule = angular.module('timesketch.api', [])
+  .service('timesketchApi', timesketchApiImplementation)