diff --git a/.drone.yml b/.drone.yml index d57fb37..5de196b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,7 +60,7 @@ steps: - mkdir -p $${BUILD_PATH}/${DRONE_BRANCH} - rm -rf $${BUILD_PATH}/${DRONE_BRANCH}/* - cd $${BUILD_PATH}/${DRONE_BRANCH} - - tar -xjf /tmp/vault-frontend-${DRONE_BRANCH}/app.tar.bz2 -C ./ + - tar -xjf /tmp/orchid-map-${DRONE_BRANCH}/app.tar.bz2 -C ./ - cp -a $${ENV_PATH}/${DRONE_BRANCH}/. $${BUILD_PATH}/${DRONE_BRANCH} - docker-compose build - docker-compose up -d diff --git a/.env b/.env new file mode 100644 index 0000000..295aeb2 --- /dev/null +++ b/.env @@ -0,0 +1,4 @@ +PUBLIC_PATH = https://localhost:3000/ +API_ADDR = https://alpha-map.vault48.org:3001 +OSRM_URL = https://vault48.org:5001/route/v1 +OSRM_PROFILE = bike diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..8e9b9d8 --- /dev/null +++ b/.env.example @@ -0,0 +1,4 @@ +PUBLIC_PATH = https://alpha-map.vault48.org/ +API_ADDR = https://alpha-map.vault48.org:3001 +OSRM_URL = https://vault48.org:5001/route/v1 +OSRM_PROFILE = bike diff --git a/.gitignore b/.gitignore index 382b80e..ecb633c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,10 +18,12 @@ yarn-error.log /config/backend.js /config/pwa.js -/src/config/frontend.js +/src/config/frontend.ts /src/config/backend.js /src/config/pwa.js # Bundle *.js.map stats.json + +.env diff --git a/src/config/frontend.example.js b/src/config/frontend.example.js deleted file mode 100644 index ba792af..0000000 --- a/src/config/frontend.example.js +++ /dev/null @@ -1,27 +0,0 @@ -import { DEFAULT_PROVIDER, PROVIDERS } from '~/constants/providers'; -import { LatLngLiteral } from 'leaflet'; - -const PUBLIC_PATH = ''; -const API_ADDR = 'https://HOSTNAME.org:3000'; -const OSRM_URL = 'https://HOSTNAME.org:5001/route/v1'; -const OSRM_PROFILE = 'bike'; -const OSRM_TEST_URL = ([south_west, north_east]: [LatLngLiteral, LatLngLiteral]) => ( - `${OSRM_URL}/${OSRM_PROFILE}/${Object.values(south_west).join(',')};${Object.values(north_east).join(',')}` -); - -export const CLIENT = { - OSRM_URL, - API_ADDR, - OSRM_TEST_URL, - OSRM_PROFILE, - STROKE_WIDTH: 5, - PUBLIC_PATH, -}; - -export const COLORS = { - PATH_COLOR: ['#ff7700', '#ff3344'], -}; - -export const PROVIDER = PROVIDERS[DEFAULT_PROVIDER]; - -export const MOBILE_BREAKPOINT = 768; diff --git a/src/config/pwa.example.js b/src/config/pwa.example.js deleted file mode 100644 index 6e99f4f..0000000 --- a/src/config/pwa.example.js +++ /dev/null @@ -1,22 +0,0 @@ -const path = require('path'); - -module.exports = { - MANIFEST: (src) => ({ - name: 'Редактор маршрутов', - short_name: 'Маршруты', - description: 'Велосипедные маршруты в новосибирске', - background_color: '#333333', - theme_color: '#01579b', - display: 'fullscreen', - 'theme-color': '#01579b', - start_url: '/', - icons: [ - { - src, // : path.resolve('./src/sprites/app.png') - sizes: [96, 128, 192, 256, 384, 512], - destination: path.join('assets', 'icons') - } - ] - }), - PUBLIC_PATH: 'https://alpha-map.vault48.org/', -}; diff --git a/webpack.config.js b/webpack.config.js index f91dd0d..f44fb84 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,6 +8,7 @@ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const WebpackPwaManifest = require('webpack-pwa-manifest'); const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin'); const PWA_CONFIG = require('./src/config/pwa'); +const Dotenv = require('dotenv-webpack'); /* Plugins */ @@ -32,15 +33,6 @@ const devtool = isDevelopment ? 'cheap-module-eval-source-map' : 'source-map'; const resolve = { alias: { - // $components: path.join(__dirname, 'src/components'), - // $containers: path.join(__dirname, 'src/containers'), - // $constants: path.join(__dirname, 'src/constants'), - // $sprites: path.join(__dirname, 'src/sprites'), - // $config: path.join(__dirname, './config'), - // $styles: path.join(__dirname, 'src/styles'), - // $redux: path.join(__dirname, 'src/redux'), - // $utils: path.join(__dirname, 'src/utils'), - // $modules: path.join(__dirname, 'src/modules'), '~': path.join(__dirname, 'src'), }, extensions: ['*', '.ts', '.tsx', '.js', '.jsx', '.json'] @@ -51,24 +43,20 @@ const resolve = { module.exports = () => { /* Export */ const plugins = [ - // concatPlugin, htmlPlugin, - // flowPlugin, - // gitPlugin, new webpack.IgnorePlugin(/^osrm-text-instructions$/, /leaflet-routing-machine$/), miniCssExractPlugin, new webpack.HashedModuleIdsPlugin(), new WebpackPwaManifest(PWA_CONFIG.MANIFEST(path.resolve('./src/sprites/app.png'))), - new SWPrecacheWebpackPlugin( - { - cacheId: 'my-domain-cache-id', - dontCacheBustUrlsMatching: /\.\w{8}\./, - filename: 'service-worker.js', - minify: true, - navigateFallback: `${PWA_CONFIG.PUBLIC_PATH}index.html`, - staticFileGlobsIgnorePatterns: [/\.map$/, /manifest\.json$/] - } - ), + new Dotenv(), + new SWPrecacheWebpackPlugin({ + cacheId: 'my-domain-cache-id', + dontCacheBustUrlsMatching: /\.\w{8}\./, + filename: 'service-worker.js', + minify: true, + navigateFallback: `${PWA_CONFIG.PUBLIC_PATH}index.html`, + staticFileGlobsIgnorePatterns: [/\.map$/, /manifest\.json$/], + }), ]; return {