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

Add ui component #4

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
38f6fd7
Add ui client
atomkevich May 3, 2016
8fe4d54
Delete uiDesigner.xml
atomkevich May 3, 2016
9a9f4e7
Delete jsLibraryMappings.xml
atomkevich May 3, 2016
da43c75
Delete vcs.xml
atomkevich May 3, 2016
a6db745
Add examples
atomkevich May 3, 2016
dabc22b
Merge remote-tracking branch 'origin/master'
atomkevich May 3, 2016
21bf96a
Add examples
atomkevich May 3, 2016
af8208a
Fix code review
atomkevich May 3, 2016
9fe5a64
Merge remote-tracking branch 'upstream/master'
atomkevich May 3, 2016
2da46c1
Change structure of application
atomkevich May 4, 2016
82b183d
Change structure of application
atomkevich May 4, 2016
b71bcfd
Add description
atomkevich May 4, 2016
c1d50f3
Add description
atomkevich May 4, 2016
8bc3fce
Merge remote-tracking branch 'upstream/master'
atomkevich May 5, 2016
03ff1bf
Merge remote-tracking branch 'upstream/master'
atomkevich May 5, 2016
fdc7922
Update travis badge to point to fvlad build
fvlad May 7, 2016
a57abfc
Merge remote-tracking branch 'origin/master' into client
fvlad May 7, 2016
2f9e168
Move client files around
fvlad May 8, 2016
e5172b9
Merge pull request #1 from fvlad/client
atomkevich May 10, 2016
5fddb32
add scoring
atomkevich May 10, 2016
22cb596
add scoring
atomkevich May 10, 2016
243b627
Merge remote-tracking branch 'upstream/master'
atomkevich May 11, 2016
d56e6bc
Add mxm client
atomkevich May 11, 2016
2b0abdb
fix config version
atomkevich May 11, 2016
34b2d99
fix versions for 7 java
atomkevich May 11, 2016
98ca929
fix versions for 7 java
atomkevich May 11, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
.lib/
dist/*
target/
.idea/*
src/main/resources/node_modules/*
lib_managed/
src_managed/
project/boot/
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# lyrics-engine

[![Join the chat at https://gitter.im/scalalab3/lyrics-engine](https://badges.gitter.im/scalalab3/lyrics-engine.svg)](https://gitter.im/scalalab3/lyrics-engine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/scalalab3/lyrics-engine](https://badges.gitter.im/scalalab3/lyrics-engine.svg)](https://gitter.im/scalalab3/lyrics-engine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Copy link
Contributor

@fvlad fvlad May 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot get, what exactly changed in this file? A few new lines?



13 changes: 12 additions & 1 deletion api/README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
Launch SBT:

$ sbt

Build UI component

$ cd lyrics-engine/api/src/main/resources
$ npm install
$ grunt
$ ls lyrics-engine/api/src/main/resources/js/scripts/ (home.js, recommend.js)


To compile everything and run all tests:

Expand All @@ -14,4 +22,7 @@ To start the application:

To stop the application:

> re-stop
> re-stop


An example of our site you can see by the link **/lyrics-engine/examples**
4 changes: 3 additions & 1 deletion api/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ libraryDependencies ++= {
"io.spray" %% "spray-testkit" % sprayV % "test",
"com.typesafe.akka" %% "akka-actor" % akkaV,
"com.typesafe.akka" %% "akka-testkit" % akkaV % "test",
"org.specs2" %% "specs2-core" % "2.3.11" % "test"
"org.specs2" %% "specs2-core" % "2.3.11" % "test",
"io.spray" %% "spray-json" % "1.3.2"
)
}


Revolver.settings
33 changes: 33 additions & 0 deletions api/src/main/resources/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

watch: {
react: {
files: 'js/react_components/*.jsx',
tasks: ['browserify']
}
},

browserify: {
options: {
transform: [ require('grunt-react').browserify ]
},
client: {
src: ['js/react_components/*.jsx', 'js/react_components/modules/Home.jsx'],
dest: 'js/scripts/home.js'
},
js: {
src: ['js/react_components/*.jsx', 'js/react_components/modules/Recommend.jsx'],
dest: 'js/scripts/recommend.js'
}
}
});

grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-watch');

grunt.registerTask('default', [
'browserify'
]);
};
4 changes: 4 additions & 0 deletions api/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ akka {

spray.can.server {
request-timeout = 1s
}
http {
interface = "0.0.0.0"
port = 9000
}
91 changes: 91 additions & 0 deletions api/src/main/resources/css/form.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
.form-style-3{
align-items:center;
max-width: 450px;
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
.form-style-3 label{
display:block;
margin-bottom: 10px;
}
.form-style-3 label > span{
float: left;
width: 100px;
color: #f0d215;
font-weight: bold;
font-size: 13px;
text-shadow: 1px 1px 1px #fff;
}
.form-style-3 fieldset{
border-radius: 10px;
-webkit-border-radius: 10px;
-moz-border-radius: 10px;
margin: 0px 0px 10px 0px;
border: 1px solid #f8ff5f;
padding: 20px;
background: rgba(128, 119, 65, 0.96);;
box-shadow: inset 0px 0px 15px #fff8ad;
-moz-box-shadow: inset 0px 0px 15px #fff0bd;
-webkit-box-shadow: inset 0px 0px 15px #fcffd2;
}
.form-style-3 fieldset legend{
color: #EBA909;
border-top: 1px solid #fffabd;
border-left: 1px solid #feffc5;
border-right: 1px solid #fffec9;
border-radius: 5px 5px 0px 0px;
-webkit-border-radius: 5px 5px 0px 0px;
-moz-border-radius: 5px 5px 0px 0px;
background: #FFF4F4;
padding: 0px 8px 3px 8px;
box-shadow: -0px -1px 2px #F1F1F1;
-moz-box-shadow:-0px -1px 2px #F1F1F1;
-webkit-box-shadow:-0px -1px 2px #F1F1F1;
font-weight: normal;
font-size: 15px;
}
.form-style-3 textarea{
width:250px;
height:100px;
}
.form-style-3 input[type=text],
.form-style-3 input[type=date],
.form-style-3 input[type=datetime],
.form-style-3 input[type=number],
.form-style-3 input[type=search],
.form-style-3 input[type=time],
.form-style-3 input[type=url],
.form-style-3 input[type=email],
.form-style-3 select,
.form-style-3 textarea{
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border: 1px solid #ffee7a;
outline: none;
color: #f09c18;
padding: 5px 8px 5px 8px;
box-shadow: inset 1px 1px 4px #ffea62;
-moz-box-shadow: inset 1px 1px 4px #ffff9d;
-webkit-box-shadow: inset 1px 1px 4px #fffdae;
background: #fffef0;
width:50%;
}
.form-style-3 input[type=submit],
.form-style-3 input[type=button]{
background: #eba909;
border: 1px solid #c9610b;
padding: 5px 15px 5px 15px;
color: #ffe275;
box-shadow: inset -1px -1px 3px #ffc920;
-moz-box-shadow: inset -1px -1px 3px #ffda25;
-webkit-box-shadow: inset -1px -1px 3px #ffe85e;
border-radius: 3px;
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
font-weight: bold;
}
.required{
color: #ffbe29;
font-weight:normal;
}
Binary file added api/src/main/resources/css/images/1.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/3.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/ads.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/image_01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/image_02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/menu_bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/menu_bg_repeat.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/src/main/resources/css/images/top_bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading