Intial Commit.

jslovers · Apr 25, 2024 · 400bcd5 · 400bcd5
commit 400bcd5
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 0 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,20 @@
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches:
+      - main  # Set this to your default branch
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Deploy to GitHub Pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./  # Set this to the directory where your index.html is located
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 JSLovers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -0,0 +1,55 @@
+# Git Workshop Task: Update Attendee List
+
+## Objective
+This task is designed to help you practice basic Git commands by adding your name to an attendee list on an HTML page, creating a new branch, and then raising a pull request to merge this branch into the `master` branch.
+
+## Instructions
+
+### Setup
+1. Fork this repository to your GitHub account.
+2. Clone your forked repository to your local machine:
+   ```bash
+   git clone https://github.com/jslovers/git-workshop-may24.git
+   ```
+3. Navigate into the cloned directory:
+   ```bash
+   cd git-workshop-may24
+   ```
+
+### Task
+1. Create a new branch for your changes:
+   ```bash
+   git checkout -b add-my-name-YOURNAME
+   ```
+2. Open the `index.html` file located in the root directory.
+3. Find the `<ul>` tag for attendees.
+4. Add a new `<li>` element with your name:
+   ```html
+   <li>Your Name</li>
+   ```
+5. Save your changes.
+
+### Committing Changes
+1. Add your changes to the staging area:
+   ```bash
+   git add index.html
+   ```
+2. Commit your changes with a descriptive message:
+   ```bash
+   git commit -m "Add <Your-Name> to attendee list"
+   ```
+
+### Pushing Changes
+1. Push your changes to the new branch on your fork:
+   ```bash
+   git push origin add-my-name
+   ```
+
+### Raising a Pull Request
+1. Go to your fork on GitHub.
+2. You'll see a prompt to "Compare & pull request" for your newly pushed branch. Click it.
+3. Ensure the base repository is set to the original repository and the base branch to `master`.
+4. Confirm your changes and then click **'Create Pull Request'**.
+
+## Conclusion
+After completing this task, you will have successfully practiced cloning a repository, creating a new branch, making changes, committing them, pushing these changes back to GitHub, and initiating a pull request to merge your changes with the `master` branch. Good luck!
diff --git a/index.html b/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Workshop Attendees</title>
+</head>
+<body>
+    <h1>Workshop Attendees</h1>
+    <ul>
+        <!-- Attendees will add their names here -->
+        <li>Jaswant Singh</li>
+    </ul>
+</body>
+</html>