Skip to content

Commit

Permalink
Merge pull request #31 from yohman/main
Browse files Browse the repository at this point in the history
changed connect to consult, added meta tags
  • Loading branch information
yohman authored Oct 7, 2024
2 parents 9d7f40a + 662cdf3 commit 203a244
Show file tree
Hide file tree
Showing 54 changed files with 397 additions and 296 deletions.
5 changes: 5 additions & 0 deletions docs/blog/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
---
title:
description:
---

# Musings on 3D Modeling

3D modeling is a fascinating field that merges creativity with technology. It's not just about creating digital objects, but about bringing ideas to life in a three-dimensional space.
Expand Down
6 changes: 4 additions & 2 deletions docs/connect/index.md → docs/consult/connect/index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
---
hide:
- toc

title: "Connect with OARC Sandbox Research Team | UCLA Technology Sandbox"
description: "Meet the interdisciplinary research team behind UCLA's Technology Sandbox. Learn how to collaborate, access our innovative computing facility, and engage with OARC's experts in digital scholarship."
---


<h1 id="title">Connect</h1>

<!-- add a search box -->
Expand Down Expand Up @@ -32,7 +34,7 @@ hide:
// //
// -------------------------------- //

let section = 'connect'
let section = 'consult'

function init(){

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function init(){
// -------------------------------- //
function createProject(projectid) {
// find the project in the projects array
let project = data.connect.values[projectid];
let project = data.consult.values[projectid];

// -------------------------------- //
// Title and secondary title //
Expand All @@ -56,7 +56,7 @@ function createProject(projectid) {
project[4] = 'sandbox.png';
}

image.src = '../../connect/images/'+project[4]; // Assuming the first column in the sheet is the image name
image.src = '../../images/'+project[4]; // Assuming the first column in the sheet is the image name
image.alt = project[0] + " " + project[1]; // Assuming the third column in the sheet is the alt text
image.title = project[0] + " " + project[1]
// assign maxheight to the image
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
7 changes: 7 additions & 0 deletions docs/connect/consult.md → docs/consult/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
---
hide:
- toc
title: "Connect with OARC Sandbox Research Team | UCLA Technology Sandbox"
description: "Meet the interdisciplinary research team behind UCLA's Technology Sandbox. Learn how to collaborate, access our innovative computing facility, and engage with OARC's experts in digital scholarship."
---

OARC’s GIS and Visualization group can help bring your research to life. We are experts in the broad range of analytic tools and techniques for visualizing data, including GIS and mapping, 3D modeling, and extended reality (XR). Our goal is to help you organize your data into a coherent visual display that can be readily interpreted and understood, whether that be through spatial, graphical, or interactive presentations. Our experts can also advise you on generating data for 3D models or XR applications, such as through 3D scanning and LIDAR.


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 7 additions & 2 deletions docs/js/getdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Parameters to be used in the page //
// -------------------------------------------- //

const sheetNames = ['work', 'learn', 'connect','musings'];
const sheetNames = ['work', 'learn', 'consult','musings'];
const spreadsheetId = '1bQDVVO-R3tt99eR7ageBYu5XK8lnnlxHZLzJghYSLa0';
const apiKey = 'AIzaSyAUi4KazffmDZV_dQUnMUKA1jJt4i0mqlU';
let data = {};
Expand Down Expand Up @@ -90,7 +90,7 @@ function addGalleryItem(row,counter,selector) {
let link = document.createElement('a');

// sometimes, link name is different from the section name...
if (section == 'connect') {
if (section == 'consult') {
link.href = 'who/?id='+counter;
} else if (section == 'learn') {
link.href = 'workshop/?id='+counter;
Expand All @@ -114,6 +114,11 @@ function addGalleryItem(row,counter,selector) {
img.src = '../'+section+'/images/'+image_file;
img.alt = row[1];

// if section is consult, don't add section to the path
if (section == 'consult') {
img.src = '../images/'+image_file;
}

// caption
let caption = document.createElement('div');
caption.className = 'caption';
Expand Down
2 changes: 2 additions & 0 deletions docs/learn/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
hide:
- navigation
- toc
title: "Learn with OARC Sandbox | UCLA Workshops and Tutorials"
description: "Access a comprehensive library of workshops and tutorials from UCLA's OARC Sandbox. Enhance your skills in digital research, data analysis, and advanced computing techniques."
---

<h1 id="title">Learn</h1>
Expand Down
2 changes: 2 additions & 0 deletions docs/musings/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
hide:
- navigation
- toc
title: "OARC Sandbox Musings | Insights from UCLA Research Staff"
description: "Dive into thought-provoking reflections and expert insights from UCLA's OARC Sandbox research team. Explore cutting-edge ideas in digital scholarship, data science, and technology innovation."
---

<h1 id="title">Musings</h1>
Expand Down
2 changes: 2 additions & 0 deletions docs/work/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
hide:
- navigation
- toc
title: "OARC Sandbox Projects | Innovative Research Initiatives at UCLA"
description: "Explore cutting-edge projects from UCLA's OARC Sandbox team. Discover our interdisciplinary research, advanced computing applications, and collaborative digital scholarship initiatives."
---

<h1 id="title">Work</h1>
Expand Down
9 changes: 5 additions & 4 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ nav:
- "Work": work/index.md
# - "Workshops": learn/resources.md
# - "Tutorials": learn/tutorials.md
- Connect:
- "Who we are": connect/index.md
- "Consult": connect/consult.md
- "Where is the Sandbox?": connect/where/index.md
- Consult:
- "Consult": consult/index.md
- "Connect with us": consult/connect/index.md
- "Where is the Sandbox?": consult/where/index.md
- "Musings": musings/index.md

extra_css:
Expand Down Expand Up @@ -73,6 +73,7 @@ markdown_extensions:
- pymdownx.inlinehilite
- pymdownx.snippets
- pymdownx.superfences
- meta

plugins:
# - search
Expand Down
18 changes: 10 additions & 8 deletions site/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@


<li class="md-tabs__item">
<a href="/connect/" class="md-tabs__link">
<a href="/consult/" class="md-tabs__link">




Connect
Consult

</a>
</li>
Expand Down Expand Up @@ -282,6 +282,8 @@








Expand All @@ -302,11 +304,11 @@


<div class="md-nav__link md-nav__container">
<a href="/connect/" class="md-nav__link ">
<a href="/consult/" class="md-nav__link ">


<span class="md-ellipsis">
Connect
Consult
</span>


Expand All @@ -322,7 +324,7 @@
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_3_label" aria-expanded="false">
<label class="md-nav__title" for="__nav_3">
<span class="md-nav__icon md-icon"></span>
Connect
Consult
</label>
<ul class="md-nav__list" data-md-scrollfix>

Expand All @@ -335,11 +337,11 @@


<li class="md-nav__item">
<a href="/connect/consult/" class="md-nav__link">
<a href="/consult/connect/" class="md-nav__link">


<span class="md-ellipsis">
Consult
Connect with us
</span>


Expand All @@ -356,7 +358,7 @@


<li class="md-nav__item">
<a href="/connect/where/" class="md-nav__link">
<a href="/consult/where/" class="md-nav__link">


<span class="md-ellipsis">
Expand Down
25 changes: 15 additions & 10 deletions site/blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@



<title>Musings on 3D Modeling - UCLA OARC Sandbox</title>
<title>UCLA OARC Sandbox</title>



Expand Down Expand Up @@ -112,7 +112,7 @@
<div class="md-header__topic" data-md-component="header-topic">
<span class="md-ellipsis">

Musings on 3D Modeling
None

</span>
</div>
Expand Down Expand Up @@ -180,12 +180,12 @@


<li class="md-tabs__item">
<a href="../connect/" class="md-tabs__link">
<a href="../consult/" class="md-tabs__link">




Connect
Consult

</a>
</li>
Expand Down Expand Up @@ -296,6 +296,8 @@








Expand All @@ -316,11 +318,11 @@


<div class="md-nav__link md-nav__container">
<a href="../connect/" class="md-nav__link ">
<a href="../consult/" class="md-nav__link ">


<span class="md-ellipsis">
Connect
Consult
</span>


Expand All @@ -336,7 +338,7 @@
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_3_label" aria-expanded="false">
<label class="md-nav__title" for="__nav_3">
<span class="md-nav__icon md-icon"></span>
Connect
Consult
</label>
<ul class="md-nav__list" data-md-scrollfix>

Expand All @@ -349,11 +351,11 @@


<li class="md-nav__item">
<a href="../connect/consult/" class="md-nav__link">
<a href="../consult/connect/" class="md-nav__link">


<span class="md-ellipsis">
Consult
Connect with us
</span>


Expand All @@ -370,7 +372,7 @@


<li class="md-nav__item">
<a href="../connect/where/" class="md-nav__link">
<a href="../consult/where/" class="md-nav__link">


<span class="md-ellipsis">
Expand Down Expand Up @@ -457,6 +459,9 @@ <h1 id="musings-on-3d-modeling">Musings on 3D Modeling<a class="headerlink" href









Expand Down
18 changes: 10 additions & 8 deletions site/blog/news/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@


<li class="md-tabs__item">
<a href="../../connect/" class="md-tabs__link">
<a href="../../consult/" class="md-tabs__link">




Connect
Consult

</a>
</li>
Expand Down Expand Up @@ -296,6 +296,8 @@








Expand All @@ -316,11 +318,11 @@


<div class="md-nav__link md-nav__container">
<a href="../../connect/" class="md-nav__link ">
<a href="../../consult/" class="md-nav__link ">


<span class="md-ellipsis">
Connect
Consult
</span>


Expand All @@ -336,7 +338,7 @@
<nav class="md-nav" data-md-level="1" aria-labelledby="__nav_3_label" aria-expanded="false">
<label class="md-nav__title" for="__nav_3">
<span class="md-nav__icon md-icon"></span>
Connect
Consult
</label>
<ul class="md-nav__list" data-md-scrollfix>

Expand All @@ -349,11 +351,11 @@


<li class="md-nav__item">
<a href="../../connect/consult/" class="md-nav__link">
<a href="../../consult/connect/" class="md-nav__link">


<span class="md-ellipsis">
Consult
Connect with us
</span>


Expand All @@ -370,7 +372,7 @@


<li class="md-nav__item">
<a href="../../connect/where/" class="md-nav__link">
<a href="../../consult/where/" class="md-nav__link">


<span class="md-ellipsis">
Expand Down
Loading

0 comments on commit 203a244

Please sign in to comment.