Skip to content

Commit e3b7d2e

Browse files
committed
Recent updates
1 parent 3b58720 commit e3b7d2e

30 files changed

+5744
-1837652
lines changed

.gitignore

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py,cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
98+
__pypackages__/
99+
100+
# Celery stuff
101+
celerybeat-schedule
102+
celerybeat.pid
103+
104+
# SageMath parsed files
105+
*.sage.py
106+
107+
# Environments
108+
.env
109+
.venv
110+
env/
111+
venv/
112+
ENV/
113+
env.bak/
114+
venv.bak/
115+
116+
# Spyder project settings
117+
.spyderproject
118+
.spyproject
119+
120+
# Rope project settings
121+
.ropeproject
122+
123+
# mkdocs documentation
124+
/site
125+
126+
# mypy
127+
.mypy_cache/
128+
.dmypy.json
129+
dmypy.json
130+
131+
# Pyre type checker
132+
.pyre/
133+
134+
# pytype static type analyzer
135+
.pytype/
136+
137+
# Cython debug symbols
138+
cython_debug/
139+
140+
# Static files
141+
static/

client/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:15.0-alpine
1+
FROM node:15.10-alpine
22

33
RUN [ "mkdir", "-p", "/usr/src/app" ]
44

client/cypress.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"baseUrl": "http://localhost:8080"
3-
}
2+
"baseUrl": "http://localhost:3000"
3+
}

client/cypress/integration/all.spec.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ describe('Perusable', function () {
55
});
66

77
it('Displays a list of results.', function () {
8-
cy.server();
9-
cy.route('GET', '**/api/v1/catalog/wines/**')
10-
.as('getWines');
11-
8+
// cy.intercept('GET', '**/api/v1/catalog/wines/**', { fixture: 'wines.json' }).as('getWines');
9+
cy.intercept('GET', '**/api/v1/catalog/wines/**').as('getWines');
10+
11+
1212
cy.visit('/');
13-
1413
cy.get('input[placeholder="Enter a search term (e.g. cabernet)"]')
1514
.type('cabernet');
16-
1715
cy.get('button').contains('Search').click();
1816
cy.wait('@getWines');
1917
cy.get('div.card-title').should('contain', 'Cabernet Sauvignon');
2018
});
21-
19+
2220
it('Displays wine search words.', function () {
23-
cy.server();
24-
cy.route('GET', '**/api/v1/catalog/wine-search-words/**')
25-
.as('getWineSearchWords');
26-
21+
// cy.intercept(
22+
// 'GET', '**/api/v1/catalog/wine-search-words/**',
23+
// { fixture: 'wine_search_words.json' }
24+
// ).as('getWineSearchWords');
25+
cy.intercept('GET', '**/api/v1/catalog/wine-search-words/**').as('getWineSearchWords');
26+
2727
cy.visit('/');
2828
cy.get('input[placeholder="Enter a search term (e.g. cabernet)"]')
2929
.type('cabarnet');

0 commit comments

Comments
 (0)