Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #4

Open
wants to merge 33 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6c80c3d
fix: layout config
orunto Oct 25, 2024
3187b64
fix: webinar button link and base_url for gh pages
orunto Oct 25, 2024
55990fa
fix: baseurl typo
orunto Oct 25, 2024
1788c62
fix: build css
orunto Oct 25, 2024
4665557
refresh build
orunto Oct 25, 2024
74ae9ca
fix: css build
orunto Oct 25, 2024
7a577c0
Merge branches 'development' and 'development' of https://github.com/…
orunto Oct 25, 2024
0ad1e4f
fix: build css
orunto Oct 25, 2024
d4cf3b1
Create jekyll.yml
orunto Oct 25, 2024
80808e1
fix: gemfile update
orunto Oct 26, 2024
18d00ed
Merge branch 'development' of https://github.com/orunto/BIRDSOpenSour…
orunto Oct 26, 2024
ee996e7
Update jekyll.yml
orunto Oct 26, 2024
d547d36
Update _config.yml
orunto Oct 26, 2024
ef63a22
Update top.html
orunto Oct 26, 2024
64d9e78
Update landing.html
orunto Oct 26, 2024
8162543
Update landing.html
orunto Oct 26, 2024
9a2794e
fix: jekyll structure
orunto Oct 26, 2024
68653ce
Merge branch 'development' of https://github.com/orunto/BIRDSOpenSour…
orunto Oct 26, 2024
69963fa
?
orunto Oct 26, 2024
fde2427
/
orunto Oct 26, 2024
b764d47
Update top.html
orunto Oct 26, 2024
2e8a1f1
fix: css position
orunto Oct 26, 2024
d35dd51
Merge branch 'development' of https://github.com/orunto/BIRDSOpenSour…
orunto Oct 26, 2024
2db27bb
fix: link convention
orunto Oct 26, 2024
494a2e6
fix: links
orunto Oct 26, 2024
741696f
fix: github url
orunto Oct 26, 2024
95583b4
fix: alignment
orunto Oct 26, 2024
de28f26
fix: alignment
orunto Oct 26, 2024
757ba90
fix: alignment
orunto Oct 26, 2024
f6b4ba8
fix: alignment
orunto Oct 26, 2024
63ae688
feat: background sat image
orunto Nov 23, 2024
dc3197e
fix: button color and footer z-index
orunto Nov 23, 2024
4850a7b
fix: docs link url
orunto Nov 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions .github/workflows/jekyll.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll site to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["development"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Ruby
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
with:
ruby-version: '3.1' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v5
- name: Build with Jekyll
# Outputs to the './_site' directory by default
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
env:
JEKYLL_ENV: production
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

*.pdf
_config.yml
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/BIRDSOpenSource/BIRDSOpenSource.github.io" }

gem 'jekyll-theme-minimal'
# gem 'jekyll-theme-minimal'

group :jekyll_plugins do
gem "jekyll-sitemap"
Expand Down
11 changes: 7 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GEM
eventmachine (1.2.7)
ffi (1.17.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x64-mingw-ucrt)
ffi (1.17.0-x86_64-darwin)
forwardable-extended (2.6.0)
google-protobuf (4.27.3)
Expand All @@ -20,6 +21,9 @@ GEM
google-protobuf (4.27.3-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x64-mingw-ucrt)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86_64-darwin)
bigdecimal
rake (>= 13)
Expand Down Expand Up @@ -48,9 +52,6 @@ GEM
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-theme-minimal (0.2.0)
jekyll (> 3.5, < 5.0)
jekyll-seo-tag (~> 2.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
Expand Down Expand Up @@ -80,6 +81,8 @@ GEM
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x64-mingw-ucrt)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-cygwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-mingw-ucrt)
Expand All @@ -98,6 +101,7 @@ PLATFORMS
aarch64-mingw-ucrt
arm64-darwin
ruby
x64-mingw-ucrt
x86-cygwin
x86-mingw-ucrt
x86_64-cygwin
Expand All @@ -106,7 +110,6 @@ PLATFORMS
DEPENDENCIES
jekyll-seo-tag
jekyll-sitemap
jekyll-theme-minimal

BUNDLED WITH
2.5.16
5 changes: 3 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
theme: jekyll-theme-minimal
# theme: jekyll-theme-minimal
title: Birds Open Source Project
description: The BIRDS program, developed by Kyushu Institute of Technology, is an educational initiative focused on CubeSat development. The BIRDS Open Source project is committed to demonstrating lean satellite development that is well documented, easy to adapt and debug, and that caters to the needs of the entire satellite development workflow, from satellite design configurations to ground station data collection and analysis.
logo: ./assets/images/logo_2018_07.png
show_downloads: false
url: "/"
# baseurl: "BIRDSOpenSource.github.io"

plugins:
- jekyll-sitemap
- jekyll-seo-tag
- jekyll-seo-tag
88 changes: 35 additions & 53 deletions _includes/navigation.html
Original file line number Diff line number Diff line change
@@ -1,57 +1,39 @@

<!-- Navigation Start -->
<nav class="navbar navbar-custom navbar-fixed-top{% if page.bluenavbar == true %} bluenavbar{% endif %}" role="navigation">
<div class="container">
<div class="navbar-header">
{% if page.section-type == "index" %}
<nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
<a href="{{site.baseurl}}/" class="logo">
<img src="/assets/favicons/favicon-light-nobg.png" width="100" height="52.5" alt="BIRDS Logo">
</a>
<ul class="nav navbar-nav">
<!-- {% if page.section-type == "index" %}
<a class="navbar-brand page-scroll" href="#page-top">
{% else %}
<a class="navbar-brand" href="{{site.baseurl}}/">
{% endif %}
<div class="navbar-logo">
<h1>
<a href="{{ '/' | relative_url }}" class="logo">
<img src="{{ '/assets/favicons/favicon-light-nobg.png' | relative_url }}" width="200" height="105" alt="BIRDS Logo">
</a>
</h1>
</a>
</div>
<div class="collapse navbar-collapse navbar-right navbar-main-collapse">
<ul class="nav navbar-nav">
<li class="firstlevel">
<a href="{{site.baseurl}}/" class="firstlevelanchor">
Home
</a>
</li>
<li class="firstlevel dropdown dropdown-large{% if currentRequest[0] == 'docs' %} active {% endif %}">
<a href="{{site.baseurl}}/docs/" class="firstlevelanchor">
Docs
</a>
</li>
<li class="firstlevel dropdown dropdown-large{% if currentRequest[0] == 'about' %} active {% endif %}">
<a href="{{site.baseurl}}/about/" class="firstlevelanchor">
About
</a>
</li>
<li class="firstlevel dropdown dropdown-large{% if currentRequest[0] == 'showcase' %} active {% endif %}">
<a href="{{site.baseurl}}/showcase/" class="firstlevelanchor">
Showcase
</a>
</li>
<li class="firstlevel dropdown dropdown-large{% if currentRequest[0] == 'webinars' %} active {% endif %}">
<a href="{{site.baseurl}}/webinars/" class="firstlevelanchor">
Webinars
</a>
</li>
<li class="firstlevel dropdown dropdown-large{% if currentRequest[0] == 'github' %} active {% endif %}">
<a href="https://github.com/BIRDSOpenSource/BIRDSOpenSource.github.io" class="firstlevelanchor">
<button type="button" class="btn btn-primary"><strong>Github</strong></button>
</a>
</li>
</ul>
</div>
{% endif %} -->
<li class="firstlevel dropdown dropdown-large">
<a href="{{site.baseurl}}/about/" class="firstlevelanchor">
About
</a>
</li>
<li class="firstlevel dropdown dropdown-large">
<a href="https://birdsopensource.github.io/Build-A-Satellite/" class="firstlevelanchor">
Build
</a>
</li>
<li class="firstlevel dropdown dropdown-large">
<a href="{{site.baseurl}}/webinars/" class="firstlevelanchor">
Webinars
</a>
</li>
<li>
<a href="https://github.com/BIRDSOpenSource/" class="firstlevelanchor">
<button type="button" class="btn btn-primary">
<strong>Github</strong>
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
<path fill="currentColor"
d="M12 2A10 10 0 0 0 2 12c0 4.42 2.87 8.17 6.84 9.5c.5.08.66-.23.66-.5v-1.69c-2.77.6-3.36-1.34-3.36-1.34c-.46-1.16-1.11-1.47-1.11-1.47c-.91-.62.07-.6.07-.6c1 .07 1.53 1.03 1.53 1.03c.87 1.52 2.34 1.07 2.91.83c.09-.65.35-1.09.63-1.34c-2.22-.25-4.55-1.11-4.55-4.92c0-1.11.38-2 1.03-2.71c-.1-.25-.45-1.29.1-2.64c0 0 .84-.27 2.75 1.02c.79-.22 1.65-.33 2.5-.33s1.71.11 2.5.33c1.91-1.29 2.75-1.02 2.75-1.02c.55 1.35.2 2.39.1 2.64c.65.71 1.03 1.6 1.03 2.71c0 3.82-2.34 4.66-4.57 4.91c.36.31.69.92.69 1.85V21c0 .27.16.59.67.5C19.14 20.16 22 16.42 22 12A10 10 0 0 0 12 2" />
</svg>
</button>
</a>
</li>
</ul>
</div>
</nav>

<!-- Navigation End -->

</nav>
5 changes: 3 additions & 2 deletions _includes/top.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<link rel="icon" type="image/png" href="/assets/favicons/favicon2.png">

<!-- CSS -->
<link rel="stylesheet" href="{{ "/assets/css/style.css" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/css/custom.css" | relative_url }}">
<!-- <link rel="stylesheet" href="{{ "/assets/css/style.css" | relative_url }}"> -->
<link rel="stylesheet" href="{{ '/assets/css/index.css' | relative_url }}">
<!-- <link rel="stylesheet" href="{{ '/assets/css/custom.css' | relative_url }}"> -->
</head>
33 changes: 20 additions & 13 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
<!DOCTYPE html>
<html lang="{{site.active_lang}}" class="no-js">

{% include top.html %}
{% include top.html %}

{% assign currentRequest = page.url | remove_first: '/' | downcase | split: '/' %}
{% assign currentRequest = page.url | remove_first: '/' | downcase | split: '/' %}

<body>
<body>

{% include navigation.html currentRequest=currentRequest %}
{% include navigation.html currentRequest=currentRequest %}

<div id="container">
<div id="content">
<section id="start">
{{ content }}
</section>
</div>
<div id="container">
<div id="content">
<section id="start">
{{ content }}
</section>
</div>
</div>

{% include footer.html %}
</body>
</html>
<main>
<section id="start">
{{ content }}
</section>
</main>

{% include footer.html %}
</body>

</html>
Loading