Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better UI dependency management and code path #324

Merged
merged 24 commits into from
Feb 20, 2016
Merged

Conversation

DawoudIO
Copy link
Contributor

  • created a top level composer file
  • download and install driftyco/ionicons for offline support - closes Support Running the CRM offline #48
  • download and install font-awesome for offline support - closes Support Running the CRM offline #48
  • moved adminlte from church info composer file to ui composer file
  • when a vagrant system starts, it download the skin dependency via composer and copy the correct files into the /skin dir

@DawoudIO DawoudIO added this to the 2.0.0 milestone Feb 15, 2016
@DawoudIO DawoudIO changed the title Better UI dependency management and code path Better UI dependency management and code path Feb 15, 2016
@DawoudIO
Copy link
Contributor Author

OK this is ready for a merge...

@DawoudIO
Copy link
Contributor Author

I'll fix the merge conflicts tonight after i get approval for this PR

@DawoudIO
Copy link
Contributor Author

This is ready

@crossan007
Copy link
Contributor

For some reason the vagrant build fails, but it works in develop. It looks like specifying the "." folder mapping gets rid of the "/vagrant" mountpoint in the VM

image

@crossan007
Copy link
Contributor

when a vagrant system starts, it download the skin dependency via composer and copy the correct files into the /skin dir

I cant find where you're calling this "build-skin.sh" script. It's not in the vagrant file, or in bootstrap.sh

Also,
Do we really want the skin updating from source every time someone builds a vagrant box? This could make PRs un-fun.

@DawoudIO
Copy link
Contributor Author

So the sql issue is line ending... I thought I fixed that.

As for the skin build it is a shell script that runs manually once you ssh into the vagrant box

@crossan007
Copy link
Contributor

I SSH'd into the box, and cd /Vagrant fails... I think adding the sync'd folder for "." is breaking vagrant's build in mapping to "/Vagrant"

@DawoudIO
Copy link
Contributor Author

It is located in /dev/churchcrm

I need to add a dev read me

@crossan007
Copy link
Contributor

I see that, but I don't think we should override the vagrant default: https://www.vagrantup.com/docs/synced-folders/

I don't think it's an unreasonable expectation for someone launching a vagrant environment that cd /Vagrant will actually land them in the project directory.

@DawoudIO
Copy link
Contributor Author

ok i pushed a line ending fix on this branch.

@crossan007
Copy link
Contributor

sorry, it's /vagrant no capital V.

On develop , this works:
image

image

but on this branch the mountpoint is gone:
image

@dschwen
Copy link

dschwen commented Feb 18, 2016

Having an actual filesystem mounted under /dev is rather unusual. That directory is usually reserved for device "files" that represent an interface to the kernel space.

@DawoudIO
Copy link
Contributor Author

ok let me see if i can get /vagrant, the issue is that i need things outside that dir. If i can get it working with /vagrant i'll fix and merge

DawoudIO added a commit that referenced this pull request Feb 20, 2016
Better UI dependency management and code path
@DawoudIO DawoudIO merged commit 0fb3404 into develop Feb 20, 2016
@DawoudIO DawoudIO deleted the build-systems branch February 20, 2016 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants