Skip to content

Fix all bugs remaining in prep for demo #55

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.

Sign up for GitHub

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

Merged
starmaid merged 1 commit into from
Nov 4, 2020
Merged

Fix all bugs remaining in prep for demo #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions public/common/account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>

<title>Account Information</title>
</head>
<body>
<div class="ui fixed violet inverted menu">
Expand All @@ -24,9 +26,9 @@

<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="/user/" id="user-own-profile">Profile</a>
<a class="item" href="/user/" id="user-own-profile">Profile</a>
<a class="item" href="/common/account.html">Account Information</a>
<a class="item" href="/index.html" onclick="firebase.auth().signOut()">
<a class="item" href="/index.html" onclick="firebase.auth().signOut();">
<h4 class="ui red header">Sign Out</h4>
</a>
</div>
Expand Down Expand Up @@ -108,5 +110,6 @@ <h1 class="ui header">Account Information</h1>
</script>

<script src="/js/account.js"></script>
<script src="/js/login.js" type="text/babel"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion public/common/create_post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="menu">
<a class="item" href="/user/" id="user-own-profile">Profile</a>
<a class="item" href="/common/account.html">Account Information</a>
<a class="item" href="/index.html" onclick="firebase.auth().signOut()">
<a class="item" href="/index.html" onclick="firebase.auth().signOut();">
<h4 class="ui red header">Sign Out</h4>
</a>
</div>
Expand Down
170 changes: 101 additions & 69 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,111 @@
<html>
<head>
<script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.css">
<script src="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.2/dist/semantic.min.js"></script>


<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>
<script src="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.js"></script>

<link rel="stylesheet" href="/css/styles.css">
<link rel="shortcut icon" href="favicon.ico">
<title>Bitwise Home</title>
</head>
<body>
<div class="ui fixed violet inverted menu">
<div class="ui fluid container">
<a href="/index.html" class="header item">
<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">
&nbsp; Bitwise
</a>
<div class="ui simple right dropdown item" id="user-dropdown">
<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">
<div id="account-dropdown">
&nbsp; retrieving...
</div>

<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="/user/" id="user-own-profile">Profile</a>
<a class="item" href="/common/account.html">Account Information</a>
<a class="item" href="/common/login.html" onclick="firebase.auth().signOut()">
<h4 class="ui red header">Sign Out</h4>
</a>
</div>
<head>
<script src="https://code.jquery.com/jquery-3.1.1.min.js" crossorigin="anonymous"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.7/dist/semantic.min.css">
<script src="https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.7/dist/semantic.min.js"></script>

<script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
<script src="https://unpkg.com/react@16/umd/react.development.js" crossorigin></script>
<script src="https://unpkg.com/react-dom@16/umd/react-dom.development.js" crossorigin></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.6.7/jquery.timeago.min.js"></script>

<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-auth.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.21.0/firebase-storage.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-firestore.js"></script>
<script src="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.js"></script>

<link rel="shortcut icon" href="/favicon.ico">
<link type="text/css" rel="stylesheet" href="https://cdn.firebase.com/libs/firebaseui/3.5.2/firebaseui.css" />
<title>Home</title>
</head>

<body>
<div class="ui fixed violet inverted menu">
<div class="ui fluid container">
<a href="/index.html" class="header item">
<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">
&nbsp; Bitwise
</a>
<div class="ui simple right dropdown item" id="user-dropdown">
<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">
<div id="account-dropdown">
&nbsp; retrieving...
</div>

<i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="/user/" id="user-own-profile">Profile</a>
<a class="item" href="/common/account.html">Account Information</a>
<a class="item" onclick="completeSignOut()">
<h4 class="ui red header">Sign Out</h4>
</a>
</div>
<a class="right header item" id="login-button">Log In</a>
<div id="login-modal"></div>
</div>
<a class="right header item" id="login-button">Log In</a>
<div id="login-modal"></div>
</div>
</div>

<br><br><br><br>
<div class="content">
<a id="test-button" href="/common/test.html" class='ui fluid inverted red button'>
<i class="keyboard icon"></i>Test Page
</a>
</div>
<br><br><br><br>

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

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

<script src="js/login.js" type="text/babel"></script>
<script src="js/index.js"></script>
</body>
<div class="ui bottom attached tab segment active" data-tab="all-posts" id="all-posts-container">
<div class="ui inline centered active slow violet double loader"></div>
</div>

<div class="ui bottom attached tab segment" data-tab="timeline" id="timeline-container">
<div class="ui inline centered active slow violet double loader"></div>
</div>

<style>
.ui.comments {
max-width: 100%;
}

.ui.comments .comment .avatar img,
.ui.comments .comment img.avatar {
height: auto;
}

.ui.comments .comment a.author:hover {
color: #6435c9;
}
</style>
</div>

<script>
// Initialize Firebase
var firebaseConfig = {
apiKey: "AIzaSyBJTDxfjl_xpPXSuiZmcriEpRj4KPPiVpg",
authDomain: "bitwise-a3c2d.firebaseapp.com",
databaseURL: "https://bitwise-a3c2d.firebaseio.com",
projectId: "bitwise-a3c2d",
storageBucket: "bitwise-a3c2d.appspot.com",
messagingSenderId: "1025486551841",
appId: "1:1025486551841:web:24f84a09e2f70631625c60",
measurementId: "G-9DCMV9YV2N"
};
firebase.initializeApp(firebaseConfig);
const db = firebase.firestore();
</script>
<script src="/js/endless.js" type="text/babel"></script>
<script src="/js/index.js" type="text/babel"></script>
<script src="/js/post.js" type="text/babel"></script>
<script src="/js/login.js" type="text/babel"></script>
</body>

</html>
2 changes: 1 addition & 1 deletion public/js/account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ firebase.auth().onAuthStateChanged(function(user) {
loadDropdown();
loadAccountInfo();
} else {
location.replace("/common/login.html");
location.replace("/index.html");
}
});

Expand Down
2 changes: 1 addition & 1 deletion public/js/create_post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ firebase.auth().onAuthStateChanged(function(user) {
$("#login-button").hide();
$("#user-dropdown").show();
} else {
location.replace("/common/login.html");
location.replace("/index.html");
}
});

Expand Down
Loading