Skip to content
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Frontend
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
384
Merge Requests
62
CI / CD
Security & Compliance
Packages
Analytics
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
91107a98
Commit
91107a98
authored
2 hours ago
by
Mark Harding
Browse files
Options
Download
(fix):
#2535
pass route params to server
parent
a8ed91a5
No related merge requests found
Pipeline
#115010089
failed with stages
in 6 minutes and 51 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
10 deletions
+29
-10
server.ts
View file @
91107a98
...
...
@@ -3,6 +3,7 @@ import 'reflect-metadata';
import
{
join
}
from
'
path
'
;
import
{
readFileSync
}
from
'
fs
'
;
import
*
as
_url
from
'
url
'
;
import
{
ngExpressEngine
}
from
'
@nguniversal/express-engine
'
;
import
{
REQUEST
,
RESPONSE
}
from
'
@nguniversal/express-engine/tokens
'
;
...
...
@@ -171,6 +172,14 @@ app.get('*', cache(), (req, res) => {
provide
:
'
ORIGIN_URL
'
,
useValue
:
`
${
http
}
://
${
req
.
headers
.
host
}
`
,
},
// for initial query params before router loads
{
provide
:
'
QUERY_STRING
'
,
useFactory
:
()
=>
{
return
_url
.
parse
(
req
.
url
,
true
).
search
;
},
deps
:
[],
},
],
},
(
err
,
html
)
=>
{
...
...
This diff is collapsed.
src/app/app.browser.module.ts
View file @
91107a98
...
...
@@ -12,6 +12,9 @@ PlotlyModule.plotlyjs = PlotlyJS;
@
NgModule
({
imports
:
[
MindsModule
,
PlotlyModule
,
CookieModule
],
bootstrap
:
[
Minds
],
providers
:
[{
provide
:
'
ORIGIN_URL
'
,
useValue
:
location
.
origin
}],
providers
:
[
{
provide
:
'
ORIGIN_URL
'
,
useValue
:
location
.
origin
},
{
provide
:
'
QUERY_STRING
'
,
useValue
:
location
.
search
},
],
})
export
class
AppBrowserModule
{}
This diff is collapsed.
src/app/common/common.module.ts
View file @
91107a98
import
{
NgModule
,
inject
}
from
'
@angular/core
'
;
import
{
NgModule
,
inject
,
Injector
}
from
'
@angular/core
'
;
import
{
CommonModule
as
NgCommonModule
,
isPlatformServer
,
...
...
@@ -432,8 +432,9 @@ const routes: Routes = [
},
{
provide
:
ConfigsService
,
useFactory
:
client
=>
new
ConfigsService
(
client
),
deps
:
[
Client
],
useFactory
:
(
client
,
injector
)
=>
new
ConfigsService
(
client
,
injector
.
get
(
'
QUERY_STRING
'
)),
deps
:
[
Client
,
Injector
],
},
{
provide
:
MetaService
,
...
...
This diff is collapsed.
src/app/common/services/configs.service.ts
View file @
91107a98
import
{
Client
}
from
'
../api/client.service
'
;
import
{
Injectable
}
from
'
@angular/core
'
;
import
{
Injectable
,
Inject
,
Optional
}
from
'
@angular/core
'
;
import
{
BehaviorSubject
,
Observable
}
from
'
rxjs
'
;
import
{
map
,
tap
}
from
'
rxjs/operators
'
;
...
...
@@ -7,11 +7,16 @@ import { map, tap } from 'rxjs/operators';
export
class
ConfigsService
{
private
configs
=
{};
constructor
(
private
client
:
Client
)
{}
constructor
(
private
client
:
Client
,
@
Inject
(
'
QUERY_STRING
'
)
private
queryString
:
string
)
{}
async
loadFromRemote
()
{
try
{
this
.
configs
=
await
this
.
client
.
get
(
'
api/v1/minds/config
'
);
this
.
configs
=
await
this
.
client
.
get
(
`api/v1/minds/config
${
this
.
queryString
}
`
);
}
catch
(
err
)
{
console
.
error
(
err
);
}
...
...
This diff is collapsed.
src/app/services/providers.ts
View file @
91107a98
import
{
NgZone
,
RendererFactory2
,
PLATFORM_ID
}
from
'
@angular/core
'
;
import
{
NgZone
,
RendererFactory2
,
PLATFORM_ID
,
Injector
}
from
'
@angular/core
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
Location
}
from
'
@angular/common
'
;
import
{
TransferState
}
from
'
@angular/platform-browser
'
;
...
...
@@ -186,8 +186,9 @@ export const MINDS_PROVIDERS: any[] = [
},
{
provide
:
ConfigsService
,
useFactory
:
client
=>
new
ConfigsService
(
client
),
deps
:
[
Client
],
useFactory
:
(
client
,
injector
)
=>
new
ConfigsService
(
client
,
injector
.
get
(
'
QUERY_STRING
'
)),
deps
:
[
Client
,
Injector
],
},
{
provide
:
FeaturesService
,
...
...
This diff is collapsed.
Please
register
or
sign in
to comment