github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Add webpack-dev-server for development environment

Browse Source
This commit is contained in:
Simon Larsen
2023-12-19 17:23:53 +00:00
parent 23a79ca158
commit 97f7a6e4ef
7 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Accounts/Dockerfile.tpl
View File

@@ -74,6 +74,8 @@ RUN npm i -D webpack-cli
{{ if eq .Env.ENVIRONMENT "development" }}
RUN mkdir /usr/src/app/dev-env
RUN touch /usr/src/app/dev-env/.env
RUN npm i -D webpack-dev-server
#Run the app
CMD [ "npm", "run", "dev" ]
{{ else }}

1
AdminDashboard/Dockerfile.tpl
View File

@@ -73,6 +73,7 @@ RUN npm i -D webpack-cli
#Run the app
RUN mkdir /usr/src/app/dev-env
RUN touch /usr/src/app/dev-env/.env
RUN npm i -D webpack-dev-server
CMD [ "npm", "run", "dev" ]
{{ else }}
# Copy app source

6
CommonServer/API/StatusPageAPI.ts
View File

@@ -1134,7 +1134,6 @@ export default class StatusPageAPI extends BaseAPI<
) => {
try {
await this.subscribeToStatusPage(req);
return Response.sendEmptyResponse(req, res);
} catch (err) {
next(err);
@@ -1957,6 +1956,11 @@ export default class StatusPageAPI extends BaseAPI<
}
if (isUpdate) {
// check isUnsubscribed is set to false.
statusPageSubscriber.isUnsubscribed = req.body.data['isUnsubscribed'] ? true : false;
await StatusPageSubscriberService.updateOneById({
id: statusPageSubscriber.id!,
data: statusPageSubscriber,

2
CommonUI/src/Utils/ModelAPI/ModelAPI.ts
View File

@@ -141,7 +141,7 @@ export default class ModelAPI {
? HTTPMethod.POST
: HTTPMethod.PUT;
if (httpMethod === HTTPMethod.PUT) {
if (httpMethod === HTTPMethod.PUT && !data.requestOptions?.overrideRequestUrl) {
apiUrl = apiUrl.addRoute(`/${data.model._id}`);
}

1
Dashboard/Dockerfile.tpl
View File

@@ -72,6 +72,7 @@ RUN npm i -D webpack-cli
#Run the app
RUN mkdir /usr/src/app/dev-env
RUN touch /usr/src/app/dev-env/.env
RUN npm i -D webpack-dev-server
CMD [ "npm", "run", "dev" ]
{{ else }}
# Copy app source

1
StatusPage/Dockerfile.tpl
View File

@@ -73,6 +73,7 @@ RUN npm i -D webpack-cli
{{ if eq .Env.ENVIRONMENT "development" }}
RUN mkdir /usr/src/app/dev-env
RUN touch /usr/src/app/dev-env/.env
RUN npm i -D webpack-dev-server
#Run the app
CMD [ "npm", "run", "dev" ]
{{ else }}

3
StatusPage/src/Pages/Subscribe/UpdateSubscription.tsx
View File

@@ -43,12 +43,13 @@ const SubscribePage: FunctionComponent<SubscribePageProps> = (
const updateApiUrl: URL = URL.fromString(
URL.fromString(STATUS_PAGE_API_URL.toString())
.addRoute(`/update-subscription/${statusPageId.toString()}`)
.addRoute('/' + statusPageSubscriberId.toString())
.toString()
);
const getSubscriptionUrl: URL = URL.fromString(
URL.fromString(STATUS_PAGE_API_URL.toString())
.addRoute(`/get-subscription/${statusPageId.toString()}`)
.addRoute(`/get-subscription/${statusPageId.toString()}`).addRoute('/' + statusPageSubscriberId.toString())
.toString()
);