ballephenix/website
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'member_section'

Browse Source
This commit is contained in:
didier amyot committed 2016-02-15 21:39:23 -05:00
2 parents d0a163c873 5569fa14f6
commit 005b008b26
10 files changed
+150 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/resultats.yaml
+2 -2
View File
@@ -43,8 +43,8 @@
time: "20:30"
home: gris
away: rouge
home_points: ~
away_points: ~
home_points: 8
away_points: 10
-
date: 2016/06/23 # year/month/day
images/logosansfond.JPG
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

script/main.js
+3 -2
View File
@@ -7,7 +7,7 @@ requirejs.config({
});
requirejs(['m', 'views/mainPage', 'views/calendarPage', 'views/rulesPage', 'views/photosPage', 'views/confidentialPage', 'views/contactPage'], function(m, mainPage, calendarPage, rulesPage, photosPage, confidentialPage, contactPage){
requirejs(['m', 'views/mainPage', 'views/calendarPage', 'views/rulesPage', 'views/photosPage', 'views/confidentialPage', 'views/contactPage', 'views/loginPage',], function(m, mainPage, calendarPage, rulesPage, photosPage, confidentialPage, contactPage, loginPage){
m.route.mode = "hash";
m.route(document.body, "/", {
"/": mainPage,
@@ -15,6 +15,7 @@ requirejs(['m', 'views/mainPage', 'views/calendarPage', 'views/rulesPage', 'view
"/reglement": rulesPage,
"/photos": photosPage,
"/membre": confidentialPage,
"/contact": contactPage
"/contact": contactPage,
"/login": loginPage
});
});
script/views/confidentialPage.js
+1 -1
View File
@@ -1,4 +1,4 @@
define(['m', '_', 'event', 'teams', 'views/topNavBar', 'views/footer'], function (m, _ , Events, teams, topNavBar, footer) {
define(['m', '_', 'teams', 'views/topNavBar', 'views/footer'], function (m, _ , teams, topNavBar, footer) {
var confidentialSelection = {};
script/views/contactPage.js
+52 -4
View File
@@ -1,9 +1,57 @@
define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], function (m, _ , util, resultParser, topNavBar, footer) {
var rulesPageBody = {};
var contactBody = {};
rulesPageBody.view = function(){
return m('h1', 'En construction');
contactBody.logo = function(){
var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
return m('div.uk-cover-background.uk-container-center', {style: style});
};
contactBody.logoLine = function(){
return m('div.uk-grid.uk-margin',
m('div.uk-width-1-1', contactBody.logo()));
};
contactBody.email = function(){
return m('a[href=mailto:info@ballephenix.com]', 'info@ballephenix.com');
};
contactBody.tel = function(){
return ' (514) 544-8976';
};
contactBody.address = function(){
return m('p', ' 123 rue Dufresne', m('br'), 'Montréal, Québec H6Y 8U7');
};
contactBody.contact = function(){
return m('div.div.uk-panel.uk-panel-box.uk-panel-box-secondary.uk-width-large-1-3.uk-container-center.uk-margin',[
m('table.uk-table',
m('tr',
m('td.uk-text-right', m('i.fa.fa-desktop')),
m('td', contactBody.email())
),
m('tr',
m('td.uk-text-right', m('i.fa.fa-phone')),
m('td', contactBody.tel())
),
m('tr',
m('td.uk-text-right', m('i.fa.fa-envelope')),
m('td', contactBody.address())
)
)
// m('div', m('i.fa.fa-desktop'), ),
// m('div', m('i.fa.fa-phone'), contactBody.tel()),
// m('div', m('i.fa.fa-envelope'), contactBody.address())
]);
};
contactBody.view = function(){
return m('div', [
contactBody.logoLine(),
contactBody.contact()
]);
};
var contactPage = {};
@@ -11,7 +59,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
contactPage.view = function(){
return [
m.component(topNavBar),
m.component(rulesPageBody),
m.component(contactBody),
m.component(footer)
];
};
script/views/loginPage.js
+43
View File
@@ -0,0 +1,43 @@
define(['m', '_', 'util', 'views/topNavBar', 'views/footer'], function (m, _ , util, topNavBar, footer) {
var loginComponent = {};
loginComponent.logo = function(){
var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
return m('div.uk-cover-background.uk-container-center', {style: style});
};
loginComponent.logoLine = function(){
return m('div.uk-grid.uk-margin',
m('div.uk-width-1-1', loginComponent.logo()));
};
loginComponent.loginForm = function(){
return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary.uk-width-large-1-3.uk-container-center.uk-margin', [
m('form.uk-text-center',
m('div.uk-form-row', m('label', "Nom d'utilisateur ", m('input[type=text].uk-form-width-small'))),
m('div.uk-form-row', m('label', "Mot de passe ", m('input[type=password].uk-form-width-small'))),
m('div.uk-form-row', m('button.uk-button', m("i.fa.fa-mars-double"), " Pénétrez"))
)
]);
};
loginComponent.view = function(){
return m('div', [
loginComponent.logoLine(),
loginComponent.loginForm()
]);
};
var loginPage = {};
loginPage.view = function(){
return [
m.component(topNavBar),
m.component(loginComponent),
m.component(footer)
];
};
return loginPage;
});
script/views/mainPage.js
+1 -1
View File
@@ -4,7 +4,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
mainPageLogo.view = function(){
return m('div.uk-grid.uk-hidden-small', [
m('div.uk-large-1-3.uk-medium-2-3.uk-container-center', [
m('div.uk-cover-background', {style: 'height: 500px; width: 500px; background-size: 500px; background-image: url(images/phenix_logo.png);'})
m('div.uk-cover-background', {style: 'height: 400px; width: 400px; background-size: 400px; background-image: url(images/logosansfond.JPG);'})
])
]);
};
script/views/photosPage.js
+7 -1
View File
@@ -2,8 +2,14 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
var rulesPageBody = {};
rulesPageBody.logo = function(){
var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
return m('div.uk-cover-background.uk-container-center', {style: style});
};
rulesPageBody.view = function(){
return m('h1', 'En construction');
return m('div.uk-grid',
m('div.uk-width-1-1', rulesPageBody.logo()));
};
var photosPage = {};
script/views/rulesPage.js
+27 -15
View File
@@ -2,42 +2,54 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
var rulesPage = {};
rulesPage.missionTest = function(){
rulesPage.missionText = function(){
return "La ligue de balle Les Phénix a été fondée en 2004 afin "+
"d'offrir aux membres de la communauté gaie et lesbienne et à "+
"leurs amis hétéros l'opportunité de s'amuser et de pratiquer "+
"un sport dans une ambiance amicale et décontractée. "+
"L'ouverture d'esprit, la camaraderie et le plaisir de "+
"pratiquer un sport à l'extérieur caractérisent cette ligue."
"pratiquer un sport à l'extérieur caractérisent cette ligue.";
};
rulesPage.mission = function(){
return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
m('h2', 'Mission'),
m('p', rulesPage.missionTest())
]);
rulesPage.logo = function(){
var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
return m('div.uk-cover-background.uk-container-center', {style: style});
};
rulesPage.rules = function(){
return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
m('h2', 'Règlements 2015'),
return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary.uk-width-large-2-3', [
m('h2', 'Règlements 2016'),
m('ul',[
m('li', m('h3', 'Règlements généraux')),
m('li', m('h3','Règles et procédures')),
m('li', m('h3','Règlements de terrain')),
m('li', m('h3', m('a', 'Règlements généraux'))),
m('li', m('h3', m('a','Règles et procédures'))),
m('li', m('h3', m('a','Règlements de terrain'))),
])
]);
};
rulesPage.logoAndRules = function(){
return m('div.uk-grid.uk-margin',[
m('div.uk-width-large-1-3', rulesPage.logo()),
rulesPage.rules()
]
);
};
rulesPage.mission = function(){
return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
m('h2', 'Mission'),
m('p', rulesPage.missionText())
]);
};
rulesPage.view = function(){
return [
m.component(topNavBar),
m('div.uk-margin-top.uk-margin-bottom.uk-grid',
m('div.uk-width-large-3-5.uk-container-center', [
rulesPage.mission(),
rulesPage.rules()
rulesPage.logoAndRules(),
rulesPage.mission()
])),
m.component(footer)
];
scss/_custom_uikit.scss
+14
View File
@@ -2,6 +2,20 @@
@import "uikit/scss/uikit-mixins.scss";
@import "uikit/scss/core/variables.scss";
// Phenix colors
$navbar-background: #f08d28; //#dabd5e;
// $foo: ; // #f8c694;
$panel-box-background: #fce3ca;
$table-striped-background: #fce3ca;
$navbar-nav-active-background: #fce3ca;
$navbar-nav-hover-background: #fce3ca;
$panel-box-secondary-background: #fce3ca;
$badge-background: #fce3ca;
$badge-color: black;
$badge-font-size: 2em;
// Defaults
@import "uikit/scss/core/base.scss";