Skip to content

Commit

Permalink
Merge branch 'noodle-run:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
YoussefLaunchUp authored Oct 31, 2023
2 parents 4665257 + f793d28 commit e0f9eab
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
title: ""
labels: bug
assignees: ""
---
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEAT]"
title: ""
labels: enhancement
assignees: ""
---
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ on:
push:
branches:
- main
pull_request:
pull_request_target:
branches:
- main
paths-ignore:
- ".vscode/**"
- "*.md"

env:
# Database
Expand All @@ -28,6 +33,7 @@ jobs:
main:
name: CI
runs-on: ubuntu-latest
environment: CI
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Our preferred way of providing the opportunity for people to contribute to Noodl

- You see an area of improvement in the code base, this could be a fix, feature, refactoring...etc

- Create an [issue](https://github.com/ixahmedxi/noodle/issues) on our Github repository.
- Create an [issue](https://github.com/noodle-run/noodle/issues) on our Github repository.

- Wait until a team member discusses the issue with you, and if both parties are in agreement, you can assign yourself to the issue.

Expand Down Expand Up @@ -106,7 +106,7 @@ There are a lot of other technologies being used in this project, however these

### Cloning the repo

To clone the repo, you firstly need to [fork](https://github.com/ixahmedxi/noodle/fork) it, and then clone your copy of noodle locally.
To clone the repo, you firstly need to [fork](https://github.com/noodle-run/noodle/fork) it, and then clone your copy of noodle locally.

```bash
git clone https://github.com/<your-gh-username>/noodle.git
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">
<img src="https://github.com/ixahmedxi/noodle/blob/main/public/logo.png?raw=true" alt="Noodle logo" width="75">
<img src="https://github.com/noodle-run/noodle/blob/main/public/logo.png?raw=true" alt="Noodle logo" width="75">
<h1>Noodle <br> Rethinking Student Productivity</h1>
<br>
</div>
Expand All @@ -14,7 +14,7 @@
>
> Follow me on twitter [@ixahmedxii](https://twitter.com/ixahmedxii) for updates.
![Noodle Preview](https://github.com/ixahmedxi/noodle/blob/main/public/preview.png?raw=true)
![Noodle Preview](https://github.com/noodle-run/noodle/blob/main/public/preview.png?raw=true)

<p align="center" style="color:dodgerblue;"><strong>⚠️ This is a UI design mockup of what the platform will look like, it is not the current state of the project.</strong></p>

Expand All @@ -40,5 +40,5 @@ As an open-source platform, Noodle strives to cultivate a community of students

## Star History

[![Star History Chart](https://api.star-history.com/svg?repos=ixahmedxi/noodle#gh-light-mode-only)](https://star-history.com/#ixahmedxi/noodle#gh-light-mode-only)
[![Star History Chart](https://api.star-history.com/svg?repos=ixahmedxi/noodle&theme=dark#gh-dark-mode-only)](https://star-history.com/#ixahmedxi/noodle#gh-dark-mode-only)
[![Star History Chart](https://api.star-history.com/svg?repos=noodle-run/noodle#gh-light-mode-only)](https://star-history.com/#noodle-run/noodle#gh-light-mode-only)
[![Star History Chart](https://api.star-history.com/svg?repos=noodle-run/noodle&theme=dark#gh-dark-mode-only)](https://star-history.com/#noodle-run/noodle#gh-dark-mode-only)
9 changes: 7 additions & 2 deletions src/app/(dashboard)/_components/side-menu-modules.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ const CreateModulePopover = () => {

const utils = trpc.useUtils();

const { mutateAsync } = trpc.module.post.create.useMutation({
const { mutateAsync, isLoading } = trpc.module.post.create.useMutation({
onSuccess: async () => {
await utils.module.get.all.invalidate();
},
Expand Down Expand Up @@ -362,7 +362,12 @@ const CreateModulePopover = () => {
<span className="text-default-500">Color</span>
</Button>

<Button type="submit" color="primary" className="font-semibold">
<Button
isLoading={isLoading}
type="submit"
color="primary"
className="font-semibold"
>
Create module
</Button>
</>
Expand Down
2 changes: 1 addition & 1 deletion src/app/(dashboard)/_components/side-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const DashboardSideMenu = async () => {
<ul>
<li>
<FeedbackModal
email={user?.emailAddresses[0]!.emailAddress ?? ""}
email={user?.emailAddresses[0]?.emailAddress ?? ""}
/>
</li>
<li>
Expand Down
2 changes: 1 addition & 1 deletion src/app/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const siteConfig = {
description:
"Noodle is an open-source platform that combines various productivity tools into one, such as note taking and task management, providing insightful automations to enhance student productivity.",

github: "https://github.com/ixahmedxi/noodle",
github: "https://github.com/noodle-run/noodle",
twitter: "https://twitter.com/ixahmedxii",
discord: "https://discord.gg/SERySfj8Eg",
instagram: "https://instagram.com/noodle.run",
Expand Down

0 comments on commit e0f9eab

Please sign in to comment.