Merge pull request #60 from OpenDataScotland/copilot/tidy-up-static-assets

feat: consolidate static assets into /assets directory

Author: JackGilmore

.gitignore

@@ -6,4 +6,5 @@ node_modules
 *.map
 .jekyll-cache/
 .vscode/settings.json
-vendor/
+vendor/
+.DS_Store

.ruby-version

@@ -1 +1 @@
-3.2
+3.2.9

_config.yml

@@ -8,7 +8,7 @@ title: Open Data Scotland
 greeting: Welcome to Open Data Scotland
 description: A crowdsourced open data portal, aggregating open datasets across Scotland.
 baseurl: ""
-logo: /img/ods_logo_transparent_2022.png
+logo: /assets/img/ods_logo_transparent_2022.png
 repo: https://github.com/OpenDataScotland/jkan/
 
 # Site theme
@@ -100,7 +100,7 @@ exclude:
   - Gemfile.lock
   - vendor
   - node_modules
-  - scripts/src
+  - assets/scripts/src
   - package.json
   - webpack.config.js
   - README.md
@@ -109,4 +109,4 @@ exclude:
   - docker-compose.yml
 
 # Site default images/logos
-default_org_icon: /img/icons/default_org_icon.png
+default_org_icon: /assets/img/icons/default_org_icon.png

_data/categories.yml

@@ -1,64 +1,64 @@
 - name: Arts / Culture / History
-  logo: /img/categories/arts-culture-history.svg
+  logo: /assets/img/categories/arts-culture-history.svg
   featured: true
 - name: Budget / Finance
-  logo: /img/categories/budget-finance.svg
+  logo: /assets/img/categories/budget-finance.svg
   logo_credit: Renan Ferreira Santos from the Noun Project
   featured: true
 - name: Business and Economy
-  logo: /img/categories/business_and_economy.svg
+  logo: /assets/img/categories/business_and_economy.svg
   logo_credit: Vectors Market from the Noun Project
   featured: true
 - name: Council and Government
-  logo: /img/categories/council_and_government.svg
+  logo: /assets/img/categories/council_and_government.svg
   logo_credit: praveen patchu from the Noun Project
   featured: true
 - name: Education
-  logo: /img/categories/education.svg
+  logo: /assets/img/categories/education.svg
   logo_credit: Sergey Patutin from the Noun Project
   featured: true
 - name: Elections / Politics
-  logo: /img/categories/elections-politics.svg
+  logo: /assets/img/categories/elections-politics.svg
   logo_credit: Jean Soo from the Noun Project
   featured: true
 - name: Food and Environment
-  logo: /img/categories/food_environment.svg
+  logo: /assets/img/categories/food_environment.svg
   featured: true
 - name: Health and Social Care
-  logo: /img/categories/health-human-services.svg
+  logo: /assets/img/categories/health-human-services.svg
   logo_credit: Timothy Miller from the Noun Project
   featured: true
 - name: Housing and Estates
-  logo: /img/categories/housing_and_estates.svg
+  logo: /assets/img/categories/housing_and_estates.svg
   featured: true
 - name: Law and Licensing
-  logo: /img/categories/law_and_licensing.svg
+  logo: /assets/img/categories/law_and_licensing.svg
   logo_credit: ghufronagustian from the Noun Project
   featured: true
 - name: Parks / Recreation
-  logo: /img/categories/parks-recreation.svg
+  logo: /assets/img/categories/parks-recreation.svg
   logo_credit: Pipe Rosas Licht from the Noun Project
   featured: true
 - name: Planning and Development
-  logo: /img/categories/planning_and_development.svg
+  logo: /assets/img/categories/planning_and_development.svg
   featured: true
 - name: Public Safety
-  logo: /img/categories/new_public_safety.svg
+  logo: /assets/img/categories/new_public_safety.svg
   logo_credit: Vectors Point from the Noun Project
   featured: true
 - name: Sport and Leisure
-  logo: /img/categories/sport_and_leisure.svg
+  logo: /assets/img/categories/sport_and_leisure.svg
   logo_credit: Adrien Coquet from theNoun Project
   featured: true
 - name: Tourism
-  logo: /img/categories/tourism.svg
+  logo: /assets/img/categories/tourism.svg
   logo_credit: WEBTECHOPS LLP from the Noun Project
   featured: true
 - name: Transportation
-  logo: /img/categories/transportation.svg
+  logo: /assets/img/categories/transportation.svg
   logo_credit: Dmitry Baranovskiy from the Noun Project
   featured: true
 - name: Uncategorised
-  logo: /img/categories/uncategorized.svg
+  logo: /assets/img/categories/uncategorized.svg
   logo_credit: Edward Boatman from the Noun Project
   featured: true

_data/themes.yml

@@ -9,22 +9,17 @@
   <meta name="keywords" content="open, data, scotland, crowdsourced, volunteer, portal{% if page.title %}, {{ page.title | split: " " | join: ", " }}{% endif %}">
 
   <!-- Favicons -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/img/favicon-16x16.png">
   <link rel="manifest" href="/site.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+  <link rel="mask-icon" href="/assets/img/safari-pinned-tab.svg" color="#5bbad5">
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="theme-color" content="#ffffff">
 
 
-  <link rel="stylesheet" href="{{ "/scripts/dist/vendor.css" | relative_url | append: cacheBust }}">
-  {% assign theme_name = site.jkan_theme | default: 'Default' %}
-  {% assign theme = site.data.themes | where:'name', theme_name | first %}
-  {% if theme and theme.src and theme.src != empty %}
-  <link rel="stylesheet" href="{{ theme.src }}">
-  {% endif %}
-  <link rel="stylesheet" href="{{ "/css/main.css" | relative_url | append: cacheBust }}">
+  <link rel="stylesheet" href="{{ "/assets/scripts/dist/vendor.css" | relative_url | append: cacheBust }}">
+  <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url | append: cacheBust }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="me" href="https://mastodon.scot/@opendatascotland">
 
@@ -40,9 +35,9 @@
   <!-- Twittercard -->
   {% include addons/twittercard.html %}
   {% endif %}
-  <script src="{{ "/scripts/dist/vendor.js" | relative_url | append: cacheBust }}"></script>
-  <script src="{{ "/scripts/dist/bundle.js" | relative_url | append: cacheBust }}" defer></script>
-  <script src="{{ "/scripts/dist/map-utils.js" | relative_url | append: cacheBust }}"></script>
+  <script src="{{ "/assets/scripts/dist/vendor.js" | relative_url | append: cacheBust }}"></script>
+  <script src="{{ "/assets/scripts/dist/bundle.js" | relative_url | append: cacheBust }}" defer></script>
+  <script src="{{ "/assets/scripts/dist/map-utils.js" | relative_url | append: cacheBust }}"></script>
 
   <script>
     var settings = {

_includes/head.html

@@ -2,7 +2,7 @@
 schema: default
 title: Abertay University
 description: Research data from Abertay University
-logo: '/img/org_logos/abertay_university.png'
+logo: '/assets/img/org_logos/abertay_university.png'
 type:
 - Further Education
 portal_url: 'https://rke.abertay.ac.uk/en/datasets/'

_organizations/abertay_university.md

@@ -2,7 +2,7 @@
 schema: default
 title: Accountant in Bankruptcy
 description: An executive agency of Scottish Government
-logo: '/img/org_logos/accountant_in_bankruptcy.png'
+logo: '/assets/img/org_logos/accountant_in_bankruptcy.png'
 type:
 - Executive agency
 portal_url: ''

_organizations/accountant_in_bankruptcy.md

@@ -2,7 +2,7 @@
 schema: default
 title: Accounts Commission for Scotland
 description: Non-departmental public body. Part of Scottish Government
-logo: '/img/org_logos/accounts_commission.png'
+logo: '/assets/img/org_logos/accounts_commission.png'
 type:
 - Non-Departmental Public Body
 portal_url: ''

_organizations/accounts_commission_for_scotland.md

@@ -2,7 +2,7 @@
 schema: default
 title: Architecture and Design Scotland
 description: Non-departmental public body. Part of Scottish Government
-logo: '/img/org_logos/architecture_and_design_scotland.png'
+logo: '/assets/img/org_logos/architecture_and_design_scotland.png'
 type:
 - Non-Departmental Public Body
 portal_url: ''