Skip to content

Commit

Permalink
Modernize to build up 3rd party packages and css styling sheets via c…
Browse files Browse the repository at this point in the history 
…omposer and npm (#1767)
  • Loading branch information
@bradymiller
Daniel Sandoval authored and bradymiller committed Aug 27, 2018
1 parent 28aca06 commit 352fd76
Show file tree
Hide file tree
Showing 13,501 changed files with 6,675 additions and 2,420,921 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
29 changes: 0 additions & 29 deletions .bowerrc
View file

This file was deleted.

2 changes: 1 addition & 1 deletion interface/.docs/#meta/index.stories.js → .docs/#meta/index.stories.js
View file
Expand Up @@ -2,6 +2,6 @@ import React from 'react';
import { storiesOf } from '@storybook/react';
import { doc } from 'storybook-readme';

import README from '../../README.md';
import README from '../../interface/README.md';

storiesOf('# Introduction', module).add('README', doc(README));
0 interface/.docs/buttons/README.md → .docs/buttons/README.md
View file
File renamed without changes.
0 interface/.docs/buttons/buttons.stories.js → .docs/buttons/buttons.stories.js
View file
File renamed without changes.
0 interface/.docs/inputs/inputs.stories.js → .docs/inputs/inputs.stories.js
View file
File renamed without changes.
15 changes: 14 additions & 1 deletion .gitignore
View file
@@ -1,4 +1,17 @@
/vendor/**/.git
# logs
/logs

# environment vars
.env

# vendor and assets
node_modules
/vendor/*
/public/assets/*
/public/themes/*
!/public/assets/manual-added-packages
!/public/assets/modified
/.docs/.out/*

# dev editor configs
/.idea/*
2 changes: 1 addition & 1 deletion interface/.storybook/ThemeProvider.js → .storybook/ThemeProvider.js
View file
Expand Up @@ -13,7 +13,7 @@ export class ThemeProvider extends React.Component {
render() {
return(
<div>
<link rel="stylesheet" type="text/css" href={"./themes/" + this.props.value + ".css"} />
<link rel="stylesheet" type="text/css" href={"./public/themes/" + this.props.value + ".css"} />
{this.props.children}
</div>
)
Expand Down
0 interface/.storybook/addons.js → .storybook/addons.js
View file
File renamed without changes.
0 interface/.storybook/config.js → .storybook/config.js
View file
File renamed without changes.
1 change: 1 addition & 0 deletions .storybook/themeOptions.json
View file
@@ -0,0 +1 @@
["style_light","rtl_style_light","style_manila","rtl_style_manila","style_ash_blue","rtl_style_ash_blue","style_burgundy","rtl_style_burgundy","style_cadmium_yellow","rtl_style_cadmium_yellow","style_chocolate","rtl_style_chocolate","style_cobalt_blue","rtl_style_cobalt_blue","style_coral","rtl_style_coral","style_deep_purple","rtl_style_deep_purple","style_dune","rtl_style_dune","style_emerald","rtl_style_emerald","style_forest_green","rtl_style_forest_green","style_mauve","rtl_style_mauve","style_mustard_green","rtl_style_mustard_green","style_olive","rtl_style_olive","style_pink","rtl_style_pink","style_powder_blue","rtl_style_powder_blue","style_red","rtl_style_red","style_sienna","rtl_style_sienna","style_tangerine","rtl_style_tangerine"]
2 changes: 1 addition & 1 deletion acknowledge_license_cert.html
View file
Expand Up @@ -3,7 +3,7 @@

<head>
<title>Acknowledgments, Licensing and Certification</title>
<link href="public/assets/bootstrap-3-3-4/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="public/assets/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
</head>

<body>
Expand Down
82 changes: 0 additions & 82 deletions bower.json
View file

This file was deleted.

31 changes: 4 additions & 27 deletions build.xml
View file
Expand Up @@ -75,33 +75,10 @@


<target name="clean-assets-dir">
<!-- Delete git files from vendor -->
<delete verbose="true">
<fileset dir="${dir.assets}" includes="**/*.git*" defaultexcludes="false"/>
<fileset dir="${dir.assets}" includes="**/*.cvs*" defaultexcludes="false"/>
</delete>

<delete dir="${dir.assets}/AnythingSlider-1-9-4/demos" verbose="true"/>
<delete dir="${dir.assets}/bootstrap-rtl-3-3-4/examples" verbose="true"/>
<delete dir="${dir.assets}/Chart.js-2-1-3/docs" verbose="true"/>
<delete dir="${dir.assets}/Chart.js-2-1-3/samples" verbose="true"/>
<delete dir="${dir.assets}/Chart.js-2-1-3/test" verbose="true"/>
<delete dir="${dir.assets}/flot-0-8-3/examples" verbose="true"/>
<delete dir="${dir.assets}/jquery-datetimepicker-2-5-4/tests" verbose="true"/>
<delete dir="${dir.assets}/jszip-3-1-5/docs" verbose="true"/>
<delete dir="${dir.assets}/jszip-3-1-5/documentation" verbose="true"/>
<delete dir="${dir.assets}/modernizr-3-5-0/test" verbose="true"/>
<delete dir="${dir.assets}/numeral-1-5-3/tests" verbose="true"/>
<delete dir="${dir.assets}/qtip2-3-0-3/grunt" verbose="true"/>
<delete dir="${dir.assets}/qtip2-3-0-3/src" verbose="true"/>
<delete dir="${dir.assets}/select2-4-0/docs" verbose="true"/>
<delete dir="${dir.assets}/select2-4-0/tests" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/examples" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/lang" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/meteor" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/plugin" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/src" verbose="true"/>
<delete dir="${dir.assets}/summernote-0-8-2/tools" verbose="true"/>
<delete dir="${dir.assets}/anythingslider/demos" verbose="true"/>
<delete dir="${dir.assets}/flot/examples" verbose="true"/>
<delete dir="${dir.assets}/jquery-datetimepicker/tests" verbose="true"/>
<delete dir="${dir.assets}/numeral/tests" verbose="true"/>
</target>


Expand Down
118 changes: 87 additions & 31 deletions config/config.yaml
View file
Expand Up @@ -12,21 +12,27 @@
# autoload: true (defaults to false)
assets:
jquery:
basePath: %assets_static_relative%/jquery-min-3-1-1/
script: index.js
basePath: %assets_static_relative%/jquery/dist/
script: jquery.min.js
autoload: true
allowNoLoad: true
jquery-1-10-2:
basePath: %assets_static_relative%/jquery-1-10-2/
script: jquery.min.js
jquery-1-11-3:
basePath: %assets_static_relative%/jquery-1-11-3/dist/
script: jquery.min.js
bootstrap:
basePath: %assets_static_relative%/bootstrap-3-3-4/dist/
basePath: %assets_static_relative%/bootstrap/dist/
script: js/bootstrap.min.js
link: css/bootstrap.min.css
autoload: true
allowNoLoad: true
allowNoLoad: true # could also just edit Header.php to remove this check (unnecessary?)
rtl:
basePath: %assets_static_relative%/bootstrap-rtl-3-3-4/dist/
basePath: %assets_static_relative%/bootstrap-rtl/dist/
link: css/bootstrap-rtl.css
bootstrap-sidebar:
basePath: %assets_static_relative%/bootstrap-sidebar-0-2-2/dist/
basePath: %assets_static_relative%/bootstrap-sidebar/dist/
script: js/sidebar.js
link: css/sidebar.css
main-theme:
Expand All @@ -35,39 +41,45 @@ assets:
autoload: true
allowNoLoad: true
tabs-theme:
basePath: %webroot%/interface/themes/
basePath: %webroot%/public/themes/
link: %theme_tabs_layout%
rtl:
basePath: %webroot%/interface/themes/
basePath: %webroot%/public/themes/
link: rtl_%theme_tabs_layout%
knockout:
basePath: %assets_static_relative%/knockout-3-4-0/dist/
script: knockout.js
basePath: %assets_static_relative%/knockout/build/output/
script: knockout-latest.js
jquery-ui:
basePath: %assets_static_relative%/jquery-ui-1-12-1/
basePath: %assets_static_relative%/jquery-ui/
script: jquery-ui.min.js
jquery-ui-base:
basePath: %assets_static_relative%/jquery-ui-1-12-1/themes/base/
basePath: %assets_static_relative%/jquery-ui-themes/themes/base/
link: jquery-ui.min.css
jquery-ui-darkness:
basePath: %assets_static_relative%/jquery-ui-1-12-1/themes/ui-darkness/
basePath: %assets_static_relative%/jquery-ui-themes/themes/ui-darkness/
link: jquery-ui.min.css
jquery-ui-sunny:
basePath: %assets_static_relative%/jquery-ui-1-12-1/themes/sunny/
basePath: %assets_static_relative%/jquery-ui-themes/themes/sunny/
link: jquery-ui.min.css
jquery-ui-redmond:
basePath: %assets_static_relative%/jquery-ui-1-12-1/themes/redmond/
basePath: %assets_static_relative%/jquery-ui-themes/themes/redmond/
link: jquery-ui.min.css
jquery-ui-cupertino:
basePath: %assets_static_relative%/jquery-ui-1-12-1/themes/cupertino/
basePath: %assets_static_relative%/jquery-ui-themes/themes/cupertino/
link: jquery-ui.min.css
jquery-ui-lightness-1-10-4:
basePath: %assets_static_relative%/jquery-ui-themes-1-10-4/themes/ui-lightness/
link: jquery-ui.min.css
jquery-ui-excite-bike-1-11-4:
basePath: %assets_static_relative%/jquery-ui-themes-1-11-4/themes/excite-bike/
link: jquery-ui.css # should this be the minified file?
fontawesome:
basePath: %assets_static_relative%/font-awesome-4-6-3/css/
basePath: %assets_static_relative%/font-awesome/css/
link: font-awesome.min.css
autoload: true
allowNoLoad: true
datetime-picker:
basePath: %assets_static_relative%/jquery-datetimepicker-2-5-4/build/
basePath: %assets_static_relative%/jquery-datetimepicker/build/
script: jquery.datetimepicker.full.min.js
link: jquery.datetimepicker.min.css
report-helper:
Expand All @@ -83,26 +95,29 @@ assets:
basePath: %webroot%/library/js/
script: common.js
textformat:
basePath: %webroot%/library/
script: textformat.js
autoload: true
allowNoLoad: true
basePath: %webroot%/library/
script: textformat.js
autoload: true
allowNoLoad: true
dialog:
basePath: %webroot%/library/
script: dialog.js
autoload: true
allowNoLoad: true
select2:
basePath: %assets_static_relative%/
script: select2-4-0/dist/js/select2.full.js
script: select2/dist/js/select2.full.js # should this be the minified file?
link:
- select2-4-0/dist/css/select2.css
- select2-bootstrap-theme-0-1-0/dist/select2-bootstrap.css
- select2/dist/css/select2.css # should this be the minified file?
- select2-bootstrap-theme/dist/select2-bootstrap.css # should this be the minified file?
jscolor:
basePath: %assets_static_relative%/jscolor-2-0-4/
basePath: %assets_static_relative%/jscolor/
script: jscolor.js
jscolor-1-4-5:
basePath: %assets_static_relative%/jscolor-1-4-5/
script: jscolor.js
emodal:
basePath: %assets_static_relative%/emodal-1-2-65/dist/
basePath: %assets_static_relative%/emodal/dist/
script: eModal.min.js
esign:
basePath: %webroot%/library/ESign/
Expand All @@ -113,12 +128,53 @@ assets:
script: dygraph.js
link: dygraph.css
moment:
basePath: %assets_static_relative%/moment-2-13-0/
script: moment.js
basePath: %assets_static_relative%/moment/
script: moment.js # should this be the minified file?
pure:
basePath: %assets_static_relative%/pure-0-5-0/
basePath: %assets_static_relative%/pure/0.5.0/
link: pure-min.css
qtip2:
basePath: %assets_static_relative%/qtip2-3-0-3/dist/
basePath: %assets_static_relative%/qtip2/dist/
script: jquery.qtip.min.js
link: jquery.qtip.min.css
qtip2-2-2-1:
basePath: %assets_static_relative%/qtip2-2-2-1/
script: jquery.qtip.min.js
link: jquery.qtip.min.css
angular:
basePath: %assets_static_relative%/angular/
script: angular.min.js
angular-sanitize:
basePath: %assets_static_relative%/angular-sanitize/
script: angular-sanitize.min.js
angular-summernote:
basePath: %assets_static_relative%/angular-summernote/dist/
script: angular-summernote.js # should this be the minified file?
anythingslider:
basePath: %assets_static_relative%/anythingslider/
script: js/jquery.anythingslider.fx.js # should optional plugins be their own key?
script: js/jquery.anythingslider.video.js # should optional plugins be their own key?
script: js/jquery.easing.1.2.js # should optional extensions be their own key?
script: js/jquery.anythingslider.min.js
# link: css/anythingslider.css
link: css/theme-metallic.css
link: css/theme-minimalist-round.css
link: css/theme-minimalist-square.css
link: css/theme-construction.css
link: css/theme-cs-portfolio.css
backbone:
basePath: %assets_static_relative%/backbone/
script: backbone-min.js
checklist-model:
basePath: %assets_static_relative%/checklist-model/
script: checklist-model.js
summernote:
basePath: %assets_static_relative%/summernote/dist/
script: summernote.js
link: summernote.css
shortcut:
basePath: %assets_static_relative%/manual-added-package/shortcut.js-2-01-B/
script: shortcut.js
underscore:
basePath: %assets_static_relative%/underscore
script: underscore-min.js

0 comments on commit 352fd76

Please sign in to comment.