ready for firebase

This commit is contained in:
sava 2020-03-19 22:01:52 +01:00
parent 744bfdf2f3
commit 5ca75569ad
7 changed files with 25 additions and 31 deletions

View File

@ -8,7 +8,7 @@
<script type="text/javascript" src="/it1/init-firebase.js"></script> <script type="text/javascript" src="/it1/init-firebase.js"></script>
</head> </head>
<bod> <bod>
<iframe id="navbar" width="100%" height="60px" src="/it1/navbar.html" style="border: 0px"></iframe> <iframe id="navbar" width="100%" height="60px" src="/it1/navbar/navbar.html" style="border: 0px"></iframe>
<div id="content"> <div id="content">
<form></form> <form></form>
</div> </div>

View File

@ -2,8 +2,8 @@
<html> <html>
<head> <head>
<title>Simple firebase logon</title> <title>Simple firebase logon</title>
<link rel="stylesheet" href="/it1/main.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="/it1/main.css">
<!-- <!--
<script defer src="https://www.gstatic.com/firebasejs/7.11.0/firebase-app.js"></script> <script defer src="https://www.gstatic.com/firebasejs/7.11.0/firebase-app.js"></script>
<script defer src="https://www.gstatic.com/firebasejs/7.11.0/firebase-auth.js"></script> <script defer src="https://www.gstatic.com/firebasejs/7.11.0/firebase-auth.js"></script>
@ -14,7 +14,13 @@
<bod> <bod>
<iframe id="navbar" width="100%" height="60px" src="/it1/navbar/navbar.html" style="border: 0px"></iframe> <iframe id="navbar" width="100%" height="60px" src="/it1/navbar/navbar.html" style="border: 0px"></iframe>
<div id="content"> <div id="content">
<h3 style="margin: 3vh">Klikk oppgaver i menyen for å se hva jeg har laget med firebase i IT1!</h3> <h3 style="margin: 3vh">Denne siden inneholder ting jeg har laget med firebase i IT1!</h3>
<br />
<ul id="oppgaver">
<li>
<h5><a href="/it1/bibliotek/index.html">Bibliotek</a></h5>
</li>
</ul>
</div> </div>
</bod> </bod>
</html> </html>

View File

@ -1,4 +1,4 @@
li.right { #oppgaver {
align-content: right margin-left: 3vh;
} }

0
it1/main.js Normal file
View File

4
it1/navbar/navbar.css Normal file
View File

@ -0,0 +1,4 @@
li.right > ul { /* TODO: FIX! */
align-content: right;
}

View File

@ -3,34 +3,31 @@
<head> <head>
<title>Navbar for iframe</title> <title>Navbar for iframe</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="/it1/navbar/navbar.css">
<!-- <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script> --> <!-- <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script> -->
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm bg-dark navbar-dark"> <nav class="navbar navbar-expand-sm bg-dark navbar-dark">
<a class="navbar-brand" onclick="reset()">IT1 firebase stuff</a> <!-- href="/it1/index.html" --> <a class="navbar-brand" target="_top" href="/it1/index.html">IT1 firebase stuff</a> <!-- href="/it1/index.html" -->
<ul class="navbar-nav"> <!-- <ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" onclick="oppgaver()">Oppgaver</a>
</li>
<li class="nav-item right"> <li class="nav-item right">
<a class="nav-link" href="/it1/about.html">About</a> <a class="nav-link" target="_top" href="/it1/about.html">About</a>
</li> </li>
</ul> </ul>
<!-- <ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item right"> <li class="nav-item right">
<a class="nav-link">Simple login here later</a> <a class="nav-link">Simple login here later</a>
</li> </li>
<li class="nav-item right" style="visibility: hidden"> <li class="nav-item right" style="visibility: hidden">
<a class="nav-link" href="/logout">Logout</a> <a class="nav-link" target="_top" href="/logout">Logout</a>
</li> </li>
<li class="nav-item right" id="register-btn"> <li class="nav-item right" id="register-btn">
<a class="nav-link" href="/register">Register</a> <a class="nav-link" target="_top" href="/register">Register</a>
</li> </li>
<li class="nav-item right" id="login-btn"> <li class="nav-item right" id="login-btn">
<a class="nav-link" href="/login">Login</a> <a class="nav-link" target="_top" href="/login">Login</a>
</li> </li>
</ul> --> </ul> -->
</nav> </nav>
<script type="text/javasctipt" src="/it1/navbar/navbar.js"></script>
</body> </body>
</html> </html>

View File

@ -1,13 +0,0 @@
var ocontent = $("#content").html()
function reset() {
$("#content").html(ocontent)
}
function oppgaver() {
$("#content").html(`
<h3><a href="/it1/bibliotek/index.html">Bibliotek</a></h3>
`)
}