Merge branch 'main' into okokok

This commit is contained in:
Unknown 2024-05-13 09:06:33 -07:00
commit 43204d2216

View file

@ -29,6 +29,7 @@
<div id="navbar"></div>
<h1></h1>
<h1></h1>
<<<<<<< HEAD
<a
href="https://login.microsoftonline.com/common/oauth2/v2.0/authorize?
client_id=c91a3691-c800-4aed-9e85-1a2c896327de
@ -45,6 +46,15 @@
<button id="uploadButton">Upload</button>
<script src="upload.js"></script>
=======
<h1>Upload Photos and Videos</h1>
<form id="uploadForm" enctype="multipart/form-data">
<input type="file" name="file" id="fileInput" multiple />
<button type="submit">Upload</button>
</form>
<script src="/Pages/upload.js"></script>
>>>>>>> main
<!-- Footer -->
<div id="socials"></div>
</body>