From 879528d965250cc1ae94672df73f633909522f60 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 13 Nov 2020 17:33:04 +0100 Subject: build process for javascript. rewrite some resources with webpack --- animism-align/cli/commands/site/export.py | 6 +++--- animism-align/frontend/app/constants.js | 2 +- animism-align/frontend/app/views/audio/audio.actions.js | 2 +- animism-align/frontend/site/index.js | 2 +- animism-align/frontend/site/site/site.actions.js | 1 - animism-align/frontend/site/store.js | 6 ++---- animism-align/webpack.config.site.js | 3 +++ 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/animism-align/cli/commands/site/export.py b/animism-align/cli/commands/site/export.py index 29804c1..f4cc23e 100644 --- a/animism-align/cli/commands/site/export.py +++ b/animism-align/cli/commands/site/export.py @@ -46,10 +46,10 @@ def cli(ctx, opt_output_dir): media_to_copy = rewrite_db_media(db, site_fp_media, media_url) db['urls'] = { 'audio': 'media/animism_episode_01.mp3' } - media_to_copy.append({ + media_to_copy['audio'] = { 'src': join(app_cfg.DIR_DATA_STORE, 'peaks/animism_episode_01_2810.mp3'), 'dst': join(site_fp_media, 'animism_episode_01.mp3'), - }) + } # ------------------------------------------------ # build the index.html @@ -102,7 +102,7 @@ def cli(ctx, opt_output_dir): def copy_media(fp_media, to_copy): os.makedirs(fp_media, exist_ok=True) - print(f"copying {len(to_copy.keys())} uploaded files") + print(f"Copying {len(to_copy.keys())} files") total_size = 0 for fp in to_copy.values(): copyfile(fp['src'], fp['dst']) diff --git a/animism-align/frontend/app/constants.js b/animism-align/frontend/app/constants.js index 62e9458..5ef91aa 100644 --- a/animism-align/frontend/app/constants.js +++ b/animism-align/frontend/app/constants.js @@ -5,7 +5,7 @@ export const ENV_DEVELOPMENT = NODE_ENV !== 'production' export const ENV_PRODUCTION = NODE_ENV === 'production' export const URLS = ENV_PRODUCTION ? { - audio: 'media/animism_episode_01_2810.mp3', + audio: '/episode1/media/animism_episode_01_2810.mp3', } : { audio: '/static/data_store/peaks/animism_episode_01_2810.mp3', peaks: '/static/data_store/peaks/peaks.json', diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js index ed9bf47..b5d4e1b 100644 --- a/animism-align/frontend/app/views/audio/audio.actions.js +++ b/animism-align/frontend/app/views/audio/audio.actions.js @@ -1,5 +1,5 @@ import * as types from 'app/types' -import { store, history, dispatch } from 'app/store' +import { store, dispatch } from 'app/store' import { URLS } from 'app/constants' diff --git a/animism-align/frontend/site/index.js b/animism-align/frontend/site/index.js index ab7c998..448d38d 100644 --- a/animism-align/frontend/site/index.js +++ b/animism-align/frontend/site/index.js @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom' import { Provider } from 'react-redux' import './site.css' -import 'app/common/forms.css' +import '../app/common/form.css' import { store } from './store' diff --git a/animism-align/frontend/site/site/site.actions.js b/animism-align/frontend/site/site/site.actions.js index b66a9b9..ff25484 100644 --- a/animism-align/frontend/site/site/site.actions.js +++ b/animism-align/frontend/site/site/site.actions.js @@ -1,6 +1,5 @@ import * as types from 'app/types' import actions from 'site/actions' -import { URLS } from 'app/constants' import FontFaceObserver from 'fontfaceobserver' export const loadProject = () => dispatch => { diff --git a/animism-align/frontend/site/store.js b/animism-align/frontend/site/store.js index 87a9a1f..0b4aff7 100644 --- a/animism-align/frontend/site/store.js +++ b/animism-align/frontend/site/store.js @@ -1,6 +1,4 @@ -import * as types from 'app/types' -import { crudState, crudReducer } from 'app/api/crud.reducer' - +import { crudReducer } from 'app/api/crud.reducer' import { applyMiddleware, compose, combineReducers, createStore } from 'redux' import { connectRouter, routerMiddleware } from 'connected-react-router' import { createBrowserHistory } from 'history' @@ -22,7 +20,7 @@ const createRootReducer = history => ( }, { auth: (state = {}) => state, router: connectRouter(history), - }) + })) ) const configureStore = (initialState = {}, history) => { diff --git a/animism-align/webpack.config.site.js b/animism-align/webpack.config.site.js index 35ce715..55f2347 100644 --- a/animism-align/webpack.config.site.js +++ b/animism-align/webpack.config.site.js @@ -38,6 +38,9 @@ module.exports = { }, resolve: { alias: { + "app/store": "site/store", + "app/actions": "site/actions", + "app/types": "site/types", // "react": "preact/compat", // "react-dom/test-utils": "preact/test-utils", // "react-dom": "preact/compat", -- cgit v1.2.3-70-g09d2