Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main -> release #31

Merged
merged 24 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d60da87
Update issue templates
coolcalcacol Jan 31, 2023
1e30cae
Create CONTRIBUTING.md
coolcalcacol Jan 31, 2023
e054e58
Merge pull request #23 from coolcalcacol/main
coolcalcacol Feb 2, 2023
f84558c
Merge pull request #22 from coolcalcacol/features/contributing-guidel…
ReduxGB Feb 3, 2023
e4f818e
Merge pull request #21 from coolcalcacol/features/github-issue-templates
ReduxGB Feb 3, 2023
6036d56
create initial database dockerfile and MySQL database dump to create …
minimkrr Feb 3, 2023
acd8cd3
Undo changes to gitinfo
ReduxGB Feb 3, 2023
42bb122
Merge remote-tracking branch 'origin/main'
ReduxGB Feb 3, 2023
1d3f91d
Undo changes to gitignore
ReduxGB Feb 3, 2023
3943724
Adds .idea back
ReduxGB Feb 3, 2023
d6a76ac
Merge pull request #25 from coolcalcacol/features/docker-integration
ReduxGB Feb 3, 2023
6de2327
Create main Dockerfile
minimkrr Feb 3, 2023
139bd7a
Merge pull request #27 from coolcalcacol/features/main-Dockerfile
ReduxGB Feb 3, 2023
304a17e
created abstract class plus specific report classes.
wardliii Feb 3, 2023
a4dbb5d
Merge pull request #28 from coolcalcacol/features/report-integration
ReduxGB Feb 3, 2023
7b803bc
Adds mysql driver dependency
ReduxGB Feb 7, 2023
593e382
Initial Commit
ReduxGB Feb 7, 2023
098ccc0
Initial Commit
ReduxGB Feb 7, 2023
6d7cfd4
Initial Commit
ReduxGB Feb 7, 2023
a66ce44
Initial Commit
ReduxGB Feb 7, 2023
cfe49c1
Initial Commit
ReduxGB Feb 7, 2023
2a910d1
Initial Commit
ReduxGB Feb 7, 2023
0c23ad5
Merge pull request #29 from coolcalcacol/feature-database-handler
coolcalcacol Feb 8, 2023
b324430
Merge pull request #30 from coolcalcacol/develop
coolcalcacol Feb 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ crashlytics-build.properties
fabric.properties
.idea/httpRequests
.idea/caches/build_file_checksums.ser
.idea/
/.idea/discord.xml
/.idea/GitLink.xml
13 changes: 13 additions & 0 deletions .idea/compiler.xml

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

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

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

12 changes: 12 additions & 0 deletions .idea/misc.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Contributing

## How to contribute
1. Create a new branch from the develop branch called "features/<Feature Name>"
2. make your changes
3. commit your changes with a descriptive message
4. push to your branch
5. submit a pull request
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM openjdk:17
COPY ./target/seMethods.jar /tmp
WORKDIR /tmp
ENTRYPOINT ["java", "-jar", "seMethods.jar", "db:3306"]
5 changes: 5 additions & 0 deletions db/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM mysql
WORKDIR /tmp
COPY *.sql /tmp/
COPY world.sql /docker-entrypoint-initdb.d
ENV MYSQL_ROOT_PASSWORD group6Pass
Loading