Skip to content

Gali-Nadav-Matan #1

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

Open
wants to merge 359 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
894c74e
edit list
galiii Dec 14, 2015
72f1fff
list view edit
galiii Dec 14, 2015
17c23f6
server edit list
galiii Dec 14, 2015
0321432
edit
galiii Dec 14, 2015
ff89ff3
edit list server
galiii Dec 14, 2015
9a5fff3
edit server list
galiii Dec 14, 2015
622fc51
edit
galiii Dec 14, 2015
2ffd98e
edit
galiii Dec 14, 2015
3e614d0
edit
galiii Dec 14, 2015
3f0c955
edit
galiii Dec 14, 2015
1af87d7
edit
galiii Dec 14, 2015
52da857
edit
galiii Dec 14, 2015
a584620
edit client
galiii Dec 14, 2015
825a0e7
edit
galiii Dec 14, 2015
1eb6b92
edit list view
galiii Dec 14, 2015
98926b5
edit
galiii Dec 15, 2015
209e18e
edit name list button find it
galiii Dec 15, 2015
fe33e88
find edit button done
galiii Dec 15, 2015
66d5523
edit
galiii Dec 15, 2015
2c70c6c
edit
galiii Dec 15, 2015
726d486
edit
galiii Dec 15, 2015
56da391
edit
galiii Dec 15, 2015
eab0100
edit button done
galiii Dec 15, 2015
fa6bc71
edit done
galiii Dec 15, 2015
2db120a
edit
galiii Dec 15, 2015
02c087c
edit
galiii Dec 15, 2015
d559b00
edit button
galiii Dec 15, 2015
34f7bad
edit
galiii Dec 15, 2015
0c48a50
edit btn
galiii Dec 15, 2015
8e78455
edit btn
galiii Dec 15, 2015
c9d6eb5
edit btn
galiii Dec 15, 2015
26048ac
edit
galiii Dec 15, 2015
a1fb276
edit
galiii Dec 15, 2015
cc0d808
edit
galiii Dec 15, 2015
2485191
in EDIT REM JS instead of 'submit' put on 'click'
galiii Dec 15, 2015
9299718
server edit
galiii Dec 15, 2015
c2bad6e
remove from list
galiii Dec 15, 2015
99fbda2
done with edit remove need to fix view
galiii Dec 15, 2015
5f39f98
update
galiii Dec 15, 2015
9e3c46b
order
galiii Dec 19, 2015
9aaca7f
order
galiii Dec 19, 2015
5810cb8
fix
galiii Dec 19, 2015
987d72c
middle
galiii Dec 19, 2015
ff17d41
items
galiii Dec 22, 2015
356028e
items
galiii Dec 28, 2015
2051e5c
server items
galiii Dec 28, 2015
24482ad
items
galiii Dec 30, 2015
95a2a9d
items
galiii Dec 30, 2015
009ccea
items
galiii Dec 30, 2015
1379810
items
galiii Dec 30, 2015
c7ebf2d
items
galiii Dec 30, 2015
79680a1
items
galiii Dec 30, 2015
1839939
items
galiii Dec 30, 2015
463e35c
items
galiii Dec 30, 2015
1e1b313
items
galiii Dec 30, 2015
a0b83fc
items
galiii Dec 30, 2015
d110a33
items
galiii Dec 30, 2015
850d467
items
galiii Dec 30, 2015
1a58fa5
items
galiii Dec 30, 2015
108a620
item
galiii Jan 6, 2016
58b7ec4
middle
galiii Jan 14, 2016
47ce8e2
middle
galiii Jan 14, 2016
a66bd6c
middle
galiii Jan 14, 2016
d0dba81
middle
galiii Jan 16, 2016
4946373
beck
galiii Feb 13, 2016
c6df01e
beck
galiii Feb 13, 2016
2e353ee
beck
galiii Feb 13, 2016
58a3318
beck
galiii Feb 13, 2016
f96b6a6
beck
galiii Feb 13, 2016
852d8be
beck
galiii Feb 13, 2016
b887555
client
galiii Feb 27, 2016
c7e5ecd
client
galiii Feb 27, 2016
e476619
client
galiii Feb 27, 2016
39e0a49
client
galiii Feb 27, 2016
8ea7c8c
client
galiii Feb 28, 2016
19a272d
button plus
galiii Feb 28, 2016
473c5bf
button
galiii Feb 28, 2016
1f24a9a
button
galiii Feb 28, 2016
a1072c8
button
galiii Feb 28, 2016
96b0325
button
galiii Feb 28, 2016
8894cac
button
galiii Feb 28, 2016
6f7292d
button
galiii Mar 2, 2016
4452bee
button
galiii Mar 2, 2016
d355967
button
galiii Mar 2, 2016
24b89fd
button
galiii Mar 2, 2016
e3d5ae7
button
galiii Mar 2, 2016
a86dad1
layout
galiii Mar 2, 2016
1adc7fe
button
galiii Mar 2, 2016
0737228
button
galiii Mar 2, 2016
6b9eb08
cleaning
galiii May 13, 2016
8270660
cleaning
galiii May 13, 2016
125fc6e
cleaning
galiii May 14, 2016
c50a0de
ex[lain
galiii May 16, 2016
ff45af0
fixinig clealing in apiRoutes
galiii May 16, 2016
0ea25f3
debug apiRoutes
galiii May 16, 2016
d384445
debug auth.js server
galiii May 16, 2016
7fb3bfc
debaug auth.js
galiii May 16, 2016
3845f3c
cleaninig
galiii May 16, 2016
b7bde10
login fix client
galiii May 16, 2016
2b2c32f
is loggin request.js
galiii May 16, 2016
a0eb612
login debug console
galiii May 16, 2016
72c2ebf
server list view fix
galiii May 16, 2016
6fb8127
fixing
galiii May 16, 2016
71571e1
cleaning for list view html client sude
galiii May 18, 2016
61ae8cd
list view client side cleaning and testing
galiii May 18, 2016
1001caf
cleaninig left side
galiii May 18, 2016
bf8babf
fixing all lists in client side left side
galiii May 19, 2016
0073005
server side db require apiRoutes line 4
galiii May 19, 2016
e9cded6
add to have a api dynamic fit in client request - getAllList to the r…
galiii May 19, 2016
e3c22a1
server side apiRoutes fixing the path of getAllLists
galiii May 19, 2016
c91b277
server side fixinix in auth.js console.log
galiii May 19, 2016
83e7661
db.js error in get all list from left side
galiii May 19, 2016
ac4a998
server side fixinix
galiii May 19, 2016
2f3c907
server side
galiii May 19, 2016
428c8a7
server side - JSON fix read
galiii May 19, 2016
def3c6c
json fix inside server side
galiii May 19, 2016
3b6e082
left side
galiii May 19, 2016
a476f30
list view
galiii May 19, 2016
ba8888b
left side
galiii May 19, 2016
227ca46
left side
galiii May 19, 2016
a9d3214
left side
galiii May 19, 2016
849ceb2
left side
galiii May 19, 2016
7cc9f9b
left side
galiii May 19, 2016
44f7539
left side
galiii May 19, 2016
9b7b8ca
left side
galiii May 19, 2016
2334762
left side
galiii May 19, 2016
e55068b
left side
galiii May 19, 2016
67825a0
left side
galiii May 19, 2016
f60e468
left side
galiii May 19, 2016
3c229c0
left side
galiii May 19, 2016
7ea2e63
left side
galiii May 19, 2016
b8d1ddf
left side
galiii May 19, 2016
c8b37d0
left side
galiii May 19, 2016
e521d94
list view client side in list.js
galiii May 22, 2016
1ade6cf
list.js client sude
galiii May 22, 2016
2b98232
lauout view client side
galiii May 23, 2016
78d7d70
List client side cheacking
galiii May 23, 2016
8073243
List client side cheacking
galiii May 23, 2016
e6da0cb
List client side cheacking
galiii May 23, 2016
31311a5
List client side cheacking
galiii May 23, 2016
4cd4418
server client side list view
galiii May 23, 2016
f008aae
server client side list view
galiii May 23, 2016
c6fb1f8
list problom
galiii May 23, 2016
56d9c59
list problom
galiii May 23, 2016
b8f2ed0
server rh list
galiii May 23, 2016
e81071d
server cliebt list view fix
galiii May 23, 2016
108b7a8
server cliebt list view fix
galiii May 23, 2016
8abf148
list explain
galiii May 23, 2016
790666d
list
galiii May 23, 2016
e0d5463
list
galiii May 23, 2016
97aa501
list
galiii May 23, 2016
bbe0922
list
galiii May 23, 2016
f613c16
list
galiii May 23, 2016
ab34c32
list
galiii May 23, 2016
67af620
list
galiii May 23, 2016
c589ede
list
galiii May 23, 2016
5de4184
list
galiii May 23, 2016
90dd6e3
list
galiii May 23, 2016
2357021
list
galiii May 23, 2016
19c37c3
list
galiii May 23, 2016
8bcbf78
list
galiii May 23, 2016
25230ba
list
galiii May 23, 2016
2189574
fix staff for middle view
galiii May 24, 2016
385422d
middle view
galiii May 24, 2016
b3a4544
fix
galiii May 24, 2016
e3a1c26
fix
galiii May 24, 2016
2fa1807
fix
galiii May 24, 2016
a98b8e4
fix
galiii May 24, 2016
9d422f8
fix
galiii May 24, 2016
db0862b
fix
galiii May 24, 2016
316b407
fix
galiii May 24, 2016
61f8d59
fix
galiii May 24, 2016
4203f0d
fix
galiii May 24, 2016
e314bc1
fix
galiii May 24, 2016
5f96725
server
galiii May 28, 2016
5d95689
middle
galiii May 28, 2016
91848dc
change
galiii May 30, 2016
a708fd8
change
galiii May 30, 2016
1f3d911
change
galiii May 30, 2016
cf5aa30
left client+ server
galiii Jun 1, 2016
60cafc5
left client+ server
galiii Jun 1, 2016
0f202ea
left client+ server
galiii Jun 1, 2016
5c0a1fa
left side server + client
galiii Jun 1, 2016
7479747
left side server + client
galiii Jun 1, 2016
e37b703
left side server + client
galiii Jun 1, 2016
c4c1891
left side server + client
galiii Jun 1, 2016
f4b8c70
cleanig + fixing
galiii Jun 2, 2016
827ae64
cleanig + fixing
galiii Jun 2, 2016
a807713
middle
galiii Jun 2, 2016
ed561b1
fix
galiii Jun 2, 2016
71f563e
fix
galiii Jun 2, 2016
d4e99da
fix
galiii Jun 2, 2016
a717963
fix
galiii Jun 2, 2016
9d0b099
fix
galiii Jun 2, 2016
0026f95
fix
galiii Jun 2, 2016
4c75991
fix
galiii Jun 4, 2016
e4cca15
css
galiii Jun 4, 2016
ee6273b
css
galiii Jun 4, 2016
b3d53ac
client
galiii Aug 21, 2016
b4e3961
style
galiii Aug 21, 2016
688bdbb
style
galiii Aug 21, 2016
60e30ee
style
galiii Aug 21, 2016
228c437
style
galiii Aug 21, 2016
6df8fb9
style
galiii Aug 21, 2016
822aa35
style font
galiii Aug 21, 2016
a62cc0f
style
galiii Aug 21, 2016
df27e3f
bb
galiii Sep 1, 2016
562ccc6
bb
galiii Sep 1, 2016
c4c1f35
jj
galiii Sep 1, 2016
e2168d5
style fed
galiii Sep 2, 2016
891eb60
layout
galiii Sep 2, 2016
bd6b204
client
galiii Sep 2, 2016
1057882
left side
galiii Sep 2, 2016
486e054
css
galiii Sep 2, 2016
0e1b376
style
galiii Sep 2, 2016
619227e
css
galiii Sep 2, 2016
8644242
css
galiii Sep 2, 2016
c98251d
css
galiii Sep 2, 2016
60827aa
fed
galiii Sep 3, 2016
43bc6f4
fed
galiii Sep 3, 2016
cbaa26e
fed
galiii Sep 3, 2016
a52d918
fed
galiii Sep 3, 2016
3f72e03
fed
galiii Sep 3, 2016
e1967f8
client
galiii Sep 5, 2016
d612241
client
galiii Sep 5, 2016
423d7eb
client
galiii Sep 5, 2016
918b68a
client
galiii Sep 5, 2016
f2424ca
client
galiii Sep 5, 2016
fc1191d
fix
galiii Sep 5, 2016
b950952
fix
galiii Sep 5, 2016
29744d5
style
galiii Dec 12, 2016
874f327
style
galiii Dec 12, 2016
80d2e15
style
galiii Dec 12, 2016
c89b82f
style
galiii Dec 12, 2016
2a405dd
style
galiii Dec 12, 2016
652ff5c
style
galiii Dec 12, 2016
3030488
style
galiii Dec 12, 2016
50125e9
style
galiii Dec 12, 2016
a59f86c
style
galiii Dec 12, 2016
0b016bf
style
galiii Dec 13, 2016
28104c7
style
galiii Dec 13, 2016
4b1dce3
style
galiii Dec 13, 2016
299a3cc
style
galiii Dec 13, 2016
2bfc230
style
galiii Dec 13, 2016
3e96ebe
style
galiii Dec 13, 2016
c1a1982
style
galiii Dec 14, 2016
d79f06c
postion
galiii Dec 14, 2016
b21ddb4
style
galiii Dec 14, 2016
cc72e23
style
galiii Dec 24, 2016
959d5ca
update
galiii Dec 26, 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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Single page application, with node.js server, educational project

**This project is not for production uses**
Gali Bril
Nadav "Lord of GitHub" Gur-Arieh
Matan Rosenfeld




## Installation
From the project directory:
Expand Down
190 changes: 190 additions & 0 deletions client/beck/NOT_FOR_USE/mainBeckup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@

/**
* Created by galibr.
*/

define(['jquery',
'modules/submit/Login/Login',
'core/cookies',
'core/layout',
'core/NOT_FOR_USE/request',
'modules/left/list_edit/List/List',
'modules/middle/itemsList/ItemB'],
function($, Login, cookies, layout,request,ListView,ItemB){
'use strict';

//global vars
var AUTH_STR = "auth",
login,
//create,
user = null,

list , //for list in the right panel
arrayBtnHtml, //array list of button edit

tab;

/*If the cookies is expierd do start login*/
function startLoggin(){
function loginSuccess(){
//console.log("check in main 1 ::checking for me if login success");
startApp(); //go to function startApp and start the application
login.destroy(); //delete page of login
}

function loginFail(){
console.log("login fail trying again");
login.resetDeferred();//
login.getPromise().then(loginSuccess, loginFail);//like a while(FALSE) until you succeed of login
}

login = new Login();//from: modules/submit/Login/Login.js
login.appendTo("#container");//
login.getPromise().then(loginSuccess, loginFail);//
}//end of login


/*########################################################################################################
################################# APPLICATION STRUCTION LEFT SIDE#######################################
########################################################################################################*/

/**have a delay from taking the DB**/
function startListView(){
function listViewSuccess(){
console.log("check in main 3 :: list View success.");
//arrayBtnHtml = list.getArrayOfButtons(); //for checking
//console.log("in start: ",list.$);
continueApp(); //for the button edit list event
}//end Success

//NOT FINISH MUST COME BACK
function listViewFail(){
console.log("list View fail trying again");
}//end Fail

list = new ListView(); //create a new listView from modules/list_edit/List/List.js
list.getPromise().then(listViewSuccess,listViewFail);
}//end startListView






/*########################################################################################################
################################# APPLICATION STRUCTION MIDDLE SIDE #####################################
########################################################################################################*/

/**
function startMiddleItems(name){
function middleTabStripSuccess(){
console.log("check in main 6 :: Tab Strip Success.");
continueApp(); //for the button edit list event
}//end Success

function middleTabStripFail(){
console.log("check in main 6 :: Tab Strip Fail trying again");
}//end Fail

tab = new ItemB(name); //create a new listView from modules/list_edit/List/List.js
tab.getPromise().then(middleTabStripSuccess,middleTabStripFail);
}
**/

function startMiddle(){
function tabSuccess(){
console.log("tab:: tab success.");
continueApp();
}//end Success

//NOT FINISH MUST COME BACK
function tabFail(){
console.log("tab fail trying again");
}//end Fail

tab = new ItemB();
tab.getPromise().then(tabSuccess,tabFail);
}

/**********************************************************************************************/
/************************** APPLICATION START *************************************************/
/**********************************************************************************************/
var bool = 0;
var i =0;
function startApp(){
//console.log("check in main 7 :: hello from start App");
layout.createLayout("3W", "#container"); //create layout
//if(bool !== 1)
user=cookies.getCookie('user');
//console.log(user);
//user=cookies.getCookie('user');
//NameOfTheUser(); //for checking
//console.log("starting application " +user); //for checking


//startListView(); // i have a delay because i did to it a structure I resolve it's with setTimOut

}//end startApp


function continueApp(){
//console.log("check in main 8 :: hello from continueApp");

/**LIST of buttons in LIST view**/
list.$.find(".listsOfView button").on('click',function(e){
console.log("check in main 8.1 :: .listsOfView button " +name);
var name= $(e.target).closest(".listsOfView").find(".name").html();
startEdtOrRemWin(name);
});


/*LIST of buttons in LIST view*/
list.$.find(".listsOfView ").on('click',function(e){
//console.log("hello");
var name= $(e.target).closest(".listsOfView").find(".name").html();
console.log("check in main 8.2 :: only in target .listsOfView "+name);
startMiddleItems(name);
});
}//end continueApp



request.isLoggedIn().then(
function(){
console.log("sucess COOKIES");
startApp();
},
function(){
console.log("failed COOKIES");
startLoggin();
});



//user=cookies.getCookie(AUTH_STR);//
//if(user !== "" ) {
//bool = 1;
// console.log("starting application" ,user);
// startApp();
//} else {


//startLoggin();
//}

//});



/**
user=cookies.getCookie(AUTH_STR);//
if(user !== "" ) {
bool = 1;
console.log("starting application" +user);
startApp();
} else {
startLoggin();
}
**/
});

101 changes: 101 additions & 0 deletions client/beck/NOT_FOR_USE/tabmain.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/**
* Created by galibr.
*/

define(['jquery',
'modules/submit/Login/Login',
'core/cookies',
'core/layout',
'core/request',
'modules/middle/itemsList/ItemB',
],
function($, Login, cookies, layout,request,ItemB){
'use strict';

//global vars
var AUTH_STR = "auth",
login,
user = null,
tab;




/*########################################################################################################
################################# SUBMIT STRUCTION ####################################################
########################################################################################################*/

/*If the cookies is expierd do start login*/
function startLoggin(){
function loginSuccess(){
//console.log("check in main 1 ::checking for me if login success");
startApp(); //go to function startApp and start the application
login.destroy(); //delete page of login
}

function loginFail(){
console.log("login fail trying again");
login.resetDeferred();//
login.getPromise().then(loginSuccess, loginFail);//like a while(FALSE) until you succeed of login
}

login = new Login();//from: modules/submit/Login/Login.js
login.appendTo("#container");//
//login.$.find("#createbtn").on('click', function(){startCreate();});//if we press the button of create: go to struction of create new user
login.getPromise().then(loginSuccess, loginFail);//
}//end of login



function startMiddle(){
function tabSuccess(){
console.log("tab:: tab success.");
continueApp();
}//end Success

//NOT FINISH MUST COME BACK
function tabFail(){
console.log("tab fail trying again");
}//end Fail

tab = new ItemB();
tab.getPromise().then(tabSuccess,tabFail);
}

/**********************************************************************************************/
/************************** APPLICATION START *************************************************/
/**********************************************************************************************/
var bool = 0;
var i =0;
function startApp(){
//console.log("check in main 7 :: hello from start App");
layout.createLayout("3W", "#container"); //create layout
//if(bool !== 1)
user=cookies.getCookie('user');


}//end startApp


function continueApp(){
//console.log("check in main 8 :: hello from continueApp");


}//end continueApp



request.isLoggedIn().then(
function(){
console.log("sucess COOKIES");
startApp();
},
function(){
console.log("failed COOKIES");
startLoggin();
});



});

19 changes: 19 additions & 0 deletions client/beck/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Created by moshemal on 4/20/15.
*/


define(function(){
requirejs.config({
baseUrl: "./",
deps: ['NOT_FOR_USE/mainBeckup'],//['main'],
shim: {
kendo: ['jquery'],
},
paths: {
jquery: "vendors/jquery/dist/jquery",
kendo: "vendors/kendo-ui/src/js/kendo.ui.core",
text: "vendors/text/text"
}
});
});
Loading