Browse Source

Refactored frontend

Preparing for multi-module frontend package layout
master
Rohan Sircar 5 months ago
parent
commit
3822e9fb3c
44 changed files with 40 additions and 103 deletions
  1. +1
    -0
      .gitignore
  2. +25
    -21
      Gruntfile.js
  3. +2
    -2
      package.json
  4. +2
    -2
      pom.xml
  5. +0
    -0
      src/main/frontend/chat/SprintfTest.d.ts
  6. +0
    -0
      src/main/frontend/chat/controller/AbstractController.ts
  7. +0
    -0
      src/main/frontend/chat/controller/ChatController.ts
  8. +0
    -0
      src/main/frontend/chat/controller/UserController.ts
  9. +0
    -0
      src/main/frontend/chat/dto/ChatMessageDTO.ts
  10. +0
    -0
      src/main/frontend/chat/dto/MessageCipherDTO.ts
  11. +0
    -0
      src/main/frontend/chat/main.ts
  12. +0
    -0
      src/main/frontend/chat/model/AbstractModel.ts
  13. +0
    -0
      src/main/frontend/chat/model/ChatModel.ts
  14. +0
    -0
      src/main/frontend/chat/model/ChatModelHelper.ts
  15. +0
    -0
      src/main/frontend/chat/model/FetchErrorHandler.ts
  16. +2
    -2
      src/main/frontend/chat/model/ModelFactory.ts
  17. +0
    -0
      src/main/frontend/chat/model/UserModel.ts
  18. +0
    -0
      src/main/frontend/chat/observe/Observable.ts
  19. +0
    -0
      src/main/frontend/chat/observe/Observer.ts
  20. +0
    -0
      src/main/frontend/chat/observe/ObserverData.ts
  21. +0
    -0
      src/main/frontend/chat/service/AlertifyNotificationService.ts
  22. +0
    -0
      src/main/frontend/chat/service/EncryptionService.ts
  23. +0
    -0
      src/main/frontend/chat/service/EncryptionServiceFactory.ts
  24. +0
    -0
      src/main/frontend/chat/service/FuseSearchService.ts
  25. +0
    -0
      src/main/frontend/chat/service/MarkDownItMarkDownService.ts
  26. +0
    -0
      src/main/frontend/chat/service/MarkDownService.ts
  27. +0
    -0
      src/main/frontend/chat/service/NotificationService.ts
  28. +0
    -0
      src/main/frontend/chat/service/SJCLEncryptionService.ts
  29. +0
    -0
      src/main/frontend/chat/service/SearchService.ts
  30. +0
    -0
      src/main/frontend/chat/singleton/JsonAPI.ts
  31. +0
    -0
      src/main/frontend/chat/singleton/Sprintf.ts
  32. +0
    -0
      src/main/frontend/chat/template/TemplateFactory.ts
  33. +0
    -0
      src/main/frontend/chat/view/AbstractView.ts
  34. +0
    -0
      src/main/frontend/chat/view/ChatView.ts
  35. +0
    -0
      src/main/frontend/chat/view/ChatViewDeps.ts
  36. +0
    -0
      src/main/frontend/chat/view/FetchHandler.ts
  37. +0
    -0
      src/main/frontend/chat/view/UserView.ts
  38. +0
    -0
      src/main/frontend/chat/view/UserViewDeps.ts
  39. +0
    -0
      src/main/frontend/chat/viewmodel/ActiveUserViewModel.ts
  40. +0
    -0
      src/main/frontend/chat/viewmodel/ChatMessageViewModel.ts
  41. +0
    -0
      src/main/frontend/workers/encryption-worker/main.ts
  42. +0
    -66
      src/main/javascript/workers/encryption-worker/tsconfig.json
  43. +8
    -10
      tsconfig.json
  44. +0
    -0
      yarn.lock

+ 1
- 0
.gitignore View File

@@ -34,6 +34,7 @@ node_modules
bundle.js
bundle.min.js
worker.js
node
src/main/javascript/node/
dist
out


src/main/javascript/Gruntfile.js → Gruntfile.js View File

@@ -1,4 +1,4 @@
module.exports = function(grunt) {
module.exports = function (grunt) {

// Project configuration.
grunt.initConfig({
@@ -9,12 +9,12 @@ module.exports = function(grunt) {
},
build: {
// Target-specific file lists and/or options go here.
src: '../resources/static/js/bundle.js',
dest: '../resources/static/js/bundle.min.js'
src: 'src/main/resources/static/js/bundle.js',
dest: 'src/main/resources/static/js/bundle.min.js'
},
chat_worker: {
src: '../resources/static/js/worker.js',
dest: '../resources/static/js/worker.js'
src: 'src/main/resources/static/js/worker.js',
dest: 'src/main/resources/static/js/worker.js'
},
},
banner: `
@@ -27,19 +27,19 @@ module.exports = function(grunt) {
`,
usebanner: {
dist: {
options: {
position: 'top',
banner: '/*! <%= banner %> */ '
},
files: {
src: [ '../resources/static/js/bundle.min.js', '../resources/static/js/worker.js' ]
}
options: {
position: 'top',
banner: '/*! <%= banner %> */ '
},
files: {
src: ['src/main/resources/static/js/bundle.min.js', 'src/main/resources/static/js/worker.js']
}
}
},
},
browserify: {
chat_worker_dev: {
src: 'workers/encryption-worker/main.ts',
dest: '../resources/static/js/worker.js',
src: 'src/main/frontend/workers/encryption-worker/main.ts',
dest: 'src/main/resources/static/js/worker.js',
options: {
browserifyOptions: {
debug: true
@@ -47,8 +47,8 @@ module.exports = function(grunt) {
}
},
dev: {
src: 'ts/src/main.ts',
dest: '../resources/static/js/bundle.js',
src: 'src/main/frontend/chat/main.ts',
dest: 'src/main/resources/static/js/bundle.js',
options: {
browserifyOptions: {
debug: true
@@ -56,8 +56,8 @@ module.exports = function(grunt) {
}
},
prod: {
src: 'ts/src/main.ts',
dest: '../resources/static/js/bundle.js',
src: 'src/main/frontend/chat/main.ts',
dest: 'src/main/resources/static/js/bundle.js',
banner: '/*! Chat.js <%= grunt.template.today("yyyy-mm-dd") %> */ ',
options: {
browserifyOptions: {
@@ -65,6 +65,10 @@ module.exports = function(grunt) {
},
}
},
chat_worker_prod: {
src: 'src/main/frontend/workers/encryption-worker/main.ts',
dest: 'src/main/resources/static/js/worker.min.js',
},
options: {
plugin: [
['tsify', { target: 'ES6', noImplicitAny: true, esModuleInterop: true, allowSyntheticDefaultImports: true }], // register plugin by name
@@ -87,7 +91,7 @@ module.exports = function(grunt) {



grunt.registerTask('default', ['browserify:dev','browserify:chat_worker_dev'])
grunt.registerTask('prod', ["browserify:prod", 'browserify:chat_worker_dev', "terser",'usebanner'])
grunt.registerTask('default', ['browserify:dev', 'browserify:chat_worker_dev'])
grunt.registerTask('prod', ["browserify:prod", 'browserify:chat_worker_dev', "terser", 'usebanner'])

};

src/main/javascript/package.json → package.json View File

@@ -55,6 +55,6 @@
}
},
"scripts": {
"watch": "watchify ts/src/main.ts -p [ tsify --target ES6 --noImplicitAny ] --debug -o ../resources/static/js/bundle.js"
"watch": "watchify src/main/frontend/chat/main.ts -p [ tsify --target ES6 --noImplicitAny ] --debug -o src/main/resources/static/js/bundle.js"
}
}
}

+ 2
- 2
pom.xml View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -152,7 +152,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>1.9.1</version>
<configuration>
<workingDirectory>src/main/javascript/</workingDirectory>
<workingDirectory>.</workingDirectory>
</configuration>
<executions>
<execution>


src/main/javascript/ts/src/SprintfTest.d.ts → src/main/frontend/chat/SprintfTest.d.ts View File


src/main/javascript/ts/src/controller/AbstractController.ts → src/main/frontend/chat/controller/AbstractController.ts View File


src/main/javascript/ts/src/controller/ChatController.ts → src/main/frontend/chat/controller/ChatController.ts View File


src/main/javascript/ts/src/controller/UserController.ts → src/main/frontend/chat/controller/UserController.ts View File


src/main/javascript/ts/src/dto/ChatMessageDTO.ts → src/main/frontend/chat/dto/ChatMessageDTO.ts View File


src/main/javascript/ts/src/dto/MessageCipherDTO.ts → src/main/frontend/chat/dto/MessageCipherDTO.ts View File


src/main/javascript/ts/src/main.ts → src/main/frontend/chat/main.ts View File


src/main/javascript/ts/src/model/AbstractModel.ts → src/main/frontend/chat/model/AbstractModel.ts View File


src/main/javascript/ts/src/model/ChatModel.ts → src/main/frontend/chat/model/ChatModel.ts View File


src/main/javascript/ts/src/model/ChatModelHelper.ts → src/main/frontend/chat/model/ChatModelHelper.ts View File


src/main/javascript/ts/src/model/FetchErrorHandler.ts → src/main/frontend/chat/model/FetchErrorHandler.ts View File


src/main/javascript/ts/src/model/ModelFactory.ts → src/main/frontend/chat/model/ModelFactory.ts View File

@@ -4,8 +4,8 @@ import { UserModel } from "./UserModel";
export class ModelFactory {
static createModel(modelName: string): Model {
switch (modelName) {
case "USER": return new UserModel();
break;
// case "USER": return new UserModel();
// break;
default: throw new Error("Invalid model name");
}
}

src/main/javascript/ts/src/model/UserModel.ts → src/main/frontend/chat/model/UserModel.ts View File


src/main/javascript/ts/src/observe/Observable.ts → src/main/frontend/chat/observe/Observable.ts View File


src/main/javascript/ts/src/observe/Observer.ts → src/main/frontend/chat/observe/Observer.ts View File


src/main/javascript/ts/src/observe/ObserverData.ts → src/main/frontend/chat/observe/ObserverData.ts View File


src/main/javascript/ts/src/service/AlertifyNotificationService.ts → src/main/frontend/chat/service/AlertifyNotificationService.ts View File


src/main/javascript/ts/src/service/EncryptionService.ts → src/main/frontend/chat/service/EncryptionService.ts View File


src/main/javascript/ts/src/service/EncryptionServiceFactory.ts → src/main/frontend/chat/service/EncryptionServiceFactory.ts View File


src/main/javascript/ts/src/service/FuseSearchService.ts → src/main/frontend/chat/service/FuseSearchService.ts View File


src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts → src/main/frontend/chat/service/MarkDownItMarkDownService.ts View File


src/main/javascript/ts/src/service/MarkDownService.ts → src/main/frontend/chat/service/MarkDownService.ts View File


src/main/javascript/ts/src/service/NotificationService.ts → src/main/frontend/chat/service/NotificationService.ts View File


src/main/javascript/ts/src/service/SJCLEncryptionService.ts → src/main/frontend/chat/service/SJCLEncryptionService.ts View File


src/main/javascript/ts/src/service/SearchService.ts → src/main/frontend/chat/service/SearchService.ts View File


src/main/javascript/ts/src/singleton/JsonAPI.ts → src/main/frontend/chat/singleton/JsonAPI.ts View File


src/main/javascript/ts/src/singleton/Sprintf.ts → src/main/frontend/chat/singleton/Sprintf.ts View File


src/main/javascript/ts/src/template/TemplateFactory.ts → src/main/frontend/chat/template/TemplateFactory.ts View File


src/main/javascript/ts/src/view/AbstractView.ts → src/main/frontend/chat/view/AbstractView.ts View File


src/main/javascript/ts/src/view/ChatView.ts → src/main/frontend/chat/view/ChatView.ts View File


src/main/javascript/ts/src/view/ChatViewDeps.ts → src/main/frontend/chat/view/ChatViewDeps.ts View File


src/main/javascript/ts/src/view/FetchHandler.ts → src/main/frontend/chat/view/FetchHandler.ts View File


src/main/javascript/ts/src/view/UserView.ts → src/main/frontend/chat/view/UserView.ts View File


src/main/javascript/ts/src/view/UserViewDeps.ts → src/main/frontend/chat/view/UserViewDeps.ts View File


src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts → src/main/frontend/chat/viewmodel/ActiveUserViewModel.ts View File


src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts → src/main/frontend/chat/viewmodel/ChatMessageViewModel.ts View File


src/main/javascript/workers/encryption-worker/main.ts → src/main/frontend/workers/encryption-worker/main.ts View File


+ 0
- 66
src/main/javascript/workers/encryption-worker/tsconfig.json View File

@@ -1,66 +0,0 @@
{
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
}
}

src/main/javascript/ts/tsconfig.json → tsconfig.json View File

@@ -2,8 +2,8 @@
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "ES2017", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [ "ES2015" ],
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
@@ -13,7 +13,7 @@
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./out", /* Redirect output structure to the directory. */
// "outDir": "./out" /* Redirect output structure to the directory. */,
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
@@ -23,7 +23,7 @@
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
@@ -44,9 +44,9 @@
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
"allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
"allowUmdGlobalAccess": true /* Allow accessing UMD globals from modules. */,
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -58,7 +58,5 @@
/* Advanced Options */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
},
"include": [
"src/**/*"
]
}
"include": ["src/main/frontend/**/*"]
}

src/main/javascript/yarn.lock → yarn.lock View File


Loading…
Cancel
Save