Skip to content

Commit

Permalink
UJ: Pre-merge commit + push
Browse files Browse the repository at this point in the history
  • Loading branch information
ianwieds committed Nov 9, 2023
2 parents 2e1e216 + e6bd596 commit 2a2edc6
Show file tree
Hide file tree
Showing 41 changed files with 1,343 additions and 181 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ settings:
enabled: true,
config: {
apiKey: 'AIzaSyA3-YBkywbzpstijvMqUwn_a0GQTi3EZQc',
authDomain: 'auth.somiibo.com',
authDomain: 'somiibo.com',
databaseURL: 'https://somiibo-91d13.firebaseio.com',
projectId: 'somiibo-91d13',
storageBucket: 'somiibo-91d13.appspot.com',
Expand Down
7 changes: 3 additions & 4 deletions _includes/master/global/foot.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ <h5 class="modal-title">
{%- else -%}
{% assign bundle_optimization = site.settings.include-script-bundle-optimization %}
{% endif %}
<!-- <script type="text/javascript" src="{{ '/assets/js/main.js' | relative_url }}?cb={{ site.time | date: '%s' }}" {{ bundle_optimization }}></script> -->
<script type="text/javascript" src="{{ site.url }}{{ '/assets/js/main.js' }}?cb={{ site.time | date: '%s' }}" {{ bundle_optimization }}></script>
<script type="text/javascript" src="{{ site.url }}/assets/js/main.js?cb={{ site.time | date: '%s' }}" {{ bundle_optimization }}></script>
{% endif %}

<!-- TODO: FIX THIS -->
Expand All @@ -131,7 +130,7 @@ <h5 class="modal-title">
{%- else -%}
{% assign core_optimization = site.settings.include-script-core-optimization %}
{% endif %}
<!-- <script type="text/javascript" src="{{ '/assets/js/master.js' | relative_url }}?cb={{ site.time | date: '%s' }}" {{ core_optimization }}></script> -->
<!-- <script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: '%s' }}" {{ core_optimization }}></script> -->
{% endif %}

<!-- TODO: FIX THIS -->
Expand All @@ -152,7 +151,7 @@ <h5 class="modal-title">
{% endif %}
{% endif %}
{%- if slapform_include == true -%}
<!-- <script type="text/javascript" src="{{ '/assets/js/slapform-processor.js' | relative_url }}?cb={{ site.time | date: '%s' }}" {{ slapform_optimization }}></script> -->
<!-- <script type="text/javascript" src={{ site.url }}/assets/js/slapform-processor.js?cb={{ site.time | date: '%s' }}" {{ slapform_optimization }}></script> -->
{% endif %}

<!-- Script - Bundle -->
Expand Down
3 changes: 1 addition & 2 deletions _includes/master/global/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@
{% elsif layout.settings.include-css-bundle == false %}
{% elsif site.settings.include-css-bundle == false %}
{% else %}
<!-- <link rel="stylesheet" type="text/css" href="{{ '/assets/css/main.css' | relative_url }}?cb={{ site.time | date: '%s' }}"> -->
<link rel="stylesheet" type="text/css" href="{{ site.url }}{{ '/assets/css/main.css' }}?cb={{ site.time | date: '%s' }}">
<link rel="stylesheet" type="text/css" href="{{ site.url }}/assets/css/main.css?cb={{ site.time | date: '%s' }}">
{% endif %}

{%- if include.post-bundle-css != null -%}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/master/admin/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<!-- ITW CW -->
<script src="https://cdn.jsdelivr.net/npm/wonderful-fetch@latest/dist/index.min.js?cb={{ site.time | date: "%s" }}"></script>
<script type="text/javascript" src="/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
<script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
{%- include /master/misc/embed-manager.html -%}
'

Expand Down
2 changes: 1 addition & 1 deletion _layouts/master/authentication/account.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<script src="https://cdn.jsdelivr.net/npm/node-powertools@latest/dist/index.min.js?cb={{ site.time | date: "%s" }}"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/js/md5.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/index.es5.min.js"></script>
<script type="text/javascript" src="/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
<script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
{%- include /master/misc/embed-manager.html -%}

'
Expand Down
2 changes: 1 addition & 1 deletion _layouts/master/authentication/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<script src="https://cdn.itwcreativeworks.com/assets/ultimate-jekyll/vendor/front-admin/v2/js/theme.min.js"></script>

<!-- ITW CW -->
<script type="text/javascript" src="/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
<script type="text/javascript" src="{{ site.url }}/assets/js/master.js?cb={{ site.time | date: "%s" }}" async defer></script>
{%- include /master/misc/embed-manager.html -%}

'
Expand Down
15 changes: 7 additions & 8 deletions _layouts/master/misc/redirect.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

head:
post-bundle-css: '
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
'

body:
Expand Down Expand Up @@ -53,9 +53,9 @@

<div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
<header class="mb-auto">
<div>
<h3 class="float-md-start mb-0">{{ site.brand.name }}</h3>
<nav class="nav nav-masthead justify-content-center float-md-end">
<div class="d-flex justify-content-between">
<h3 class="mb-0">{{ site.brand.name }}</h3>
<nav class="nav nav-masthead">
<a class="nav-link fw-bold py-1 px-0 active" aria-current="page" href="{{ site.url }}">Return home</a>
</nav>
</div>
Expand All @@ -66,9 +66,9 @@ <h3 class="float-md-start mb-0">{{ site.brand.name }}</h3>
<h1>Redirecting...</h1>
<div class="spinner-border spinner-border-md text-primary ms-3" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
</div>

<p class="lead">Taking you to the page you requested...</p>
<p class="lead">
<noscript>
Expand All @@ -78,7 +78,6 @@ <h1>Redirecting...</h1>
</main>

<footer class="mt-auto">
<!-- <p>Cover template for <a href="https://getbootstrap.com/" class="">Bootstrap</a>, by <a href="https://twitter.com/mdo" class="">@mdo</a>.</p> -->
</footer>
</div>

Expand Down Expand Up @@ -107,7 +106,7 @@ <h1>Redirecting...</h1>
redirect.url.searchParams.set(pair[0], pair[1]);
}
}

// Set final URL
var finalURL = redirect.url.toString();

Expand Down
6 changes: 4 additions & 2 deletions _layouts/master/placeholder/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
title: "Oops! This page doesn't exist"
description: "This page doesn't exist. Please let us know so we can fix the broken link."
breadcrumb: "404"
index: false
index: false
---
<div class="container" style="height: 100vh;">
<div class="row h-100">
Expand All @@ -18,7 +18,7 @@
<div class="py-5 text-center">
<a class="d-flex justify-content-center" href="{{ site.url }}">
<img class="zi-2" id="main-logo" src="{{ site.brand.logo-image-svg }}?cb={{ site.time | date: '%s' }}" alt="{{ site.brand.name }}" style="width: 8rem;">
</a>
</a>
<div class="d-flex justify-content-center align-items-center flex-column">
<h1>Oops!</h1>
<p class="mb-0">This page doesn't exist. Please let us know so we can fix the broken link.</p>
Expand All @@ -43,3 +43,5 @@ <h1>Oops!</h1>
// Set page URL
document.getElementById('page-url').innerHTML = window.location.href;
</script>

{{ content | liquify | markdownify }}
2 changes: 2 additions & 0 deletions _layouts/master/placeholder/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ Behind {{ site.brand.name }} is a team of dedicated professionals, each bringing
We invite you to join us on our journey as we continue to revolutionize the digital landscape. With {{ site.brand.name }}, the future is in your hands.

Thank you for choosing {{ site.brand.name }}. We look forward to being a part of your success story.

{{ content | liquify | markdownify }}
9 changes: 6 additions & 3 deletions _layouts/master/placeholder/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
meta:
title: "{{ site.brand.name }} - App Launcher"
description: "{{ site.brand.name }} app launcher"
breadcrumb: "Launcher"
breadcrumb: "Launcher"
---
{% assign download = null %}

Expand All @@ -31,7 +31,7 @@
<div class="py-5 text-center">
<a class="d-flex justify-content-center" href="{{ site.url }}" target="_blank">
<img class="zi-2" id="main-logo" src="{{ site.brand.logo-image-svg }}?cb={{ site.time | date: '%s' }}" alt="{{ site.brand.name }}" style="width: 8rem;">
</a>
</a>
<p class="lead">Welcome to the <strong>{{ site.brand.name }}</strong> app launcher!</p>
<a id="launch-button" class="btn btn-outline-primary mb-1 me-1" href="{{ site.app }}://dashboard">Launch {{ site.brand.name }}</a>
<a id="download-button" class="btn btn-primary mb-1" href="{{ download }}">Download {{ site.brand.name }}</a>
Expand All @@ -46,7 +46,7 @@
var launchButton = document.getElementById('launch-button');
var downloadButton = document.getElementById('download-button');
var newUrl;

if (split[1]) {
split.shift();
newUrl = '{{ site.app }}://dashboard?' + split.join('?');
Expand All @@ -63,3 +63,6 @@
}, 5e3)
}
</script>

{{ content | liquify | markdownify }}

4 changes: 3 additions & 1 deletion _layouts/master/placeholder/blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3 class="mb-0">{{ post.post.title }}</h3>
</div>
</div>
{% endfor %}
</div>
</div>
</div>

<div class="col-md-4">
Expand Down Expand Up @@ -121,3 +121,5 @@ <h4 class="fst-italic">Elsewhere</h4>
<a href="#">Back to top</a>
</p>
</footer> -->

{{ content | liquify | markdownify }}
14 changes: 8 additions & 6 deletions _layouts/master/placeholder/blog/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
layout: master/placeholder/global/default
sitemap:
include: true

### REGULAR PAGES ###
---
<div class="container">
Expand Down Expand Up @@ -75,18 +75,18 @@ <h1 class="blog-post-title mb-1">{{ page.post.title }}</h1>

<div class="mb-3">
{%- include /master/modules/engagement/social-share-kit.html -%}
</div>
</div>

<nav class="blog-pagination" aria-label="Pagination">
{% if page.previous.url %}
<a href="{{ page.previous.url }}" class="btn btn-outline-primary rounded-pill">Previous post</a>
{% else %}
{% else %}
<a class="btn btn-outline-secondary rounded-pill disabled">Previous post</a>
{% endif %}
{% endif %}

{% if page.next.url %}
<a href="{{ page.next.url }}" class="btn btn-outline-primary rounded-pill">Next post</a>
{% else %}
{% else %}
<a class="btn btn-outline-secondary rounded-pill disabled">Next post</a>
{% endif %}
</nav>
Expand Down Expand Up @@ -142,3 +142,5 @@ <h4 class="fst-italic">Elsewhere</h4>
<a href="#">Back to top</a>
</p>
</footer> -->

{{ content | liquify | markdownify }}
2 changes: 2 additions & 0 deletions _layouts/master/placeholder/careers.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ meta:
redirect:
url: "https://docs.google.com/forms/d/e/1FAIpQLSeLELeP0Om3stwaxM3HbzirXxleuPpEPDVsZ19ubFzozbxKOw/viewform?usp=pp_url&entry.1492864166={{ site.brand.name }}"
---

{{ content | liquify | markdownify }}
6 changes: 4 additions & 2 deletions _layouts/master/placeholder/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

foot:
post-bundle-script: '
<script type="text/javascript" src="{{ "/assets/js/slapform-processor.js" | relative_url }}?cb={{ site.time | date: "%s" }}"></script>
<script type="text/javascript" src="{{ site.url }}/assets/js/slapform-processor.js?cb={{ site.time | date: "%s" }}"></script>
<script>
Manager.ready(function () {
var Slapform = new _SlapformProcessor();
Slapform.init();
Slapform.init();
})
</script>
'
Expand Down Expand Up @@ -52,3 +52,5 @@ <h1 class="display-4">{{ site.brand.name }}</h1>
</div>
</div>
</div>

{{ content | liquify | markdownify }}
4 changes: 3 additions & 1 deletion _layouts/master/placeholder/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sitemap:
meta:
title: "{{ site.brand.name }} - Download"
description: "{{ site.brand.name }} is free to use on Windows, Mac & Linux. Get started for free today!"
breadcrumb: "Download"
breadcrumb: "Download"
---
# Download {{ site.brand.name }} Free
{{ layout.meta.description }}
Expand Down Expand Up @@ -46,3 +46,5 @@ If you encounter any issues during the download or have any questions about the
# Get Started with {{ site.brand.name }} Desktop App Today

Elevate your productivity and take your {{ site.brand.name }} experience to the next level with our desktop app. Download now and unlock the full potential of our tools and services right from your desktop.

{{ content | liquify | markdownify }}
4 changes: 3 additions & 1 deletion _layouts/master/placeholder/extension.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sitemap:
meta:
title: "{{ site.brand.name }} - Browser Extension"
description: "The {{ site.brand.name }} browser extension is free to use on Chrome, Firefox & Opera. Get started for free today!"
breadcrumb: "Extension"
breadcrumb: "Extension"
---
# {{ site.brand.name }} Browser Extension
{{ layout.meta.description }}
Expand Down Expand Up @@ -44,3 +44,5 @@ Having trouble with installation or have any questions? Our support team is avai
# Enhance Your {{ site.brand.name }} Experience Today

Upgrade your {{ site.brand.name }} experience with our powerful browser extension. Install now and explore the extended functionality of our services right from your browser. Welcome to a more efficient and integrated browsing experience with {{ site.brand.name }}.

{{ content | liquify | markdownify }}
4 changes: 2 additions & 2 deletions _layouts/master/placeholder/global/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
### REGULAR PAGES ###
head:
pre-bundle-css: '
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
'

foot:
pre-bundle-script: '
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
'

settings:
Expand Down
6 changes: 4 additions & 2 deletions _layouts/master/placeholder/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sitemap:
meta:
title: "{{ site.meta.title }}"
description: "{{ site.meta.description }}"
breadcrumb: "Home"
breadcrumb: "Home"
---
# Welcome to {{ site.brand.name }}
{{ site.meta.description }}
Expand Down Expand Up @@ -65,4 +65,6 @@ Our team is committed to your success. We provide round-the-clock support to ens

Ready to take the first step towards streamlined success? Join the {{ site.brand.name }} community today. Our friendly customer service team is on hand to answer any questions and help you get started.

Your journey towards greater efficiency starts here. Welcome to {{ site.brand.name }}.
Your journey towards greater efficiency starts here. Welcome to {{ site.brand.name }}.

{{ content | liquify | markdownify }}
3 changes: 3 additions & 0 deletions _layouts/master/placeholder/legal/cookies.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,6 @@ Effective date: May 1, 2018
<li>Email: {{ site.contact.email-support }}</li>

</ul>

{{ content | liquify | markdownify }}

4 changes: 3 additions & 1 deletion _layouts/master/placeholder/legal/privacy.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Effective date: May 1, 2018

Welcome to {{ site.brand.name }} ("{{ site.brand.name }}," "we," "us" or "our"). {{ site.brand.name }} is a platform/service/application that can be described as: {{ site.meta.description }}. By visiting our website ("the website", "the site"), using the {{ site.brand.name }} application ("the software"," "the application," "our software" or "our application"), accessing the information, resources, services, and tools that we provide, you acknowledge, understand, and agree to accept and adhere to the following {{ page.meta.breadcrumb }} as stated in this policy. Our {{ page.meta.breadcrumb }} applies to all visitors, users, and others who access the Service ("Users").

This {{ page.meta.breadcrumb }} describes how {{ site.brand.name }} and our affiliated entities collect, use, process, and share your personally identifiable information. Our {{ page.meta.breadcrumb }} is designed to provide transparency into our privacy practices and principles, in a format that our users can easily navigate, read, and understand.
This {{ page.meta.breadcrumb }} describes how {{ site.brand.name }} and our affiliated entities collect, use, process, and share your personally identifiable information. Our {{ page.meta.breadcrumb }} is designed to provide transparency into our privacy practices and principles, in a format that our users can easily navigate, read, and understand.

We are dedicated to treating your personal information with care and respect. If there is anything that is not clear from this {{ page.meta.breadcrumb }} please feel free to contact our support team: [{{ site.url }}/contact]({{ site.url }}/contact).

Expand Down Expand Up @@ -75,3 +75,5 @@ Use of our site signifies your acceptance of this policy. If you do not accept t
## How to Contact Us:
You can contact us at: [{{ site.url }}/contact]({{ site.url }}/contact)

{{ content | liquify | markdownify }}

2 changes: 2 additions & 0 deletions _layouts/master/placeholder/legal/terms.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,5 @@ Unless otherwise expressed, {{ brand }} expressly disclaims all warranties and c
## Contact Information
If you have any questions, comments, or concerns, please contact us: [{{ site.url }}/contact]({{ site.url }}/contact)

{{ content | liquify | markdownify }}

2 changes: 2 additions & 0 deletions _layouts/master/placeholder/pricing.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ We understand that needs can change. That's why we make it easy to adjust your p
We prioritize your security. Trust in {{ site.brand.name }}'s robust data protection measures and state-of-the-art encryption technologies to keep your information safe.

Are you ready to experience the {{ site.brand.name }} difference? Don't hesitate to reach out to our friendly customer service team if you have any questions. Your success is our success. Let's grow together with {{ site.brand.name }}.

{{ content | liquify | markdownify }}
4 changes: 3 additions & 1 deletion _layouts/master/placeholder/team/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ <h5 class="card-title">{{ member.member.name }}</h5>
<div class="card-footer">
<small class="text-body-secondary">Joined: {{ member.member.joined }}</small>
</div>
</div>
</div>

</article>
</div>
{% endfor %}
</div>

{{ content | liquify | markdownify }}
8 changes: 4 additions & 4 deletions _layouts/master/placeholder/team/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h5 class="card-title">{{ page.member.name }}</h5>
<p class=""><span class="badge text-bg-secondary">Joined:</span> {{ page.member.joined }}</p>
<p class=""><span class="badge text-bg-secondary">Skills:</span> {{ page.member.skills }}</p>
<p class=""><span class="badge text-bg-secondary">Location:</span> {{ page.member.location }}</p>


<h6>About Me</h6>
{{ content }}
Expand All @@ -35,9 +35,9 @@ <h6>Socials</h6>
<a href="https://www.linkedin.com/in/{{ page.member.linkedin | default: site.socials.linkedin }}" class="btn btn-primary">LinkedIn</a>
<a href="https://www.instagram.com/{{ page.member.instagram | default: site.socials.instagram }}" class="btn btn-primary">Instagram</a>
</div>
</div>
</div>
</div>



</article>

{{ content | liquify | markdownify }}
Loading

0 comments on commit 2a2edc6

Please sign in to comment.