Skip to content

Commit

Permalink
chore: move frontend directory a level up
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Oct 11, 2017
1 parent 798963b commit df5f137
Show file tree
Hide file tree
Showing 547 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions server/zanata-frontend/.gitignore
Expand Up @@ -11,12 +11,12 @@ dist/
coverage/

# generated css
src/frontend/app/styles/atomic.css
src/app/styles/atomic.css

# generated frontend icons
src/frontend/app/components/Icon/list.js
src/frontend/app/components/Icons/icons.svg
src/frontend/app/components/Icons/index.jsx
src/app/components/Icon/list.js
src/app/components/Icons/icons.svg
src/app/components/Icons/index.jsx

# files generated by `make storybook-static`, should never be checked in
storybook-static
Expand Down
2 changes: 1 addition & 1 deletion server/zanata-frontend/README.md
Expand Up @@ -3,4 +3,4 @@
Zanata javascript module for:

- [Zanata alpha editor](./src/editor/README.md)
- [Explore page, User profile page, Glossary page, and side menu bar](./src/frontend/README.md)
- [Explore page, User profile page, Glossary page, and side menu bar](./src/README.md)
4 changes: 2 additions & 2 deletions server/zanata-frontend/pom.xml
Expand Up @@ -31,7 +31,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Directory for frontend to run the build from. -->
<frontend.build.directory>${project.basedir}/src/frontend</frontend.build.directory>
<frontend.build.directory>${project.basedir}/src</frontend.build.directory>

<!-- Command to use after 'npm ' for the frontend build. Default is the faster draft build. -->
<frontend.build.command>draft</frontend.build.command>
Expand Down Expand Up @@ -128,7 +128,7 @@
<outputDirectory>${bundle.dest}</outputDirectory>
<resources>
<resource>
<directory>src/frontend/dist</directory>
<directory>src/dist</directory>
<include>editor.min.js</include>
<include>editor.css</include>
<include>editor.css.map</include>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -7,7 +7,7 @@ This is only needed once on the page to add all the icons to the page.

If you watch build is complaining
```
Module not found: Error: Can't resolve './Icons' in 'platform/server/zanata-frontend/src/frontend/app/components'
Module not found: Error: Can't resolve './Icons' in 'platform/server/zanata-frontend/src/app/components'
```
You need to run ```make draft``` first to generate the index.jsx file and then run the normal watch task.
File renamed without changes.

0 comments on commit df5f137

Please sign in to comment.