From 929226c5992b8570cee25681555d64f2afcf8ee2 Mon Sep 17 00:00:00 2001 From: Marco Lussetti Date: Sun, 17 Nov 2019 12:02:11 -0800 Subject: [PATCH 1/5] Fix minor typo --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 6a0f90c..3f1ed67 100644 --- a/index.html +++ b/index.html @@ -235,7 +235,7 @@

Memberships

Our space is funded through monthly memberships, workshops and donations. We offer two tiers of membership:

Drop-in: Free access to the space during our regular Open House H4cknight every Wednesday 5pm-9pm
-
Keyholder: $75 per month which gives you 24/7 access to the building (some limitaions apply)
+
Keyholder: $75 per month which gives you 24/7 access to the building (some limitations apply)
Family: extra $25 per month for all additional family memberships
From 89bd728fc84715d19881648ad5495bdb930e44a8 Mon Sep 17 00:00:00 2001 From: Marco Lussetti Date: Sun, 17 Nov 2019 12:14:19 -0800 Subject: [PATCH 2/5] Fix dead community links, & switch to https --- index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 3f1ed67..25e43e3 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@

Kamloops Makerspace

  • Memberships
  • Contact
  • Sponsors
    • -
  • Community
    • +
  • Community
    • @@ -50,10 +50,10 @@

    Kamloops Makerspace

    - + -

    JOIN US!

    +

    JOIN US!

    We are a community of makers

    @@ -80,7 +80,7 @@

    We are a non profit society dedicated to serving the creative and innovative people from all walks of life, can come together and share their enthusiasm and knowledge.

    The Kamloops Makerspace is a volunteer driven community workspace collective. - We have an active community forum where members share information, projects, and ideas. + We have an active community forum where members share information, projects, and ideas. We at the Kamloops Makerspace hope to provide an open and inclusive community workspace.
    We have several active work spaces including:
    @@ -258,7 +258,7 @@

    Memberships provide access to:

    Workshops
    -

    We offer at least one workshop every month. These could be anything from 3D printing, electronics, or welding to arts and crafts. Check our community forum or calendar for upcoming events.

    +

    We offer at least one workshop every month. These could be anything from 3D printing, electronics, or welding to arts and crafts. Check our community forum or calendar for upcoming events.

    @@ -269,7 +269,7 @@
    Workshops
    Tools
    -

    The majority of the tools we have available for member use are donated or on long-term loan from members or other community orgaizations. Visit our tools and space page on the forum to see a list of what we offer!

    +

    The majority of the tools we have available for member use are donated or on long-term loan from members or other community orgaizations. Visit our community forums to find out more about the tools we offer!

    @@ -321,7 +321,7 @@

    Get in touch

    Email: info@kamloopsmakerspace.com

    - We have our own social network that we use primarily, but we sometimes also use popular networks:
    + We have our own social network that we use primarily, but we sometimes also use popular networks:
      From 5d374ee1cf3dda6d63ed3dcc239e449cfcbf21a8 Mon Sep 17 00:00:00 2001 From: Marco Lussetti Date: Sun, 17 Nov 2019 12:15:00 -0800 Subject: [PATCH 3/5] Remove Google Plus (discontinued by Google) --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 25e43e3..68201fc 100644 --- a/index.html +++ b/index.html @@ -325,7 +325,6 @@

      Email: info@kamloopsmakerspace.

    From eb3874a14dfa89b9aa317409b775f764ded78528 Mon Sep 17 00:00:00 2001 From: Marco Lussetti Date: Sun, 17 Nov 2019 12:25:06 -0800 Subject: [PATCH 4/5] Clean up indent I was struggling a bit to edit the file as it had a mix of tab and spaces, with what looked like a 2 space indent objective. Cleaned up the indentation and standardized on 2 space indent. Obviously no attachment to it, was just try to standardize on what looked like the original intent --- index.html | 419 ++++++++++++++++++++++++++--------------------------- 1 file changed, 209 insertions(+), 210 deletions(-) diff --git a/index.html b/index.html index 68201fc..5556dea 100644 --- a/index.html +++ b/index.html @@ -2,27 +2,27 @@ - - - - + + + + - Kamloops Makerspace - - - - - - - - + Kamloops Makerspace + + + + + + + + - -
    -
    -
    + +
    +
    +
    - +
    -
    +

    JOIN US!

    -

    We are a community of makers

    -
    -
    - - - -
    +

    We are a community of makers

    +
    +
    + + + +
    - + - +
    -
    -
    -
    -
    -
    -
    -

    About us

    -

    Our Mission

    -

    We are a non profit society dedicated to serving the creative - community in the Thompson Nicola region. Our goal is to establish - and operate a space in Kamloops where hobyists, inventors, artists - and innovative people from all walks of life, can come together - and share their enthusiasm and knowledge.

    +
    +
    +
    +
    +
    +
    +

    About us

    +

    Our Mission

    +

    We are a non profit society dedicated to serving the creative + community in the Thompson Nicola region. Our goal is to establish + and operate a space in Kamloops where hobyists, inventors, artists + and innovative people from all walks of life, can come together + and share their enthusiasm and knowledge.

    The Kamloops Makerspace is a volunteer driven community workspace collective. - We have an active community forum where members share information, projects, and ideas. - We at the Kamloops Makerspace hope to provide an open and inclusive community workspace.
    -
    We have several active work spaces including:
    - - -
    -
    -
    -
    -
    -
    -
    + We have an active community forum where members share information, projects, and ideas. + We at the Kamloops Makerspace hope to provide an open and inclusive community workspace. +
    We have several active work spaces including:
    + +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    +
    -
    Kitchen
    +
    Kitchen
    Kitchen

    This full service kitchen is available for members to prepare meals and provides access to the all important COFFEE MACHINE!

    -
    +
    -
    -
    +
    +
    -
    Lounge
    +
    Lounge
    Lounge

    The lounge is where we hang out, eat, work on projects, watch tutorial videos, play games, and talk about the things we should be working on!.

    -
    +
    -
    -
    +
    +
    -
    Hackroom
    +
    Hackroom
    Hackroom

    The Hackroom provides storage for various componants and spare parts that are available for members to use in their projects with ample workspace available. It currently houses the Froggy Mill, Hot Air Rework Station and our 3D Printers.

    -
    +
    -
    -
    +
    +
    -
    Electronics Lab
    +
    Electronics Lab
    Electronics Lab

    The Electronics Lab provides members with a space to work on delicate electronic components. There is a variety of equipment such as soldering station, osciliscopes, and other testing equipment.

    -
    +
    @@ -154,37 +153,37 @@
    Electronics Lab
    Metal Shop
    Metal Shop

    The Metal Shop houses our Laser Cutter, Scorpion Mill, Drill press, Machining Lathe, Paint Booth, as well as an 8' work bench.

    - - + +
    -
    +
    Wood Shop
    Wood Shop

    The Wood Shop is a comprehensive shop which contains our SawStop table saw, CNC router, Shop Smith Multi-tool, Chop Saw and several hand tools.

    - - + +
    -
    -
    -
    +
    +
    +
    -
    ClaySpace and Kiln Room
    +
    ClaySpace and Kiln Room
    ClaySpace and Kiln Room

    The ClaySpace provides members with an appropriate work space for ceramics, and the kiln room allows members to fire their projects in house.

    -
    +
    @@ -193,180 +192,180 @@
    ClaySpace and Kiln Room
    Design Lab
    Design Lab

    The design lab offers more artisitic members a space to work on physical and virtual art. We provide an air brush station with easel, light table, drafting table, vinyl cutter and computer workstation.

    - - + +
    -
    +
    Craftorium
    Craftorium

    The Craftoruim focuses on hanidicrafts with equipment to assit members with projects that include sewing, crochet/knitting, paper crafts, polymer clay, jewellery making, perler beads, and many more.

    - - + +
    -
    - - -

    If you would like to learn more and get a free tour of the Makerspace, please join us at one of our weekly open house H4ck Nights every Wednesday, 5:00-9:00PM!

    -
    - + - +

    If you would like to learn more and get a free tour of the Makerspace, please join us at one of our weekly open house H4ck Nights every Wednesday, 5:00-9:00PM!

    +
    + + + +
    -
    -
    -
    -
    -
    -
    -

    - Membership Signup Form

    -

    Memberships

    -

    Our space is funded through monthly memberships, workshops and donations. We offer two tiers of membership:

    -
    Drop-in: Free access to the space during our regular Open House H4cknight every Wednesday 5pm-9pm
    -
    Keyholder: $75 per month which gives you 24/7 access to the building (some limitations apply)
    -
    Family: extra $25 per month for all additional family memberships
    - -
    -
    -
    -
    -
    -
    -

    Memberships provide access to:

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Workshops
    -

    We offer at least one workshop every month. These could be anything from 3D printing, electronics, or welding to arts and crafts. Check our community forum or calendar for upcoming events.

    -
    +
    +
    +
    +
    +
    +
    +

    + Membership Signup Form +

    +

    Memberships

    +

    Our space is funded through monthly memberships, workshops and donations. We offer two tiers of membership:

    +
    Drop-in: Free access to the space during our regular Open House H4cknight every Wednesday 5pm-9pm
    +
    Keyholder: $75 per month which gives you 24/7 access to the building (some limitations apply)
    +
    Family: extra $25 per month for all additional family memberships
    + +
    -
    +
    -
    -
    -
    -
    -
    -
    Tools
    -

    The majority of the tools we have available for member use are donated or on long-term loan from members or other community orgaizations. Visit our community forums to find out more about the tools we offer!

    -
    +
    +
    +

    Memberships provide access to:

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    Workshops
    +

    We offer at least one workshop every month. These could be anything from 3D printing, electronics, or welding to arts and crafts. Check our community forum or calendar for upcoming events.

    -
    +
    -
    -
    -
    -
    -
    -
    Space
    -
    207 Victoria St West. Kamloops, BC V2C 1A5
    -

    Come by any Wednesdays from 5pm to 9pm to checkout the space or message us on facebook to set up a time that works with one of our keyholders.

    -
    +
    +
    +
    +
    +
    +
    +
    Tools
    +

    The majority of the tools we have available for member use are donated or on long-term loan from members or other community orgaizations. Visit our community forums to find out more about the tools we offer!

    -
    +
    -
    -
    - +
    +
    +
    +
    +
    +
    Space
    +
    207 Victoria St West. Kamloops, BC V2C 1A5
    +

    Come by any Wednesdays from 5pm to 9pm to checkout the space or message us on facebook to set up a time that works with one of our keyholders.

    +
    +
    +
    +
    + + + + - +
    -
    -
    -
    -
    -
    -
    -

    Get in touch

    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    +

    Get in touch

    + +
    +
    +
    +
    +
    +
    +
    -
    -
    -
    -

    Email: info@kamloopsmakerspace.com

    -
    -
    - We have our own social network that we use primarily, but we sometimes also use popular networks:
    -
      +
      +
      +
      +
    +
    +
    +
    +
    +

    Email: info@kamloopsmakerspace.com

    +
    +
    + We have our own social network that we use primarily, but we sometimes also use popular networks:
    +
    -
    +

    Sponsorship

    We appreciate any support we can get. Please checkout our sponsors page to get started.

    -
    -
    +
    +
    -
    -
    - + + + -
    -
    -
    -
    -
    -
    - - - -
    -
    -

    ©Copyright 2015 - Kamloops Makerspace.

    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +

    ©Copyright 2015 - Kamloops Makerspace.

    +
    +
    +
    +
    - - + + From 58b8cf25ca5d70b77c739b12cf7c86c0f68bb55f Mon Sep 17 00:00:00 2001 From: Marco Lussetti Date: Sun, 17 Nov 2019 12:28:34 -0800 Subject: [PATCH 5/5] Missed a bit of indents --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 5556dea..2dc737c 100644 --- a/index.html +++ b/index.html @@ -234,9 +234,9 @@

    Memberships

    Our space is funded through monthly memberships, workshops and donations. We offer two tiers of membership:

    -
    Drop-in: Free access to the space during our regular Open House H4cknight every Wednesday 5pm-9pm
    -
    Keyholder: $75 per month which gives you 24/7 access to the building (some limitations apply)
    -
    Family: extra $25 per month for all additional family memberships
    +
    Drop-in: Free access to the space during our regular Open House H4cknight every Wednesday 5pm-9pm
    +
    Keyholder: $75 per month which gives you 24/7 access to the building (some limitations apply)
    +
    Family: extra $25 per month for all additional family memberships