Skip to content
This repository was archived by the owner on Mar 31, 2020. It is now read-only.

Green Greenhouses #2

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
3bc5d3b
Update README.md
FelixRandle Feb 21, 2019
fc028d6
set up basic framework
Feb 22, 2019
a795259
Base UI
FelixRandle Feb 24, 2019
20116c6
Added basic backend functionality
Feb 24, 2019
fef8af0
Moved folder
Feb 24, 2019
0f88d6c
remove old project files
Feb 24, 2019
0eacc3e
Throupy (#1)
Feb 24, 2019
aa613fe
Merge branch 'master' of https://github.com/FelixRandle/code-jam-4 in…
Feb 24, 2019
d2d642b
Added Add event option and menu
Feb 24, 2019
4860975
Merge branch 'master' into Throupy
FelixRandle Feb 24, 2019
d6f03be
Throupy (#2)
Feb 24, 2019
96bbc98
Added hound.yml
FelixRandle Feb 24, 2019
c762391
Split up pages
Feb 24, 2019
47738a1
Merge branch 'Throupy' of https://github.com/FelixRandle/code-jam-4 i…
Feb 24, 2019
737926f
Merge branch 'master' into Throupy
FelixRandle Feb 24, 2019
6175a68
Throupy (#3)
Feb 24, 2019
62a3ea1
made the basic translation file with a simple one way translation fun…
Feb 24, 2019
c367d1b
File Merging
FelixRandle Feb 24, 2019
605e475
Update DBHandler.py
Feb 25, 2019
48467a8
Merge branch 'Throupy' of https://github.com/FelixRandle/code-jam-4 i…
Feb 25, 2019
1e33312
Remove Event
Feb 25, 2019
4f3046f
Delete Button and PEP-8
Feb 25, 2019
99ebab6
Updated Event Viewer
FelixRandle Feb 25, 2019
f8d6a86
Merge branch 'Throupy'
FelixRandle Feb 25, 2019
6f21c7c
Updated Event Viewer (#5)
FelixRandle Feb 25, 2019
7c92108
added date checking using regex and added a InputCheck function to ch…
Zomatree Feb 25, 2019
857852f
Updated eventViewer
FelixRandle Feb 25, 2019
9c79961
Merge branch 'Felix'
FelixRandle Feb 25, 2019
62b5d08
Moved application.py
FelixRandle Feb 25, 2019
63e1aba
Merge branch 'Zomatree'
FelixRandle Feb 25, 2019
8e6efac
Merge Fixing
FelixRandle Feb 25, 2019
b83d45f
Login System (#8)
Feb 27, 2019
6c7f90a
Update application.py (#9)
Zomatree Feb 27, 2019
e269c0a
Fixed jsonMessages path
FelixRandle Feb 27, 2019
85ba295
Added Dark Mode
FelixRandle Feb 28, 2019
29f2955
Zomatree (#12)
Zomatree Feb 28, 2019
4dc3e18
Delete events.db
FelixRandle Feb 28, 2019
b1d2d22
Zomatree (#13)
Zomatree Mar 3, 2019
18fdd04
Undid changes (#15)
FelixRandle Mar 3, 2019
c28b172
Felix (#16)
FelixRandle Mar 3, 2019
36de500
Felix (#17)
FelixRandle Mar 3, 2019
fd2036c
Zomatree (#18)
Zomatree Mar 3, 2019
0b479b7
Revert "Zomatree (#18)"
FelixRandle Mar 3, 2019
3e2d2b7
Added User Login (#19)
FelixRandle Mar 3, 2019
b2e46bb
Zomatree (#20)
Zomatree Mar 3, 2019
ddf80e0
Removed unnecessary code
FelixRandle Mar 3, 2019
b857457
Dark Mode Update
FelixRandle Mar 3, 2019
8231e5c
Update README.md
FelixRandle Mar 3, 2019
9423c57
Linting issue.
FelixRandle Mar 3, 2019
2575dd5
Merge branch 'master' of https://github.com/FelixRandle/code-jam-4
FelixRandle Mar 3, 2019
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
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[flake8]
max-line-length=100
application_import_names=projectt
ignore=P102,B311,W503,E226,S311,W504,F821
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,5 @@ venv.bak/

# mypy
.mypy_cache/
.gitignore
app.db
3 changes: 3 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
flake8:
enabled: true
config_file: .flake8
6 changes: 5 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ verify_ssl = true

[dev-packages]
flake8 = "*"
autopep8 = "*"

[packages]
flake8 = "*"
googletrans = "*"

[requires]
python_version = "3.7"

[scripts]
lint = "python -m flake8"
lint = "python -m flake8"
start = "python -m project"
102 changes: 94 additions & 8 deletions Pipfile.lock

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

24 changes: 20 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,32 @@ You should be using [Pipenv](https://pipenv.readthedocs.io/en/latest/). Take a l

# Project Information

`# TODO`
TEAM GREEN GREENHOUSES

Team Leader:

[FliX](https://github.com/FelixRandle)

Team Members:

[Throupy](https://github.com/Throupy)

[Zomatree](https://github.com/zomatree)

## Description

`# TODO`
Find it tough to manage all those events you partake in?

Google Calendar too tough to understand, don't worry, we only have like, 4 buttons.

With all new dark mode to ensure that you're eyes never hurt after a long event management session.

## Setup & Installation

`# TODO`
Run `pipenv install --dev` from the repo's directory.

## How do I use this thing?

`# TODO`
Run `pipenv start run` from the repo's directory.

Register in the application. Add new events and take a look at all your stored events.
Loading