Skip to content
GitLab
Commit eee94b25 authored by Alfakhori's avatar Alfakhori
Browse files

Update public/index.html 

Deleted public/aktuelles.html, public/kontakt.html, public/settings.js, public/style.css
parent 89618c75
master
No related merge requests found
Pipeline #10058 passed with stage
in 6 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 265 deletions
+11 -265
public/aktuelles.html deleted 100644 → 0
+ 0
- 35
View file @ 89618c75
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="generator" content="GitLab Pages">
<title>Aktuelles</title>
<link rel="stylesheet" href="style.css">
</head>
<body>
<div id="topbar">
<div id="menu" class="navbar"></div>
</div>
<div class="content">
<h1 id='projectname'></h1> <!--Projektname kommt aus settings.js, hier nichts einfügen-->
<h2> Aktuelles aus dem Projekt: </h2>
<!-- ÄNDERUNGEN NUR NACH DIESER ZEILE -->
<!-- TODO Newseintrag kopieren und anpasen, Blindtext entfernen -->
<div class="news">
<div class="header">
01.01.1900: Erster Newseintrag
</div>
<div class="text">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque pellentesque diam ipsum, nec ultricies sem mollis et. Phasellus porttitor nec felis quis ultricies. In venenatis faucibus nisl sed facilisis. Cras sapien nibh, dignissim at eros quis, commodo lobortis eros. Sed a massa eleifend, dictum elit at, blandit magna. Nullam auctor enim nec orci luctus sagittis. Nunc blandit quam nec laoreet egestas. Nulla feugiat nisl lacus, a viverra nisi hendrerit vitae. In nibh arcu, sodales in enim tincidunt, tempus imperdiet ex. Aliquam fermentum augue magna, vel accumsan augue consequat et. Vestibulum id interdum orci, a aliquam sapien. Vivamus eu ipsum sollicitudin, aliquet arcu ut, ornare massa. Suspendisse tincidunt lectus a odio ultrices interdum. Praesent vitae sodales urna, vitae sagittis ex. Vivamus tincidunt nisi ultrices lectus dapibus, at placerat nisl elementum. Fusce cursus, sapien in tincidunt pellentesque, mi erat mollis nibh, ut maximus tortor magna vitae nibh.
</p>
</div>
</div>
<!-- KEINE ÄNDERUNGEN NACH DIESER ZEILE -->
</div>
<script src="settings.js"> </script>
</body>
</html>
public/index.html
+ 11
- 96
View file @ eee94b25
<!doctype html>
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>Cube Demo</title>
<!-- three.js -->
<script src="https://unpkg.com/three@0.126.0/build/three.js"></script>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Interactive Map</title>
<link rel="stylesheet" href="/css/styles.css">
<link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
</head>
<body>
<div id="map"></div>
<!-- Starting an immersive WebXR session requires user interaction.
We start this one with a simple button. -->
<button onclick="activateXR()">Start Cube Demo</button>
<script>
async function activateXR() {
// Add a canvas element and initialize a WebGL context that is compatible with WebXR.
const canvas = document.createElement("canvas");
document.body.appendChild(canvas);
const gl = canvas.getContext("webgl", {xrCompatible: true});
// To be continued in upcoming steps.
const scene = new THREE.Scene();
// The cube will have a different color on each side.
const materials = [
new THREE.MeshBasicMaterial({color: 0xff0000}),
new THREE.MeshBasicMaterial({color: 0x0000ff}),
new THREE.MeshBasicMaterial({color: 0x00ff00}),
new THREE.MeshBasicMaterial({color: 0xff00ff}),
new THREE.MeshBasicMaterial({color: 0x00ffff}),
new THREE.MeshBasicMaterial({color: 0xffff00})
];
// Create the cube and add it to the demo scene.
const cube = new THREE.Mesh(new THREE.BoxBufferGeometry(0.2, 0.2, 0.2), materials);
cube.position.set(1, 1, 1);
scene.add(cube);
// Set up the WebGLRenderer, which handles rendering to the session's base layer.
const renderer = new THREE.WebGLRenderer({
alpha: true,
preserveDrawingBuffer: true,
canvas: canvas,
context: gl
});
renderer.autoClear = false;
// The API directly updates the camera matrices.
// Disable matrix auto updates so three.js doesn't attempt
// to handle the matrices independently.
const camera = new THREE.PerspectiveCamera();
camera.matrixAutoUpdate = false;
// Initialize a WebXR session using "immersive-ar".
const session = await navigator.xr.requestSession("immersive-ar");
session.updateRenderState({
baseLayer: new XRWebGLLayer(session, gl)
});
// A 'local' reference space has a native origin that is located
// near the viewer's position at the time the session was created.
const referenceSpace = await session.requestReferenceSpace('local');
// Create a render loop that allows us to draw on the AR view.
const onXRFrame = (time, frame) => {
// Queue up the next draw request.
session.requestAnimationFrame(onXRFrame);
// Bind the graphics framebuffer to the baseLayer's framebuffer
gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer)
// Retrieve the pose of the device.
// XRFrame.getViewerPose can return null while the session attempts to establish tracking.
const pose = frame.getViewerPose(referenceSpace);
if (pose) {
// In mobile AR, we only have one view.
const view = pose.views[0];
const viewport = session.renderState.baseLayer.getViewport(view);
renderer.setSize(viewport.width, viewport.height)
// Use the view's transform matrix and projection matrix to configure the THREE.camera.
camera.matrix.fromArray(view.transform.matrix)
camera.projectionMatrix.fromArray(view.projectionMatrix);
camera.updateMatrixWorld(true);
// Render the scene with THREE.WebGLRenderer.
renderer.render(scene, camera)
}
}
session.requestAnimationFrame(onXRFrame);
}
</script>
<script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/PapaParse/5.3.0/papaparse.min.js"></script>
<script src="/js/script.js"></script>
</body>
</html>
public/kontakt.html deleted 100644 → 0
+ 0
- 38
View file @ 89618c75
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="generator" content="GitLab Pages">
<title>Aktuelles</title>
<link rel="stylesheet" href="style.css">
</head>
<body>
<div id="topbar">
<div id="menu" class="navbar"></div>
</div>
<div class="content">
<h1 id='projectname'></h1> <!--Projektname kommt aus settings.js, hier nichts einfügen-->
<h2> Kontakt: </h2>
<!-- ÄNDERUNGEN NUR NACH DIESER ZEILE -->
<!-- TODO Daten anpasen -->
<div class="news">
<div class="header">
Verantwortliche Person:
</div>
<div class="text">
<p>
Max Mustermann
</p>
<p>
Bei Fragen zum Projekt kontaktieren Sie <a href="mailto:max.mustermann@hft-stuttgart.de">max.mustermann@hft-stuttgart.de</a>
</p>
</div>
</div>
<!-- KEINE ÄNDERUNGEN NACH DIESER ZEILE -->
</div>
<script src="settings.js"> </script>
</body>
</html>
public/settings.js deleted 100644 → 0
+ 0
- 51
View file @ 89618c75
//TODO Projektnamen setzen:
let projektname= ""
// TODO Link zur Projektseite setzen
let projektseitenlink= ""
// TODO URL zum Projektlogo setzen
let projektlogourl = ""
// KEINE ÄNDERUNG NACH DIESER ZEILE!
let menu = document.getElementById("menu");
//link1: home
let homelink = document.createElement("a");
homelink.href="index.html"
homelink.innerHTML="Home"
menu.appendChild(homelink);
//link2: projektseite
let projectlink = document.createElement("a");
projectlink.href=projektseitenlink
projectlink.innerHTML="Projekt"
menu.appendChild(projectlink);
//link3: aktuelles
let newslink = document.createElement("a");
newslink.href="aktuelles.html"
newslink.innerHTML="Aktuelles"
menu.appendChild(newslink);
//link4: Kontakt
let contactlink = document.createElement("a");
contactlink.href="kontakt.html"
contactlink.innerHTML="Kontakt"
menu.appendChild(contactlink);
//set projectname
document.getElementById("projectname").innerHTML=projektname;
let hftlogo = document.createElement("a");
let topbar = document.getElementById("topbar");
hftlogo.href = "https://hft-stuttgart.de";
hftlogo.innerHTML="<img src='https://www.hft-stuttgart.de/typo3conf/ext/hft_sitepackage/Resources/Public/img/HFT_logo.svg'/>";
topbar.insertBefore(hftlogo,menu);
if(projektlogourl != ""){
let projectlogo = document.createElement("a");
projectlogo.href=projektseitenlink;
projectlogo.innerHTML="<img src='" + projektlogourl + "'/>";
topbar.insertBefore(projectlogo,menu);
}
//footer: add logo innovatice Hochschule
let bmbf = document.createElement('div');
bmbf.innerHTML = "<img src='https://transfer.hft-stuttgart.de/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png' alt='Innovative Hochschule' style='height:90px'/>"
document.body.appendChild(bmbf);
public/style.css deleted 100644 → 0
+ 0
- 45
View file @ 89618c75
body {
font-family: sans-serif;
margin: auto;
max-width: 1280px;
margin-left:2%;
margin-right:2%;
}
.navbar {
background-color: #cc3125;
border-radius: 2px;
/* max-width: 800px; */
}
.navbar a {
color: #aaa;
display: inline-block;
font-size: 15px;
padding: 10px;
text-decoration: none;
}
.navbar a:hover {
color: #ffffff;
}
#topbar img{
max-width:15%;
margin-right:20px;
}
.content{
margin-left:2%;
margin-right:2%;
}
.header{
font-weight: bold;
}
.news{
background-color: #f5f5f5;
margin-bottom: 20px;
padding-top:10px;
padding-bottom: 10px;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal