Skip to content

Commit 326f261

Browse files
authored
Proper webapp (#463)
* Setup webapp routing * working baseUrl/absoluteBaseUrl * Removed menu item about Removed the info page Fixed the garbage collection of games Notifications not localhost (wip) * Remove site generation * routing fix, removed site styling
1 parent 293bbd7 commit 326f261

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+271
-908
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Icon
1212
# Thumbnails
1313
._*
1414

15+
#editor
16+
.vscode
17+
1518
# Files that might appear in the root of a volume
1619
.DocumentRevisions-V100
1720
.fseventsd

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
include "com.enonic.xp:lib-event:${xpVersion}"
3434
include "com.enonic.xp:lib-task:${xpVersion}"
3535
include "com.enonic.xp:lib-mail:${xpVersion}"
36+
include 'com.enonic.lib:lib-router:2.1.0'
3637
include "com.enonic.lib:lib-thymeleaf:2.0.0"
3738
include "com.enonic.lib:lib-mustache:2.0.0"
3839
include "com.enonic.lib:lib-http-client:2.1.1"

config/webpack.aot.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ module.exports = webpackMerge(commonConfig, {
3636
plugins: [
3737
aotPlugin,
3838
new HtmlWebpackPlugin({
39-
template: 'src/main/resources/site/pages/pwa/pwa.ejs',
40-
filename: '../site/pages/pwa/pwa.html',
41-
inject: false
39+
template: 'src/main/resources/webapp/webapp.ejs',
40+
filename: '../webapp/webapp.html',
41+
inject: false,
4242
}),
4343
new webpack.optimize.UglifyJsPlugin({
4444
minimize: true,

config/webpack.common.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ module.exports = {
3232
'vendor': './src/angular/vendor.ts',
3333
'app': './src/angular/main.ts',
3434
'styles': './src/angular/styles.less',
35-
'critical': './src/main/resources/assets/css/critical.less'
3635
},
3736

3837
resolve: {
@@ -72,7 +71,7 @@ module.exports = {
7271
{
7372
// load app wide styles
7473
test: /\.(less|css)$/,
75-
include: [helpers.root('src', 'angular'), helpers.root('src', 'main', 'resources', 'assets')],
74+
include: [helpers.root('src', 'angular')],
7675
exclude: helpers.root('src', 'angular', 'app'),
7776
loader: ExtractTextPlugin.extract({
7877
fallback: 'style-loader',

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/angular/app/app.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<li routerLinkActive="active"><a routerLink="/teams" href="#">Teams</a></li>
2525
<li routerLinkActive="active"><a routerLink="/players" href="#">Players</a></li>
2626
<li routerLinkActive="active"><a routerLink="/games" href="#">Games</a></li>
27-
<li *ngFor="let infoPage of infoPages" routerLinkActive="active"><a routerLink="/{{infoPage.name}}" href="#">{{infoPage.title}}</a></li>
2827
<li *ngIf="isAuthenticated">
2928
<ul id="user-dropdown" class="dropdown-content">
3029
<li><a href="#" routerLink="/">{{playerName}}</a></li>

src/main/resources/assets/css/critical.less

Lines changed: 0 additions & 173 deletions
This file was deleted.

0 commit comments

Comments
 (0)