From b5f95a37dca814aecfc6be4e5d77021077e5a521 Mon Sep 17 00:00:00 2001 From: Rui Martins Date: Wed, 8 Nov 2023 22:21:52 +0000 Subject: [PATCH 1/3] refactor: Update gitignore, makefile, README, editconfig --- .editorconfig | 35 ++++++ .gitignore | 336 ++++++++++++++++++++++++++++++++++++++++++++++++-- Makefile | 28 ++++- README.md | 22 ++++ 4 files changed, 407 insertions(+), 14 deletions(-) create mode 100644 .editorconfig create mode 100644 README.md diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..de4722f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,35 @@ +# Primetag template for all projects: https://gitlab.com/primetag/playbook/-/blob/main/config-templates/.editorconfig +# Before you apply changes, you should compare this file with the template. +# If you change this file, check if you should update the template too + +# Read More about EditorConfig: https://EditorConfig.org + +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +max_line_length = 120 +trim_trailing_whitespace = true + +[*.md] +indent_size = 2 +trim_trailing_whitespaces = false + +[*.{tf,tfvars}] +indent_size = 2 + +[*.py] +max_line_length = 120 +indent_style = space +indent_size = 4 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 + +[Makefile] +indent_style = tab diff --git a/.gitignore b/.gitignore index 56cc544..8b9cb38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,10 @@ # Nix and direnv .direnv -# IDEs -.vscode - -# OS -.DS_Store - -# Node -node_modules +# Created by https://www.toptal.com/developers/gitignore/api/hugo,node,linux,macos,windows,visualstudiocode,webstorm+all +# Edit at https://www.toptal.com/developers/gitignore?templates=hugo,node,linux,macos,windows,visualstudiocode,webstorm+all +### Hugo ### # Generated files by hugo /public/ /resources/_gen/ @@ -22,4 +17,327 @@ hugo.darwin hugo.linux # Temporary lock file while building -/.hugo_build.lock \ No newline at end of file +/.hugo_build.lock + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +### Node Patch ### +# Serverless Webpack directories +.webpack/ + +# Optional stylelint cache + +# SvelteKit build / generate output +.svelte-kit + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### WebStorm+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### WebStorm+all Patch ### +# Ignore everything but code style settings and run configurations +# that are supposed to be shared within teams. + +.idea/* + +!.idea/codeStyles +!.idea/runConfigurations + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/hugo,node,linux,macos,windows,visualstudiocode,webstorm+all \ No newline at end of file diff --git a/Makefile b/Makefile index 8a78847..fb7d71d 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,26 @@ -build: +.PHONY: help build init upgrade/theme + +default: help + +help: # Show help for each of the Makefile recipes. + @echo "" + @echo "██╗ ██╗ █████╗ ██████╗ ██████╗ ██╗ ██╗ █████╗ ██████╗ ███████╗ ██████╗██╗████████╗██╗ ██╗" + @echo "██║ ██║██╔══██╗██╔══██╗██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ ██╔════╝██║╚══██╔══╝╚██╗ ██╔╝" + @echo "███████║███████║██████╔╝██║ ██║██║ █╗ ██║███████║██████╔╝█████╗ ██║ ██║ ██║ ╚████╔╝ " + @echo "██╔══██║██╔══██║██╔══██╗██║ ██║██║███╗██║██╔══██║██╔══██╗██╔══╝ ██║ ██║ ██║ ╚██╔╝ " + @echo "██║ ██║██║ ██║██║ ██║██████╔╝╚███╔███╔╝██║ ██║██║ ██║███████╗ ╚██████╗██║ ██║ ██║ " + @echo "╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝╚═════╝ ╚══╝╚══╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝ ╚═════╝╚═╝ ╚═╝ ╚═╝ " + @echo "" + @echo " contact@hardwarecity.org" + @echo "Usage: make [target]" + @grep -E '^[a-zA-Z0-9 -]+:.*#' Makefile | sort | while read -r l; do printf "* \033[1;32m$$(echo $$l | cut -f 1 -d':')\033[00m:$$(echo $$l | cut -f 2- -d'#')\n"; done + @echo "" + +build: # Build the site. hugo --minify --environment production -init: - git submodule update --init +init: # Initialize the theme submodule. + git submodule update --init -upgrade/theme: - git submodule update --remote --merge \ No newline at end of file +upgrade/theme: # Upgrade the theme submodule. + git submodule update --remote --merge diff --git a/README.md b/README.md new file mode 100644 index 0000000..d0a4f58 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +# Hardware City website + +This is the source code for the Hardware City website. + +## How to set up +```bash + +``` + +## How to run + +```bash + +``` + + + +--- +With ❤️ from [Hardware City](https://hardwarecity.org) From e2196276fdc575a0de2290d8ddca128427791ee7 Mon Sep 17 00:00:00 2001 From: Rui Martins Date: Wed, 8 Nov 2023 23:18:46 +0000 Subject: [PATCH 2/3] Update .editorconfig --- .editorconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.editorconfig b/.editorconfig index de4722f..a4f8d1c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,3 @@ -# Primetag template for all projects: https://gitlab.com/primetag/playbook/-/blob/main/config-templates/.editorconfig -# Before you apply changes, you should compare this file with the template. -# If you change this file, check if you should update the template too - -# Read More about EditorConfig: https://EditorConfig.org - root = true [*] From 6b2bc43cb2cbaf4c4bb8463325e558760fed33f8 Mon Sep 17 00:00:00 2001 From: Rui Martins Date: Tue, 14 Nov 2023 18:20:01 +0000 Subject: [PATCH 3/3] docs: Split sessions file in smaller files (#2) * docs: Split sessions file in smaller files * chore: added dates to all sessions and separated the hackathons content in to single files --------- Co-authored-by: Diogo Correia --- README.md | 6 +- config/_default/languages.yaml | 2 +- content/en/hackathons/_index.md | 8 + .../en/hackathons/nos-hackathon-iot-2019.md | 22 + .../en/hackathons/sunset-hackahton-2017.md | 21 + .../en/hackathons/sunset-hackahton-2018.md | 43 ++ .../en/hackathons/sunset-hackahton-2019.md | 25 + content/en/sessions/_index.md | 488 ------------------ content/en/sessions/session-1.md | 24 + content/en/sessions/session-10.md | 56 ++ content/en/sessions/session-11.md | 56 ++ content/en/sessions/session-12.md | 63 +++ content/en/sessions/session-2.md | 44 ++ content/en/sessions/session-3.md | 41 ++ content/en/sessions/session-4.md | 48 ++ content/en/sessions/session-5.md | 41 ++ content/en/sessions/session-6.md | 37 ++ content/en/sessions/session-7.md | 23 + content/en/sessions/session-8.md | 58 +++ content/en/sessions/session-9.md | 50 ++ content/en/sunset-hackathon.md | 68 --- content/en/who-we-are.md | 4 + 22 files changed, 669 insertions(+), 559 deletions(-) create mode 100644 content/en/hackathons/_index.md create mode 100644 content/en/hackathons/nos-hackathon-iot-2019.md create mode 100644 content/en/hackathons/sunset-hackahton-2017.md create mode 100644 content/en/hackathons/sunset-hackahton-2018.md create mode 100644 content/en/hackathons/sunset-hackahton-2019.md create mode 100644 content/en/sessions/session-1.md create mode 100644 content/en/sessions/session-10.md create mode 100644 content/en/sessions/session-11.md create mode 100644 content/en/sessions/session-12.md create mode 100644 content/en/sessions/session-2.md create mode 100644 content/en/sessions/session-3.md create mode 100644 content/en/sessions/session-4.md create mode 100644 content/en/sessions/session-5.md create mode 100644 content/en/sessions/session-6.md create mode 100644 content/en/sessions/session-7.md create mode 100644 content/en/sessions/session-8.md create mode 100644 content/en/sessions/session-9.md delete mode 100644 content/en/sunset-hackathon.md diff --git a/README.md b/README.md index d0a4f58..99d063c 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,15 @@ This is the source code for the Hardware City website. ## How to set up ```bash - +make init +npm install postcss-cli # TODO(Rui): Move this line to the Makefile? ``` ## How to run ```bash - +make build +hugo serve # -p 1313 --bind 127.0.0.1 ```