Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
c78f9fb
chore: add EXPOSE in Dockerfile
evoxmusic Aug 23, 2021
2a866b5
fix: settings.py
evoxmusic Aug 23, 2021
3c7e0aa
chore: change texts
evoxmusic Aug 23, 2021
ff05f10
fake change
evoxmusic Aug 23, 2021
81b41ed
test
evoxmusic Aug 24, 2021
8e2526b
minor change
evoxmusic Aug 24, 2021
6a0025d
chore: change title
evoxmusic Aug 26, 2021
5f10643
minor
evoxmusic Aug 27, 2021
c8fe47d
minor change
evoxmusic Aug 27, 2021
4abdc23
minor change
evoxmusic Aug 30, 2021
1419feb
change title
evoxmusic Aug 30, 2021
46ce814
title change
evoxmusic Aug 31, 2021
ace1bcd
change title
evoxmusic Aug 31, 2021
dc86335
change title
evoxmusic Sep 1, 2021
8de6475
change title
evoxmusic Sep 1, 2021
7c6a69a
change title
evoxmusic Sep 1, 2021
f268a89
change title
evoxmusic Sep 4, 2021
c392014
change title
evoxmusic Sep 7, 2021
a2f6db1
change title
evoxmusic Sep 7, 2021
0f063c4
change title
evoxmusic Sep 9, 2021
c040c21
change title
evoxmusic Sep 14, 2021
105d30f
change title
evoxmusic Sep 14, 2021
b37048a
change title
evoxmusic Sep 15, 2021
0fa6a15
change title
evoxmusic Oct 1, 2021
5708a99
change title
evoxmusic Oct 1, 2021
d7e5366
chor: min change
evoxmusic Oct 22, 2021
279f287
chore: change title
evoxmusic Oct 28, 2021
1c40a7b
chore: change title
evoxmusic Nov 2, 2021
f4ca843
chore: change title
evoxmusic Nov 2, 2021
fe81094
chore: change title
evoxmusic Nov 3, 2021
ec28d8c
chore: change title
evoxmusic Nov 16, 2021
601112d
chore: title
evoxmusic Nov 18, 2021
c40a29c
chore: title
evoxmusic Nov 24, 2021
1610019
chore: change title
evoxmusic Nov 24, 2021
8394831
Merge pull request #3 from evoxmusic/chore/change_title
evoxmusic Nov 24, 2021
aad574e
chore: change title
evoxmusic Nov 26, 2021
37a4ed7
chore: change title
evoxmusic Nov 29, 2021
7e912e7
chore: change title
evoxmusic Dec 1, 2021
7a799d2
chore: change title
evoxmusic Dec 3, 2021
706ffd8
chore: change title
evoxmusic Dec 3, 2021
72b5084
chore: change title
evoxmusic Dec 3, 2021
2184aff
chore: change title
evoxmusic Dec 3, 2021
f6d5ba1
chore: change title
evoxmusic Dec 3, 2021
b021a8f
Merge pull request #10 from evoxmusic/feat/teo
evoxmusic Dec 3, 2021
35fdf1a
chore: change title
evoxmusic Dec 13, 2021
6ed9476
chore: change title
evoxmusic Dec 14, 2021
52cdd66
Merge pull request #18 from evoxmusic/feat/cyril
evoxmusic Dec 14, 2021
2740e3e
chore: change title
evoxmusic Dec 17, 2021
83b5233
chore: change title
evoxmusic Dec 17, 2021
301b082
chore: change title
evoxmusic Dec 20, 2021
3745fb7
chore: change title
evoxmusic Dec 21, 2021
e85c9b8
chore: change title
evoxmusic Dec 21, 2021
a5c5fda
chore: change title
evoxmusic Dec 22, 2021
7f58ca0
chore: change title
evoxmusic Dec 28, 2021
32c6344
chore: change title
evoxmusic Dec 29, 2021
fdeb37d
chore: change title
evoxmusic Dec 29, 2021
fe07000
chore: change title
evoxmusic Jan 4, 2022
a3d35c3
chore: change title - this is a new feature
evoxmusic Jan 4, 2022
f4a9699
Merge pull request #22 from evoxmusic/feat/burin_new_feat
evoxmusic Jan 4, 2022
de22964
chore: change title
evoxmusic Jan 4, 2022
d91cd57
chore: change title
evoxmusic Jan 4, 2022
2449559
chore: change title
evoxmusic Jan 5, 2022
6dbb276
chore: change title
evoxmusic Jan 5, 2022
8ece439
chore: change title for andrey
evoxmusic Jan 5, 2022
aaddc58
chore: change title
evoxmusic Jan 6, 2022
c02026e
chore: change title for osmar
evoxmusic Jan 6, 2022
d102275
chore: change title
evoxmusic Jan 7, 2022
b064059
chore: change title
evoxmusic Jan 11, 2022
24caa25
chore: change title
evoxmusic Jan 11, 2022
4aac04f
fix: runtime python
evoxmusic Jan 13, 2022
e2c9b2d
fix python runtime
evoxmusic Jan 13, 2022
5b330e2
chore: change title
evoxmusic Jan 17, 2022
aa43259
Merge pull request #25 from evoxmusic/feat/snehit
evoxmusic Jan 17, 2022
9092633
chore: change title
evoxmusic Jan 18, 2022
06229ac
chore: change title
evoxmusic Jan 19, 2022
2083f48
chore: change title
evoxmusic Jan 19, 2022
13a5c45
chore: change title
evoxmusic Jan 20, 2022
a53b70c
chore: change title
evoxmusic Jan 21, 2022
6c9a356
Merge pull request #27 from evoxmusic/feat/mehdi
evoxmusic Jan 21, 2022
0bd4428
chore: change title
evoxmusic Jan 21, 2022
19ab529
chore: change title
evoxmusic Jan 26, 2022
52d448b
chore: change title
evoxmusic Jan 27, 2022
ba4f00d
chore: change title
evoxmusic Jan 31, 2022
cf75d59
chore: change title
evoxmusic Jan 31, 2022
1d323d2
chore: change title
evoxmusic Jan 31, 2022
65142d7
Merge pull request #29 from evoxmusic/feat/benjamin_notiplus
evoxmusic Jan 31, 2022
1933408
chore: change title
evoxmusic Feb 2, 2022
ce6b768
chore: change title
evoxmusic Feb 2, 2022
c5c8119
chore: change tittle
evoxmusic Feb 2, 2022
e5b9f18
chore: change title
evoxmusic Feb 4, 2022
c479bb4
chore: change title
evoxmusic Feb 4, 2022
aa75fa7
Update base.html
evoxmusic Feb 9, 2022
432831d
Update base.html
evoxmusic Feb 9, 2022
6b844f9
chore: change title
evoxmusic Feb 14, 2022
dfd64ef
chore: change title
evoxmusic Feb 15, 2022
72e2b5d
change title
evoxmusic Feb 17, 2022
639eedb
change title
evoxmusic Feb 17, 2022
0abc754
chore: change title
evoxmusic Feb 17, 2022
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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ RUN pip install --no-cache-dir -r requirements.txt

COPY . .

CMD ["python", "run.py"]
EXPOSE 5555

CMD ["python", "run.py"]
4 changes: 2 additions & 2 deletions app/client/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div>
<div class="dh-highlight-text">
<div class="container">
<h1 class="clearmargin clearpadding">ShortMe</h1>
<h1 class="clearmargin clearpadding">Hello Romain</h1>
<p id="heading-p">ShortMe is a free tool to shorten URLs. Create a short & memorable URL in seconds.</p>
</div>
</div>
Expand All @@ -41,4 +41,4 @@ <h1 class="clearmargin clearpadding">ShortMe</h1>

</body>

</html>
</html>
5 changes: 1 addition & 4 deletions app/client/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ <h6 class="text-dark font-weight-bold">Check out <a href="{{ url_for('api_doc_bl
<div class="text-center" id="credits">
<div class="card credits-card">
<h6 class="text-dark font-weight-bold"><i class="fa fa-code c"></i> with <i class="fa fa-heart c"></i>
by <a href="https://www.linkedin.com/in/tomer-chaim/">Tomer</a></h6>

<h6 class="text-dark font-weight-bold">Check out my <a
href="https://github.com/acrobaticPanicc/">GitHub</a></h6>
by <a href="https://www.qovery.com">Qovery</a></h6>
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion app/client/templates/verify.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="card-body">

<h1 id="token"></h1>
<h1><span>✉</span> Please check your inbox</h1>
<h1><span>✉</span> Please check your inbox x</h1>
<p>We've sent a verification code to your email. Please enter it below and click
verify.</p>

Expand Down
18 changes: 9 additions & 9 deletions app/setup/settings.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import os

SECRET_KEY = os.environ.get('SECRET_KEY')
SQLALCHEMY_DATABASE_URI = os.environ.get('SQLALCHEMY_DATABASE_URI')
SQLALCHEMY_TRACK_MODIFICATIONS = os.environ.get('SQLALCHEMY_TRACK_MODIFICATIONS')
ADMIN_USERNAME = os.environ.get('ADMIN_USERNAME')
ADMIN_PASSWORD = os.environ.get('ADMIN_PASSWORD')
SECRET_KEY = 'mySecretKey' #os.environ.get('SECRET_KEY')
SQLALCHEMY_DATABASE_URI = 'sqlite:///db.sqlite3' #os.environ.get('SQLALCHEMY_DATABASE_URI')
SQLALCHEMY_TRACK_MODIFICATIONS = False #os.environ.get('SQLALCHEMY_TRACK_MODIFICATIONS')
ADMIN_USERNAME = 'admin' #os.environ.get('ADMIN_USERNAME')
ADMIN_PASSWORD = 'admin' #os.environ.get('ADMIN_PASSWORD')

MAIL_SERVER = os.environ.get('MAIL_SERVER')
MAIL_PORT = int(os.environ.get('MAIL_PORT'))
MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
MAIL_SERVER = 'localhost' # os.environ.get('MAIL_SERVER')
MAIL_PORT = 25 # int(os.environ.get('MAIL_PORT'))
MAIL_USERNAME = 'user' # os.environ.get('MAIL_USERNAME')
MAIL_PASSWORD = 'password' # os.environ.get('MAIL_PASSWORD')
MAIL_USE_TLS = False
MAIL_USE_SSL = True

Expand Down
1 change: 1 addition & 0 deletions runtime.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-3.7.12