Skip to content
Snippets Groups Projects
Commit efd121d7 authored by Eike Cochu's avatar Eike Cochu
Browse files

converted ui project to dynamic web project

ui is dynamic web project for export to war file (is static though)
added sass plugin for ember
parent f1db4a28
No related branches found
No related tags found
No related merge requests found
Showing
with 158 additions and 153 deletions
...@@ -275,30 +275,6 @@ ...@@ -275,30 +275,6 @@
}, },
"buffers": "buffers":
[ [
{
"file": "vipra-ui/app/routes/words/show.js",
"settings":
{
"buffer_size": 178,
"line_ending": "Unix"
}
},
{
"file": "vipra-ui/ember-cli-build.js",
"settings":
{
"buffer_size": 881,
"line_ending": "Unix"
}
},
{
"file": "vipra-ui/app/templates/index.hbs",
"settings":
{
"buffer_size": 145,
"line_ending": "Unix"
}
}
], ],
"build_system": "", "build_system": "",
"build_system_choices": "build_system_choices":
...@@ -477,24 +453,18 @@ ...@@ -477,24 +453,18 @@
}, },
"expanded_folders": "expanded_folders":
[ [
"/home/eike/repos/master/ma-impl", "/home/eike/repos/master/ma-impl"
"/home/eike/repos/master/ma-impl/vipra-ui",
"/home/eike/repos/master/ma-impl/vipra-ui/app",
"/home/eike/repos/master/ma-impl/vipra-ui/app/components",
"/home/eike/repos/master/ma-impl/vipra-ui/app/models",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/topics/show",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/articles",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words"
], ],
"file_history": "file_history":
[ [
"/home/eike/repos/master/ma-impl/vipra-ui/ember-cli-build.js",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/application.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/index.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/loading.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/styles/app.css",
"/home/eike/Downloads/squares.css",
"/home/eike/repos/master/ma-impl/vipra-ui/app/index.html",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words/show.js",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words/show.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words/show.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words/index.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words/index.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/models/word.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/models/word.js",
...@@ -506,7 +476,6 @@ ...@@ -506,7 +476,6 @@
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components/items-list.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components/items-list.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show/index.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show/index.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/words.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/index.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/router.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/router.js",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/words",
"/home/eike/repos/master/ma-impl/vipra-ui/app/models/topic.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/models/topic.js",
...@@ -534,7 +503,6 @@ ...@@ -534,7 +503,6 @@
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show/edit.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show/edit.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/show.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/helpers/topic-share.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/helpers/topic-share.js",
"/home/eike/repos/master/ma-impl/vipra-ui/app/styles/app.css",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components/topic-link.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/components/topic-link.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/edit.hbs", "/home/eike/repos/master/ma-impl/vipra-ui/app/templates/topics/edit.hbs",
"/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles/show.js", "/home/eike/repos/master/ma-impl/vipra-ui/app/routes/articles/show.js",
...@@ -616,13 +584,7 @@ ...@@ -616,13 +584,7 @@
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/routes/articles.show.js", "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/routes/articles.show.js",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/templates/articles/test.hbs", "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/templates/articles/test.hbs",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/.ember-cli", "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/.ember-cli",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/bower_components/ember-data/ember-data.js", "/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/bower_components/ember-data/ember-data.js"
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/bower_components/ember/ember.js",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/templates/application.hbs",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/app/serializers/application.js",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/bower.json",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/bower_components/ember/.bower.json",
"/home/eike/Repositories/fu/ss15/ma/impl/vipra-ui/package.json"
], ],
"find": "find":
{ {
...@@ -946,96 +908,8 @@ ...@@ -946,96 +908,8 @@
"groups": "groups":
[ [
{ {
"selected": 1,
"sheets": "sheets":
[ [
{
"buffer": 0,
"file": "vipra-ui/app/routes/words/show.js",
"semi_transient": false,
"settings":
{
"buffer_size": 178,
"regions":
{
},
"selection":
[
[
178,
178
]
],
"settings":
{
"open_with_edit": true,
"syntax": "Packages/JavaScriptNext - ES6 Syntax/JavaScriptNext.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 2,
"type": "text"
},
{
"buffer": 1,
"file": "vipra-ui/ember-cli-build.js",
"semi_transient": false,
"settings":
{
"buffer_size": 881,
"regions":
{
},
"selection":
[
[
877,
877
]
],
"settings":
{
"syntax": "Packages/JavaScriptNext - ES6 Syntax/JavaScriptNext.tmLanguage",
"tab_size": 2,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 0,
"type": "text"
},
{
"buffer": 2,
"file": "vipra-ui/app/templates/index.hbs",
"semi_transient": false,
"settings":
{
"buffer_size": 145,
"regions":
{
},
"selection":
[
[
145,
145
]
],
"settings":
{
"syntax": "Packages/Handlebars/grammars/Handlebars.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"stack_index": 1,
"type": "text"
}
] ]
} }
], ],
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
...@@ -5,7 +5,32 @@ ...@@ -5,7 +5,32 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
</projectDescription> </projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="output" path=""/>
</classpath>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="vipra-ui">
<wb-resource deploy-path="/" source-path="/dist"/>
<wb-resource deploy-path="/" source-path="/webapp" tag="defaultRootSource"/>
<property name="context-root" value="vipra-ui"/>
<property name="java-output-path" value="/vipra-ui/build/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="jst.web"/>
<fixed facet="wst.jsdt.web"/>
<fixed facet="java"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.1"/>
</faceted-project>
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Window
\ No newline at end of file
...@@ -6,4 +6,7 @@ eclipse.preferences.version=1 ...@@ -6,4 +6,7 @@ eclipse.preferences.version=1
override=true override=true
suspend=false suspend=false
vals/org.eclipse.wst.html.core.HTMLValidator/global=FF01 vals/org.eclipse.wst.html.core.HTMLValidator/global=FF01
vals/org.eclipse.wst.xml.core.xml/global=FF03
vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
vals/org.eclipse.wst.xsl.core.xsl/global=FF02
vf.version=3 vf.version=3
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Vipra</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>Vipra</title>
<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
......
td {
vertical-align: top;
}
.word {
cursor: pointer;
padding-right: 5px;
}
\ No newline at end of file
td {
vertical-align: top;
}
.word {
cursor: pointer;
padding-right: 5px;
}
.center {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.loading {
background: url(/assets/images/squares.gif) no-repeat center center;
width: 120px;
height: 120px;
}
\ No newline at end of file
<nav class="navbar navbar-default">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#vipra-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Vipra</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="vipra-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Browse <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>{{#link-to 'articles'}}Articles{{/link-to}}</li>
<li>{{#link-to 'topics'}}Topics{{/link-to}}</li>
<li>{{#link-to 'words'}}Words{{/link-to}}</li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
{{outlet}} {{outlet}}
\ No newline at end of file
<h1>Vipra</h1>
{{#link-to 'articles'}}Articles{{/link-to}}<br>
{{#link-to 'topics'}}Topics{{/link-to}}<br>
{{#link-to 'words'}}Words{{/link-to}}
\ No newline at end of file
Loading... <div class="center">
\ No newline at end of file <div class="loading">
</div>
</div>
\ No newline at end of file
...@@ -4,7 +4,13 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); ...@@ -4,7 +4,13 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) { module.exports = function(defaults) {
var app = new EmberApp(defaults, { var app = new EmberApp(defaults, {
// Add options here sourcemaps: {
enabled: EmberApp.env() !== 'production',
extensions: ['js']
},
sassOptions: {
extension: 'scss'
}
}); });
var bootstrapPath = 'bower_components/bootstrap/dist'; var bootstrapPath = 'bower_components/bootstrap/dist';
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"ember-cli-inject-live-reload": "^1.3.1", "ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.4", "ember-cli-qunit": "^1.0.4",
"ember-cli-release": "0.2.8", "ember-cli-release": "0.2.8",
"ember-cli-sass": "5.2.1",
"ember-cli-sri": "^1.2.0", "ember-cli-sri": "^1.2.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "1.13.15", "ember-data": "1.13.15",
......
vipra-ui/public/assets/images/squares.gif

27.3 KiB

<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment