Skip to content

Commit

Permalink
refactor: change to 2-space tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
@zeim839
zeim839 committed Jan 13, 2024
1 parent 7e39790 commit a31aa01
Show file tree
Hide file tree
Showing 11 changed files with 495 additions and 493 deletions.
144 changes: 72 additions & 72 deletions views/admin.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Admin</title>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.png" />
<link rel="stylesheet" href="css/common.css" />
<link rel="stylesheet" href="css/navbar.css" />
<link rel="stylesheet" href="css/table.css" />
<link rel="stylesheet" href="css/data-row.css" />
<link rel="stylesheet" href="css/admin.css" />
<style>
#temp-container {
display: flex;
flex-direction: column;
justify-content: center;
}
</style>
<script>
var blogTableSelections = []
var usersTableSelections = []
var imagesTableSelections = []
</script>
<script defer src="js/dashboard.js"></script>
<script src="./js/navbar.js" defer async></script>
</head>
<body>
<%- include('./components/alert.ejs') %>
<%- include('./components/navbar.ejs') %>
<section id="dashboard-section">
<section class="dashboard-subsection">
<button
class="new-button"
type="button"
onclick="window.open('/api/edit/blog')"
>NEW</button>
<button id="delete-button-blog" type="button" onclick="deleteHandler('blog');">DELETE</button>
<h1>Blog</h1>
<hr/>
<%- include('./components/blog-table.ejs', { data: blog}) %>
</section>
<section class="dashboard-subsection">
<button
class="new-button"
type="button"
onclick="window.open('/api/edit/user')"
>NEW</button>
<button id="delete-button-users" type="button" onclick="deleteHandler('users');">DELETE</button>
<h1>Users</h1>
<hr/>
<div class="table-wrapper">
<%- include('./components/users-table.ejs', { data: users }) %>
</div>
</section>
<section class="dashboard-subsection">
<button
id="new-button-images"
class="new-button"
type="button"
onclick="window.open('/api/edit/image')"
> NEW
</button>
<button id="delete-button-images" type="button" onclick="deleteHandler('image');">DELETE</button>
<h1>Images</h1>
<hr/>
<div class="table-wrapper">
<%- include('./components/images-table.ejs', { data: images }) %>
</div>
</section>
</section>
<%- include('./components/footer.ejs') %>
</body>
<head>
<title>Admin</title>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.png" />
<link rel="stylesheet" href="css/common.css" />
<link rel="stylesheet" href="css/navbar.css" />
<link rel="stylesheet" href="css/table.css" />
<link rel="stylesheet" href="css/data-row.css" />
<link rel="stylesheet" href="css/admin.css" />
<style>
#temp-container {
display: flex;
flex-direction: column;
justify-content: center;
}
</style>
<script>
var blogTableSelections = []
var usersTableSelections = []
var imagesTableSelections = []
</script>
<script defer src="js/dashboard.js"></script>
<script src="./js/navbar.js" defer async></script>
</head>
<body>
<%- include('./components/alert.ejs') %>
<%- include('./components/navbar.ejs') %>
<section id="dashboard-section">
<section class="dashboard-subsection">
<button
class="new-button"
type="button"
onclick="window.open('/api/edit/blog')"
>NEW</button>
<button id="delete-button-blog" type="button" onclick="deleteHandler('blog');">DELETE</button>
<h1>Blog</h1>
<hr/>
<%- include('./components/blog-table.ejs', { data: blog}) %>
</section>
<section class="dashboard-subsection">
<button
class="new-button"
type="button"
onclick="window.open('/api/edit/user')"
>NEW</button>
<button id="delete-button-users" type="button" onclick="deleteHandler('users');">DELETE</button>
<h1>Users</h1>
<hr/>
<div class="table-wrapper">
<%- include('./components/users-table.ejs', { data: users }) %>
</div>
</section>
<section class="dashboard-subsection">
<button
id="new-button-images"
class="new-button"
type="button"
onclick="window.open('/api/edit/image')"
> NEW
</button>
<button id="delete-button-images" type="button" onclick="deleteHandler('image');">DELETE</button>
<h1>Images</h1>
<hr/>
<div class="table-wrapper">
<%- include('./components/images-table.ejs', { data: images }) %>
</div>
</section>
</section>
<%- include('./components/footer.ejs') %>
</body>
</html>
56 changes: 32 additions & 24 deletions views/blog.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>UF Open Source Club | Blog</title>
<link rel="stylesheet" href="./css/common.css" />
<style>
body { background: black; }
section { height: 100%; min-height: calc(100vh - 92.5px - 70px); }
</style>
<script src="./js/navbar.js" defer async></script>
</head>
<body>
<%- include('./components/alert.ejs') %>
<%- include('./components/navbar.ejs') %>
<section class="blog">
<div class="section_heading">
<h2>Blog</h2>
</div>
<%- include('./components/blog-grid.ejs', { blog: blog }) %>
</section>
<%- include('./components/footer.ejs') %>
</body>
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description"
content="Read open source news and announcements
from the University of Florida's Open Source Club"
>
<meta name="keywords"
content="University of Florida, UF, OSC, Open Source,
Computer Science, Data Science, Programming"
>
<title>UF Open Source Club | Blog</title>
<link rel="stylesheet" href="./css/common.css" />
<style>
body { background: black; }
section { height: 100%; min-height: calc(100vh - 92.5px - 70px); }
</style>
<script src="./js/navbar.js" defer async></script>
</head>
<body>
<%- include('./components/alert.ejs') %>
<%- include('./components/navbar.ejs') %>
<section class="blog">
<div class="section_heading">
<h2>Blog</h2>
</div>
<%- include('./components/blog-grid.ejs', { blog: blog }) %>
</section>
<%- include('./components/footer.ejs') %>
</body>
</html>
104 changes: 52 additions & 52 deletions views/components/blog-table.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
<div style="overflow-x:auto;">
<table id="blog-table">
<thead>
<th scope="col"
class="tcheckbox">
<input type="checkbox"
onclick="selectAllCheckboxClickHandler('blog-table', blogTableSelections);deleteButtonVisibility ('blog-table','delete-button-blog');"
/></th>
<th scope="col" class="title-header">Title</th>
<th scope="col">Subtitle</th>
<th scope="col">Status</th>
<th scope="col">Author</th>
<th scope="col">Edit</th>
<th scope="col">Preview</th>
</thead>
<tbody>
<% data.forEach((entry) => { %>
<tr class="data-row" id="<%= entry.id %>">
<td>
<input
type="checkbox"
name="row-selected"
onclick="checkboxClickHandler('<%= entry.id %>', 'blog-table', blogTableSelections);deleteButtonVisibility ('blog-table','delete-button-blog');"
/></td>
<td><%= entry.title %></td>
<td><%= entry.subtitle %></td>
<td><%= entry.status %></td>
<td><%= entry.author %></td>
<td>
<button type="button" onclick="window.open('/api/edit/blog/<%= entry.id %>')">
EDIT
</button>
</td>
<td>
<button type="button" onclick="window.open('/api/blog/<%= entry.id %>')">
PREVIEW
</button>
</td>
</tr>
<% }) %>
</tbody>
<tfoot>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tfoot>
</table>
<table id="blog-table">
<thead>
<th scope="col"
class="tcheckbox">
<input type="checkbox"
onclick="selectAllCheckboxClickHandler('blog-table', blogTableSelections);deleteButtonVisibility ('blog-table','delete-button-blog');"
/></th>
<th scope="col" class="title-header">Title</th>
<th scope="col">Subtitle</th>
<th scope="col">Status</th>
<th scope="col">Author</th>
<th scope="col">Edit</th>
<th scope="col">Preview</th>
</thead>
<tbody>
<% data.forEach((entry) => { %>
<tr class="data-row" id="<%= entry.id %>">
<td>
<input
type="checkbox"
name="row-selected"
onclick="checkboxClickHandler('<%= entry.id %>', 'blog-table', blogTableSelections);deleteButtonVisibility ('blog-table','delete-button-blog');"
/></td>
<td><%= entry.title %></td>
<td><%= entry.subtitle %></td>
<td><%= entry.status %></td>
<td><%= entry.author %></td>
<td>
<button type="button" onclick="window.open('/api/edit/blog/<%= entry.id %>')">
EDIT
</button>
</td>
<td>
<button type="button" onclick="window.open('/api/blog/<%= entry.id %>')">
PREVIEW
</button>
</td>
</tr>
<% }) %>
</tbody>
<tfoot>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tfoot>
</table>
</div>
52 changes: 26 additions & 26 deletions views/components/footer.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<footer>
<div>
<div class="footer-content-container">
<div class='footer-upper'>
<h1 style="padding-left:20px; font-size: 18px;">UF OSC
<a style="text-align: left; color: aliceblue; font-family: Arial; padding-left: 10px; font-weight: normal; font-size: 15px;">
<%= version %>
</a>
</h1>
<div class="social-buttons">
<a href="https://discord.gg/Gsxej6u" target="_blank"><img src="/assets/Discord.png" alt="discord" width="35" ></a>
<a href="https://github.com/ufosc" target="_blank"><img src="/assets/Github.png" alt="github" width="35" ></a>
<a href="https://instagram.com/uf_osc?igshid=YmMyMTA2M2Y=" target="_blank"><img src="/assets/Instagram.png" alt="instagram" width="35" ></a>
<a href="https://www.facebook.com/groups/ufosc/" target="_blank"><img src="/assets/Facebook.png" alt="facebook" width="35" ></a>
</div>
</div>
<div>
<div class="footer-content-container">
<div class='footer-upper'>
<h1 style="padding-left:20px; font-size: 18px;">UF OSC
<a style="text-align: left; color: aliceblue; font-family: Arial; padding-left: 10px; font-weight: normal; font-size: 15px;">
<%= version %>
</a>
</h1>
<div class="social-buttons">
<a href="https://discord.gg/Gsxej6u" target="_blank"><img src="/assets/Discord.png" alt="discord" width="35" ></a>
<a href="https://github.com/ufosc" target="_blank"><img src="/assets/Github.png" alt="github" width="35" ></a>
<a href="https://instagram.com/uf_osc?igshid=YmMyMTA2M2Y=" target="_blank"><img src="/assets/Instagram.png" alt="instagram" width="35" ></a>
<a href="https://www.facebook.com/groups/ufosc/" target="_blank"><img src="/assets/Facebook.png" alt="facebook" width="35" ></a>
</div>
<div class="footer-content-container" style="background: white">
<div class="footer-lower">
<h4 style="float: left;">Copyright (C) 2023 Open Source Club</h4>
<div style="float: right">
<a href="https://github.com/ufosc/Club_Website_2/blob/main/LICENSE.md"
target="_blank"
style="float: left; margin-left: 30px; font-weight: bold; text-decoration: underline;">
License AGPL -3.0-or-later
</a>
</div>
</div>
</div>
</div>
<div class="footer-content-container" style="background: white">
<div class="footer-lower">
<h4 style="float: left;">Copyright (C) 2023 Open Source Club</h4>
<div style="float: right">
<a href="https://github.com/ufosc/Club_Website_2/blob/main/LICENSE.md"
target="_blank"
style="float: left; margin-left: 30px; font-weight: bold; text-decoration: underline;">
License AGPL -3.0-or-later
</a>
</div>
</div>
</div>
</div>
</footer>
Loading

0 comments on commit a31aa01

Please sign in to comment.