From ba2d82106da7bef70e84f97637c0916b058ae327 Mon Sep 17 00:00:00 2001
From: Abraham Raji <avronr@tuta.io>
Date: Fri, 9 Oct 2020 12:23:52 +0530
Subject: [PATCH] Cleanup
---
README.md | 44 ++------
content/welcome-mentors.md | 6 ++
content/welcome.md | 6 ++
mentors.html | 95 ------------------
LICENSE => website/LICENSE | 0
website/README.md | 40 ++++++++
{archetypes => website/archetypes}/default.md | 0
config.toml => website/config.toml | 0
{content => website/content}/_index.md | 0
{content => website/content}/about.md | 0
{content => website/content}/archives.md | 0
{content => website/content}/coc.md | 0
{content => website/content}/learners.md | 0
{content => website/content}/mentors.md | 0
.../content}/privacy-policy.md | 0
{content => website/content}/schedule.md | 0
website/content/welcome-mentor.md | 28 ++++++
website/content/welcome.md | 43 ++++++++
.../layouts}/_default/baseof.html | 0
.../layouts}/_default/list.html | 0
.../layouts}/_default/single.html | 0
{layouts => website/layouts}/index.html | 0
.../layouts}/partials/footer.html | 0
.../layouts}/partials/head.html | 0
.../layouts}/partials/nav.html | 0
{static => website/static}/css/style.css | 0
{static => website/static}/img/example-29.svg | 0
{static => website/static}/img/fsci_logo.png | Bin
.../static}/img/landing-image.png | Bin
.../static}/img/landing-image.svg | 0
{static => website/static}/img/mentee.png | Bin
{static => website/static}/img/mentee.svg | 0
{static => website/static}/img/mentor.svg | 0
{static => website/static}/img/non-tech.svg | 0
{static => website/static}/img/tech.svg | 0
35 files changed, 130 insertions(+), 132 deletions(-)
delete mode 100644 mentors.html
rename LICENSE => website/LICENSE (100%)
create mode 100644 website/README.md
rename {archetypes => website/archetypes}/default.md (100%)
rename config.toml => website/config.toml (100%)
rename {content => website/content}/_index.md (100%)
rename {content => website/content}/about.md (100%)
rename {content => website/content}/archives.md (100%)
rename {content => website/content}/coc.md (100%)
rename {content => website/content}/learners.md (100%)
rename {content => website/content}/mentors.md (100%)
rename {content => website/content}/privacy-policy.md (100%)
rename {content => website/content}/schedule.md (100%)
create mode 100644 website/content/welcome-mentor.md
create mode 100644 website/content/welcome.md
rename {layouts => website/layouts}/_default/baseof.html (100%)
rename {layouts => website/layouts}/_default/list.html (100%)
rename {layouts => website/layouts}/_default/single.html (100%)
rename {layouts => website/layouts}/index.html (100%)
rename {layouts => website/layouts}/partials/footer.html (100%)
rename {layouts => website/layouts}/partials/head.html (100%)
rename {layouts => website/layouts}/partials/nav.html (100%)
rename {static => website/static}/css/style.css (100%)
rename {static => website/static}/img/example-29.svg (100%)
rename {static => website/static}/img/fsci_logo.png (100%)
rename {static => website/static}/img/landing-image.png (100%)
rename {static => website/static}/img/landing-image.svg (100%)
rename {static => website/static}/img/mentee.png (100%)
rename {static => website/static}/img/mentee.svg (100%)
rename {static => website/static}/img/mentor.svg (100%)
rename {static => website/static}/img/non-tech.svg (100%)
rename {static => website/static}/img/tech.svg (100%)
diff --git a/README.md b/README.md
index 0e73aa9..3aa9ab4 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,9 @@
-# Free Software Camp Website
+# Free Software Camp
+A unique, online mentorship programme conceptualized and organized by Free Software Foundation of India and Free Software Community of India.
-This website is build using [Hugo](https://gohugo.io/ "Hugo website"), a static site generator built with Go.
+Free Software Camp is a mentorship programme for bringing more people to Free Software with strong focus on philosophy. We connect learners with experienced Free Software community members to work on some tasks together - this could be either technical or non technical.
-### Installing Hugo
-Hugo is available on most modern operating systems. If you're using a GNU/Linux distribution that uses the `apt` package manager (Debian, Ubuntu or any of their derivatives) you can install it with the following command:
-
-``` sh
-sudo apt install hugo
-```
-If you're using a GNU/Linux distribution that uses the `pacman` package manager (Archlinux or any of it's derivatives) you can use the following command:
-
-``` sh
-sudo pacman -S hugo
-```
-If you're using a Distro that uses the dnf package manger (Fedora) you can use the following command:
-
-``` sh
-sudo dnf install hugo
-```
-### Running a development server
-To run a development server run the following command:
-
-``` sh
-hugo server -D
-```
-If you want your server to show your draft posts to run:
-
-``` sh
-hugo server -D --buildDrafts
-```
-### Generating Static Sites
-To generate static websites, just run the command `hugo` from the command line from the project's root folder where the config.toml file is present.
-This will generate the files in a directory called `public`. These files can now be deployed using a web server of your choice.
-
-### Workflow for camp.fsf.org.in
-- Run the hugo commands to generate the static site in the public folder.
-- Commit the contents of the public folder to the `production` branch.
-- The production branch can then be pushed to the server.
+This repo contains the website and resources related to Free Software Camp.
+- *website* : This folder consists the source code of the camp.fsf.org.in website. Instructions to develop and build the website is given in the README.md file in the website folder.
+- *Poster* : Consists of Promotional for Free Software Camp
+- *Scripts* : Consist of some useful Scripts
diff --git a/content/welcome-mentors.md b/content/welcome-mentors.md
index 5625cec..9af0c7d 100644
--- a/content/welcome-mentors.md
+++ b/content/welcome-mentors.md
@@ -5,6 +5,9 @@ slug: welcome-mentors
---
Dear Mentor,
+\
+\
+
We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
1) Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html)
@@ -16,4 +19,7 @@ You can reach out to us on camp@mm.gnu.org.in for any queries or concerns.
Regards,
+\
+\
+
Free Software Camp Organizing Team
diff --git a/content/welcome.md b/content/welcome.md
index a0ceef0..c5878c3 100644
--- a/content/welcome.md
+++ b/content/welcome.md
@@ -5,6 +5,9 @@ slug: welcome
---
Dear Learner,
+\
+\
+
We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
1. Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html).
@@ -30,6 +33,9 @@ Matrix is a communication protocol for sharing instant messages, photos, files a
You can reach out to us by mailing to [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in) for any queries or concerns.
+\
+\
+
Regards,
Free Software Camp Organizing Team
diff --git a/mentors.html b/mentors.html
deleted file mode 100644
index c8b9893..0000000
--- a/mentors.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="ie=edge">
- <title>Free Software Camp Mentors</title>
- <meta name="description" content="">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="style.css" type="text/css" media="screen" />
- <link rel="apple-touch-icon" href="/apple-touch-icon.png">
- <!-- Place favicon.ico in the root directory -->
- <link rel="stylesheet" href="https://tools-static.wmflabs.org/cdnjs/ajax/libs/font-awesome/5.14.0/css/all.css" crossorigin="anonymous" />
- </head>
- <body>
- <main>
- <div class="nav-container">
- <nav>
- <div class="logo">
- <a href="index.html">Free Software <span style="color:#469198">Camp</span></a>
- </div>
- <input type="checkbox" id="chk">
- <label for="chk" class="show-menu-btn" style="align-items:center;">
- <i class="nav-icon fas fa-bars"></i>
- </label>
- <ul class="menu">
- <li><a href="index.html#about">About</a></li>
- <li><a href="coc.html">Code of Conduct</a></li>
- <li><a href="sched.html">Schedule</a></li>
- <li><a href="index.html#contact">Contact</a></li>
- <div class="dropdown cta">
- <button onclick="myFunction()" class="dropbtn">Apply</button>
- <div id="myDropdown" class="dropdown-content" style="padding: 5px;">
- <button style="padding: 0px;"><a href='learners.html'>As Learner</a></button>
- <button style="padding: 0px;"><a href='mentors.html'>As Mentor</a></button>
- </div>
- </div>
- <label for="chk" class="hide-menu-btn"><i class="nav-icon fas fa-times"></i></label>
- </ul>
- </nav>
- </div>
-
- <script>
- function myFunction() {
- document.getElementById("myDropdown").classList.toggle("show");
- }
- function myFunctionnav() {
- document.getElementById("myDropdownnav").classList.toggle("show");
- }
- window.onclick = function(event) {
- if (!event.target.matches('.dropbtn')) {
- var dropdowns = document.getElementsByClassName("dropdown-content");
- var i;
- for (i = 0; i < dropdowns.length; i++) {
- var openDropdown = dropdowns[i];
- if (openDropdown.classList.contains('show')) {
- openDropdown.classList.remove('show');
- }
- }
- }
- }
- </script>
- <div class="expectations">
- <h1 class="heading">Mentor expectations</h2>
- <ul>
- <li>Free software contributions</li>
- <li>Identify projects in which they can mentor learners</li>
- <li>Commit 5 hours per week of mentoring during the 3 months of the mentorship - including answering questions, reviewing contributions, and meeting with learners</li>
- <li>Real-time meeting with learner(s) preferably once a week - either through real-time chat, video conference, or phone</li>
- <li>Timely review of contributions - if a mentor is unable to provide contribution review, they are responsible for finding community members who can</li>
- <li>Guidance to learners about how to work in a free software community</li>
- <li>Guidance to learners about time management</li>
- <li>Connect learners to the larger free software community</li>
- <li>Communicate with learners using Free Software tools</li>
- </ul>
- <div class="deco-box">
- <p>Do you want to apply as Learner instead?</p>
- <button><a href='learners.html'>Apply As Learner</a></button>
- </div>
- </div>
- <h2 class="medium-heading" style="text-align:center;margin-bottom:20px">Please fill out the form below to join as a mentor</h2>
- <div class="reg_form">
- <iframe frameborder="2" src="https://ee.kobotoolbox.org/single/eJ2m4rrb" width="80%" height="100%" style="margin: auto;"></iframe>
- </div>
- <footer>
- <div class="footer-icon-row ">
- <h1>Organised By</h1>
- <a href="https://fsci.in"><img height="50px" src="assets/img/fsci_logo.png" alt="Logo of FSCI" /></a>
- <a href="https://fsf.org.in"><img height="50px" src="https://fsf.org.in/assets/img/logo.png" alt="Logo of FSF" /></a>
- </div>
- <h3 style="text-align: center; font-weight: 400">Free Software Camp <a style="color: inherit;" href="privacy.html">Privacy Policy</a></h3>
- <p style="text-align: center;">Made with <span style="color: #e25555;">♥</span> All original content licensed under a free/libre copyleft license (GPL or CC BY-SA)</p>
- </footer>
- </main>
- </body>
-</html>
diff --git a/LICENSE b/website/LICENSE
similarity index 100%
rename from LICENSE
rename to website/LICENSE
diff --git a/website/README.md b/website/README.md
new file mode 100644
index 0000000..4af4369
--- /dev/null
+++ b/website/README.md
@@ -0,0 +1,40 @@
+# Free Software Camp Website
+
+This website is build using [Hugo](https://gohugo.io/ "Hugo website"), a static site generator built with Go.
+
+### Installing Hugo
+Hugo is available on most modern operating systems. If you're using a GNU/Linux distribution that uses the `apt` package manager (Debian, Ubuntu or any of their derivatives) you can install it with the following command:
+
+``` sh
+sudo apt install hugo
+```
+If you're using a GNU/Linux distribution that uses the `pacman` package manager (Archlinux or any of it's derivatives) you can use the following command:
+
+``` sh
+sudo pacman -S hugo
+```
+If you're using a Distro that uses the dnf package manger (Fedora) you can use the following command:
+
+``` sh
+sudo dnf install hugo
+```
+### Running a development server
+To run a development server run the following command:
+
+``` sh
+hugo server -D
+```
+If you want your server to show your draft posts to run:
+
+``` sh
+hugo server -D --buildDrafts
+```
+### Generating Static Sites
+To generate static websites, just run the command `hugo` from the command line from the project's root folder where the config.toml file is present.
+This will generate the files in a directory called `public`. These files can now be deployed using a web server of your choice.
+
+### Workflow for camp.fsf.org.in
+- Make necessary changes and commit the changes to git.
+- Run the `generate-site` script (present in the root folder) from the website folder.
+- Switch to the `production` branch.
+- Run the `update` script, commit the changes in git and push the changes to production branch.
diff --git a/archetypes/default.md b/website/archetypes/default.md
similarity index 100%
rename from archetypes/default.md
rename to website/archetypes/default.md
diff --git a/config.toml b/website/config.toml
similarity index 100%
rename from config.toml
rename to website/config.toml
diff --git a/content/_index.md b/website/content/_index.md
similarity index 100%
rename from content/_index.md
rename to website/content/_index.md
diff --git a/content/about.md b/website/content/about.md
similarity index 100%
rename from content/about.md
rename to website/content/about.md
diff --git a/content/archives.md b/website/content/archives.md
similarity index 100%
rename from content/archives.md
rename to website/content/archives.md
diff --git a/content/coc.md b/website/content/coc.md
similarity index 100%
rename from content/coc.md
rename to website/content/coc.md
diff --git a/content/learners.md b/website/content/learners.md
similarity index 100%
rename from content/learners.md
rename to website/content/learners.md
diff --git a/content/mentors.md b/website/content/mentors.md
similarity index 100%
rename from content/mentors.md
rename to website/content/mentors.md
diff --git a/content/privacy-policy.md b/website/content/privacy-policy.md
similarity index 100%
rename from content/privacy-policy.md
rename to website/content/privacy-policy.md
diff --git a/content/schedule.md b/website/content/schedule.md
similarity index 100%
rename from content/schedule.md
rename to website/content/schedule.md
diff --git a/website/content/welcome-mentor.md b/website/content/welcome-mentor.md
new file mode 100644
index 0000000..2e00779
--- /dev/null
+++ b/website/content/welcome-mentor.md
@@ -0,0 +1,28 @@
+---
+title: "Welcome Mentors"
+date: 2020-09-29T00:38:53+05:30
+slug: welcome-mentors
+---
+
+Dear Mentor,
+
+\
+\
+
+We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
+
+1. Make sure you have read the code of conduct
+2. Add your project ideas to this wiki page (contact us with your git.fosscommunity.in username for getting access to edit the wiki page)
+3. Consider subscribing to our low volume announcement mailing list or following us on mastodon/fediverse for updates regarding the camp and join in the conversation on matrix using any of the matrix powered apps like Element. If new to using matrix, you can sign up for accounts by following instructions at chat.feneas.org, chat.tchncs.de or chat.privacytools.io, instead of using matrix.org which will help to reduce their server load.
+
+
+You can reach out to us on camp@mm.gnu.org.in for any queries or concerns.
+
+
+\
+\
+
+Regards,
+
+
+Free Software Camp Organizing Team
diff --git a/website/content/welcome.md b/website/content/welcome.md
new file mode 100644
index 0000000..041268f
--- /dev/null
+++ b/website/content/welcome.md
@@ -0,0 +1,43 @@
+---
+title: "Welcome Learner"
+date: 2020-09-29T00:38:53+05:30
+slug: welcome
+---
+Dear Learner,
+
+\
+\
+
+We have received your application to join Free Software Camp 2020 organized by Free Software Foundation of India and Free Software Community of India. Please read this email and take necessary steps to complete your application.
+
+1. Make sure you have read the [code of conduct](https://camp.fsf.org.in/coc.html).
+2. Make sure you take the learners' [survey](https://ee.kobotoolbox.org/single/nxw4UE3B) that indicates to us your preferred language for sessions.
+3. Consider subscribing to our low volume announcement [mailing list](https://lists.fsci.in/postorius/lists/camp-announce.mm.gnu.org.in/) or following us on [mastodon/fediverse](https://social.masto.host/@fscamp>https://social.masto.host/@fscamp)for updates regarding the camp and join in the conversation on [matrix](https://matrix.to/#/#fscamp:poddery.com) using any of the matrix powered apps like Element.
+4. If your age is below 15, please contact us at [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in)
+
+If you are new to these terms, here is an explanation:
+
+## Mailing list:
+
+A mail send to a mailing list is distributed to all members, so when we send an email to camp-announce mailing list, all of you will get a copy of the mail.
+
+We have sent you an invitation to join the camp-announce mailing list, but Gmail seems to be marking it as spam even though we have correct DKIM and SPF records (these are standards for authenticating emails) for our emails. If you mark the invitation as not spam, it may help new people receive the mail in their inbox.
+
+## Mastodon/Fediverse:
+
+Mastodon is a Free Software to create a social media service similar to Twitter in features. Unlike twitter, mastodon is not controlled by a single company. Many people and organizations around the world run their own mastodon services which are referred to as instances and users of any of these instances can interact with users of any other instance. Additionally there are other software interoperable with mastodon and all of it together constitute the fediverse. Some other software part of the Fediverse are Pleroma, Friendica, Peertube, Pixelfed etc.
+
+## Matrix/Element:
+
+Matrix is a communication protocol for sharing instant messages, photos, files and audio/video calls. Element is most feature-complete app for Matrix protocol and is available on smart phones and laptop/desktop. Matrix has a similar decentralized architecture to mastodon, where different people and organizations provide an interoperable network of home servers (similar to an instance of mastodon). If you are new to using matrix, you can sign up for accounts by following instructions at [https://chat.feneas.org](https://chat.feneas.org), [https://chat.tchncs.de](https://chat.tchncs.de) or [https://chat.privacytools.io](https://chat.privacytools.io), instead of using matrix.org which will help to reduce their server load.
+
+You can reach out to us by mailing to [camp@mm.gnu.org.in](mailto:camp@mm.gnu.org.in) for any queries or concerns.
+
+
+\
+\
+
+Regards,
+
+
+Free Software Camp Organizing Team
diff --git a/layouts/_default/baseof.html b/website/layouts/_default/baseof.html
similarity index 100%
rename from layouts/_default/baseof.html
rename to website/layouts/_default/baseof.html
diff --git a/layouts/_default/list.html b/website/layouts/_default/list.html
similarity index 100%
rename from layouts/_default/list.html
rename to website/layouts/_default/list.html
diff --git a/layouts/_default/single.html b/website/layouts/_default/single.html
similarity index 100%
rename from layouts/_default/single.html
rename to website/layouts/_default/single.html
diff --git a/layouts/index.html b/website/layouts/index.html
similarity index 100%
rename from layouts/index.html
rename to website/layouts/index.html
diff --git a/layouts/partials/footer.html b/website/layouts/partials/footer.html
similarity index 100%
rename from layouts/partials/footer.html
rename to website/layouts/partials/footer.html
diff --git a/layouts/partials/head.html b/website/layouts/partials/head.html
similarity index 100%
rename from layouts/partials/head.html
rename to website/layouts/partials/head.html
diff --git a/layouts/partials/nav.html b/website/layouts/partials/nav.html
similarity index 100%
rename from layouts/partials/nav.html
rename to website/layouts/partials/nav.html
diff --git a/static/css/style.css b/website/static/css/style.css
similarity index 100%
rename from static/css/style.css
rename to website/static/css/style.css
diff --git a/static/img/example-29.svg b/website/static/img/example-29.svg
similarity index 100%
rename from static/img/example-29.svg
rename to website/static/img/example-29.svg
diff --git a/static/img/fsci_logo.png b/website/static/img/fsci_logo.png
similarity index 100%
rename from static/img/fsci_logo.png
rename to website/static/img/fsci_logo.png
diff --git a/static/img/landing-image.png b/website/static/img/landing-image.png
similarity index 100%
rename from static/img/landing-image.png
rename to website/static/img/landing-image.png
diff --git a/static/img/landing-image.svg b/website/static/img/landing-image.svg
similarity index 100%
rename from static/img/landing-image.svg
rename to website/static/img/landing-image.svg
diff --git a/static/img/mentee.png b/website/static/img/mentee.png
similarity index 100%
rename from static/img/mentee.png
rename to website/static/img/mentee.png
diff --git a/static/img/mentee.svg b/website/static/img/mentee.svg
similarity index 100%
rename from static/img/mentee.svg
rename to website/static/img/mentee.svg
diff --git a/static/img/mentor.svg b/website/static/img/mentor.svg
similarity index 100%
rename from static/img/mentor.svg
rename to website/static/img/mentor.svg
diff --git a/static/img/non-tech.svg b/website/static/img/non-tech.svg
similarity index 100%
rename from static/img/non-tech.svg
rename to website/static/img/non-tech.svg
diff --git a/static/img/tech.svg b/website/static/img/tech.svg
similarity index 100%
rename from static/img/tech.svg
rename to website/static/img/tech.svg
--
GitLab