Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./node_modules
7 changes: 7 additions & 0 deletions .idea/typescript-compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

523 changes: 436 additions & 87 deletions .idea/workspace.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Configuration.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Configuration.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Configuration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
interface Configuration{
console: Boolean, file: Boolean, colors: Boolean, logLevel:string;
}
92 changes: 52 additions & 40 deletions OfekTwitter/Index.html
Original file line number Diff line number Diff line change
@@ -1,57 +1,69 @@
<!--comment for pull reqeust-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>ofek twitter</title>
<link rel="icon" href="../images/OfekUnit.png">
<link rel="stylesheet" href="../css/static.css">
<link rel="stylesheet" href="../css/index.css">
<link rel="stylesheet" href="../css/bootstrap.css">
<link rel="stylesheet" href="../css/index1.css">
<script src="../scripts/tweets.js"></script>
<script src="../scripts/testing.js"></script>
<link rel="stylesheet" href="../css/testing.css">

</head>
<body>
<header>
<img src="../images/OfekUnit.png" alt="ofeklogo">
<a href="SignIn.html" >Sign In</a>
<a href="SignUp.html" >Sign Up</a>
<a href="users.html" >Users</a>
<h4>OfekTwitter</h4>

<header class="navbar navbar-toggleable-md navbar-light bg-faded ">
<img src="../images/OfekUnit.png" alt="ofeklogo" class="navbar-left" >
<ul class="nav navbar-nav navbar-right">
<li>
<a href="SignIn.html" class="">Sign In</a>
</li>
<li>
<a href="SignUp.html" class="">Sign Up</a>
</li>
<li>
<a href="users.html" class="">Users</a>
</li>
</ul>
<a href="index.html" class="text-left pull-left"><h4 class="navbar-text navbar-header" >OfekTwitter</h4></a>
</header>
<form>
<div class="add-comment">
<input type="text" placeholder="tweet text..." id="tweetText">
<input type="submit" value="publish"></input>
<div class="col-xs-10 col-md-10 col-md-offset-1">
<textarea placeholder="tweet text..." id="tweetText" class="col-xs-12 col-md-12 form-control noresize"></textarea>
<input type="button" value="publish" class="btn btn-primary pull-right" onclick="addTweet()"></input>
</div>
</form>
<div class="comment-holder">
<div class="comment-container">
<img src="../images/useravatar.png">
<div class="user-name">james says</div>
<div class="user-comment">blabla bbaaaa</div>

<div class="comment-container">
<img src="../images/useravatar.png">
<div class="user-name">james says</div>
<div class="user-comment">blabla bbaaaa</div>

<div class="comment-container">
<img src="../images/useravatar.png">
<div class="user-name">james says</div>
<div class="user-comment">blabla bbaaaa</div>

<div class="comment-container">
<img src="../images/useravatar.png">
<div class="user-name">james says</div>
<div class="user-comment">blabla bbaaaa</div>

<div class="comment-container">
<img src="../images/useravatar.png">
<div class="user-name">james says</div>
<div class="user-comment">blabla bbaaaa</div>
</div>
</div>
</div>
</div>
<div class="col-xs-10 col-md-10 col-md-offset-1" id = "tweetsHolder">

<div class="row mt-1">
<img src="../images/useravatar.png" class="left col-xs-1 col-md-1">
<div class="user-name col-xs-11 col-md-11 text-left ">james says</div>
<div class="user-comment col-xs-11 col-md-11 text-left">blabla bbaaaa</div>
</div>

<div class="row mt-1">
<img src="../images/useravatar.png" class="left col-xs-1 col-md-1">
<div class="user-name col-xs-11 col-md-11 text-left ">james says</div>
<div class="user-comment col-xs-11 col-md-11 text-left">blabla bbaaaa</div>
</div>
</div>
</body>
<script>

Choose a reason for hiding this comment

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

להקפיד לכתוב
script
בקובץ נפרד

test_group('first test group', function() {
assert(true, "simple successful test");
assert(true, "simple successful test 2");
assert(false, "simple unsuccessful test");
});


test_group('second test group', function() {
assert(true, "simple successful test");
assert(true, "simple unsuccessful test 2");
assert(true, "simple unsuccessful test 3");
});

</script>

</html>
54 changes: 39 additions & 15 deletions OfekTwitter/SignIn.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,54 @@
<!--comment for pull reqeust-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>ofek twitter</title>
<link rel="icon" href="../images/OfekUnit.png">
<link rel="stylesheet" href="../css/static.css">
<link rel="stylesheet" href="../css/SignIn.css">
<link rel="stylesheet" href="../css/bootstrap.css">
<link rel="stylesheet" href="../css/SignIn1.css">
</head>
<body>
<header>
<img src="../images/OfekUnit.png" alt="ofeklogo">
<a href="SignIn.html" >Sign In</a>
<a href="SignUp.html" >Sign Up</a>
<a href="users.html" >Users</a>
<h4>OfekTwitter</h4>
<header class="navbar navbar-toggleable-md navbar-light bg-faded ">
<img src="../images/OfekUnit.png" alt="ofeklogo" class="navbar-left" >
<ul class="nav navbar-nav navbar-right">
<li>
<a href="SignIn.html" class="">Sign In</a>
</li>
<li>
<a href="SignUp.html" class="">Sign Up</a>
</li>
<li>
<a href="users.html" class="">Users</a>
</li>
</ul>
<a href="index.html" class="text-left pull-left"><h4 class="navbar-text navbar-header" >OfekTwitter</h4></a>
</header>
<form>
<div class="registar-container">
<div class="panel panel-default col-xs-4 col-md-4 col-md-offset-4 ">
<div class="registar-header">Sign In</div>
<div class="registar-container-internal">
<p>Username</p>
<input type="text" id="UserName">
<p>Password</p>
<input type="text" id="Password">
<div class="registar-container-internal col-xs-12 col-md-12">
<div class="col-xs-1 col-md-12">
<div class="col-xs-0 col-md-4 ">
<p>Username</p>
</div>
<div class="col-xs-0 col-md-7">
<input type="text" id="UserName" placeholder="User name" class="form-control">
</div>
</div>
<div>
<div class="col-xs-1 col-md-12">
<div class="col-xs-0 col-md-4 ">
<p class="text-center">Password</p>
</div>
<div class="col-xs-0 col-md-7">
<input type="text" id="Password" placeholder="Password" class="form-control">
</div>
</div>

</div>
</div>
<input type="submit">
<input type="submit" class="btn btn-primary center-block">
</div>
</form>
</body>
Expand Down
69 changes: 59 additions & 10 deletions OfekTwitter/SignUp.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,71 @@
<!--comment for pull reqeust-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>ofek twitter</title>
<link rel="icon" href="../images/OfekUnit.png">
<link rel="stylesheet" href="../css/static.css">
<link rel="stylesheet" href="../css/SignUp.css">


<link rel="stylesheet" href="../css/bootstrap.css">
<link rel="stylesheet" href="../css/SignIn1.css">
</head>
<body>
<header>
<img src="../images/OfekUnit.png" alt="ofeklogo">
<a href="SignIn.html" >Sign In</a>
<a href="SignUp.html" >Sign Up</a>
<a href="users.html" >Users</a>
<header class="navbar navbar-toggleable-md navbar-light bg-faded ">
<img src="../images/OfekUnit.png" alt="ofeklogo" class="navbar-left" >
<ul class="nav navbar-nav navbar-right">
<li>
<a href="SignIn.html" class="">Sign In</a>
</li>
<li>
<a href="SignUp.html" class="">Sign Up</a>
</li>
<li>
<a href="users.html" class="">Users</a>
</li>
</ul>
<a href="index.html" class="text-left pull-left"><h4 class="navbar-text navbar-header" >OfekTwitter</h4></a>
</header>

<form>
<div class="panel panel-default col-xs-4 col-md-4 col-md-offset-4 ">
<div class="registar-header">Sign In</div>
<div class="registar-container-internal col-xs-12 col-md-12">
<div class="col-xs-1 col-md-12">
<div class="col-xs-0 col-md-4 ">
<p>Username</p>
</div>
<div class="col-xs-0 col-md-7">
<input type="text" id="UserName" placeholder="User name" class="form-control">
</div>
</div>
<div>
<div class="col-xs-1 col-md-12">
<div class="col-xs-0 col-md-4 ">
<p class="text-center">Password</p>
</div>
<div class="col-xs-0 col-md-7">
<input type="text" id="Password" placeholder="Password" class="form-control">
</div>
</div>

<h4>OfekTwitter</h4>
</header>
</div>
<div>
<div class="col-xs-1 col-md-12">
<div class="col-xs-0 col-md-4 ">
<p class="text-center">Password</p>
</div>
<div class="col-xs-0 col-md-7">
<input type="text" id="ConfirmPassword" placeholder="confirm Password" class="form-control">
</div>
</div>

</div>
</div>
<input type="submit" class="btn btn-primary center-block">
</div>
</form>
<!--
<form action="MyCtrl">
<div class="registar-container">
<div class="registar-header">Sign Up</div>
Expand All @@ -31,6 +80,6 @@ <h4>OfekTwitter</h4>
<input type="submit">
</div>
</form>

-->
</body>
</html>
Loading