Skip to content

Commit 56e8867

Browse files
Merge branch 'development' of github.com:fossasia/open-event-frontend into import_event
2 parents bbc6331 + 8a4df90 commit 56e8867

File tree

189 files changed

+52887
-23934
lines changed

Some content is hidden

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

189 files changed

+52887
-23934
lines changed

.dockerignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
dist
5+
tmp
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
node_modules
9+
bower_components
10+
Dockerfile
1011

1112
# misc
1213
/.sass-cache

.jshintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"esversion": 6
3+
}

Dockerfile

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.15-alpine as builder
1+
FROM node:10-alpine as builder
22
LABEL maintainer="Niranjan Rajendran <[email protected]>"
33

44
WORKDIR /app
@@ -10,16 +10,28 @@ COPY package.json yarn.lock ./
1010
RUN yarn install
1111

1212
COPY . .
13-
RUN node scripts/l10n.js generate
14-
RUN touch .env && JOBS=1 npx ember build -prod
13+
14+
RUN node scripts/l10n.js generate && \
15+
touch .env && \
16+
JOBS=1 yarn build -prod
1517

1618
##
1719
##
1820

19-
FROM steebchen/nginx-spa:stable
21+
FROM node:10-alpine
22+
23+
WORKDIR /fastboot
24+
25+
COPY scripts/fastboot-server.js .
26+
COPY --from=builder /app/dist/ app/
2027

21-
COPY --from=builder /app/dist /app
28+
RUN apk add --no-cache ca-certificates && \
29+
cp app/package.json . && \
30+
yarn install && \
31+
yarn add fastboot-app-server && \
32+
rm -rf yarn.lock && \
33+
yarn cache clean
2234

23-
EXPOSE 80
35+
EXPOSE 4000
2436

25-
CMD ["nginx"]
37+
CMD ["node", "fastboot-server.js"]
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-by-event', 'admin/sales/by-event');
7+
return url;
8+
}
9+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-by-locations', 'admin/sales/by-location');
7+
return url;
8+
}
9+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-by-marketers', 'admin/sales/by-marketer');
7+
return url;
8+
}
9+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-by-organizer', 'admin/sales/by-organizer');
7+
return url;
8+
}
9+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-discounteds', 'admin/sales/discounted');
7+
return url;
8+
}
9+
});

app/adapters/admin-sales-fee.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-fee', 'admin/sales/fee');
7+
return url;
8+
}
9+
});
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import ApplicationAdapter from './application';
2+
3+
export default ApplicationAdapter.extend({
4+
buildURL(modelName, id, snapshot, requestType, query) {
5+
let url = this._super(modelName, id, snapshot, requestType, query);
6+
url = url.replace('admin-sales-by-invoice', 'admin/sales/invoice');
7+
return url;
8+
}
9+
});

0 commit comments

Comments
 (0)