Commit a95b5c06 authored by Netanel Hagbi's avatar Netanel Hagbi

Merge branch 'develop' into 'joe-prod'

Upload Version - 25.10.17-  From develop into joe-prod

See merge request !134
parents 08aa7132 0f626a02
......@@ -51,6 +51,75 @@ Explain what these tests test and why
```
Give an example
```
## Files Structure
```
+---api
| +---games
| | games.js # Definition of games collections
| | games.test.js
| |
| \---server
| methods.js # Writing to games collections
| methods.test.js
| publication.js # Reading from games collections
| publication.test.js # Test of reading games collections
|
|
+---startup
| +---both
| | constants.js # Constants in the app
| | index.js # Import modules used by both client and server through a single index entry point
| |
| +---client
| | index.js # Import client startup through a single index entry point
| | routes.js # Routing in client side
| |
| \---server
| authentication.js # authentication by gitlab
| index.js # Import server startup through a single index entry point
| register-api.js # Containes all file's server and run them
| security.js # Security configuration file
|
\---ui
+---components
| |
| \---pivot-table
| | pivot-table.js
| |
| \---locales
| pivot.he.js
| pivot.he.js.map
| pivot.he.min.js
| pivot.he.min.js.map
|
+---layouts # Wrapper components for behaviour and visuals
| game.js
| login.js
| manage.js
|
+---pages # Entry points for rendering used by the router
+---game
| home.js
| owner-router.js
| player-router.js
| router.js
|
+---both # Game pages for owner and player
| game-close.js
| leaders.js
| question-statistics.js
| question.js
| winner.js
|
+---owner # Game pages for owner
| lobby.js
|
\---player # Game pages for player
answer-sent.js
instructions.js
```
## Deployment
......@@ -58,9 +127,9 @@ Add additional notes about how to deploy this on a live system
## Built With
* [Dropwizard](http://www.dropwizard.io/1.0.2/docs/) - The web framework used
* [Maven](https://maven.apache.org/) - Dependency Management
* [ROME](https://rometools.github.io/rome/) - Used to generate RSS Feeds
* [Meteor](https://www.meteor.com/) - Platform for building web and mobile apps in pure JavaScript
* [React](https://reactjs.org/) - JavaScript library for building user interfaces
* [Astronomy](http://jagi.github.io/meteor-astronomy/) - Model Layer for Meteor collections
## Contributing
......
import { FilesCollection } from 'meteor/ostrio:files';
const Image = new FilesCollection({
storagePath: 'C:/Users/Segev/projects/shablool-data',
storagePath: '/shablool-images',
collectionName: 'images',
allowClientCode: false, // Disallow remove files from Client
onBeforeUpload(file) {
......
......@@ -39,11 +39,9 @@ export default class PivotTable extends React.Component {
return (
<div className="row">
<div id="pivot-table">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.11/c3.min.css" />
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" />
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.4.11/c3.min.js" />
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js" />
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js" />
<link rel="stylesheet" type="text/css" href="/libs/c3/c3.min.css" />
<script type="text/javascript" src="/libs/d3/d3.min.js" />
<script type="text/javascript" src="/libs/c3/c3.min.js" />
<div id="output" />
</div>
</div>
......
......@@ -21,8 +21,14 @@ const QuizCard = ({ quiz, actions }) => {
const quizImage = Image.findOne({ _id: quiz.image });
return (
<div className="panel panel-default quiz-card" id={`quiz-card-${quiz._id}`}>
<div className="panel-body">
<div className="panel-body panel-style">
<div className="row">
<div className="corner-ribbon top-right white">
{quiz.private
? <i className="fa fa-lock lock-icon" aria-hidden="true" />
: <i className="fa fa-unlock unlock-icon" aria-hidden="true" />
}
</div>
<div className="col-md-3">
<div className="quiz-card-img-area">
<div className="quiz-panel-img-area">
......
.quiz-card {
.panel-style {
position: relative;
overflow: hidden;
}
.quiz-card-img-area {
padding-top: 20px;
}
......@@ -53,4 +57,80 @@
.tag {
margin: 2px;
}
/* The ribbons */
.corner-ribbon{
width: 100px;
top: 25px;
text-align: center;
line-height: normal;
letter-spacing: 1px;
color: #f0f0f0;
display: block;
overflow: hidden;
position: absolute;
}
/* Custom styles */
.corner-ribbon.sticky{
position: fixed;
}
.corner-ribbon.shadow{
box-shadow: 0 0 3px rgba(0,0,0,.3);
}
/* Different positions */
.corner-ribbon.top-left{
top: 15px;
left: -30px;
transform: rotate(-45deg);
-webkit-transform: rotate(-45deg);
}
.corner-ribbon.top-right{
top: 15px;
right: -30px;
left: auto;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
}
.corner-ribbon.bottom-left{
top: auto;
bottom: 25px;
left: -50px;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
}
.corner-ribbon.bottom-right{
top: auto;
right: -50px;
bottom: 25px;
left: auto;
transform: rotate(-45deg);
-webkit-transform: rotate(-45deg);
}
/* Colors */
.corner-ribbon.white{background: #f0f0f0; color: #555;}
.corner-ribbon.black{background: #333;}
.corner-ribbon.grey{background: #999;}
.corner-ribbon.blue{background: #39d;}
.corner-ribbon.green{background: #2c7;}
.corner-ribbon.turquoise{background: #1b9;}
.corner-ribbon.purple{background: #95b;}
.corner-ribbon.red{background: #e43;}
.corner-ribbon.orange{background: #e82;}
.corner-ribbon.yellow{background: #ec0;}
.lock-icon {
color: #e43;
}
.unlock-icon {
color: #2c7;
}
}
.c3 svg{font:10px sans-serif;-webkit-tap-highlight-color:transparent}.c3 line,.c3 path{fill:none;stroke:#000}.c3 text{-webkit-user-select:none;-moz-user-select:none;user-select:none}.c3-bars path,.c3-event-rect,.c3-legend-item-tile,.c3-xgrid-focus,.c3-ygrid{shape-rendering:crispEdges}.c3-chart-arc path{stroke:#fff}.c3-chart-arc text{fill:#fff;font-size:13px}.c3-grid line{stroke:#aaa}.c3-grid text{fill:#aaa}.c3-xgrid,.c3-ygrid{stroke-dasharray:3 3}.c3-text.c3-empty{fill:gray;font-size:2em}.c3-line{stroke-width:1px}.c3-circle._expanded_{stroke-width:1px;stroke:#fff}.c3-selected-circle{fill:#fff;stroke-width:2px}.c3-bar{stroke-width:0}.c3-bar._expanded_{fill-opacity:.75}.c3-target.c3-focused{opacity:1}.c3-target.c3-focused path.c3-line,.c3-target.c3-focused path.c3-step{stroke-width:2px}.c3-target.c3-defocused{opacity:.3!important}.c3-region{fill:#4682b4;fill-opacity:.1}.c3-brush .extent{fill-opacity:.1}.c3-legend-item{font-size:12px}.c3-legend-item-hidden{opacity:.15}.c3-legend-background{opacity:.75;fill:#fff;stroke:#d3d3d3;stroke-width:1}.c3-title{font:14px sans-serif}.c3-tooltip-container{z-index:10}.c3-tooltip{border-collapse:collapse;border-spacing:0;background-color:#fff;empty-cells:show;-webkit-box-shadow:7px 7px 12px -9px #777;-moz-box-shadow:7px 7px 12px -9px #777;box-shadow:7px 7px 12px -9px #777;opacity:.9}.c3-tooltip tr{border:1px solid #CCC}.c3-tooltip th{background-color:#aaa;font-size:14px;padding:2px 5px;text-align:left;color:#FFF}.c3-tooltip td{font-size:13px;padding:3px 6px;background-color:#fff;border-left:1px dotted #999}.c3-tooltip td>span{display:inline-block;width:10px;height:10px;margin-right:6px}.c3-tooltip td.value{text-align:right}.c3-area{stroke-width:0;opacity:.2}.c3-chart-arcs-title{dominant-baseline:middle;font-size:1.3em}.c3-chart-arcs .c3-chart-arcs-background{fill:#e0e0e0;stroke:none}.c3-chart-arcs .c3-chart-arcs-gauge-unit{fill:#000;font-size:16px}.c3-chart-arcs .c3-chart-arcs-gauge-max,.c3-chart-arcs .c3-chart-arcs-gauge-min{fill:#777}.c3-chart-arc .c3-gauge-value{fill:#000}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment