Skip to content

Commit 8adf1d9

Browse files
starmaidstarmaid
authored
Merge pull request #55 from mchartigan/demo-ready
Fix all bugs remaining in prep for demo
2 parents 7f95494 + e427968 commit 8adf1d9

8 files changed

Lines changed: 252 additions & 218 deletions

File tree

‎public/common/account.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
99
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
1010
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>
11+
12+
<title>Account Information</title>
1113
</head>
1214
<body>
1315
<div class="ui fixed violet inverted menu">
@@ -24,9 +26,9 @@
2426

2527
<i class="dropdown icon"></i>
2628
<div class="menu">
27-
<a class="item" href="/user/" id="user-own-profile">Profile</a>
29+
<a class="item" href="/user/" id="user-own-profile">Profile</a>
2830
<a class="item" href="/common/account.html">Account Information</a>
29-
<a class="item" href="/index.html" onclick="firebase.auth().signOut()">
31+
<a class="item" href="/index.html" onclick="firebase.auth().signOut();">
3032
<h4 class="ui red header">Sign Out</h4>
3133
</a>
3234
</div>
@@ -108,5 +110,6 @@ <h1 class="ui header">Account Information</h1>
108110
</script>
109111

110112
<script src="/js/account.js"></script>
113+
<script src="/js/login.js" type="text/babel"></script>
111114
</body>
112115
</html>

‎public/common/create_post.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="menu">
2727
<a class="item" href="/user/" id="user-own-profile">Profile</a>
2828
<a class="item" href="/common/account.html">Account Information</a>
29-
<a class="item" href="/index.html" onclick="firebase.auth().signOut()">
29+
<a class="item" href="/index.html" onclick="firebase.auth().signOut();">
3030
<h4 class="ui red header">Sign Out</h4>
3131
</a>
3232
</div>

‎public/index.html‎

Lines changed: 101 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,111 @@
11
<html>
2-
<head>
3-
<script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
4-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css">
5-
<script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.js"></script>
6-
72

8-
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-app.js"></script>
9-
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
10-
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
11-
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>
12-
<script src="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.js"></script>
13-
14-
<link rel="stylesheet" href="/css/styles.css">
15-
<link rel="shortcut icon" href="favicon.ico">
16-
<title>Bitwise Home</title>
17-
</head>
18-
<body>
19-
<div class="ui fixed violet inverted menu">
20-
<div class="ui fluid container">
21-
<a href="/index.html" class="header item">
22-
<img class="logo" src="https://firebasestorage.googleapis.com/v0/b/bitwise-a3c2d.appspot.com/o/assets%2Flogo.png?alt=media&token=1498c5a1-3b43-436c-bed0-d764d91fe3e5">
23-
&nbsp; Bitwise
24-
</a>
25-
<div class="ui simple right dropdown item" id="user-dropdown">
26-
<img id="profile-icon" class="logo" src="https://firebasestorage.googleapis.com/v0/b/bitwise-a3c2d.appspot.com/o/usercontent%2Fdefault%2Fprofile.jpg?alt=media&token=f35c1c16-d557-4b94-b5f0-a1782869b551">
27-
<div id="account-dropdown">
28-
&nbsp; retrieving...
29-
</div>
30-
31-
<i class="dropdown icon"></i>
32-
<div class="menu">
33-
<a class="item" href="/user/" id="user-own-profile">Profile</a>
34-
<a class="item" href="/common/account.html">Account Information</a>
35-
<a class="item" href="/common/login.html" onclick="firebase.auth().signOut()">
36-
<h4 class="ui red header">Sign Out</h4>
37-
</a>
38-
</div>
3+
<head>
4+
<script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
5+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.7/dist/semantic.min.css">
6+
<script src="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.7/dist/semantic.min.js"></script>
7+
8+
<script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
9+
<script src="https://unpkg.com/react@16/umd/react.development.js" crossorigin></script>
10+
<script src="https://unpkg.com/react-dom@16/umd/react-dom.development.js" crossorigin></script>
11+
12+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.6.7/jquery.timeago.min.js"></script>
13+
14+
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-app.js"></script>
15+
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
16+
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
17+
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>
18+
<script src="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.js"></script>
19+
20+
<link rel="shortcut icon" href="/favicon.ico">
21+
<link type="text/css" rel="stylesheet" href="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.css" />
22+
<title>Home</title>
23+
</head>
24+
25+
<body>
26+
<div class="ui fixed violet inverted menu">
27+
<div class="ui fluid container">
28+
<a href="/index.html" class="header item">
29+
<img class="logo" src="https://firebasestorage.googleapis.com/v0/b/bitwise-a3c2d.appspot.com/o/assets%2Flogo.png?alt=media&token=1498c5a1-3b43-436c-bed0-d764d91fe3e5">
30+
&nbsp; Bitwise
31+
</a>
32+
<div class="ui simple right dropdown item" id="user-dropdown">
33+
<img id="profile-icon" class="logo"
34+
src="https://firebasestorage.googleapis.com/v0/b/bitwise-a3c2d.appspot.com/o/usercontent%2Fdefault%2Fprofile.jpg?alt=media&token=f35c1c16-d557-4b94-b5f0-a1782869b551">
35+
<div id="account-dropdown">
36+
&nbsp; retrieving...
37+
</div>
38+
39+
<i class="dropdown icon"></i>
40+
<div class="menu">
41+
<a class="item" href="/user/" id="user-own-profile">Profile</a>
42+
<a class="item" href="/common/account.html">Account Information</a>
43+
<a class="item" onclick="completeSignOut()">
44+
<h4 class="ui red header">Sign Out</h4>
45+
</a>
3946
</div>
40-
<a class="right header item" id="login-button">Log In</a>
41-
<div id="login-modal"></div>
4247
</div>
48+
<a class="right header item" id="login-button">Log In</a>
49+
<div id="login-modal"></div>
4350
</div>
51+
</div>
4452

45-
<br><br><br><br>
46-
<div class="content">
47-
<a id="test-button" href="/common/test.html" class='ui fluid inverted red button'>
48-
<i class="keyboard icon"></i>Test Page
49-
</a>
50-
</div>
53+
<br><br><br><br>
5154

52-
<div class="content">
53-
<a id="create-post-button" href="/common/create_post.html" class='ui fluid inverted violet button'>
54-
<i class="pencil alternate icon"></i>Create Post
55-
</a>
56-
<br>
57-
<ul id="timeline"></ul>
58-
</div>
55+
<div class="ui main container">
56+
<a class='ui fluid inverted violet button' id="create-post-button" href="/common/create_post.html" style="display:none;">
57+
<i class="pencil alternate icon"></i>
58+
Create Post
59+
</a>
5960

60-
<script>
61-
// Initialize Firebase
62-
var firebaseConfig = {
63-
apiKey: "AIzaSyBJTDxfjl_xpPXSuiZmcriEpRj4KPPiVpg",
64-
authDomain: "bitwise-a3c2d.firebaseapp.com",
65-
databaseURL: "https://bitwise-a3c2d.firebaseio.com",
66-
projectId: "bitwise-a3c2d",
67-
storageBucket: "bitwise-a3c2d.appspot.com",
68-
messagingSenderId: "1025486551841",
69-
appId: "1:1025486551841:web:24f84a09e2f70631625c60",
70-
measurementId: "G-9DCMV9YV2N"
71-
};
72-
firebase.initializeApp(firebaseConfig);
73-
const db = firebase.firestore();
74-
</script>
61+
<div class="ui top attached tabular menu">
62+
<a class="item active" data-tab="all-posts">All Posts</a>
63+
<a class="item" data-tab="timeline" id="timeline-tab" style="display:none;">My Timeline</a>
64+
</div>
7565

76-
<script src="js/login.js" type="text/babel"></script>
77-
<script src="js/index.js"></script>
78-
</body>
66+
<div class="ui bottom attached tab segment active" data-tab="all-posts" id="all-posts-container">
67+
<div class="ui inline centered active slow violet double loader"></div>
68+
</div>
69+
70+
<div class="ui bottom attached tab segment" data-tab="timeline" id="timeline-container">
71+
<div class="ui inline centered active slow violet double loader"></div>
72+
</div>
73+
74+
<style>
75+
.ui.comments {
76+
max-width: 100%;
77+
}
78+
79+
.ui.comments .comment .avatar img,
80+
.ui.comments .comment img.avatar {
81+
height: auto;
82+
}
83+
84+
.ui.comments .comment a.author:hover {
85+
color: #6435c9;
86+
}
87+
</style>
88+
</div>
89+
90+
<script>
91+
// Initialize Firebase
92+
var firebaseConfig = {
93+
apiKey: "AIzaSyBJTDxfjl_xpPXSuiZmcriEpRj4KPPiVpg",
94+
authDomain: "bitwise-a3c2d.firebaseapp.com",
95+
databaseURL: "https://bitwise-a3c2d.firebaseio.com",
96+
projectId: "bitwise-a3c2d",
97+
storageBucket: "bitwise-a3c2d.appspot.com",
98+
messagingSenderId: "1025486551841",
99+
appId: "1:1025486551841:web:24f84a09e2f70631625c60",
100+
measurementId: "G-9DCMV9YV2N"
101+
};
102+
firebase.initializeApp(firebaseConfig);
103+
const db = firebase.firestore();
104+
</script>
105+
<script src="/js/endless.js" type="text/babel"></script>
106+
<script src="/js/index.js" type="text/babel"></script>
107+
<script src="/js/post.js" type="text/babel"></script>
108+
<script src="/js/login.js" type="text/babel"></script>
109+
</body>
110+
79111
</html>

‎public/js/account.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ firebase.auth().onAuthStateChanged(function(user) {
2222
loadDropdown();
2323
loadAccountInfo();
2424
} else {
25-
location.replace("/common/login.html");
25+
location.replace("/index.html");
2626
}
2727
});
2828

‎public/js/create_post.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ firebase.auth().onAuthStateChanged(function(user) {
3535
$("#login-button").hide();
3636
$("#user-dropdown").show();
3737
} else {
38-
location.replace("/common/login.html");
38+
location.replace("/index.html");
3939
}
4040
});
4141

0 commit comments

Comments
 (0)