Skip to content

Commit

Permalink
Merge pull request #40 from Schwarz-Official/develop
Browse files Browse the repository at this point in the history
Major GraphQL and Hot Chocolate Fusion integrations
  • Loading branch information
neerajbelsare authored Nov 2, 2024
2 parents 6ddbc22 + e593321 commit 4daf611
Show file tree
Hide file tree
Showing 186 changed files with 3,266 additions and 1,464 deletions.
13 changes: 13 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": 1,
"isRoot": true,
"tools": {
"hotchocolate.fusion.commandline": {
"version": "14.0.0",
"commands": [
"fusion"
],
"rollForward": false
}
}
}
12 changes: 0 additions & 12 deletions .github/workflows/lint.yml

This file was deleted.

28 changes: 26 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
### Frontend

# dependencies
/frontend/node_modules
Expand All @@ -21,6 +21,30 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/backend/auth/auth/secrets.py
/frontend/.env
/.idea

### Backend

/backend/auth/auth/secrets.py
/backend/user_profiles/.env
/commands.txt
/backend/*.log
/backend/*.pot
/backend/*.pyc
/backend/auth/__pycache__/
/backend/local_settings.py
/backend/db.sqlite3
db.sqlite3-journal
media


### HotChocolate Fusion Gateway

# .NET Core build folders
/gateway/bin/
/gateway/obj/

# Common node modules locations
/node_modules
/wwwroot/node_modules
26 changes: 23 additions & 3 deletions .idea/Schwarz.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/aws.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/libraries/groovy_4_0_2.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/sqldialects.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .runConfigs/Backend Auth Server.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Backend Auth Server" type="Python.DjangoServer" factoryName="Django server">
<module name="Schwarz" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
<env name="DJANGO_SETTINGS_MODULE" value="auth.settings" />
</envs>
<option name="SDK_HOME" value="" />
<option name="SDK_NAME" value="Pipenv (Schwarz)" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="launchJavascriptDebuger" value="false" />
<option name="port" value="8000" />
<option name="host" value="localhost" />
<option name="additionalOptions" value="" />
<option name="browserUrl" value="" />
<option name="runTestServer" value="false" />
<option name="runNoReload" value="false" />
<option name="useCustomRunCommand" value="false" />
<option name="customRunCommand" value="" />
<method v="2" />
</configuration>
</component>
12 changes: 12 additions & 0 deletions .runConfigs/Frontend Dev Server.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Frontend Dev Server" type="js.build_tools.npm">
<package-json value="$PROJECT_DIR$/frontend/package.json" />
<command value="run" />
<scripts>
<script value="dev" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
</component>
100 changes: 98 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,104 @@ We welcome UI/UX design contributions to enhance the user experience of Schwarz.

## Code Contributions

For detailed instructions on setting up the codebase and the overall software release workflow of Schwarz, please refer to the [README](./README.md).
### Setting Up the Project

1. **Fork the Repository**:
1. Navigate to the [Schwarz GitHub repository](https://github.com/Schwarz-Official/Schwarz).
2. Click the "Fork" button in the top-right corner of the repository's page. This will create a copy of the repository in your GitHub account.

2. **Clone Your Fork**:
1. Open your forked repository on GitHub (it should be at `https://github.com/your-username/Schwarz`).
2. Click the "Code" button and copy the URL of your forked repository.
3. On your local machine, open your terminal or command prompt.
4. Navigate to the directory where you want to clone the repository using the `cd` command.
5. Run the following command, replacing `<your-username>` with your GitHub username:
```bash
git clone https://github.com/your-username/schwarz-repo.git
```

3. **Set Up Remote Upstream**:
1. Change your directory to the cloned repository:
```bash
cd Schwarz
```

2. Add the original Schwarz repository as a remote named "upstream" to stay synced with the latest changes:
```bash
git remote add upstream https://github.com/Schwarz-Official/Schwarz.git
```

7. **Install Dependencies**: Schwarz has both frontend (React) and backend (Django) components. First, install the required packages in both the `frontend` and `backend` folders:
```bash
# Inside the frontend folder
cd frontend
npm install
# Inside the backend folder
cd ../backend
pip install -r requirements.txt
```

### Running the Project

#### Frontend (React App)

To run the React app, navigate to the `frontend` folder and start the development server:

```bash
cd frontend
npm start
```

This will start the React development server. You can view the app in your browser at `http://localhost:3000`.

#### Backend (Django Server)

To run the Django backend, navigate to the `backend` folder and apply migrations, create a superuser, and then run the server:

```bash
cd backend
# Apply migrations
python manage.py migrate
# Create a superuser
python manage.py createsuperuser
# Run the server
python manage.py runserver
```

The Django server will be accessible at `http://localhost:8000`.

### Making Your Changes

1. **Create a New Branch**: Before making changes, create a new branch for your work:
```bash
git checkout -b my-feature
```

2. **Make Changes**: Make your changes, add your features, or fix bugs. Remember to follow the project's coding style.
3. **Commit Your Changes**: Commit your changes with a descriptive message:
```bash
git add .
git commit -m "Description of your changes"
```
4. **Push Your Changes**: Push your changes to your forked repository:
```bash
git push origin my-feature
```
### Submitting Your Changes
1. **Create a Pull Request**: Visit your forked repository on GitHub, switch to the branch you created, and click the "New Pull Request" button.
2. **Describe Your Changes**: Fill in a descriptive title and comment explaining your changes. Reference any related issues.
3. **Review and Merge**: A maintainer will review your changes. Once approved, your changes will be merged into the project.
Thank you for your contribution to Schwarz! If you have any questions or need further assistance, feel free to reach out. Happy coding! 🚀
---
---
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ EXPOSE 8000
# RUN apt-get update && apt-get install -y ...

# Start your Django application
CMD ["python", "backend/manage.py", "runserver", "0.0.0.0:8000"]
CMD ["python", "backend/manage.py", "runserver", "0.0.0.0:8000"]
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ pipeline {
// }
// }
}
}
}
13 changes: 0 additions & 13 deletions Pipfile

This file was deleted.

23 changes: 0 additions & 23 deletions Pipfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion assets/Other_Logos_SVG/Apple_logo_black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/Other_Logos_SVG/Google__G__Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/Other_Logos_SVG/Logo_of_Twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4daf611

Please sign in to comment.