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

Update angularjs/angular-ui to last version #479

Merged
merged 7 commits into from Mar 11, 2018
Merged

Update angularjs/angular-ui to last version #479

merged 7 commits into from Mar 11, 2018

Conversation

fiftin
Copy link
Collaborator

@fiftin fiftin commented Mar 9, 2018

Update angularjs to v1.6, angular-ui to 2.5.

I replaced success/error blocks to then/catch because angular v1.6 isn't support it.

Please apply update-angular PR to semaphore-vendor before

@twhiston
Copy link
Contributor

twhiston commented Mar 9, 2018

🔥 i'll test this over the weekend and get back to you, nice one!

Unrelated frontend question - is it possible to create a folder structure where the assets that we compile from all live in a different root to the output? currently we mix in the pug and html files, and the less and css, during the generation process.
Would it be possible to refactor in such a way that we separate all the files actually needed to run the app from the files needed to build it? I guess the bundled js needs to stay where it is (or maybe i am wrong, my frontend skills are not strong 😛 ) but it would be cool if we could create a bit more granularity here if possible. What do you think?

@twhiston twhiston self-requested a review March 9, 2018 17:38
@fiftin
Copy link
Collaborator Author

fiftin commented Mar 9, 2018

Yes, we can move pug/less files from semaphore/public/html & semaphore/public/css to directories semaphore/less & semaphore/pug for example.

@fiftin
Copy link
Collaborator Author

fiftin commented Mar 9, 2018

or to semaphore/public/pug & semaphore/public/less

@twhiston
Copy link
Contributor

twhiston commented Mar 9, 2018

well i would like to keep the frontend completely seperate from the backend, because really it is kind of a separate project from the API (conceptually at least).
So maybe we could have another subfolder something like

root
- api
- cli
- etc.....
- web
    - resources
       - pug
       - less
       - unbundled js etc....
    - public
       - html
       - css
       - js

That way we can just use packr on the public folder and put only the things we need in to the binary. How does that feel to you. @strangeman any thoughts?

@strangeman
Copy link
Contributor

Good idea. Current folder structure a bit annoying, I often get confused with pug and html files.

@fiftin
Copy link
Collaborator Author

fiftin commented Mar 10, 2018

I ready to do this in next PR. OK?

@twhiston
Copy link
Contributor

Yeah would be great in another PR, thanks! I'll give this one a review tomorrow so we can get it merged

@fiftin
Copy link
Collaborator Author

fiftin commented Mar 11, 2018

Codeatyle issues are not relevant to this PR.
Can we fix them after PR application?

@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@twhiston
Copy link
Contributor

@fiftin yeah absolutely fine to fix codacy issues after this PR, i just enabled it so it reviewed everything as soon as I did!

@semaphoreui semaphoreui deleted a comment Mar 11, 2018
@twhiston
Copy link
Contributor

looking good to me, merging

@twhiston twhiston merged commit 4916435 into semaphoreui:develop Mar 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants