Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/acmcsufoss/1st
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanThatOneKid committed Feb 14, 2024
2 parents 2047666 + 275168a commit 23433cd
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 104 deletions.
81 changes: 42 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,87 +1,90 @@
# 1st | First Contributions to acmCSUF

<br>

`oss.acmcsuf.com/1st` aims to simplify and guide the way beginners make their first contribution. If you are looking to make your first contribution, follow the steps below. If you're not comfortable with command line, [here are tutorials using GUI tools](https://github.com/firstcontributions/first-contributions/blob/main/README.md#tutorials-using-other-tools). If you don't have Git on your machine, [install it](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git).
<br> <br>
`oss.acmcsuf.com/1st` aims to simplify and guide the way beginners make their
first contribution. If you are looking to make your first contribution, follow
the steps below. If you're not comfortable with command line,
[here are tutorials using GUI tools](https://github.com/firstcontributions/first-contributions/blob/main/README.md#tutorials-using-other-tools).
If you don't have Git on your machine,
[install it](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git).

## Welcome to ACM!

<br>

ACM at CSUF provides a social online platform, Discord, that brings passionate Titans together to engage in multiple conversations regarding our community, the tech field, and many more. Join [our Discord server](https://acmcsuf.com/discord) to learn more about future events, meet new people, and get involved with the community!
<br> <br>
ACM at CSUF provides a social online platform, Discord, that brings passionate
Titans together to engage in multiple conversations regarding our community, the
tech field, and many more. Join
[our Discord server](https://acmcsuf.com/discord) to learn more about future
events, meet new people, and get involved with the community!

## Fork `oss.acmcsuf.com/1st`

<br>
<img src="https://github.com/EvanCPSC/1st/assets/142952307/bfd366f9-8f05-4c51-ae3f-2928fbf6c0f0" alt="Forking oss.acmcsuf.com/1st visual example" width="800" />

![image](https://github.com/EvanCPSC/1st/assets/142952307/bfd366f9-8f05-4c51-ae3f-2928fbf6c0f0)
Fork the repository by clicking on the fork button on the top of [`oss.acmcsuf.com/1st`'s page on GitHub](https://github.com/acmcsufoss/1st). This will create a copy of this repository in your account.
<br> <br>
Fork the repository by clicking on the fork button on the top of
[`oss.acmcsuf.com/1st`'s page on GitHub](https://github.com/acmcsufoss/1st).
This will create a copy of this repository in your account.

## Clone the repository

<br>
<img src="https://github.com/EvanCPSC/1st/assets/142952307/6725515a-0d2f-4e30-8552-d94fd65e7352" alt="Cloning the github repo visual example" width="800" />

![image](https://github.com/EvanCPSC/1st/assets/142952307/6725515a-0d2f-4e30-8552-d94fd65e7352)
Now clone the forked repository to your machine. Go to your GitHub account, open the forked repository, click on the code button and then click the _copy to clipboard_ icon.
Now clone the forked repository to your machine. Go to your GitHub account, open
the forked repository, click on the code button and then click the _copy to
clipboard_ icon.

Open a terminal and run the following git command: git clone "url you just copied" where "url you just copied" (without the quotation marks) is the url to this repository (your fork of this project). See the previous steps to obtain the url.
![image](https://github.com/EvanCPSC/1st/assets/142952307/fc40d06a-62d5-4ca3-bfcc-e80b3831f7d0)
Open a terminal and run the following git command: git clone "url you just
copied" where "url you just copied" (without the quotation marks) is the url to
this repository (your fork of this project). See the previous steps to obtain
the url.

<img src="https://github.com/EvanCPSC/1st/assets/142952307/fc40d06a-62d5-4ca3-bfcc-e80b3831f7d0" alt="Copy the repo URL visual example" height="400" />

For example:

`git clone https://github.com/this-is-you/acmcsuf.com.git`

where `this-is-you` is your GitHub username. Here you're copying the contents of the first-contributions repository on GitHub to your computer.
<br> <br>
where `this-is-you` is your GitHub username. Here you're copying the contents of
the first-contributions repository on GitHub to your computer.

## Create a branch

<br>

Change to the repository directory on your computer (if you are not already there): `cd acmcsuf.com`
Now create a branch using the git switch command: `git switch -c your-new-branch-name`
For example: `git switch -c add-ethanthatonekid`
<br> <br>
Change to the repository directory on your computer (if you are not already
there): `cd acmcsuf.com` Now create a branch using the git switch command:
`git switch -c your-new-branch-name` For example:
`git switch -c add-ethanthatonekid`

## Make necessary changes and commit them

<br>

<!-- TODO: Place instructions here.
Reference: https://acmcsuf.com/1st -->

<br> <br>

## Push changes to GitHub

<br>

Push your changes using the command `git push`:

`git push origin -u add-your-branch-name`

replacing `<add-your-branch-name>` with the name of the branch you created earlier.
<br> <br>
replacing `<add-your-branch-name>` with the name of the branch you created
earlier.

## Submit your changes for review

<br>
If you go to your repository on GitHub, you'll see a `Compare & pull request`
button. Click on that button.

If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
![image](https://github.com/EvanCPSC/1st/assets/142952307/fa97c205-7bde-45d6-94ce-141c98b14832)
<img src="https://github.com/EvanCPSC/1st/assets/142952307/fa97c205-7bde-45d6-94ce-141c98b14832" alt="Compare and pull request visual example" width="800" />

Now submit the pull request.
![image](https://github.com/EvanCPSC/1st/assets/142952307/7a6cde83-7287-4cdb-9adb-995675969f5f)

Soon, someone will be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.
<img src="https://github.com/EvanCPSC/1st/assets/142952307/7a6cde83-7287-4cdb-9adb-995675969f5f" alt="Creating the pull request visual example" width="800" />

Soon, someone will be merging all your changes into the master branch of this
project. You will get a notification email once the changes have been merged.

---

### CONGRATULATIONS ON MAKING YOUR FIRST CONTRIUBUTION

Inspired by [First Contributions](https://github.com/firstcontributions/first-contributions#readme)
Inspired by
[First Contributions](https://github.com/firstcontributions/first-contributions#readme)

Maintained with 💚 by [**@acmcsufoss**](https://github.com/acmcsufoss)
20 changes: 10 additions & 10 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ echo "<!DOCTYPE html>
<p>
This is a repository dedicated for new members of the ACM at CSUF
<b>Open Source Software Team</b> to make their first contributions to the
acmcsufoss org! Let us walk through the steps so you can make your first
commit, pull request, or issue closing to become a contributor of our
beloved community!
<b class=\"oss\">Open Source Software Team</b> to make their first
contributions to the acmcsufoss org! Let us walk through the steps so you
can make your first commit, pull request, or issue closing to become a
contributor of our beloved community!
</p>
<p>
Instructions on how to contribute can be found at <a
href=\"https://github.com/acmcsufoss/1st\"
>https://github.com/acmcsufoss/1st</a>. If you have any questions, feel
free to ask in the <a href=\"https://acmcsuf.com/discord\"
>#first-contributions</a> channel in our Discord server.
<p>
Instructions on how to contribute can be found in the
<a href=\"https://github.com/acmcsufoss/1st#readme\">README</a>. If you have
any questions, feel free to ask in the
<a href=\"https://acmcsuf.com/discord\">#first-contributions</a> channel in
our Discord server.
</p>
<h2>References</h2>
Expand Down
122 changes: 68 additions & 54 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,62 +1,76 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<link rel="stylesheet" href="style.css" />
<title>1st | acmcsufoss</title>
</head>
<body>
<h1>Welcome to First Contributions!</h1>
<link rel="stylesheet" href="style.css" />
<title>1st | acmcsufoss</title>
</head>
<body>
<h1>Welcome to First Contributions!</h1>

<p>
This is a repository dedicated for new members of the ACM at CSUF
<b>Open Source Software Team</b> to make their first contributions to the
acmcsufoss org! Let us walk through the steps so you can make your first
commit, pull request, or issue closing to become a contributor of our
beloved community!
</p>
<p>
This is a repository dedicated for new members of the ACM at CSUF
<b class="oss">Open Source Software Team</b> to make their first
contributions to the acmcsufoss org! Let us walk through the steps so you
can make your first commit, pull request, or issue closing to become a
contributor of our beloved community!
</p>

<p>
Instructions on how to contribute can be found at <a
href="https://github.com/acmcsufoss/1st"
>https://github.com/acmcsufoss/1st</a>. If you have any questions, feel
free to ask in the <a href="https://acmcsuf.com/discord"
>#first-contributions</a> channel in our Discord server.
</p>
<p>
Instructions on how to contribute can be found in the
<a href="https://github.com/acmcsufoss/1st#readme">README</a>. If you have
any questions, feel free to ask in the
<a href="https://acmcsuf.com/discord">#first-contributions</a> channel in
our Discord server.
</p>

<h2>References</h2>
<ul>
<li><a href="https://acmcsuf.com/1st">acmcsuf.com/1st</a></li>
<li>
<a
href="https://github.com/firstcontributions/first-contributions#readme"
>First contributions
</a>
</li>
</ul>
<h2>References</h2>
<ul>
<li>
<a href="https://acmcsuf.com/1st">acmcsuf.com/1st</a>
</li>
<li>
<a
href="https://github.com/firstcontributions/first-contributions#readme"
>First contributions
</a>
</li>
</ul>

<h2>List of contributors</h2>
<ul>
<li>
<p><a href="https://etok.codes/"><strong>@EthanThatOneKid</strong></a>
wuz here.</p>
</li>
<li>
<p><a href="https://github.com/evancpsc"><strong>@evancpsc</strong></a>:
Bassist</p>
</li>
<li>
<p><a
href="https://karni.codes/"><strong>@karnikaavelumani</strong></a>:
<img alt="Karni" src="https://avatars.githubusercontent.com/u/60043611?v=4" width="100" /></p>
</li>
<li>
<p><a
href="https://github.com/tomasohCHOM"><strong>@tomasohCHOM</strong></a>:
Sveltist</p>
</li>
</ul>
</body>
<h2>List of contributors</h2>
<ul>
<li>
<p>
<a href="https://etok.codes/"><strong>@EthanThatOneKid</strong></a>
wuz here.
</p>
</li>
<li>
<p>
<a href="https://github.com/evancpsc"><strong>@evancpsc</strong></a
>: Bassist
</p>
</li>
<li>
<p>
<a href="https://karni.codes/"><strong>@karnikaavelumani</strong></a
>:
<img
alt="Karni"
src="https://avatars.githubusercontent.com/u/60043611?v=4"
width="100"
/>
</p>
</li>
<li>
<p>
<a href="https://github.com/tomasohCHOM"
><strong>@tomasohCHOM</strong></a
>: Sveltist
</p>
</li>
</ul>
</body>
</html>
12 changes: 11 additions & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
--color-secondary: #e5e5e5;
--color-contrast: #393939;
--color-oss-team: #11d4b1;
--color-link: #0097a7;

@media (prefers-color-scheme: dark) {
--color-primary: #1a1a1a;
--color-secondary: #2d2d2d;
--color-contrast: #f5f5f5;
--color-link: #4dd0e1;
}
}

Expand All @@ -46,6 +48,14 @@ h1 {
text-align: center;
}

p > b {
p > b.oss {
color: var(--color-oss-team);
}

a {
color: var(--color-link);
}

ul li p img {
width: 1.5rem;
}

0 comments on commit 23433cd

Please sign in to comment.