Skip to content

Commit

Permalink
Merge pull request #55 from appodeal/develop
Browse files Browse the repository at this point in the history
Release v0.0.13
  • Loading branch information
jpascal authored May 15, 2019
2 parents 7944874 + 0c6800a commit 2b947cf
Show file tree
Hide file tree
Showing 66 changed files with 4,858 additions and 2,982 deletions.
6 changes: 3 additions & 3 deletions Dockerfile_mac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -- Release ---
FROM nginx:1.15.9
COPY dist/*.* /usr/share/nginx/html/
COPY download-page/*.* /usr/share/nginx/html/
COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY app/*.* /usr/share/nginx/html/
COPY html/* /usr/share/nginx/html/
COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ APP_NAME ?= admob-sync-app
docker-build:
docker build -t $(REGISTRY_BASE_URL)/$(COMPANY_NAME)/$(APP_NAME):$(TAG) .
docker-build-mac:
docker build -f Dockerfile_mac -t $(REGISTRY_BASE_URL)/$(COMPANY_NAME)/$(APP_NAME):$(TAG) .
docker build -f Dockerfile_mac -t $(REGISTRY_BASE_URL)/$(COMPANY_NAME)/$(APP_NAME):$(TAG) ./dist
docker-push:
docker push $(REGISTRY_BASE_URL)/$(COMPANY_NAME)/$(APP_NAME):$(TAG)
14 changes: 14 additions & 0 deletions config/development.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@
"updates": {
"releaseNotesUrl": "https://wiki.appodeal.com",
"updatesServerUrl": "https://amsa-updates.appodeal.com"
},
"setupOptions": {
"projectName": "Appodeal",
"appName": "Appodeal Revenue",
"clientName": "Appodeal AdMob Sync App (staging)",
"domains": [
"appodeal.com"
],
"allowedJs": [
"https://staging7.appodeal.com"
],
"allowedCallbacks": [
"https://staging7.appodeal.com/admob_plugin/api/v3/oauth/callback"
]
}
}
}
14 changes: 14 additions & 0 deletions config/production.json.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@
"updates": {
"releaseNotesUrl": "https://wiki.appodeal.com",
"updatesServerUrl": "https://amsa-updates.appodeal.com"
},
"setupOptions": {
"projectName": "Appodeal",
"appName": "Appodeal Revenue",
"clientName": "Appodeal AdMob Sync App",
"domains": [
"appodeal.com"
],
"allowedJs": [
"https://api-services.appodeal.com"
],
"allowedCallbacks": [
"https://api-services.appodeal.com/admob_plugin/api/v3/oauth/callback"
]
}
}
}
10 changes: 10 additions & 0 deletions download-page/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
node_modules
build
/.idea
**/.DS_Store
*.iml
config/*.json
/release
/dist
tmp
userData
12 changes: 6 additions & 6 deletions nginx.conf → download-page/nginx/nginx.conf.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ server {
}

if ($http_user_agent ~ Windows ) {
add_header Content-Disposition 'attachment; filename="admob-sync-app-setup-latest.exe"';
rewrite ^(.*) /admob-sync-app-setup-setup-latest.exe break;
add_header Content-Disposition 'attachment; filename="<%= dist.win.fileName %>"';
rewrite ^(.*) /<%= dist.win.fileName %> break;
}
if ($http_user_agent ~ "Mac OS" ) {
add_header Content-Disposition 'attachment; filename="admob-sync-app-latest.dmg"';
rewrite ^(.*) /admob-sync-app-latest.dmg break;
add_header Content-Disposition 'attachment; filename="<%= dist.mac.fileName %>"';
rewrite ^(.*) /<%= dist.mac.fileName %> break;
}
if ($http_user_agent ~ Linux ) {
add_header Content-Disposition 'attachment; filename="admob-sync-app-setup-latest.deb"';
rewrite ^(.*) /admob-sync-app-setup-latest.deb break;
add_header Content-Disposition 'attachment; filename="<%= dist.linux.fileName %>"';
rewrite ^(.*) /<%= dist.linux.fileName %> break;
}

rewrite ^(.*) /index.html last;
Expand Down
46 changes: 37 additions & 9 deletions download-page/index.html → download-page/src/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
align-self: center;
}
.platforms a {
display: flex;
background: #e01a17;
Expand All @@ -46,12 +47,26 @@
margin: 20px;
border-radius: 8px;
padding: 10px;
height: 60px;
}
.platforms a .label {
text-align: left;
padding: 10px;
}
.platforms a small {
font-size: small;
}
.platforms svg {
height: 60px;
margin: 0 10px;
}
.platforms svg.mac {
height: 55px;
}
@media all and (min-width: 767px) {
.platforms {
Expand All @@ -62,11 +77,11 @@
</head>
<body>
<div class="root">
<img src="logo.png"/>
<img src="./logo.png"/>
<p>Choose your platform to download app</p>
<div class="platforms">
<div>
<a href="admob-sync-app-setup-latest.exe" download>
<a href="<%= dist.win.fileName %>" download>
<svg focusable="false"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 448 512"
Expand All @@ -75,34 +90,47 @@
d="M0 93.7l183.6-25.3v177.4H0V93.7zm0 324.6l183.6 25.3V268.4H0v149.9zm203.8 28L448 480V268.4H203.8v177.9zm0-380.6v180.1H448V32L203.8 65.7z"
></path>
</svg>
Windows</a>
<div class="label">
Windows
<br>
<small><%= dist.win.version %></small>
</div>
</a>
</div>
<div>
<a href="admob-sync-app-latest.dmg" download>
<a href="<%= dist.mac.fileName %>" download>
<svg focusable="false"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 384 512"
class="svg-inline--fa fa-apple fa-w-12 fa-9x"
class="mac"
>
<path fill="currentColor"
d="M318.7 268.7c-.2-36.7 16.4-64.4 50-84.8-18.8-26.9-47.2-41.7-84.7-44.6-35.5-2.8-74.3 20.7-88.5 20.7-15 0-49.4-19.7-76.4-19.7C63.3 141.2 4 184.8 4 273.5q0 39.3 14.4 81.2c12.8 36.7 59 126.7 107.2 125.2 25.2-.6 43-17.9 75.8-17.9 31.8 0 48.3 17.9 76.4 17.9 48.6-.7 90.4-82.5 102.6-119.3-65.2-30.7-61.7-90-61.7-91.9zm-56.6-164.2c27.3-32.4 24.8-61.9 24-72.5-24.1 1.4-52 16.4-67.9 34.9-17.5 19.8-27.8 44.3-25.6 71.9 26.1 2 49.9-11.4 69.5-34.3z"
></path>
</svg>
Mac OS
<div class="label">
Mac OS
<br>
<small><%= dist.mac.version %></small>
</div>
</a>
</div>
<div>
<a href="admob-sync-app-setup-latest.deb" download>
<a href="<%= dist.linux.fileName %>" download>
<svg focusable="false"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 448 512"
class="svg-inline--fa fa-linux fa-w-14 fa-9x"
>
<path fill="currentColor"
d="M220.8 123.3c1 .5 1.8 1.7 3 1.7 1.1 0 2.8-.4 2.9-1.5.2-1.4-1.9-2.3-3.2-2.9-1.7-.7-3.9-1-5.5-.1-.4.2-.8.7-.6 1.1.3 1.3 2.3 1.1 3.4 1.7zm-21.9 1.7c1.2 0 2-1.2 3-1.7 1.1-.6 3.1-.4 3.5-1.6.2-.4-.2-.9-.6-1.1-1.6-.9-3.8-.6-5.5.1-1.3.6-3.4 1.5-3.2 2.9.1 1 1.8 1.5 2.8 1.4zM420 403.8c-3.6-4-5.3-11.6-7.2-19.7-1.8-8.1-3.9-16.8-10.5-22.4-1.3-1.1-2.6-2.1-4-2.9-1.3-.8-2.7-1.5-4.1-2 9.2-27.3 5.6-54.5-3.7-79.1-11.4-30.1-31.3-56.4-46.5-74.4-17.1-21.5-33.7-41.9-33.4-72C311.1 85.4 315.7.1 234.8 0 132.4-.2 158 103.4 156.9 135.2c-1.7 23.4-6.4 41.8-22.5 64.7-18.9 22.5-45.5 58.8-58.1 96.7-6 17.9-8.8 36.1-6.2 53.3-6.5 5.8-11.4 14.7-16.6 20.2-4.2 4.3-10.3 5.9-17 8.3s-14 6-18.5 14.5c-2.1 3.9-2.8 8.1-2.8 12.4 0 3.9.6 7.9 1.2 11.8 1.2 8.1 2.5 15.7.8 20.8-5.2 14.4-5.9 24.4-2.2 31.7 3.8 7.3 11.4 10.5 20.1 12.3 17.3 3.6 40.8 2.7 59.3 12.5 19.8 10.4 39.9 14.1 55.9 10.4 11.6-2.6 21.1-9.6 25.9-20.2 12.5-.1 26.3-5.4 48.3-6.6 14.9-1.2 33.6 5.3 55.1 4.1.6 2.3 1.4 4.6 2.5 6.7v.1c8.3 16.7 23.8 24.3 40.3 23 16.6-1.3 34.1-11 48.3-27.9 13.6-16.4 36-23.2 50.9-32.2 7.4-4.5 13.4-10.1 13.9-18.3.4-8.2-4.4-17.3-15.5-29.7zM223.7 87.3c9.8-22.2 34.2-21.8 44-.4 6.5 14.2 3.6 30.9-4.3 40.4-1.6-.8-5.9-2.6-12.6-4.9 1.1-1.2 3.1-2.7 3.9-4.6 4.8-11.8-.2-27-9.1-27.3-7.3-.5-13.9 10.8-11.8 23-4.1-2-9.4-3.5-13-4.4-1-6.9-.3-14.6 2.9-21.8zM183 75.8c10.1 0 20.8 14.2 19.1 33.5-3.5 1-7.1 2.5-10.2 4.6 1.2-8.9-3.3-20.1-9.6-19.6-8.4.7-9.8 21.2-1.8 28.1 1 .8 1.9-.2-5.9 5.5-15.6-14.6-10.5-52.1 8.4-52.1zm-13.6 60.7c6.2-4.6 13.6-10 14.1-10.5 4.7-4.4 13.5-14.2 27.9-14.2 7.1 0 15.6 2.3 25.9 8.9 6.3 4.1 11.3 4.4 22.6 9.3 8.4 3.5 13.7 9.7 10.5 18.2-2.6 7.1-11 14.4-22.7 18.1-11.1 3.6-19.8 16-38.2 14.9-3.9-.2-7-1-9.6-2.1-8-3.5-12.2-10.4-20-15-8.6-4.8-13.2-10.4-14.7-15.3-1.4-4.9 0-9 4.2-12.3zm3.3 334c-2.7 35.1-43.9 34.4-75.3 18-29.9-15.8-68.6-6.5-76.5-21.9-2.4-4.7-2.4-12.7 2.6-26.4v-.2c2.4-7.6.6-16-.6-23.9-1.2-7.8-1.8-15 .9-20 3.5-6.7 8.5-9.1 14.8-11.3 10.3-3.7 11.8-3.4 19.6-9.9 5.5-5.7 9.5-12.9 14.3-18 5.1-5.5 10-8.1 17.7-6.9 8.1 1.2 15.1 6.8 21.9 16l19.6 35.6c9.5 19.9 43.1 48.4 41 68.9zm-1.4-25.9c-4.1-6.6-9.6-13.6-14.4-19.6 7.1 0 14.2-2.2 16.7-8.9 2.3-6.2 0-14.9-7.4-24.9-13.5-18.2-38.3-32.5-38.3-32.5-13.5-8.4-21.1-18.7-24.6-29.9s-3-23.3-.3-35.2c5.2-22.9 18.6-45.2 27.2-59.2 2.3-1.7.8 3.2-8.7 20.8-8.5 16.1-24.4 53.3-2.6 82.4.6-20.7 5.5-41.8 13.8-61.5 12-27.4 37.3-74.9 39.3-112.7 1.1.8 4.6 3.2 6.2 4.1 4.6 2.7 8.1 6.7 12.6 10.3 12.4 10 28.5 9.2 42.4 1.2 6.2-3.5 11.2-7.5 15.9-9 9.9-3.1 17.8-8.6 22.3-15 7.7 30.4 25.7 74.3 37.2 95.7 6.1 11.4 18.3 35.5 23.6 64.6 3.3-.1 7 .4 10.9 1.4 13.8-35.7-11.7-74.2-23.3-84.9-4.7-4.6-4.9-6.6-2.6-6.5 12.6 11.2 29.2 33.7 35.2 59 2.8 11.6 3.3 23.7.4 35.7 16.4 6.8 35.9 17.9 30.7 34.8-2.2-.1-3.2 0-4.2 0 3.2-10.1-3.9-17.6-22.8-26.1-19.6-8.6-36-8.6-38.3 12.5-12.1 4.2-18.3 14.7-21.4 27.3-2.8 11.2-3.6 24.7-4.4 39.9-.5 7.7-3.6 18-6.8 29-32.1 22.9-76.7 32.9-114.3 7.2zm257.4-11.5c-.9 16.8-41.2 19.9-63.2 46.5-13.2 15.7-29.4 24.4-43.6 25.5s-26.5-4.8-33.7-19.3c-4.7-11.1-2.4-23.1 1.1-36.3 3.7-14.2 9.2-28.8 9.9-40.6.8-15.2 1.7-28.5 4.2-38.7 2.6-10.3 6.6-17.2 13.7-21.1.3-.2.7-.3 1-.5.8 13.2 7.3 26.6 18.8 29.5 12.6 3.3 30.7-7.5 38.4-16.3 9-.3 15.7-.9 22.6 5.1 9.9 8.5 7.1 30.3 17.1 41.6 10.6 11.6 14 19.5 13.7 24.6zM173.3 148.7c2 1.9 4.7 4.5 8 7.1 6.6 5.2 15.8 10.6 27.3 10.6 11.6 0 22.5-5.9 31.8-10.8 4.9-2.6 10.9-7 14.8-10.4s5.9-6.3 3.1-6.6-2.6 2.6-6 5.1c-4.4 3.2-9.7 7.4-13.9 9.8-7.4 4.2-19.5 10.2-29.9 10.2s-18.7-4.8-24.9-9.7c-3.1-2.5-5.7-5-7.7-6.9-1.5-1.4-1.9-4.6-4.3-4.9-1.4-.1-1.8 3.7 1.7 6.5z"
></path>
</svg>
Linux</a>
<div class="label">
Linux
<br>
<small><%= dist.linux.version %></small>
</div>
</a>
</div>

</div>
Expand Down
2 changes: 2 additions & 0 deletions download-page/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// just empty js
// to be able use webpack with ejs for index.html
File renamed without changes
9 changes: 9 additions & 0 deletions download-page/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"esModuleInterop": false
},
"include": [
"./**/*"
]
}
61 changes: 61 additions & 0 deletions download-page/webpack.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import CopyPlugin from 'copy-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import * as path from 'path';
import webpack from 'webpack';
import * as dist from '../dist/app/dist-info.json';


export const SRC_PATH = path.resolve(__dirname, './src');
export const NGINX_PATH = path.resolve(__dirname, './nginx');

export const BUILD_PATH = path.resolve(__dirname, '..', 'dist');

export default (env: webpack.Configuration): webpack.Configuration => {
return {
context: __dirname,
target: 'web',
entry: path.resolve(SRC_PATH, 'index.js'),
output: {
path: BUILD_PATH,
filename: 'html/main.js'
},
module: {
rules: [
{
test: /\.(ejs)$/,
use: [
{
loader: 'ejs-webpack-loader',
options: {
data: {dist},
htmlmin: false
}
}
]

}
]
},
plugins: [
new HtmlWebpackPlugin({
template: path.join(SRC_PATH, 'index.ejs'),
filename: 'html/index.html',
htmlmin: true,
inject: false
}),
new HtmlWebpackPlugin({
hash: false,
inject: false,
template: path.join(NGINX_PATH, 'nginx.conf.ejs'),
filename: 'nginx/nginx.conf'

}),
new CopyPlugin([
{
from: path.join(SRC_PATH, 'logo.png'),
to: 'html/logo.png'
}
])
]
};
}
Loading

0 comments on commit 2b947cf

Please sign in to comment.